Refined diff remarks

Author: abhisheksarkar30

apps/excel-diff-checker.jar

@@ -1,2 +1,2 @@
-"%java8home%/bin/java" -jar excel-diff-checker.jar -b old* -t new* %* > edc.log
+"%java8home%/bin/java" -jar excel-diff-checker.jar -b old.* -t new.* %* > edc.log
 pause

apps/launch.bat

@@ -55,7 +55,7 @@ private void processAllRows() throws Exception {
 	}
 
 	private void processAllColumns(XSSFRow row1, XSSFRow row2) throws Exception {
-		StringBuilder sb = new StringBuilder();
+		StringBuilder rowRemarks = new StringBuilder();
 		boolean isRow1Blank = true, isRow2Blank = true;
 
 		for (int columnIndex = 0; columnIndex <= row1.getLastCellNum(); columnIndex++) {
@@ -67,55 +67,55 @@ private void processAllColumns(XSSFRow row1, XSSFRow row2) throws Exception {
 					isRow2Blank = false;
 					crt.setDiffFlag(true);
 					Utility.processDiffForColumn(cell1 == null ? row1.createCell(columnIndex) : cell1, remarksOnly,
-							Utility.getCellValue(cell2), sb);
+							Utility.getCellValue(cell2), rowRemarks);
 				}
 			} else if (Utility.hasNoContent(cell2)) {
 				if (Utility.hasContent(cell1)) {
 					isRow1Blank = false;
 					crt.setDiffFlag(true);
-					Utility.processDiffForColumn(cell1, remarksOnly, cell2 == null? null : Utility.getCellValue(cell2), sb);
+					Utility.processDiffForColumn(cell1, remarksOnly, cell2 == null? null : Utility.getCellValue(cell2), rowRemarks);
 				}
 			} else {
 				isRow1Blank = isRow2Blank = false;
 
 				if (!Utility.getCellValue(cell1).equals(Utility.getCellValue(cell2))) {
 					crt.setDiffFlag(true);
-					Utility.processDiffForColumn(cell1, remarksOnly, Utility.getCellValue(cell2), sb);
+					Utility.processDiffForColumn(cell1, remarksOnly, Utility.getCellValue(cell2), rowRemarks);
 				}
 			}
 		}
 
 		if(!isRow1Blank && isRow2Blank)
-			crt.getDiffContainer().append(String.format("Removed Row[%s] in sheet[%s]\n",
+			crt.getDiffContainer().append(String.format("\nRemoved Row[%s] of Sheet[%s]",
 					(row1.getRowNum() + 1), sheet1.getSheetName()));
 		else if(isRow1Blank && !isRow2Blank)
-			crt.getDiffContainer().append(String.format("Added Row[%s] in sheet[%s]\n",
+			crt.getDiffContainer().append(String.format("\nAdded Row[%s] in Sheet[%s]",
 					(row1.getRowNum() + 1), sheet1.getSheetName()));
 		else
-			crt.getDiffContainer().append(sb);
+			crt.getDiffContainer().append(rowRemarks);
 	}
 
 	public void processNullRow(XSSFSheet sheet1, int rowIndex, XSSFRow row2) throws Exception {
 		XSSFRow row1 = sheet1.getRow(rowIndex);
-		StringBuilder sb = new StringBuilder();
+		StringBuilder rowRemarks = new StringBuilder();
 
 		if (row1 == null) {
 			if (row2.getPhysicalNumberOfCells() != 0) {
 				row1 = sheet1.createRow(rowIndex);
 				crt.setDiffFlag(true);
 				for (int columnIndex = 0; columnIndex <= row2.getLastCellNum(); columnIndex++) {
 					Utility.processDiffForColumn(row1.createCell(0), remarksOnly,
-							Utility.getCellValue(row2.getCell(columnIndex)), sb);
+							Utility.getCellValue(row2.getCell(columnIndex)), rowRemarks);
 				}
-				crt.getDiffContainer().append(String.format("Added Row[%s] in sheet[%s]\n",
+				crt.getDiffContainer().append(String.format("\nAdded Row[%s] in Sheet[%s]",
 						(row1.getRowNum() + 1), sheet1.getSheetName()));
 			}
 		} else {
 			if (row1.getPhysicalNumberOfCells() != 0) {
 				crt.setDiffFlag(true);
 				XSSFCell cell1 = row1.getCell(0);
-				Utility.processDiffForColumn(cell1 == null ? row1.createCell(0) : cell1, remarksOnly, "Null row", sb);
-				crt.getDiffContainer().append(String.format("Removed Row[%s] in sheet[%s]\n",
+				Utility.processDiffForColumn(cell1 == null ? row1.createCell(0) : cell1, remarksOnly, "Null row", rowRemarks);
+				crt.getDiffContainer().append(String.format("\nRemoved Row[%s] of Sheet[%s]",
 						(row1.getRowNum() + 1), sheet1.getSheetName()));
 			}
 		}

src/main/java/edu/abhi/poi/excel/SheetProcessorTask.java

@@ -33,11 +33,13 @@ public static void processDiffForColumn(XSSFCell cell1, boolean remarksOnly, Str
 
 		Sheet sheet = cell1.getSheet();
 
-		sb.append(String.format("Diff at cell[%s] of sheet[%s]\n", cell1.getReference(), sheet.getSheetName()));
-
 		if(remarksOnly) {
-			sb.append(String.format("Expected: [%s], Found: [%s]\n", getCellValue(cell1), note));
+			sb.append(String.format("\nDiff at Cell[%s] of Sheet[%s]", cell1.getReference(), sheet.getSheetName()));
+			sb.append(String.format("\nExpected: [%s], Found: [%s]", getCellValue(cell1), note));
 			return;
+		} else {
+			sb.append(sb.length() > 0 ? " " : String.format("\nDiff at Row[%s] of Sheet[%s]: ", (cell1.getRowIndex() + 1), sheet.getSheetName()));
+			sb.append(cell1.getReference());
 		}
 
 		synchronized(sheet.getWorkbook()) {
@@ -84,7 +86,7 @@ public static String getCellValue(XSSFCell cell) throws Exception {
 		break;
 		case _NONE:	content += null;
 		break;
-		default: throw new Exception(String.format("Unexpected Cell[%s] Type[%s] of sheet[%s]", cell.getReference(), 
+		default: throw new Exception(String.format("Unexpected Cell[%s] Type[%s] of Sheet[%s]", cell.getReference(), 
 				cell.getCellType(), cell.getSheet().getSheetName()));
 		}
 		return content;