Merge pull request #983 from AdamBJ/FixForIssue947

Fix for issue 947
umple · Jan 31, 2017 · 5b89e44 · 5b89e44
2 parents 5c71af9 + 5b47dd0
commit 5b89e44
Show file tree

Hide file tree

Showing 213 changed files with 213 additions and 638 deletions.
diff --git a/UmpleToJava/UmpleTLTemplates/toString_declare.ump b/UmpleToJava/UmpleTLTemplates/toString_declare.ump
@@ -3,7 +3,7 @@ class UmpleToJava {
 
   public String toString()
   {
-    String outputString = "";<<#
+    <<#
 	  String customToStringPrefixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("before","toString"));
 	  String customToStringPostfixCode = GeneratorHelper.toCode(uClass.getApplicableCodeInjections("after","toString"));
 	  if (customToStringPrefixCode != null) 
@@ -87,7 +87,6 @@ class UmpleToJava {
 	      ret += " + System.getProperties().getProperty(\"line.separator\") +\n            ";
 	      ret += "\"  \" + " +  "\""+reflexiveNames.get(m)+" = \"+("+reflexive.get(m)+"!=null?Integer.toHexString(System.identityHashCode("+reflexive.get(m)+")):\"null\")";
 	  }
-	  ret += "\n     + outputString";
 	  append(realSb,"\n    return {0};", ret);
 	  #>>
   }!>>

diff --git a/cruise.umple/test/cruise/umple/compiler/FLoatGenerator.java.txt b/cruise.umple/test/cruise/umple/compiler/FLoatGenerator.java.txt
@@ -123,15 +123,13 @@ public class FLoatGenerator
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "x" + ":" + getX()+ "," +
             "y" + ":" + getY()+ "," +
             "a" + ":" + getA()+ "," +
             "b" + ":" + getB()+ "," +
             "c" + ":" + getC()+ "," +
             "rho" + ":" + getRho()+ "," +
-            "theta" + ":" + getTheta()+ "]"
-     + outputString;
+            "theta" + ":" + getTheta()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/compiler/RangeX.java.txt b/cruise.umple/test/cruise/umple/compiler/RangeX.java.txt
@@ -60,10 +60,8 @@ public class RangeX
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "start" + ":" + getStart()+ "," +
-            "end" + ":" + getEnd()+ "]"
-     + outputString;
+            "end" + ":" + getEnd()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/compiler/RegularFlight.java.txt b/cruise.umple/test/cruise/umple/compiler/RegularFlight.java.txt
@@ -205,13 +205,11 @@ public class RegularFlight
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "flightNumber" + ":" + getFlightNumber()+ "," +
             "flightNumber3" + ":" + getFlightNumber3()+ "," +
             "flightNumber4" + ":" + getFlightNumber4()+ "," +
             "lala" + ":" + getLala()+ "]" + System.getProperties().getProperty("line.separator") +
-            "  " + "time" + "=" + (getTime() != null ? !getTime().equals(this)  ? getTime().toString().replaceAll("  ","    ") : "this" : "null")
-     + outputString;
+            "  " + "time" + "=" + (getTime() != null ? !getTime().equals(this)  ? getTime().toString().replaceAll("  ","    ") : "this" : "null");
   }
 }
diff --git a/...se.umple/test/cruise/umple/implementation/java/AssociationBothSidesSorted_Mentor.java.txt b/...se.umple/test/cruise/umple/implementation/java/AssociationBothSidesSorted_Mentor.java.txt
@@ -164,10 +164,8 @@ public class Mentor
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "name" + ":" + getName()+ "]" + System.getProperties().getProperty("line.separator") +
-            "  " + "studentsPriority" + "=" + (getStudentsPriority() != null ? !getStudentsPriority().equals(this)  ? getStudentsPriority().toString().replaceAll("  ","    ") : "this" : "null")
-     + outputString;
+            "  " + "studentsPriority" + "=" + (getStudentsPriority() != null ? !getStudentsPriority().equals(this)  ? getStudentsPriority().toString().replaceAll("  ","    ") : "this" : "null");
   }
 }
diff --git a/...e.umple/test/cruise/umple/implementation/java/AssociationBothSidesSorted_Student.java.txt b/...e.umple/test/cruise/umple/implementation/java/AssociationBothSidesSorted_Student.java.txt
@@ -164,10 +164,8 @@ public class Student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "id" + ":" + getId()+ "]" + System.getProperties().getProperty("line.separator") +
-            "  " + "mentorsPriority" + "=" + (getMentorsPriority() != null ? !getMentorsPriority().equals(this)  ? getMentorsPriority().toString().replaceAll("  ","    ") : "this" : "null")
-     + outputString;
+            "  " + "mentorsPriority" + "=" + (getMentorsPriority() != null ? !getMentorsPriority().equals(this)  ? getMentorsPriority().toString().replaceAll("  ","    ") : "this" : "null");
   }
 }
diff --git a/...mple/test/cruise/umple/implementation/java/AssociationSortedWithNameSpace_Mentor.java.txt b/...mple/test/cruise/umple/implementation/java/AssociationSortedWithNameSpace_Mentor.java.txt
@@ -164,10 +164,8 @@ public class Mentor
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "name" + ":" + getName()+ "]" + System.getProperties().getProperty("line.separator") +
-            "  " + "myStudentsPriority" + "=" + (getMyStudentsPriority() != null ? !getMyStudentsPriority().equals(this)  ? getMyStudentsPriority().toString().replaceAll("  ","    ") : "this" : "null")
-     + outputString;
+            "  " + "myStudentsPriority" + "=" + (getMyStudentsPriority() != null ? !getMyStudentsPriority().equals(this)  ? getMyStudentsPriority().toString().replaceAll("  ","    ") : "this" : "null");
   }
 }
diff --git a/...ple/test/cruise/umple/implementation/java/AssociationSortedWithNameSpace_Student.java.txt b/...ple/test/cruise/umple/implementation/java/AssociationSortedWithNameSpace_Student.java.txt
@@ -164,10 +164,8 @@ public class Student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "id" + ":" + getId()+ "]" + System.getProperties().getProperty("line.separator") +
-            "  " + "ProfsPriority" + "=" + (getProfsPriority() != null ? !getProfsPriority().equals(this)  ? getProfsPriority().toString().replaceAll("  ","    ") : "this" : "null")
-     + outputString;
+            "  " + "ProfsPriority" + "=" + (getProfsPriority() != null ? !getProfsPriority().equals(this)  ? getProfsPriority().toString().replaceAll("  ","    ") : "this" : "null");
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/AssociationTestSorted_Mentor.java.txt b/cruise.umple/test/cruise/umple/implementation/java/AssociationTestSorted_Mentor.java.txt
@@ -149,9 +149,7 @@ public class Mentor
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+ "]" + System.getProperties().getProperty("line.separator") +
-            "  " + "studentsPriority" + "=" + (getStudentsPriority() != null ? !getStudentsPriority().equals(this)  ? getStudentsPriority().toString().replaceAll("  ","    ") : "this" : "null")
-     + outputString;
+            "  " + "studentsPriority" + "=" + (getStudentsPriority() != null ? !getStudentsPriority().equals(this)  ? getStudentsPriority().toString().replaceAll("  ","    ") : "this" : "null");
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/AssociationTestSorted_Student.java.txt b/cruise.umple/test/cruise/umple/implementation/java/AssociationTestSorted_Student.java.txt
@@ -169,9 +169,7 @@ public class Student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "id" + ":" + getId()+ "]"
-     + outputString;
+            "id" + ":" + getId()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint1.java.txt b/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint1.java.txt
@@ -52,9 +52,7 @@ public class student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "age" + ":" + getAge()+ "]"
-     + outputString;
+            "age" + ":" + getAge()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint3.java.txt b/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint3.java.txt
@@ -73,10 +73,8 @@ public class Client
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "minAge" + ":" + getMinAge()+ "," +
-            "age" + ":" + getAge()+ "]"
-     + outputString;
+            "age" + ":" + getAge()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint4.java.txt b/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint4.java.txt
@@ -55,9 +55,7 @@ public class student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "age" + ":" + getAge()+ "]"
-     + outputString;
+            "age" + ":" + getAge()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint5.java.txt b/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint5.java.txt
@@ -70,10 +70,8 @@ public class student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "age" + ":" + getAge()+ "," +
-            "weight" + ":" + getWeight()+ "]"
-     + outputString;
+            "weight" + ":" + getWeight()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint6.java.txt b/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint6.java.txt
@@ -70,10 +70,8 @@ public class student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "age" + ":" + getAge()+ "," +
-            "weight" + ":" + getWeight()+ "]"
-     + outputString;
+            "weight" + ":" + getWeight()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint7.java.txt b/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint7.java.txt
@@ -67,10 +67,8 @@ public class student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "age" + ":" + getAge()+ "," +
-            "weight" + ":" + getWeight()+ "]"
-     + outputString;
+            "weight" + ":" + getWeight()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint8.java.txt b/cruise.umple/test/cruise/umple/implementation/java/BasicConstraint8.java.txt
@@ -67,10 +67,8 @@ public class student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "age" + ":" + getAge()+ "," +
-            "weight" + ":" + getWeight()+ "]"
-     + outputString;
+            "weight" + ":" + getWeight()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/BasicPostcondition1.java.txt b/cruise.umple/test/cruise/umple/implementation/java/BasicPostcondition1.java.txt
@@ -59,9 +59,7 @@ public class Client
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "minAge" + ":" + getMinAge()+ "]"
-     + outputString;
+            "minAge" + ":" + getMinAge()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/BasicPrecondition1.java.txt b/cruise.umple/test/cruise/umple/implementation/java/BasicPrecondition1.java.txt
@@ -59,9 +59,7 @@ public class Client
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "minAge" + ":" + getMinAge()+ "]"
-     + outputString;
+            "minAge" + ":" + getMinAge()+ "]";
   }
 }
diff --git a/...test/cruise/umple/implementation/java/ClassTemplateTest_AbstractClassInheritance.java.txt b/...test/cruise/umple/implementation/java/ClassTemplateTest_AbstractClassInheritance.java.txt
@@ -160,9 +160,7 @@ public class Teacher extends Person
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "position" + ":" + getPosition()+ "]"
-     + outputString;
+            "position" + ":" + getPosition()+ "]";
   }
 }
diff --git a/...le/test/cruise/umple/implementation/java/ClassTemplateTest_AssociationAttributes.java.txt b/...le/test/cruise/umple/implementation/java/ClassTemplateTest_AssociationAttributes.java.txt
@@ -45,9 +45,7 @@ public class Token
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+ "]" + System.getProperties().getProperty("line.separator") +
-            "  " + "p" + "=" + (getP() != null ? !getP().equals(this)  ? getP().toString().replaceAll("  ","    ") : "this" : "null")
-     + outputString;
+            "  " + "p" + "=" + (getP() != null ? !getP().equals(this)  ? getP().toString().replaceAll("  ","    ") : "this" : "null");
   }
 }
diff --git a/...ple/test/cruise/umple/implementation/java/ClassTemplateTest_AssociationClassTest.java.txt b/...ple/test/cruise/umple/implementation/java/ClassTemplateTest_AssociationClassTest.java.txt
@@ -114,11 +114,9 @@ public class Registration
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "grade" + ":" + getGrade()+ "]" + System.getProperties().getProperty("line.separator") +
             "  " + "student = "+(getStudent()!=null?Integer.toHexString(System.identityHashCode(getStudent())):"null") + System.getProperties().getProperty("line.separator") +
-            "  " + "courseSection = "+(getCourseSection()!=null?Integer.toHexString(System.identityHashCode(getCourseSection())):"null")
-     + outputString;
+            "  " + "courseSection = "+(getCourseSection()!=null?Integer.toHexString(System.identityHashCode(getCourseSection())):"null");
   }
 }
diff --git a/....umple/test/cruise/umple/implementation/java/ClassTemplateTest_AttributeComments.java.txt b/....umple/test/cruise/umple/implementation/java/ClassTemplateTest_AttributeComments.java.txt
@@ -55,9 +55,7 @@ public class Student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "c" + ":" + getC()+ "]"
-     + outputString;
+            "c" + ":" + getC()+ "]";
   }
 }
diff --git a/...e/test/cruise/umple/implementation/java/ClassTemplateTest_AttributeInlineComment.java.txt b/...e/test/cruise/umple/implementation/java/ClassTemplateTest_AttributeInlineComment.java.txt
@@ -48,9 +48,7 @@ public class Foo
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "bar" + ":" + getBar()+ "]"
-     + outputString;
+            "bar" + ":" + getBar()+ "]";
   }
 }
diff --git a/...est/cruise/umple/implementation/java/ClassTemplateTest_AttributeMultilineComment.java.txt b/...est/cruise/umple/implementation/java/ClassTemplateTest_AttributeMultilineComment.java.txt
@@ -48,9 +48,7 @@ public class Foo
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "name" + ":" + getName()+ "]"
-     + outputString;
+            "name" + ":" + getName()+ "]";
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/ClassTemplateTest_Attributes.java.txt b/cruise.umple/test/cruise/umple/implementation/java/ClassTemplateTest_Attributes.java.txt
@@ -383,7 +383,6 @@ public class Mentor
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "x" + ":" + getX()+ "," +
             "str" + ":" + getStr()+ "," +
@@ -403,7 +402,6 @@ public class Mentor
             "  " + "tt" + "=" + (getTt() != null ? !getTt().equals(this)  ? getTt().toString().replaceAll("  ","    ") : "this" : "null") + System.getProperties().getProperty("line.separator") +
             "  " + "u" + "=" + (getU() != null ? !getU().equals(this)  ? getU().toString().replaceAll("  ","    ") : "this" : "null") + System.getProperties().getProperty("line.separator") +
             "  " + "v" + "=" + (getV() != null ? !getV().equals(this)  ? getV().toString().replaceAll("  ","    ") : "this" : "null") + System.getProperties().getProperty("line.separator") +
-            "  " + "w" + "=" + (getW() != null ? !getW().equals(this)  ? getW().toString().replaceAll("  ","    ") : "this" : "null")
-     + outputString;
+            "  " + "w" + "=" + (getW() != null ? !getW().equals(this)  ? getW().toString().replaceAll("  ","    ") : "this" : "null");
   }
 }
diff --git a/cruise.umple/test/cruise/umple/implementation/java/ClassTemplateTest_BuildOutputPath.ump.txt b/cruise.umple/test/cruise/umple/implementation/java/ClassTemplateTest_BuildOutputPath.ump.txt
@@ -45,9 +45,7 @@ public class Student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "name" + ":" + getName()+ "]"
-     + outputString;
+            "name" + ":" + getName()+ "]";
   }
 }
diff --git a/...se.umple/test/cruise/umple/implementation/java/ClassTemplateTest_EmptyStringAttr.java.txt b/...se.umple/test/cruise/umple/implementation/java/ClassTemplateTest_EmptyStringAttr.java.txt
@@ -45,9 +45,7 @@ public class Student
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "grade" + ":" + getGrade()+ "]"
-     + outputString;
+            "grade" + ":" + getGrade()+ "]";
   }
 }
diff --git a/...se.umple/test/cruise/umple/implementation/java/ClassTemplateTest_FixmlAttributes.java.txt b/...se.umple/test/cruise/umple/implementation/java/ClassTemplateTest_FixmlAttributes.java.txt
@@ -65,10 +65,8 @@ public class Mentor
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "id" + ":" + getId()+ "," +
-            "capacity" + ":" + getCapacity()+ "]"
-     + outputString;
+            "capacity" + ":" + getCapacity()+ "]";
   }
 }
diff --git a/...e.umple/test/cruise/umple/implementation/java/ClassTemplateTest_FixmlAttributes1.java.txt b/...e.umple/test/cruise/umple/implementation/java/ClassTemplateTest_FixmlAttributes1.java.txt
@@ -50,9 +50,7 @@ public class Mentor
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
-            "id" + ":" + getId()+ "]"
-     + outputString;
+            "id" + ":" + getId()+ "]";
   }
 }
diff --git a/...e.umple/test/cruise/umple/implementation/java/ClassTemplateTest_FixmlAttributes2.java.txt b/...e.umple/test/cruise/umple/implementation/java/ClassTemplateTest_FixmlAttributes2.java.txt
@@ -82,11 +82,9 @@ public class Mentor
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "capacity" + ":" + getCapacity()+ "," +
             "id" + ":" + getId()+ "," +
-            "name" + ":" + getName()+ "]"
-     + outputString;
+            "name" + ":" + getName()+ "]";
   }
 }
diff --git a/...e.umple/test/cruise/umple/implementation/java/ClassTemplateTest_FixmlAttributes3.java.txt b/...e.umple/test/cruise/umple/implementation/java/ClassTemplateTest_FixmlAttributes3.java.txt
@@ -84,11 +84,9 @@ public class Mentor
 
   public String toString()
   {
-    String outputString = "";
     return super.toString() + "["+
             "capacity" + ":" + getCapacity()+ "," +
             "id" + ":" + getId()+ "," +
-            "name" + ":" + getName()+ "]"
-     + outputString;
+            "name" + ":" + getName()+ "]";
   }
 }