Fix for issue #419

tsantalis · Mar 23, 2023 · 7231881 · 7231881
1 parent 1537376
commit 7231881
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 30 deletions.
diff --git a/src/gr/uom/java/xmi/diff/ExtractOperationRefactoring.java b/src/gr/uom/java/xmi/diff/ExtractOperationRefactoring.java
@@ -84,19 +84,6 @@ public void updateMapperInfo() {
 		}
 	}
 
-	private boolean isMappedInParent(AbstractCodeFragment leaf) {
-		if(bodyMapper.parentMapperContainsMapping(leaf)) {
-			return true;
-		}
-		else if(leaf.getParent() != null && bodyMapper.parentMapperContainsMapping(leaf.getParent())) {
-			return true;
-		}
-		else if(leaf.getParent() != null && leaf.getParent().getParent() == null) {
-			return true;
-		}
-		return false;
-	}
-
 	private boolean isDefaultValue(String argument) {
 		return argument.equals("null") || argument.equals("0") || argument.equals("false") || argument.equals("true");
 	}
@@ -131,7 +118,7 @@ else if(!isDefaultValue(argument)) {
 						List<AbstractCodeFragment> leaves = sourceOperationAfterExtraction.getBody().getCompositeStatement().getLeaves();
 						for(AbstractCodeFragment leaf : leaves) {
 							for(AbstractCall call : extractedOperationInvocations) {
-								if(leaf.getLocationInfo().subsumes(call.getLocationInfo()) && isMappedInParent(leaf)) {
+								if(leaf.getLocationInfo().subsumes(call.getLocationInfo())) {
 									List<LeafExpression> expressions2 = leaf.findExpression(replacement.getAfter());
 									if(expressions2.size() == 1) {
 										for(LeafExpression expression1 : expressions1) {
@@ -154,7 +141,7 @@ private boolean processArgument(AbstractCodeMapping mapping, AbstractCall call,
 		if(expressions1.size() > 0) {
 			List<AbstractCodeFragment> leaves = sourceOperationAfterExtraction.getBody().getCompositeStatement().getLeaves();
 			for(AbstractCodeFragment leaf : leaves) {
-				if(leaf.getLocationInfo().subsumes(call.getLocationInfo()) && isMappedInParent(leaf)) {
+				if(leaf.getLocationInfo().subsumes(call.getLocationInfo())) {
 					List<LeafExpression> expressions2 = leaf.findExpression(argument);
 					if(expressions2.size() == 1) {
 						for(LeafExpression expression1 : expressions1) {

diff --git a/src/gr/uom/java/xmi/diff/InlineOperationRefactoring.java b/src/gr/uom/java/xmi/diff/InlineOperationRefactoring.java
@@ -65,19 +65,6 @@ public void updateMapperInfo() {
 		}
 	}
 
-	private boolean isMappedInParent(AbstractCodeFragment leaf) {
-		if(bodyMapper.parentMapperContainsMapping(leaf)) {
-			return true;
-		}
-		else if(leaf.getParent() != null && bodyMapper.parentMapperContainsMapping(leaf.getParent())) {
-			return true;
-		}
-		else if(leaf.getParent() != null && leaf.getParent().getParent() == null) {
-			return true;
-		}
-		return false;
-	}
-
 	private boolean isDefaultValue(String argument) {
 		return argument.equals("null") || argument.equals("0") || argument.equals("false") || argument.equals("true");
 	}
@@ -112,7 +99,7 @@ else if(!isDefaultValue(argument)) {
 						List<AbstractCodeFragment> leaves = targetOperationBeforeInline.getBody().getCompositeStatement().getLeaves();
 						for(AbstractCodeFragment leaf : leaves) {
 							for(AbstractCall call : inlinedOperationInvocations) {
-								if(leaf.getLocationInfo().subsumes(call.getLocationInfo()) && isMappedInParent(leaf)) {
+								if(leaf.getLocationInfo().subsumes(call.getLocationInfo())) {
 									List<LeafExpression> expressions1 = leaf.findExpression(replacement.getBefore());
 									if(expressions1.size() == 1) {
 										for(LeafExpression expression2 : expressions2) {
@@ -135,7 +122,7 @@ private boolean processArgument(AbstractCodeMapping mapping, AbstractCall call,
 		if(expressions2.size() > 0) {
 			List<AbstractCodeFragment> leaves = targetOperationBeforeInline.getBody().getCompositeStatement().getLeaves();
 			for(AbstractCodeFragment leaf : leaves) {
-				if(leaf.getLocationInfo().subsumes(call.getLocationInfo()) && isMappedInParent(leaf)) {
+				if(leaf.getLocationInfo().subsumes(call.getLocationInfo())) {
 					List<LeafExpression> expressions1 = leaf.findExpression(argument);
 					if(expressions1.size() == 1) {
 						for(LeafExpression expression2 : expressions2) {