From 9dffae8843ac3b3fdb35eada4426a22628d3dd33 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 6 Nov 2014 14:47:16 +0000
Subject: [PATCH] Update on Makefile and removing TMLCPconnectors from
graphical models
---
Makefile | 2 +-
src/tmltranslator/TMLCP.java | 7 +++++++
.../tmlcp/TMLCPActivityDiagram.java | 16 +++++++++++++++-
src/tmltranslator/tmlcp/TMLCPChoice.java | 9 ++++++++-
src/ui/GTMLModeling.java | 4 +++-
5 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 74acc6d511..d644430d18 100755
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ myrelease: basic launcher ttooljar
basic:
$(JAVAC) $(CLASSPATH) $(TTOOL_SRC) $(TTOOL_SRC)/*.java
-jar: ttooljar
+jar: launcher ttooljar
ttooljar:
rm -f $(TTOOL_BIN)/$(TTOOL_BINARY)
diff --git a/src/tmltranslator/TMLCP.java b/src/tmltranslator/TMLCP.java
index c5f947b14f..02dd44cf3d 100755
--- a/src/tmltranslator/TMLCP.java
+++ b/src/tmltranslator/TMLCP.java
@@ -319,6 +319,13 @@ public class TMLCP extends TMLElement {
}
+ public void removeADConnectors() {
+ mainCP.removeADConnectors();
+ for(TMLCPActivityDiagram diag: otherCPs) {
+ diag.removeADConnectors();
+ }
+ }
+
public void printDataStructure() {
ArrayList<TMLCPActivityDiagram> CPlist = new ArrayList<TMLCPActivityDiagram>();
diff --git a/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java b/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
index 08ff0a9179..2712d54cf0 100755
--- a/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
+++ b/src/tmltranslator/tmlcp/TMLCPActivityDiagram.java
@@ -264,11 +264,25 @@ public class TMLCPActivityDiagram extends TMLElement {
if ((src != null) && (dest != null)) {
src.addNextElement(dest);
+ if (src instanceof TMLCPChoice) {
+ ((TMLCPChoice)src).addGuard(((TMLCPConnector)tempElem).getGuard());
+ }
}
}
}
-
+ }
+
+ public void removeADConnectors() {
+ LinkedList<TMLCPElement> toBeRemoved = new LinkedList<TMLCPElement>();
+ for(TMLCPElement tempElem: elements) {
+ if (tempElem instanceof TMLCPConnector) {
+ toBeRemoved.add(tempElem);
+ }
+ }
+ for(TMLCPElement tempElem: toBeRemoved) {
+ elements.remove(tempElem);
+ }
}
} //End of class
diff --git a/src/tmltranslator/tmlcp/TMLCPChoice.java b/src/tmltranslator/tmlcp/TMLCPChoice.java
index e99ab9d339..188e85c1f5 100755
--- a/src/tmltranslator/tmlcp/TMLCPChoice.java
+++ b/src/tmltranslator/tmlcp/TMLCPChoice.java
@@ -53,7 +53,7 @@ import myutil.*;
//The method is not very suited for the language, I should come back later...
public class TMLCPChoice extends TMLCPElement {
- private ArrayList<String> guards = new ArrayList<String>();
+ private ArrayList<String> guards;
public TMLCPChoice(String _name, ArrayList<String> _guards, Object _referenceObject) {
super(_name, _referenceObject);
@@ -63,6 +63,13 @@ public class TMLCPChoice extends TMLCPElement {
/* public void addGuard( String _guard ) {
nexts.add( new TMLCPElement( _guard, null ) );
}*/
+
+ public void addGuard(String _guard) {
+ if (guards == null) {
+ guards = new ArrayList<String>();
+ }
+ guards.add(_guard);
+ }
public ArrayList<String> getGuards() {
return this.guards;
diff --git a/src/ui/GTMLModeling.java b/src/ui/GTMLModeling.java
index 300266f883..24d1149f33 100755
--- a/src/ui/GTMLModeling.java
+++ b/src/ui/GTMLModeling.java
@@ -2198,6 +2198,7 @@ public class GTMLModeling {
tmlcp.correctReferences();
tmlcp.generateNexts();
+ tmlcp.removeADConnectors();
//tmlcp.splitADs();
} //End of method
@@ -2281,7 +2282,8 @@ public class GTMLModeling {
}
if( component instanceof ui.tmlcp.TMLCPChoice ) {
//TraceManager.addDev( k + component.getName() + "\t" + component.getValue() + "\t" + component.getY());
- choice = new tmltranslator.tmlcp.TMLCPChoice( component.getName(), ((ui.tmlcp.TMLCPChoice) component).getGuards(), component );
+ // old way: adding guards choice = new tmltranslator.tmlcp.TMLCPChoice( component.getName(), ((ui.tmlcp.TMLCPChoice) component).getGuards(), component );
+ choice = new tmltranslator.tmlcp.TMLCPChoice( component.getName(), null, component );
AD.addTMLCPElement( choice );
}
if( component instanceof ui.tmlcp.TGConnectorTMLCP) {
--
GitLab