Fix for issue #463

tsantalis · Apr 24, 2024 · fca0140 · fca0140
1 parent 301f49e
commit fca0140
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java b/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
@@ -3832,6 +3832,13 @@ else if(statement1.getLocationInfo().getCodeElementType().equals(CodeElementType
 										}
 									}
 								}
+								else if(replacements.size() == 1 && replacementInfo.getReplacements(ReplacementType.TYPE).size() > 0) {
+									List<Replacement> typeReplacements = replacementInfo.getReplacements(ReplacementType.TYPE);
+									Replacement typeReplacement = typeReplacements.get(0);
+									if(typeReplacement.getBefore().startsWith(typeReplacement.getAfter() + "<") || typeReplacement.getAfter().startsWith(typeReplacement.getBefore() + "<")) {
+										score = 0.99;
+									}
+								}
 								if(score == 0.99) {
 									for(CompositeStatementObject matchingInnerNode1 : matchingInnerNodes1) {
 										if(!matchingInnerNode1.equals(statement1)) {
@@ -4175,6 +4182,13 @@ else if(statement1.getLocationInfo().getCodeElementType().equals(CodeElementType
 										}
 									}
 								}
+								else if(replacements.size() == 1 && replacementInfo.getReplacements(ReplacementType.TYPE).size() > 0) {
+									List<Replacement> typeReplacements = replacementInfo.getReplacements(ReplacementType.TYPE);
+									Replacement typeReplacement = typeReplacements.get(0);
+									if(typeReplacement.getBefore().startsWith(typeReplacement.getAfter() + "<") || typeReplacement.getAfter().startsWith(typeReplacement.getBefore() + "<")) {
+										score = 0.99;
+									}
+								}
 								if(score == 0.99) {
 									for(CompositeStatementObject matchingInnerNode2 : matchingInnerNodes2) {
 										if(!matchingInnerNode2.equals(statement2)) {