Extract constants

Author: tsantalis

src/main/java/gr/uom/java/xmi/Constants.java

@@ -2,7 +2,7 @@
 
 public enum Constants {
 	JAVA(";\n", "return ", "return;\n", "return true;\n", "return false;\n", "return null;\n", "return this;\n", "=", "break;\n", "continue;\n",
-			" -> ", "::", " + ", "throw ", "case ", "try", "{", "}", "{", "}", "this.");
+			" -> ", "::", " + ", "throw ", "case ", "try", "{", "}", "{", "}", "this.", " ? ", " : ");
 	public final String STATEMENT_TERMINATION;
 	public final String RETURN_SPACE;
 	public final String RETURN_STATEMENT;
@@ -24,6 +24,8 @@ public enum Constants {
 	public final String OPEN_ARRAY_INITIALIZER;
 	public final String CLOSE_ARRAY_INITIALIZER;
 	public final String THIS_DOT;
+	public final String TERNARY_CONDITION;
+	public final String TERNARY_ELSE;
 
 	Constants(
 			String STATEMENT_TERMINATION,
@@ -46,7 +48,9 @@ public enum Constants {
 			String CLOSE_BLOCK,
 			String OPEN_ARRAY_INITIALIZER,
 			String CLOSE_ARRAY_INITIALIZER,
-			String THIS_DOT) {
+			String THIS_DOT,
+			String TERNARY_CONDITION,
+			String TERNARY_ELSE) {
 		this.STATEMENT_TERMINATION = STATEMENT_TERMINATION;
 		this.RETURN_SPACE = RETURN_SPACE;
 		this.RETURN_STATEMENT = RETURN_STATEMENT;
@@ -68,5 +72,7 @@ public enum Constants {
 		this.OPEN_ARRAY_INITIALIZER = OPEN_ARRAY_INITIALIZER;
 		this.CLOSE_ARRAY_INITIALIZER = CLOSE_ARRAY_INITIALIZER;
 		this.THIS_DOT = THIS_DOT;
+		this.TERNARY_CONDITION = TERNARY_CONDITION;
+		this.TERNARY_ELSE = TERNARY_ELSE;
 	}
 }

src/main/java/gr/uom/java/xmi/decomposition/AbstractCall.java

@@ -1153,7 +1153,7 @@ private int argumentIsWrappedInExceptionAndThrown(String statement) {
 	}
 
 	private boolean indexCondition(String statement, int index) {
-		return (arguments().size() <= 2 && (index == 0 || this.getName().equals("assertThrows") || "Assert".equals(this.getExpression()))) || (statement.contains(" ? ") && statement.contains(" : "));
+		return (arguments().size() <= 2 && (index == 0 || this.getName().equals("assertThrows") || "Assert".equals(this.getExpression()))) || (statement.contains(JAVA.TERNARY_CONDITION) && statement.contains(JAVA.TERNARY_ELSE));
 	}
 
 	public Replacement makeReplacementForReturnedArgument(String statement) {
@@ -1210,7 +1210,7 @@ else if((index = argumentIsExpression(statement)) != -1 && indexCondition(statem
 	}
 
 	public Replacement makeReplacementForWrappedLambda(String statement) {
-		if(argumentIsLambdaStatement(statement) && (arguments().size() == 1 || (statement.contains(" ? ") && statement.contains(" : ")))) {
+		if(argumentIsLambdaStatement(statement) && (arguments().size() == 1 || (statement.contains(JAVA.TERNARY_CONDITION) && statement.contains(JAVA.TERNARY_ELSE)))) {
 			return new Replacement(statement.substring(0, statement.length()-JAVA.STATEMENT_TERMINATION.length()), arguments().get(0),
 					ReplacementType.ARGUMENT_REPLACED_WITH_EXPRESSION);
 		}
@@ -1252,7 +1252,7 @@ private boolean expressionIsAssigned(String statement) {
 
 	public Replacement makeReplacementForAssignedArgument(String statement) {
 		int index = argumentIsAssigned(statement);
-		if(index >= 0 && (arguments().size() == 1 || (statement.contains(" ? ") && statement.contains(" : ")))) {
+		if(index >= 0 && (arguments().size() == 1 || (statement.contains(JAVA.TERNARY_CONDITION) && statement.contains(JAVA.TERNARY_ELSE)))) {
 			return new Replacement(statement.substring(statement.indexOf(JAVA.ASSIGNMENT)+1, statement.length()-JAVA.STATEMENT_TERMINATION.length()),
 					arguments().get(index), ReplacementType.ARGUMENT_REPLACED_WITH_RIGHT_HAND_SIDE_OF_ASSIGNMENT_EXPRESSION);
 		}

src/main/java/gr/uom/java/xmi/decomposition/StringBasedHeuristics.java

@@ -373,7 +373,7 @@ else if(variableDeclarations2.size() == 0 && !r.getAfter().contains("[") && !r.g
 			for(String key1 : methodInvocationMap1.keySet()) {
 				for(AbstractCall invocation1 : methodInvocationMap1.get(key1)) {
 					if(invocation1.actualString().equals(diff1) && invocation1.arguments().contains(diff2) &&
-							(invocation1.arguments().size() == 1 || (diff2.contains(" ? ") && diff2.contains(" : ")))) {
+							(invocation1.arguments().size() == 1 || (diff2.contains(JAVA.TERNARY_CONDITION) && diff2.contains(JAVA.TERNARY_ELSE)))) {
 						if(!variableDeclarationNameReplaced(variableDeclarations1, variableDeclarations2, info.getReplacements()) && !returnExpressionReplaced(s1, s2, info.getReplacements())) {
 							Replacement r = new VariableReplacementWithMethodInvocation(diff1, diff2, invocation1, Direction.INVOCATION_TO_VARIABLE);
 							info.addReplacement(r);
@@ -385,7 +385,7 @@ else if(variableDeclarations2.size() == 0 && !r.getAfter().contains("[") && !r.g
 			for(String key2 : methodInvocationMap2.keySet()) {
 				for(AbstractCall invocation2 : methodInvocationMap2.get(key2)) {
 					if(invocation2.actualString().equals(diff2) && invocation2.arguments().contains(diff1) &&
-							(invocation2.arguments().size() == 1 || (diff1.contains(" ? ") && diff1.contains(" : ")))) {
+							(invocation2.arguments().size() == 1 || (diff1.contains(JAVA.TERNARY_CONDITION) && diff1.contains(JAVA.TERNARY_ELSE)))) {
 						if(!variableDeclarationNameReplaced(variableDeclarations1, variableDeclarations2, info.getReplacements()) && !returnExpressionReplaced(s1, s2, info.getReplacements())) {
 							Replacement r = new VariableReplacementWithMethodInvocation(diff1, diff2, invocation2, Direction.VARIABLE_TO_INVOCATION);
 							info.addReplacement(r);
@@ -2945,7 +2945,7 @@ protected static boolean commonConditional(String s1, String s2, Map<String, Str
 			}
 			boolean containsTernaryOperatorReplacement = false;
 			for(Replacement replacement : info.getReplacements()) {
-				if(replacement.getAfter().contains(" ? ") && replacement.getAfter().contains(" : ")) {
+				if(replacement.getAfter().contains(JAVA.TERNARY_CONDITION) && replacement.getAfter().contains(JAVA.TERNARY_ELSE)) {
 					containsTernaryOperatorReplacement = true;
 				}
 			}