diff --git a/Makefile b/Makefile
index 12bce183b7147bd7ad041e10cd7f6d5376a395ae..f6f63ad70aaadb8f6d23575284b03ff1ffc11888 100755
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,11 @@ JAVAC = javac
JAR = jar
JAVADOC = javadoc
TAR = tar
+GZIP = gzip -9 -f
DEBUG = -g
CLASSPATH = -classpath
CLASSPATH = -sourcepath
-PACKAGE = automata compiler/tmlparser vcd nc ddtranslator launcher myutil tpndescription sddescription sdtranslator translator tmltranslator tmltranslator/toautomata tmltranslator/tosystemc tmltranslator/tomappingsystemc tmltranslator/tomappingsystemc2 tmltranslator/touppaal tmltranslator/toturtle translator/tojava translator/tosimujava translator/totpn translator/touppaal ui ui/ad ui/cd ui/oscd ui/osad ui/dd ui/file ui/graph ui/iod ui/ncdd ui/procsd ui/prosmdui/prosmd/util ui/tmlad ui/tmlcd ui/tmldd ui/tmlcomp ui/req ui/sd ui/tree ui/ucd ui/window tmltranslator tmltranslator/toturtle tmltranslator/tosystemc tmatrix uppaaldesc fr/inria/oasis/vercors/cttool/model remotesimulation
+PACKAGE = automata compiler/tmlparser vcd nc ddtranslator launcher myutil tpndescription sddescription sdtranslator translator tmltranslator tmltranslator/toautomata tmltranslator/tosystemc tmltranslator/tomappingsystemc tmltranslator/tomappingsystemc2 tmltranslator/touppaal tmltranslator/toturtle translator/tojava translator/tosimujava translator/totpn translator/touppaal ui ui/ad ui/cd ui/oscd ui/osad ui/dd ui/ebrdd ui/file ui/graph ui/iod ui/ncdd ui/procsd ui/prosmdui/prosmd/util ui/tmlad ui/tmlcd ui/tmldd ui/tmlcomp ui/req ui/sd ui/tree ui/ucd ui/window tmltranslator tmltranslator/toturtle tmltranslator/tosystemc tmatrix uppaaldesc fr/inria/oasis/vercors/cttool/model remotesimulation
BUILDER = builder.jar
BUILD_INFO = build.txt
BUILD_TO_MODIFY = src/ui/DefaultText.java
@@ -165,14 +166,14 @@ stdrelease:
cp -R $(TTOOL_BIN)/$(TTOOL_LOTOS_H).h $(TTOOL_BIN)/$(TTOOL_LOTOS_H)_?.h $(TTOOL_BIN)/$(TTOOL_LOTOS_H)_?.t $(TTOOL_BIN)/$(TTOOL_LOTOS_H)_?.f $(TTOOL_TARGET)/bin
cp $(TTOOL_BIN)/$(TTOOL_BINARY) $(TTOOL_BIN)/$(LAUNCHER_BINARY) $(TTOOL_BIN)/$(TIFTRANSLATOR_BINARY) $(TTOOL_BIN)/$(TMLTRANSLATOR_BINARY) $(TTOOL_BIN)/$(TTOOL_CONFIG_SRC) $(TTOOL_TARGET)/bin
# Basic release
- cd $(TTOOL_TARGET_RELEASE);$(TAR) cfvz $(TTOOL_STD_RELEASE)/release.tgz *
+ cd $(TTOOL_TARGET_RELEASE);$(TAR) cfv $(TTOOL_STD_RELEASE)/release.tar *; $(GZIP) -9 $(TTOOL_STD_RELEASE)/release.tar; mv $(TTOOL_STD_RELEASE)/release.tar.gz $(TTOOL_STD_RELEASE)/release.tgz
# Advanced release
$(JAVADOC) $(CLASSPATH) $(TTOOL_SRC) -d $(TTOOL_TARGET)/doc/srcdoc $(TTOOL_SRC)/*.java $(TTOOL_SRC)/*/*.java $(TTOOL_SRC)/*/*/*.java $(TTOOL_SRC)/fr/inria/oasis/vercors/cttool/model/*.java
mkdir -p $(TTOOL_TARGET)/src
cp -R $(TTOOL_SRC)/* $(TTOOL_TARGET)/src
find $(TTOOL_TARGET)/src -type f -not \( -name '*.java' -o -name '*.gif' -o -name '*.jjt' -o -name '*.txt' \) -a -exec rm -f {} \;
cp -R $(TTOOL_DOC)/README_src $(TTOOL_TARGET)/src
- cd $(TTOOL_TARGET_RELEASE);$(TAR) cfvz $(TTOOL_STD_RELEASE)/releaseWithSrc.tgz *
+ cd $(TTOOL_TARGET_RELEASE);$(TAR) cfv $(TTOOL_STD_RELEASE)/releaseWithSrc.tar *; $(GZIP) $(TTOOL_STD_RELEASE)/releaseWithSrc.tar; mv $(TTOOL_STD_RELEASE)/releaseWithSrc.tar.gz $(TTOOL_STD_RELEASE)/releaseWithSrc.tgz
jttooljar:
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index fabe002cd2ecd679e762ddf418b36aeee9338f54..412e487fa670f1e9382786c647043b2b15576f16 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -107,7 +107,7 @@ public class IconManager {
public static ImageIcon imgic900, imgic902, imgic904, imgic906, imgic908, imgic910, imgic912, imgic914, imgic916, imgic918, imgic920, imgic922, imgic924, imgic926;
// Requirement diagrams
public static ImageIcon imgic1000, imgic1002, imgic1004,imgic1006,imgic1008, imgic1010, imgic1012, imgic1014;
- public static ImageIcon imgic1050, imgic1052, imgic1054,imgic1056;
+ public static ImageIcon imgic1050, imgic1052, imgic1054,imgic1056, imgic1058;
// TMLDD
public static ImageIcon imgic1100, imgic1102, imgic1104, imgic1106, imgic1108;
@@ -403,6 +403,8 @@ public class IconManager {
private static String icon1052 = "images/ercconnector.gif";
private static String icon1054 = "images/ebrddeso.gif";
private static String icon1056 = "images/ebrdderb.gif";
+ private static String icon1058 = "images/ebrdd.gif";
+
// DIPLODOCUS architecture
@@ -706,6 +708,7 @@ public class IconManager {
imgic1052 = getIcon(icon1052);
imgic1054 = getIcon(icon1054);
imgic1056 = getIcon(icon1056);
+ imgic1058 = getIcon(icon1058);
imgic1100 = getIcon(icon1100);
imgic1102 = getIcon(icon1102);
diff --git a/src/ui/RequirementPanel.java b/src/ui/RequirementPanel.java
index cbe07d1294cc10d04937111c6429c8d34635a0ea..193629f22b3df2d3019092aeba32799dfbd6b6ef 100755
--- a/src/ui/RequirementPanel.java
+++ b/src/ui/RequirementPanel.java
@@ -133,7 +133,7 @@ public class RequirementPanel extends TURTLEPanel {
jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
toolBarPanel.add(toolBarEBRDD, BorderLayout.NORTH);
toolBarPanel.add(jsp, BorderLayout.CENTER);
- tabbedPane.addTab(s, IconManager.imgic1000, toolBarPanel, "Opens EBRDD");
+ tabbedPane.addTab(s, IconManager.imgic1058, toolBarPanel, "Opens EBRDD");
tabbedPane.setSelectedIndex(0);
JPanel toolBarPanel = new JPanel();
toolBarPanel.setLayout(new BorderLayout());
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index e491a6c4dd6403ab0798027ba192094e09674db2..6ea21f8a041ec016678e111463bb2da4aa64e903 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -685,7 +685,7 @@ public class TGUIAction extends AbstractAction {
actions[EBRDD_CONNECTOR] = new TAction("add-ebrdd-connector", "Connect two operators together", IconManager.imgic202, IconManager.imgic202, "Connect two operators together", "Connect two operators of the currently opened Event-Based Requirement Description Diagram", 0);
actions[EBRDD_START] = new TAction("add-ebrdd-start", "Add Start state", IconManager.imgic222, IconManager.imgic222, "Start", "Add a start state to the currently opened Event-Based Requirement Description Diagram", 0);
actions[EBRDD_STOP] = new TAction("add-ebrdd-stop", "Add Stop", IconManager.imgic210, IconManager.imgic210, "Stop", "Add a termination state to the currently opened Event-Based Requirement Description Diagram", 0);
- actions[EBRDD_CHOICE] = new TAction("add-ebrdd-choice", "Add Choice", IconManager.imgic222, IconManager.imgic222, "Choice", "Add a deterministic choice to the currently opened Event-Based Requirement Description Diagram", 0);
+ actions[EBRDD_CHOICE] = new TAction("add-ebrdd-choice", "Add Choice", IconManager.imgic208, IconManager.imgic208, "Choice", "Add a deterministic choice to the currently opened Event-Based Requirement Description Diagram", 0);
actions[EBRDD_ERC] = new TAction("add-ebrdd-erc", "Add ERC", IconManager.imgic1050, IconManager.imgic1050, "Event Reception Container", "Add an Event Reception Container to the currently opened Event-Based Requirement Description Diagram", 0);
actions[EBRDD_ACTION] = new TAction("add-ebrdd-action", "Add Action", IconManager.imgic204, IconManager.imgic204, "Action", "Add an Action to the currently opened Event-Based Requirement Description Diagram", 0);
actions[EBRDD_FOR_LOOP] = new TAction("add-ebrdd-for-loop", "Loop (for)", IconManager.imgic912, IconManager.imgic912, "Loop (for)", "Add a for loop to the currently opened Event-Based Requirement Description Diagram", 0);
diff --git a/src/ui/ebrdd/EBRDDERB.java b/src/ui/ebrdd/EBRDDERB.java
index b6b44fcf3551cd2467586b32296dba161f26dd96..af2f9c0af3e11d67e5a58a6bbc6fbb03b903c5ed 100644
--- a/src/ui/ebrdd/EBRDDERB.java
+++ b/src/ui/ebrdd/EBRDDERB.java
@@ -84,11 +84,16 @@ public class EBRDDERB extends TGCOneLineText implements SwallowedTGComponent {
editable = true;
removable = true;
- value = "action / condition";
name = "Event Reaction Block";
+
+ makeValue();
- myImageIcon = IconManager.imgic204;
+ myImageIcon = IconManager.imgic1056;
}
+
+ public void makeValue() {
+ setValue("evt:" + evt + " / cond:" + condition + " / action:" + action);
+ }
public void internalDrawing(Graphics g) {
if (wid != width) {
@@ -192,6 +197,7 @@ public class EBRDDERB extends TGCOneLineText implements SwallowedTGComponent {
evt = dialog.getEvent().trim();
condition = dialog.getCondition().trim();
action = dialog.getAction().trim();
+ makeValue();
return true;
}
@@ -272,6 +278,7 @@ public class EBRDDERB extends TGCOneLineText implements SwallowedTGComponent {
} catch (Exception e) {
throw new MalformedModelingException();
}
+ makeValue();
}
public String getEvent() {
diff --git a/src/ui/ebrdd/EBRDDERC.java b/src/ui/ebrdd/EBRDDERC.java
index cf39dc36880f8125385bdb5889407785bd99f354..3fdc2b3a29db89e5ae24c573e8775e212ddba20a 100644
--- a/src/ui/ebrdd/EBRDDERC.java
+++ b/src/ui/ebrdd/EBRDDERC.java
@@ -94,7 +94,7 @@ public class EBRDDERC extends TGCWithInternalComponent implements SwallowTGCompo
name = tdp.findNodeName("ERC");
value = "name";
- //myImageIcon = IconManager.imgic700;
+ myImageIcon = IconManager.imgic1050;
}
public void internalDrawing(Graphics g) {
diff --git a/src/ui/ebrdd/EBRDDESO.java b/src/ui/ebrdd/EBRDDESO.java
index 757295bfbc97466042f82495dc26de5ca425b3b9..e5a0b4fcb8d115ed6e3d214b0a6a5f0483a818b0 100644
--- a/src/ui/ebrdd/EBRDDESO.java
+++ b/src/ui/ebrdd/EBRDDESO.java
@@ -94,11 +94,11 @@ public class EBRDDESO extends TGCWithoutInternalComponent implements SwallowedTG
editable = true;
removable = true;
- setValue("Conjunction");
+ setValue(ESOS[id] + "(" + timeout + ", " + oncePerEvent + ", " + n + ", " + m + ")");
name = "ESO";
id = 0;
- myImageIcon = IconManager.imgic206;
+ myImageIcon = IconManager.imgic1054;
}
public void internalDrawing(Graphics g) {
@@ -171,6 +171,8 @@ public class EBRDDESO extends TGCWithoutInternalComponent implements SwallowedTG
n = _n;
m = _m;
+ setValue(ESOS[id] + "(" + timeout + ", " + oncePerEvent + ", " + n + ", " + m + ")");
+
return true;
}
@@ -239,6 +241,8 @@ public class EBRDDESO extends TGCWithoutInternalComponent implements SwallowedTG
} catch (Exception e) {
throw new MalformedModelingException();
}
+ setValue(ESOS[id] + "(" + timeout + ", " + oncePerEvent + ", " + n + ", " + m + ")");
+
}
public static boolean hasTimeout(int _id) {
diff --git a/src/ui/ebrdd/EBRDDSequence.java b/src/ui/ebrdd/EBRDDSequence.java
index 3c180c6f26d2923172113a23d1975e9b6afc0755..7ecf7a3a6fbf87af78b95a156b67e2b878821a34 100644
--- a/src/ui/ebrdd/EBRDDSequence.java
+++ b/src/ui/ebrdd/EBRDDSequence.java
@@ -91,7 +91,7 @@ public class EBRDDSequence extends TGCWithInternalComponent implements EmbeddedC
name = "sequence";
- myImageIcon = IconManager.imgic206;
+ myImageIcon = IconManager.imgic226;
}
public void internalDrawing(Graphics g) {
diff --git a/src/ui/ebrdd/TGConnectorEBRDDERC.java b/src/ui/ebrdd/TGConnectorEBRDDERC.java
index 8944fee475b1fcf2d7a8f9c6fd9bb2c75d654a13..d1d9564be041a922838dff6e5db79ac5c96fb23d 100755
--- a/src/ui/ebrdd/TGConnectorEBRDDERC.java
+++ b/src/ui/ebrdd/TGConnectorEBRDDERC.java
@@ -62,7 +62,7 @@ public class TGConnectorEBRDDERC extends TGConnector {
public TGConnectorEBRDDERC(int _x, int _y, int _minX, int _minY, int _maxX, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp, TGConnectingPoint _p1, TGConnectingPoint _p2, Vector _listPoint) {
super(_x, _y, _minX, _minY, _maxX, _maxY, _pos, _father, _tdp, _p1, _p2, _listPoint);
- myImageIcon = IconManager.imgic202;
+ myImageIcon = IconManager.imgic1052;
}
protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
diff --git a/src/ui/tree/DiagramTreeRenderer.java b/src/ui/tree/DiagramTreeRenderer.java
index c7841171cbb9aa529e6f9c56a2c8a4de05c2a30b..68e678397ca9bb64d4ba6229489db420afa5ebf4 100755
--- a/src/ui/tree/DiagramTreeRenderer.java
+++ b/src/ui/tree/DiagramTreeRenderer.java
@@ -55,6 +55,7 @@ import ui.*;
import ui.ad.*;
import ui.cd.*;
import ui.iod.*;
+import ui.ebrdd.*;
import ui.req.*;
import ui.sd.*;
import ui.dd.*;
@@ -134,6 +135,9 @@ public class DiagramTreeRenderer extends DefaultTreeCellRenderer {
} else if (value instanceof RequirementDiagramPanel) {
setIcon(IconManager.imgic1000);
setToolTipText("TURTLE Requirement Diagram");
+ } else if (value instanceof EBRDDPanel) {
+ setIcon(IconManager.imgic1058);
+ setToolTipText("Event-Based Requirement Description Diagram");
} else if (value instanceof TActivityDiagramPanel) {
setIcon(IconManager.imgic15);
setToolTipText("TURTLE Activity Diagram of " + value.toString());