Final fix for issue #77

tsantalis · Aug 17, 2020 · 3186615 · 3186615
1 parent cf942fd
commit 3186615
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/gr/uom/java/jdeodorant/refactoring/manipulators/ExtractClassRefactoring.java b/src/gr/uom/java/jdeodorant/refactoring/manipulators/ExtractClassRefactoring.java
@@ -761,7 +761,19 @@ else if(binding.getKind() == IBinding.VARIABLE) {
         		Assignment fieldAssignment = finalFieldAssignmentMap.get(fieldFragment);
         		Assignment newFieldAssignment = extractedClassAST.newAssignment();
         		extractedClassRewriter.set(newFieldAssignment, Assignment.LEFT_HAND_SIDE_PROPERTY, fieldAssignment.getLeftHandSide(), null);
-        		extractedClassRewriter.set(newFieldAssignment, Assignment.RIGHT_HAND_SIDE_PROPERTY, fieldAssignment.getRightHandSide(), null);
+        		if(fieldAssignment.getRightHandSide() instanceof MethodInvocation) {
+        			MethodInvocation invocation = (MethodInvocation)fieldAssignment.getRightHandSide();
+        			SimpleName variableName = extractedClassAST.newSimpleName(invocation.resolveMethodBinding().getName());
+        			extractedClassRewriter.set(newFieldAssignment, Assignment.RIGHT_HAND_SIDE_PROPERTY, variableName, null);
+        		}
+        		else if(fieldAssignment.getRightHandSide() instanceof ClassInstanceCreation) {
+        			ClassInstanceCreation creation = (ClassInstanceCreation)fieldAssignment.getRightHandSide();
+        			SimpleName variableName = extractedClassAST.newSimpleName(creation.resolveConstructorBinding().getName());
+        			extractedClassRewriter.set(newFieldAssignment, Assignment.RIGHT_HAND_SIDE_PROPERTY, variableName, null);
+        		}
+        		else {
+        			extractedClassRewriter.set(newFieldAssignment, Assignment.RIGHT_HAND_SIDE_PROPERTY, fieldAssignment.getRightHandSide(), null);
+        		}
         		extractedClassRewriter.set(newFieldAssignment, Assignment.OPERATOR_PROPERTY, fieldAssignment.getOperator(), null);
         		ExpressionStatement assignmentStatement = extractedClassAST.newExpressionStatement(newFieldAssignment);
         		extractedClassConstructorBodyStatementsRewrite.insertLast(assignmentStatement, null);