Extract and Move functionality for reuse

jodavimehran · Jul 19, 2024 · faa6fcf · faa6fcf
1 parent 138da45
commit faa6fcf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 36 deletions.
diff --git a/src/main/java/org/codetracker/AttributeTrackerChangeHistory.java b/src/main/java/org/codetracker/AttributeTrackerChangeHistory.java
@@ -354,4 +354,26 @@ public HistoryInfo<Attribute> blameReturn() {
 		}
 		return null;
 	}
+
+	public void checkInitializerChange(Attribute rightAttribute, Attribute leftAttribute) {
+		AbstractExpression leftInitializer = leftAttribute.getUmlAttribute().getVariableDeclaration().getInitializer();
+		AbstractExpression rightInitializer = rightAttribute.getUmlAttribute().getVariableDeclaration().getInitializer();
+		if (leftInitializer != null && rightInitializer != null) {
+			if (!leftInitializer.getString().equals(rightInitializer.getString())) {
+				attributeChangeHistory.addChange(leftAttribute, rightAttribute, ChangeFactory.forAttribute(Type.INITIALIZER_CHANGE));
+		        add(leftAttribute);
+		        attributeChangeHistory.connectRelatedNodes();
+			}
+		}
+		else if (leftInitializer == null && rightInitializer != null) {
+			attributeChangeHistory.addChange(leftAttribute, rightAttribute, ChangeFactory.forAttribute(Type.INITIALIZER_ADDED));
+			add(leftAttribute);
+			attributeChangeHistory.connectRelatedNodes();
+		}
+		else if (leftInitializer != null && rightInitializer == null) {
+			attributeChangeHistory.addChange(leftAttribute, rightAttribute, ChangeFactory.forAttribute(Type.INITIALIZER_REMOVED));
+			add(leftAttribute);
+			attributeChangeHistory.connectRelatedNodes();
+		}
+	}
 }
diff --git a/src/main/java/org/codetracker/AttributeTrackerImpl.java b/src/main/java/org/codetracker/AttributeTrackerImpl.java
@@ -1,16 +1,13 @@
 package org.codetracker;
 
 import gr.uom.java.xmi.UMLModel;
-import gr.uom.java.xmi.decomposition.AbstractExpression;
 import gr.uom.java.xmi.diff.*;
 import org.apache.commons.lang3.tuple.Pair;
 import org.codetracker.api.AttributeTracker;
 import org.codetracker.api.CodeElementNotFoundException;
 import org.codetracker.api.History;
 import org.codetracker.api.Version;
 import org.codetracker.api.History.HistoryInfo;
-import org.codetracker.change.ChangeFactory;
-import org.codetracker.change.Change.Type;
 import org.codetracker.element.Attribute;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.Repository;
@@ -94,22 +91,7 @@ public History<Attribute> track() throws Exception {
                     if (leftAttribute != null) {
                         historyReport.step2PlusPlus();
                         //check if initializer changed
-                        AbstractExpression leftInitializer = leftAttribute.getUmlAttribute().getVariableDeclaration().getInitializer();
-						AbstractExpression rightInitializer = rightAttribute.getUmlAttribute().getVariableDeclaration().getInitializer();
-						if (leftInitializer != null && rightInitializer != null) {
-                        	if (!leftInitializer.getString().equals(rightInitializer.getString())) {
-                                changeHistory.get().addChange(leftAttribute, rightAttribute, ChangeFactory.forAttribute(Type.INITIALIZER_CHANGE));
-                                changeHistory.add(leftAttribute);
-                        	}
-                        }
-						else if (leftInitializer == null && rightInitializer != null) {
-							changeHistory.get().addChange(leftAttribute, rightAttribute, ChangeFactory.forAttribute(Type.INITIALIZER_ADDED));
-							changeHistory.add(leftAttribute);
-						}
-						else if (leftInitializer != null && rightInitializer == null) {
-							changeHistory.get().addChange(leftAttribute, rightAttribute, ChangeFactory.forAttribute(Type.INITIALIZER_REMOVED));
-							changeHistory.add(leftAttribute);
-						}
+                        changeHistory.checkInitializerChange(rightAttribute, leftAttribute);
                         continue;
                     }
 
@@ -304,23 +286,7 @@ public HistoryInfo<Attribute> blame() throws Exception {
                     Attribute leftAttribute = getAttribute(leftModel, parentVersion, rightAttribute::equalIdentifierIgnoringVersion);
                     if (leftAttribute != null) {
                         historyReport.step2PlusPlus();
-                        //check if initializer changed
-                        AbstractExpression leftInitializer = leftAttribute.getUmlAttribute().getVariableDeclaration().getInitializer();
-						AbstractExpression rightInitializer = rightAttribute.getUmlAttribute().getVariableDeclaration().getInitializer();
-						if (leftInitializer != null && rightInitializer != null) {
-                        	if (!leftInitializer.getString().equals(rightInitializer.getString())) {
-                                changeHistory.get().addChange(leftAttribute, rightAttribute, ChangeFactory.forAttribute(Type.INITIALIZER_CHANGE));
-                                changeHistory.add(leftAttribute);
-                        	}
-                        }
-						else if (leftInitializer == null && rightInitializer != null) {
-							changeHistory.get().addChange(leftAttribute, rightAttribute, ChangeFactory.forAttribute(Type.INITIALIZER_ADDED));
-							changeHistory.add(leftAttribute);
-						}
-						else if (leftInitializer != null && rightInitializer == null) {
-							changeHistory.get().addChange(leftAttribute, rightAttribute, ChangeFactory.forAttribute(Type.INITIALIZER_REMOVED));
-							changeHistory.add(leftAttribute);
-						}
+                        changeHistory.checkInitializerChange(rightAttribute, leftAttribute);
                         continue;
                     }