Commit 187ac27

committed

addComment API refactorings to processDiff

1 parent a25fbcd commit 187ac27Copy full SHA for 187ac27

File tree

3 files changed

+14

-13

lines changed

.gitignore
src/main/java/edu/abhi/poi/excel
- ExcelDiffChecker.java
- Utility.java

3 files changed

+14

-13

lines changed

`‎.gitignore‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,3 +80,4 @@ local.properties`
`80`	`80`	`# Custom`
`81`	`81`	`!apps/*`
`82`	`82`	`/target/`
	`83`	`+.xls`

`‎src/main/java/edu/abhi/poi/excel/ExcelDiffChecker.java‎`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,7 @@ public static void main(String[] args) {`
`25`	`25`	`String FILE_NAME2 = args[1];`
`26`	`26`	`commentFlag = args.length == 2;`
`27`	`27`
`28`		`- String RESULT_FILE = FILE_NAME1.substring(0, FILE_NAME1.lastIndexOf(".")) + " vs " +`
`29`		`- FILE_NAME2;`
	`28`	`+ String RESULT_FILE = FILE_NAME1.substring(0, FILE_NAME1.lastIndexOf(".")) + " vs " + FILE_NAME2;`
`30`	`29`
`31`	`30`	`boolean success = true;`
`32`	`31`
`@@ -83,14 +82,14 @@ public static void main(String[] args) {`
`83`	`82`	`if(cell1 == null)`
`84`	`83`	`cell1 = row1.createCell(columnIndex);`
`85`	`84`
`86`		`- Utility.addComment(resultWorkbook, sheet1, rowIndex, cell1, "SYSTEM", cell2);`
	`85`	`+ Utility.processDiff(cell1, cell2, commentFlag);`
`87`	`86`	`}`
`88`	`87`	`} else if(Utility.hasNoContent(cell2)) {`
`89`	`88`	`if(Utility.hasContent(cell1)) {`
`90`		`- Utility.addComment(resultWorkbook, sheet1, rowIndex, cell1, "SYSTEM", null);`
	`89`	`+ Utility.processDiff(cell1, null, commentFlag);`
`91`	`90`	`}`
`92`	`91`	`} else if(!cell1.getRawValue().equals(cell2.getRawValue())) {`
`93`		`- Utility.addComment(resultWorkbook, sheet1, rowIndex, cell1, "SYSTEM", cell2);`
	`92`	`+ Utility.processDiff(cell1, cell2, commentFlag);`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`	`}`

`‎src/main/java/edu/abhi/poi/excel/Utility.java‎`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,10 @@`
`10`	`10`	`import org.apache.poi.ss.usermodel.DateUtil;`
`11`	`11`	`import org.apache.poi.ss.usermodel.Drawing;`
`12`	`12`	`import org.apache.poi.ss.usermodel.Sheet;`
`13`		`-import org.apache.poi.ss.usermodel.Workbook;`
`14`	`13`	`import org.apache.poi.xssf.usermodel.XSSFCell;`
`15`	`14`
`16`	`15`	`/**`
`17`		`- * @author abhis`
	`16`	`+ * @author abhishek sarkar`
`18`	`17`	`*`
`19`	`18`	`*/`
`20`	`19`	`public class Utility {`
`@@ -28,33 +27,35 @@ public static boolean hasContent(XSSFCell cell) {`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`@SuppressWarnings("rawtypes")`
`31`		`- public static void addComment(Workbook workbook, Sheet sheet, int rowIndex, XSSFCell cell1, String author, XSSFCell cell2) throws Exception {`
	`30`	`+ public static void processDiff(XSSFCell cell1, XSSFCell cell2, boolean commentFlag) throws Exception {`
	`31`	`+`
	`32`	`+ Sheet sheet = cell1.getSheet();`
`32`	`33`
`33`	`34`	`System.out.println(String.format("Diff at cell[%s] of sheet[%s]", cell1.getReference(), sheet.getSheetName()));`
`34`	`35`
`35`	`36`	`ExcelDiffChecker.diffFound = true;`
`36`	`37`
`37`		`- if(!ExcelDiffChecker.commentFlag) {`
	`38`	`+ if(!commentFlag) {`
`38`	`39`	`System.out.println(String.format("Expected: [%s], Found: [%s]", getCellValue(cell1), getCellValue(cell2)));`
`39`	`40`	`return;`
`40`	`41`	`}`
`41`	`42`
`42`		`- CreationHelper factory = workbook.getCreationHelper();`
	`43`	`+ CreationHelper factory = sheet.getWorkbook().getCreationHelper();`
`43`	`44`	`//get an existing cell or create it otherwise:`
`44`	`45`
`45`	`46`	`ClientAnchor anchor = factory.createClientAnchor();`
`46`	`47`	`//i found it useful to show the comment box at the bottom right corner`
`47`	`48`	`anchor.setCol1(cell1.getColumnIndex() + 1); //the box of the comment starts at this given column...`
`48`	`49`	`anchor.setCol2(cell1.getColumnIndex() + 3); //...and ends at that given column`
`49`		`- anchor.setRow1(rowIndex + 1); //one row below the cell...`
`50`		`- anchor.setRow2(rowIndex + 5); //...and 4 rows high`
	`50`	`+ anchor.setRow1(cell1.getRowIndex() + 1); //one row below the cell...`
	`51`	`+ anchor.setRow2(cell1.getRowIndex() + 5); //...and 4 rows high`
`51`	`52`
`52`	`53`	`Drawing drawing = sheet.createDrawingPatriarch();`
`53`	`54`	`Comment comment = drawing.createCellComment(anchor);`
`54`	`55`
`55`	`56`	`//set the comment text and author`
`56`	`57`	`comment.setString(factory.createRichTextString("Found " + Utility.getCellValue(cell2)));`
`57`		`- comment.setAuthor(author);`
	`58`	`+ comment.setAuthor("SYSTEM");`
`58`	`59`
`59`	`60`	`cell1.setCellComment(comment);`
`60`	`61`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 187ac27

File tree

3 files changed

3 files changed

`‎.gitignore‎`

`‎src/main/java/edu/abhi/poi/excel/ExcelDiffChecker.java‎`

`‎src/main/java/edu/abhi/poi/excel/Utility.java‎`

0 commit comments