Hide diffs when one of the field values is blank a.k.a no conflict (#9110)

HoussemNasri · web-flow · commit 48f927094547 · 2022-09-02T00:02:28.000+02:00
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
@@ -21,6 +21,7 @@
 import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
+import org.jabref.model.strings.StringUtil;
 
 import com.tobiasdiez.easybind.EasyBind;
 import org.fxmisc.richtext.StyleClassedTextArea;
@@ -150,7 +151,7 @@ public MergedFieldCell getMergedValueCell() {
     }
 
     public void showDiff(ShowDiffConfig diffConfig) {
-        if (!rightValueCell.isVisible()) {
+        if (!rightValueCell.isVisible() || StringUtil.isNullOrEmpty(viewModel.getLeftFieldValue()) || StringUtil.isNullOrEmpty(viewModel.getRightFieldValue())) {
             return;
         }
         LOGGER.debug("Showing diffs...");

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar;`
`22`	`22`	`import org.jabref.model.entry.BibEntry;`
`23`	`23`	`import org.jabref.model.entry.field.Field;`
	`24`	`+import org.jabref.model.strings.StringUtil;`
`24`	`25`
`25`	`26`	`import com.tobiasdiez.easybind.EasyBind;`
`26`	`27`	`import org.fxmisc.richtext.StyleClassedTextArea;`
`@@ -150,7 +151,7 @@ public MergedFieldCell getMergedValueCell() {`
`150`	`151`	`}`
`151`	`152`
`152`	`153`	`public void showDiff(ShowDiffConfig diffConfig) {`
`153`		`- if (!rightValueCell.isVisible()) {`
	`154`	`+ if (!rightValueCell.isVisible() \|\| StringUtil.isNullOrEmpty(viewModel.getLeftFieldValue()) \|\| StringUtil.isNullOrEmpty(viewModel.getRightFieldValue())) {`
`154`	`155`	`return;`
`155`	`156`	`}`
`156`	`157`	`LOGGER.debug("Showing diffs...");`