Fix for issue #198

jodavimehran · Nov 26, 2024 · 0307a95 · 0307a95
1 parent f3bb82f
commit 0307a95
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/main/java/org/codetracker/AbstractTracker.java b/src/main/java/org/codetracker/AbstractTracker.java
@@ -642,8 +642,8 @@ protected static boolean isAttributeAdded(UMLModelDiff modelDiff, String classNa
 	            return true;
 	    }
 
-	    UMLClass addedClass = modelDiff.getAddedClass(className);
-	    if (addedClass != null) {
+	    Set<UMLClass> addedClasses = modelDiff.getAllAddedClasses(className);
+	    for (UMLClass addedClass : addedClasses) {
 	        for (UMLAttribute attribute : addedClass.getAttributes()) {
 	            if (isAttributeAdded(attribute, equalOperator, currentVersion))
 	                return true;
@@ -714,8 +714,8 @@ protected static boolean isMethodAdded(UMLModelDiff modelDiff, String className,
 	            return true;
 	    }
 
-	    UMLClass addedClass = modelDiff.getAddedClass(className);
-	    if (addedClass != null) {
+	    Set<UMLClass> addedClasses = modelDiff.getAllAddedClasses(className);
+	    for (UMLClass addedClass : addedClasses) {
 	        for (UMLOperation operation : addedClass.getOperations()) {
 	            if (isMethodAdded(operation, equalOperator, addedMethodHandler, currentVersion))
 	                return true;

diff --git a/src/main/java/org/codetracker/AttributeTrackerChangeHistory.java b/src/main/java/org/codetracker/AttributeTrackerChangeHistory.java
@@ -261,8 +261,8 @@ public boolean isAttributeAdded(UMLModelDiff modelDiff, String className, Versio
                 return true;
         }
 
-        UMLClass addedClass = modelDiff.getAddedClass(className);
-        if (addedClass != null) {
+        Set<UMLClass> addedClasses = modelDiff.getAllAddedClasses(className);
+	    for (UMLClass addedClass : addedClasses) {
             for (UMLAttribute umlAttribute : addedClass.getAttributes()) {
                 if (handleAddAttribute(currentVersion, parentVersion, equalOperator, umlAttribute, "added with new class"))
                     return true;

diff --git a/src/main/java/org/codetracker/MethodTrackerChangeHistory.java b/src/main/java/org/codetracker/MethodTrackerChangeHistory.java
@@ -850,23 +850,24 @@ public boolean isMethodAdded(UMLModelDiff modelDiff, String className, Version c
         	}
         }
 
-        UMLClass addedClass = modelDiff.getAddedClass(className);
-        if (addedClass != null) {
+        Set<UMLClass> addedClasses = modelDiff.getAllAddedClasses(className);
+	    for (UMLClass addedClass : addedClasses) {
             for (UMLOperation operation : addedClass.getOperations()) {
                 if (handleAddOperation(currentVersion, parentVersion, equalOperator, operation, "added with new class"))
                     return true;
             }
         }
-        else {
+        if (addedClasses.isEmpty()) {
         	String prefix = new String(className);
+        	Set<UMLClass> outerAddedClasses = null;
         	while (prefix.contains(".")) {
         		prefix = prefix.substring(0, prefix.lastIndexOf("."));
-        		addedClass = modelDiff.getAddedClass(prefix);
-        		if (addedClass != null) {
+        		outerAddedClasses = modelDiff.getAllAddedClasses(prefix);
+        		if (!outerAddedClasses.isEmpty()) {
         			break;
         		}
         	}
-        	if (addedClass != null) {
+        	for (UMLClass addedClass : outerAddedClasses) {
         		for (UMLAnonymousClass anonymousClass : addedClass.getAnonymousClassList()) {
         			for (UMLOperation operation : anonymousClass.getOperations()) {
                         if (handleAddOperation(currentVersion, parentVersion, equalOperator, operation, "added with new anonymous class"))
@@ -930,7 +931,7 @@ public boolean isMethodAdded(UMLModelDiff modelDiff, String className, Version c
             if (handleAddOperation(currentVersion, parentVersion, equalOperator, operation, "new initializer"))
                 return true;
         }
-        if (addedClass != null) {
+        for (UMLClass addedClass : addedClasses) {
             for (UMLInitializer operation : addedClass.getInitializers()) {
                 if (handleAddOperation(currentVersion, parentVersion, equalOperator, operation, "added with new class"))
                     return true;