Permalink
Browse files

fix all _ use of toString, fix buildSDMLib for local build add jUnit …

…and bsh-Jar for Build-script bsh... is temporary added
  • Loading branch information...
Stefan Lindel
Stefan Lindel committed Aug 29, 2014
1 parent 6a9edc2 commit 8b7fb01c331bbd23c148ede3b5c0bbcae3fd8931
Showing with 345 additions and 341 deletions.
  1. +9 −4 buildSDMLib.xml
  2. BIN lib/bsh-2.0b5.jar
  3. BIN lib/junit.jar
  4. +4 −4 src/main/java/org/sdmlib/codegen/LocalVarTableEntry.java
  5. +4 −4 src/main/java/org/sdmlib/codegen/StatementEntry.java
  6. +7 −7 src/main/java/org/sdmlib/codegen/SymTabEntry.java
  7. +2 −2 src/main/java/org/sdmlib/models/classes/Attribute.java
  8. +3 −4 src/main/java/org/sdmlib/models/modelsets/SDMSetBase.java
  9. +4 −4 src/main/java/org/sdmlib/models/objects/GenericAttribute.java
  10. +4 −4 src/main/java/org/sdmlib/models/objects/GenericLink.java
  11. +5 −5 src/main/java/org/sdmlib/models/objects/GenericObject.java
  12. +7 −7 src/main/java/org/sdmlib/models/pattern/AttributeConstraint.java
  13. +5 −5 src/main/java/org/sdmlib/models/pattern/CardinalityConstraint.java
  14. +4 −4 src/main/java/org/sdmlib/models/pattern/CloneOp.java
  15. +4 −4 src/main/java/org/sdmlib/models/pattern/DestroyObjectElem.java
  16. +5 −5 src/main/java/org/sdmlib/models/pattern/GenericConstraint.java
  17. +5 −5 src/main/java/org/sdmlib/models/pattern/LinkConstraint.java
  18. +4 −4 src/main/java/org/sdmlib/models/pattern/MatchIsomorphicConstraint.java
  19. +4 −4 src/main/java/org/sdmlib/models/pattern/MatchOtherThen.java
  20. +6 −6 src/main/java/org/sdmlib/models/pattern/NegativeApplicationCondition.java
  21. +6 −6 src/main/java/org/sdmlib/models/pattern/OptionalSubPattern.java
  22. +6 −6 src/main/java/org/sdmlib/models/pattern/Pattern.java
  23. +4 −4 src/main/java/org/sdmlib/models/pattern/PatternElement.java
  24. +5 −5 src/main/java/org/sdmlib/models/pattern/PatternLink.java
  25. +4 −4 src/main/java/org/sdmlib/models/pattern/PatternObject.java
  26. +3 −3 src/main/java/org/sdmlib/models/pattern/ReachableState.java
  27. +3 −3 src/main/java/org/sdmlib/models/pattern/RuleApplication.java
  28. +4 −4 src/main/java/org/sdmlib/models/pattern/UnifyGraphsOp.java
  29. +9 −9 src/main/java/org/sdmlib/models/transformations/ChoiceTemplate.java
  30. +6 −6 src/main/java/org/sdmlib/models/transformations/Match.java
  31. +10 −10 src/main/java/org/sdmlib/models/transformations/Template.java
  32. +1 −1 src/main/java/org/sdmlib/storyboards/KanbanEntry.java
  33. +1 −1 src/main/java/org/sdmlib/storyboards/LogEntryStoryBoard.java
  34. +6 −6 src/main/java/org/sdmlib/storyboards/Storyboard.java
  35. +3 −3 src/main/java/org/sdmlib/storyboards/StoryboardStep.java
  36. +4 −4 src/main/replication/org/sdmlib/model/taskflows/FetchFileFlow.java
  37. +4 −4 src/main/replication/org/sdmlib/model/taskflows/LogEntry.java
  38. +3 −3 src/main/replication/org/sdmlib/model/taskflows/Logger.java
  39. +3 −3 src/main/replication/org/sdmlib/model/taskflows/PeerProxy.java
  40. +4 −4 src/main/replication/org/sdmlib/model/taskflows/SocketThread.java
  41. +3 −3 src/main/replication/org/sdmlib/model/taskflows/TaskFlow.java
  42. +4 −4 src/main/replication/org/sdmlib/replication/BoardTask.java
  43. +3 −3 src/main/replication/org/sdmlib/replication/Lane.java
  44. +5 −5 src/main/replication/org/sdmlib/replication/LogEntry.java
  45. +1 −1 src/main/replication/org/sdmlib/replication/ReplicationChange.java
  46. +3 −3 src/main/replication/org/sdmlib/replication/ReplicationChannel.java
  47. +4 −4 src/main/replication/org/sdmlib/replication/ReplicationNode.java
  48. +3 −3 src/main/replication/org/sdmlib/replication/ReplicationRoot.java
  49. +4 −4 src/main/replication/org/sdmlib/replication/ReplicationServer.java
  50. +3 −3 src/main/replication/org/sdmlib/replication/ServerSocketAcceptThread.java
  51. +3 −3 src/test/java/de/kassel/roombook/Building.java
  52. +5 −5 src/test/java/de/kassel/roombook/Floor.java
  53. +4 −4 src/test/java/org/sdmlib/examples/groupAccount/model/Item.java
  54. +4 −4 src/test/java/org/sdmlib/examples/groupAccount/model/Person.java
  55. +3 −3 src/test/java/org/sdmlib/examples/helloworld/Greeting.java
  56. +3 −3 src/test/java/org/sdmlib/examples/helloworld/GreetingMessage.java
  57. +3 −3 src/test/java/org/sdmlib/examples/helloworld/Person.java
  58. +4 −4 src/test/java/org/sdmlib/examples/helloworld/model/Edge.java
  59. +3 −3 src/test/java/org/sdmlib/examples/helloworld/model/GraphComponent.java
  60. +4 −4 src/test/java/org/sdmlib/examples/helloworld/model/Node.java
  61. +3 −3 src/test/java/org/sdmlib/examples/ludo/model/Dice.java
  62. +6 −6 src/test/java/org/sdmlib/examples/ludo/model/Field.java
  63. +5 −5 src/test/java/org/sdmlib/examples/ludo/model/Pawn.java
  64. +6 −6 src/test/java/org/sdmlib/examples/ludo/model/Player.java
  65. +4 −4 src/test/java/org/sdmlib/examples/ludoreverse/model/Ludo.java
  66. +4 −4 src/test/java/org/sdmlib/examples/ludoreverse/model/Player.java
  67. +3 −3 src/test/java/org/sdmlib/examples/m2m/model/GraphComponent.java
  68. +4 −4 src/test/java/org/sdmlib/examples/m2m/model/Person.java
  69. +4 −4 src/test/java/org/sdmlib/examples/m2m/model/Relation.java
  70. +3 −3 src/test/java/org/sdmlib/examples/simpleModel/model/Alex.java
  71. +3 −3 src/test/java/org/sdmlib/examples/simpleModel/model/Mac.java
  72. +4 −4 src/test/java/org/sdmlib/examples/studyright/model/Assignment.java
  73. +3 −3 src/test/java/org/sdmlib/examples/studyright/model/Female.java
  74. +3 −3 src/test/java/org/sdmlib/examples/studyright/model/Lecture.java
  75. +4 −4 src/test/java/org/sdmlib/examples/studyright/model/Professor.java
  76. +4 −4 src/test/java/org/sdmlib/examples/studyright/model/Room.java
  77. +6 −6 src/test/java/org/sdmlib/examples/studyright/model/Student.java
  78. +3 −3 src/test/java/org/sdmlib/examples/studyright/model/Topic.java
  79. +3 −3 src/test/java/org/sdmlib/examples/studyright/model/University.java
  80. +4 −4 src/test/java/org/sdmlib/examples/studyrightWithAssignments/model/Assignment.java
  81. +5 −5 src/test/java/org/sdmlib/examples/studyrightWithAssignments/model/Room.java
  82. +7 −7 src/test/java/org/sdmlib/examples/studyrightWithAssignments/model/Student.java
  83. +7 −7 src/test/java/org/sdmlib/examples/studyrightWithAssignments/model/TeachingAssistant.java
  84. +3 −3 src/test/java/org/sdmlib/examples/studyrightWithAssignments/model/University.java
View
@@ -24,9 +24,10 @@
<mkdir dir="build/temp/" />
<mkdir dir="build/lib/" />
<mkdir dir="build/javadoc/" />
<javac srcdir="src:NetworkParser" destdir="build/temp" includeantruntime="false" debug="true" sourcepath="src" listfiles="true">
<javac srcdir="src/main/:../NetworkParser/src/main" destdir="build/temp" includeantruntime="false" debug="true" sourcepath="src" listfiles="true">
<classpath>
<pathelement location="lib/junit.jar"/>
<pathelement location="lib/bsh-2.0b5.jar"/>
</classpath>
</javac>
</target>
@@ -46,7 +47,7 @@
<include name="**/*.html"/>
<include name="**/*.css"/>
</fileset>
<fileset dir="./NetworkParser" />
<fileset dir="../NetworkParser/src/main/java" />
</jar>
<jar destfile="build/SDMLib-source.jar">
@@ -58,9 +59,13 @@
</manifest>
<fileset dir="build/temp/" />
<fileset dir="./src"/>
<fileset dir="./NetworkParser" />
<fileset dir="../NetworkParser/src/main/java" />
</jar>
<javadoc destdir="build/javadoc/" sourcepath="src">
<javadoc destdir="build/javadoc/" sourcepath="src/main/:../NetworkParser/src/main/java">
<classpath>
<pathelement location="lib/junit.jar"/>
<pathelement location="lib/bsh-2.0b5.jar"/>
</classpath>
</javadoc>
<jar destfile="build/SDMLib-javadoc.jar">
<manifest>
View
BIN +375 KB lib/bsh-2.0b5.jar
Binary file not shown.
View
BIN +239 KB lib/junit.jar
Binary file not shown.
@@ -34,10 +34,10 @@ and associated documentation files (the "Software"), to deal in the Software wit
public String toString()
{
// StringBuilder _ = new StringBuilder();
// _.append(" ").append(this.getName());
// _.append(" ").append(this.getType());
// _.append(" ").append(this.getStartPos());
// _.append(" ").append(this.getEndPos());
// s.append(" ").append(this.getName());
// s.append(" ").append(this.getType());
// s.append(" ").append(this.getStartPos());
// s.append(" ").append(this.getEndPos());
return "" + name + " : " + type;
}
@@ -43,10 +43,10 @@ public String toString()
}
/*
_.append(" ").append(this.getKind());
_.append(" ").append(this.getAssignTargetVarName());
_.append(" ").append(this.getStartPos());
_.append(" ").append(this.getEndPos());
s.append(" ").append(this.getKind());
s.append(" ").append(this.getAssignTargetVarName());
s.append(" ").append(this.getStartPos());
s.append(" ").append(this.getEndPos());
*/
@@ -50,13 +50,13 @@ public String toString()
{
// TODO : don't know
// StringBuilder _ = new StringBuilder();
// _.append(" ").append(this.getKind());
// _.append(" ").append(this.getMemberName());
// _.append(" ").append(this.getType());
// _.append(" ").append(this.getStartPos());
// _.append(" ").append(this.getBodyStartPos());
// _.append(" ").append(this.getEndPos());
// _.append(" ").append(this.getModifiers());
// s.append(" ").append(this.getKind());
// s.append(" ").append(this.getMemberName());
// s.append(" ").append(this.getType());
// s.append(" ").append(this.getStartPos());
// s.append(" ").append(this.getBodyStartPos());
// s.append(" ").append(this.getEndPos());
// s.append(" ").append(this.getModifiers());
return "" + type;
}
//==========================================================================
@@ -78,8 +78,8 @@ public Attribute with(Clazz value)
public String toString()
{
// StringBuilder _ = new StringBuilder();
// _.append(" ").append(this.getInitialization());
// _.append(" ").append(this.getName());
// s.append(" ").append(this.getInitialization());
// s.append(" ").append(this.getName());
return "" + name + " : " + type;
}
@@ -5,17 +5,16 @@
import org.sdmlib.CGUtil;
import de.uniks.networkparser.AbstractList;
import de.uniks.networkparser.gui.ItemList;
public class SDMSetBase<T> extends ItemList<T>
{
@Override
protected boolean initAllowDuplicate()
public SDMSetBase()
{
return false;
this.allowDuplicate = false;
}
@Override
public String toString()
{
@@ -170,11 +170,11 @@ public GenericObject createOwner()
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getName());
_.append(" ").append(this.getValue());
return _.substring(1);
s.append(" ").append(this.getName());
s.append(" ").append(this.getValue());
return s.substring(1);
}
}
@@ -296,11 +296,11 @@ public GenericGraph createGraph()
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getTgtLabel());
_.append(" ").append(this.getSrcLabel());
return _.substring(1);
s.append(" ").append(this.getTgtLabel());
s.append(" ").append(this.getSrcLabel());
return s.substring(1);
}
}
@@ -529,12 +529,12 @@ public GenericLink createOutgoingLinks(String srcLabel, String tgtLabel, Generic
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getName());
_.append(" ").append(this.getType());
_.append(" ").append(this.getIcon());
return _.substring(1);
s.append(" ").append(this.getName());
s.append(" ").append(this.getType());
s.append(" ").append(this.getIcon());
return s.substring(1);
}
@@ -289,15 +289,15 @@ public AttributeConstraint withSrc(PatternObject value)
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getPatternObjectName());
_.append(" ").append(this.getAttrName());
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getCmpOp());
_.append(" ").append(this.getTgtValue());
s.append(" ").append(this.getPatternObjectName());
s.append(" ").append(this.getAttrName());
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getCmpOp());
s.append(" ").append(this.getTgtValue());
return _.substring(1);
return s.substring(1);
}
@@ -165,12 +165,12 @@ public CardinalityConstraint withTgtRoleName(String value)
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getTgtRoleName());
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
return _.substring(1);
s.append(" ").append(this.getTgtRoleName());
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
return s.substring(1);
}
@@ -134,11 +134,11 @@ public void removeYou()
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
return _.substring(1);
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
return s.substring(1);
}
}
@@ -150,11 +150,11 @@ public PatternObject createPatternObject()
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
return _.substring(1);
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
return s.substring(1);
}
}
@@ -95,12 +95,12 @@ public void removeYou()
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getText());
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
return _.substring(1);
s.append(" ").append(this.getText());
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
return s.substring(1);
}
@@ -194,12 +194,12 @@ public void removeYou()
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getTgtRoleName());
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
return _.substring(1);
s.append(" ").append(this.getTgtRoleName());
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
return s.substring(1);
}
@@ -109,11 +109,11 @@ public void removeYou()
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
return _.substring(1);
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
return s.substring(1);
}
}
@@ -141,11 +141,11 @@ public MatchOtherThen withHostGraphSrcObject(Object value)
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
return _.substring(1);
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
return s.substring(1);
}
@@ -111,13 +111,13 @@ public void removeYou()
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getDebugMode());
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
_.append(" ").append(this.getName());
return _.substring(1);
s.append(" ").append(this.getDebugMode());
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
s.append(" ").append(this.getName());
return s.substring(1);
}
@@ -151,13 +151,13 @@ public void resetSearch()
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getDebugMode());
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
_.append(" ").append(this.getName());
return _.substring(1);
s.append(" ").append(this.getDebugMode());
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
s.append(" ").append(this.getName());
return s.substring(1);
}
}
@@ -903,13 +903,13 @@ public MP withDebugMode(int value)
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getDebugMode());
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
_.append(" ").append(this.getName());
return _.substring(1);
s.append(" ").append(this.getDebugMode());
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
s.append(" ").append(this.getName());
return s.substring(1);
}
// ==========================================================================
@@ -243,11 +243,11 @@ public String dumpHostGraphObject(Object hostGraphObject)
@Override
public String toString()
{
StringBuilder _ = new StringBuilder();
StringBuilder s = new StringBuilder();
_.append(" ").append(this.getModifier());
_.append(" ").append(this.getPatternObjectName());
return _.substring(1);
s.append(" ").append(this.getModifier());
s.append(" ").append(this.getPatternObjectName());
return s.substring(1);
}
Oops, something went wrong.

0 comments on commit 8b7fb01

Please sign in to comment.