Improve matching of . in Javadocs (#976)

JabRef/jabref-koppor#716
jabgui/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
jablib/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
jablib/src/main/java/org/jabref/logic/importer/Importer.java
jablib/src/main/java/org/jabref/model/database/BibDatabaseContext.java

Author: tsantalis

src/main/java/gr/uom/java/xmi/diff/UMLJavadocDiff.java

@@ -425,7 +425,7 @@ private boolean processModifiedTags(UMLTagElement tagBefore, UMLTagElement tagAf
 							}
 						}
 					}
-					if(!matchFound) {
+					if(!matchFound && beforeMatchingIndices.size() == matchingIndices.size()) {
 						for(Integer index : matchingIndices) {
 							if(!alreadyMatchedDocElement(docElement, fragmentsAfter.get(index))) {
 								Pair<UMLDocElement, UMLDocElement> pair = Pair.of(docElement, fragmentsAfter.get(index));
@@ -513,7 +513,7 @@ private boolean processModifiedTags(UMLTagElement tagBefore, UMLTagElement tagAf
 							}
 						}
 					}
-					if(!matchFound) {
+					if(!matchFound && afterMatchingIndices.size() == matchingIndices.size()) {
 						for(Integer index : matchingIndices) {
 							if(!alreadyMatchedDocElement(fragmentsBefore.get(index), docElement)) {
 								Pair<UMLDocElement, UMLDocElement> pair = Pair.of(fragmentsBefore.get(index), docElement);
@@ -550,27 +550,31 @@ private boolean processModifiedTags(UMLTagElement tagBefore, UMLTagElement tagAf
 		if(deletedDocElements.size() <= addedDocElements.size()) {
 			for(UMLDocElement deletedDocElement : new ArrayList<>(deletedDocElements)) {
 				String trimmed1 = deletedDocElement.getText().replaceAll("^\"|\"$", "");
-				for(UMLDocElement addedDocElement : new ArrayList<>(addedDocElements)) {
-					String trimmed2 = addedDocElement.getText().replaceAll("^\"|\"$", "");
-					if(trimmed1.equals(trimmed2) || trimmed1.equals(trimmed2 + ".") || trimmed2.equals(trimmed1 + ".")) {
-						Pair<UMLDocElement, UMLDocElement> pair = Pair.of(deletedDocElement, addedDocElement);
-						commonDocElements.add(pair);
-						deletedDocElements.remove(deletedDocElement);
-						addedDocElements.remove(addedDocElement);
+				if(!trimmed1.equals(".")) {
+					for(UMLDocElement addedDocElement : new ArrayList<>(addedDocElements)) {
+						String trimmed2 = addedDocElement.getText().replaceAll("^\"|\"$", "");
+						if(trimmed1.equals(trimmed2) || trimmed1.equals(trimmed2 + ".") || trimmed2.equals(trimmed1 + ".")) {
+							Pair<UMLDocElement, UMLDocElement> pair = Pair.of(deletedDocElement, addedDocElement);
+							commonDocElements.add(pair);
+							deletedDocElements.remove(deletedDocElement);
+							addedDocElements.remove(addedDocElement);
+						}
 					}
 				}
 			}
 		}
 		else {
 			for(UMLDocElement addedDocElement : new ArrayList<>(addedDocElements)) {
 				String trimmed2 = addedDocElement.getText().replaceAll("^\"|\"$", "");
-				for(UMLDocElement deletedDocElement : new ArrayList<>(deletedDocElements)) {
-					String trimmed1 = deletedDocElement.getText().replaceAll("^\"|\"$", "");
-					if(trimmed1.equals(trimmed2) || trimmed1.equals(trimmed2 + ".") || trimmed2.equals(trimmed1 + ".")) {
-						Pair<UMLDocElement, UMLDocElement> pair = Pair.of(deletedDocElement, addedDocElement);
-						commonDocElements.add(pair);
-						deletedDocElements.remove(deletedDocElement);
-						addedDocElements.remove(addedDocElement);
+				if(!trimmed2.equals(".")) {
+					for(UMLDocElement deletedDocElement : new ArrayList<>(deletedDocElements)) {
+						String trimmed1 = deletedDocElement.getText().replaceAll("^\"|\"$", "");
+						if(trimmed1.equals(trimmed2) || trimmed1.equals(trimmed2 + ".") || trimmed2.equals(trimmed1 + ".")) {
+							Pair<UMLDocElement, UMLDocElement> pair = Pair.of(deletedDocElement, addedDocElement);
+							commonDocElements.add(pair);
+							deletedDocElements.remove(deletedDocElement);
+							addedDocElements.remove(addedDocElement);
+						}
 					}
 				}
 			}