Fixed toString

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@111847 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/C_ExternalReferenceExpression.java

@@ -52,7 +52,7 @@ public class C_ExternalReferenceExpression extends C_Expression implements C_Mul
 
 	@Override
 	public String toString() {
-		return "C_ExternalReferenceExpression [ id=" + id+", leftArgument=" + leftArgument
+		return "ExternalReferenceExpression [ id=" + id+", leftArgument=" + leftArgument
 				+ ", rightArgument=" + rightArgument  + "]";
 	}
 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Avg.java

@@ -51,7 +51,7 @@ public class C_Avg extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Avg [id=" + id + ", argument=" + argument + "]";
+		return "Avg [id=" + id + ", argument=" + argument + "]";
 	}
 
 }

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Count.java

@@ -51,7 +51,7 @@ public class C_Count extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Count [id=" + id + ", argument=" + argument + "]";
+		return "Count [id=" + id + ", argument=" + argument + "]";
 	}
 
 	

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Max.java

@@ -51,7 +51,7 @@ public class C_Max extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Max [id=" + id + ", argument=" + argument + "]";
+		return "Max [id=" + id + ", argument=" + argument + "]";
 	}
 
 	

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Min.java

@@ -51,7 +51,7 @@ public class C_Min extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Min [id=" + id + ", argument=" + argument + "]";
+		return "Min [id=" + id + ", argument=" + argument + "]";
 	}
 
 }

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/aggregation/C_Sum.java

@@ -51,7 +51,7 @@ public class C_Sum extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Sum [id=" + id + ", argument=" + argument + "]";
+		return "Sum [id=" + id + ", argument=" + argument + "]";
 	}
 
 }

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Addition.java

@@ -37,7 +37,7 @@ public class C_Addition  extends C_ArithmeticExpression {
 
 	@Override
 	public String toString() {
-		return "C_Addition [id=" + id + ", leftArgument="
+		return "Addition [id=" + id + ", leftArgument="
 				+ leftArgument + ", rightArgument=" + rightArgument + "]";
 	}
 		

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_ArithmeticExpression.java

@@ -83,7 +83,7 @@ public class C_ArithmeticExpression extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_ArithmeticExpression [id=" + id + ", leftArgument="
+		return "ArithmeticExpression [id=" + id + ", leftArgument="
 				+ leftArgument + ", rightArgument=" + rightArgument + "]";
 	}
 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Division.java

@@ -36,7 +36,7 @@ public class C_Division  extends C_ArithmeticExpression {
 
 	@Override
 	public String toString() {
-		return "C_Division [id=" + id + ", leftArgument="
+		return "Division [id=" + id + ", leftArgument="
 				+ leftArgument + ", rightArgument=" + rightArgument + "]";
 	}
 		

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Modulus.java

@@ -36,7 +36,7 @@ public class C_Modulus  extends C_ArithmeticExpression {
 
 	@Override
 	public String toString() {
-		return "C_Modulus [id=" + id + ", leftArgument="
+		return "Modulus [id=" + id + ", leftArgument="
 				+ leftArgument + ", rightArgument=" + rightArgument + "]";
 	}
 		

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Multiplication.java

@@ -36,7 +36,7 @@ public class C_Multiplication  extends C_ArithmeticExpression {
 
 	@Override
 	public String toString() {
-		return "C_Multiplication [id=" + id + ", leftArgument="
+		return "Multiplication [id=" + id + ", leftArgument="
 				+ leftArgument + ", rightArgument=" + rightArgument + "]";
 	}
 		

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/arithmetic/C_Subtraction.java

@@ -37,7 +37,7 @@ public class C_Subtraction  extends C_ArithmeticExpression {
 
 	@Override
 	public String toString() {
-		return "C_Subtraction [id=" + id + ", leftArgument="
+		return "Subtraction [id=" + id + ", leftArgument="
 				+ leftArgument + ", rightArgument=" + rightArgument + "]";
 	}
 		

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/functions/C_Cast.java

@@ -61,7 +61,7 @@ public class C_Cast extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Cast [id=" + id + ", leftArgument=" + leftArgument
+		return "Cast [id=" + id + ", leftArgument=" + leftArgument
 				+ ", rightArgument=" + rightArgument + "]";
 	}
 	

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_Concat.java

@@ -60,7 +60,7 @@ public class C_Concat extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Concat [id=" + id + ", leftArgument=" + leftArgument
+		return "Concat [id=" + id + ", leftArgument=" + leftArgument
 				+ ", rightArgument=" + rightArgument + "]";
 	}
 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByIndex.java

@@ -76,7 +76,7 @@ public class C_SubstringByIndex extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_SubstringByIndex [id=" + id + ", sourceString="
+		return "SubstringByIndex [id=" + id + ", sourceString="
 				+ sourceString + ", fromIndex=" + fromIndex + ", toIndex="
 				+ toIndex + "]";
 	}

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringByRegex.java

@@ -59,7 +59,7 @@ public class C_SubstringByRegex extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_SubstringByRegex [id=" + id + ", sourceString="
+		return "SubstringByRegex [id=" + id + ", sourceString="
 				+ sourceString + ", regex=" + regex + "]";
 	}
 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_SubstringPosition.java

@@ -67,7 +67,7 @@ public class C_SubstringPosition extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_SubstringPosition [id=" + id + ", leftArgument="
+		return "SubstringPosition [id=" + id + ", leftArgument="
 				+ leftArgument + ", rightArgument=" + rightArgument + "]";
 	}
 

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/composite/text/C_TextReplaceMatchingRegex.java

@@ -71,7 +71,7 @@ public class C_TextReplaceMatchingRegex extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_TextReplaceMatchingRegex [id=" + id + ", toCheckText="
+		return "TextReplaceMatchingRegex [id=" + id + ", toCheckText="
 				+ toCheckText + ", regexp=" + regexp + ", replacing="
 				+ replacing + "]";
 	}

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/leaf/C_ConstantList.java

@@ -37,7 +37,7 @@ public class C_ConstantList extends C_Leaf implements C_MultivaluedExpression {
 
 	@Override
 	public String toString() {
-		return "C_ConstantList [id=" + id + ", arguments=" + arguments + "]";
+		return "ConstantList [id=" + id + ", arguments=" + arguments + "]";
 	}
 
 	

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_And.java

@@ -53,7 +53,7 @@ public class C_And extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_And [arguments=" + arguments + ", id=" + id + "]";
+		return "And [arguments=" + arguments + ", id=" + id + "]";
 	}
 	
 	

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Between.java

@@ -57,7 +57,7 @@ public class C_Between extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Between [id=" + id + ", leftArgument=" + leftArgument
+		return "Between [id=" + id + ", leftArgument=" + leftArgument
 				+ ", rightArgument=" + rightArgument + "]";
 	}
 	

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNotNull.java

@@ -48,7 +48,7 @@ public class C_IsNotNull extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_IsNotNull [id=" + id + ", argument=" + argument + "]";
+		return "IsNotNull [id=" + id + ", argument=" + argument + "]";
 	}
 
 }

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_IsNull.java

@@ -47,7 +47,7 @@ public class C_IsNull extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_IsNull [id=" + id + ", argument=" + argument + "]";
+		return "IsNull [id=" + id + ", argument=" + argument + "]";
 	}
 	
 	

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Not.java

@@ -45,7 +45,7 @@ public class C_Not extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Not [id=" + id + ", argument=" + argument + "]";
+		return "Not [id=" + id + ", argument=" + argument + "]";
 	}
 	
 	

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_Or.java

@@ -53,7 +53,7 @@ public class C_Or extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_Or [id=" + id + ", arguments=" + arguments + "]";
+		return "Or [id=" + id + ", arguments=" + arguments + "]";
 	}
 	
 	

src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/model/logical/C_ValueIsIn.java

@@ -58,7 +58,7 @@ public class C_ValueIsIn extends C_Expression {
 
 	@Override
 	public String toString() {
-		return "C_ValueIsIn [id=" + id + ", leftArgument=" + leftArgument
+		return "ValueIsIn [id=" + id + ", leftArgument=" + leftArgument
 				+ ", rightArgument=" + rightArgument + "]";
 	}