diff --git a/Makefile b/Makefile
index f6f63ad70aaadb8f6d23575284b03ff1ffc11888..f7d73702decc3ef2ebefb36a8fdfa8b6c098ee6a 100755
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ 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/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
+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 req/ebrdd 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
@@ -80,7 +80,7 @@ basic:
ttooljar_std:
rm -f $(TTOOL_BIN)/$(TTOOL_BINARY)
cp $(TTOOL_SRC)/ui/images/$(STD_LOGO) $(TTOOL_SRC)/ui/images/$(LOGO)
- cd $(TTOOL_SRC); $(JAR) cmf $(TTOOL_JAR_TXT) $(TTOOL_BIN)/$(TTOOL_BINARY) Main.class vcd/*.class automata/*.class compiler/tmlparser/*.class nc/*.class tmltranslator/*.class tmltranslator/toautomata/*.class tmatrix/*.class tmltranslator/toturtle/*.class tmltranslator/touppaal/*.class tmltranslator/tosystemc/*.class tmltranslator/tomappingsystemc/*.class tmltranslator/tomappingsystemc2/*.class tpndescription/*.class ddtranslator/*.class launcher/*.class myutil/*.class sddescription/*.class sdtranslator/*.class translator/*.class translator/tojava/*.class translator/tosimujava/*.class translator/touppaal/*.class translator/totpn/*.class ui/*.class ui/*/*.class ui/*/*/*.class uppaaldesc/*.class ui/images/*.* ui/images/toolbarButtonGraphics/general/*.gif ui/images/toolbarButtonGraphics/media/*.gif $(TTOOL_BIN)/$(LAUNCHER_BINARY) RTLLauncher.class launcher/*.class fr/inria/oasis/vercors/cttool/model/*.class remotesimulation/*.class
+ cd $(TTOOL_SRC); $(JAR) cmf $(TTOOL_JAR_TXT) $(TTOOL_BIN)/$(TTOOL_BINARY) Main.class vcd/*.class automata/*.class compiler/tmlparser/*.class nc/*.class tmltranslator/*.class tmltranslator/toautomata/*.class tmatrix/*.class tmltranslator/toturtle/*.class tmltranslator/touppaal/*.class tmltranslator/tosystemc/*.class tmltranslator/tomappingsystemc/*.class tmltranslator/tomappingsystemc2/*.class tpndescription/*.class ddtranslator/*.class launcher/*.class myutil/*.class sddescription/*.class sdtranslator/*.class translator/*.class translator/tojava/*.class translator/tosimujava/*.class translator/touppaal/*.class translator/totpn/*.class req/ebrdd/*.java ui/*.class ui/*/*.class ui/*/*/*.class uppaaldesc/*.class ui/images/*.* ui/images/toolbarButtonGraphics/general/*.gif ui/images/toolbarButtonGraphics/media/*.gif $(TTOOL_BIN)/$(LAUNCHER_BINARY) RTLLauncher.class launcher/*.class fr/inria/oasis/vercors/cttool/model/*.class remotesimulation/*.class
launcher:
diff --git a/src/ui/GTURTLEModeling.java b/src/ui/GTURTLEModeling.java
index 7f38fd8711f3cfe682f659b0924795a8f8ac079a..55f7eab609fd4a72ba04eb7bbbc4d587e670efe5 100755
--- a/src/ui/GTURTLEModeling.java
+++ b/src/ui/GTURTLEModeling.java
@@ -99,6 +99,8 @@ import sdtranslator.*;
import uppaaldesc.*;
+import req.ebrdd.*;
+
public class GTURTLEModeling {
//Added by Solange
@@ -119,6 +121,8 @@ public class GTURTLEModeling {
private CorrespondanceTGElement listE;
private String rtlotos;
+ private EBRDD ebrdd;
+
private UPPAALSpec uppaal;
private RelationTIFUPPAAL uppaalTIFTable;
private RelationTMLUPPAAL uppaalTMLTable;
@@ -4839,5 +4843,16 @@ public class GTURTLEModeling {
((ActionStateErrorHighlight)_tgc).setStateAction(ErrorHighlight.UNKNOWN_AS);
}
}
+
+ public boolean makeEBRDD(EBRDDPanel tdp) {
+ EBRDDTranslator ebrddt = new EBRDDTranslator();
+ ebrdd = ebrddt.generateEBRDD(tdp);
+ warnings = ebrddt.getWarnings();
+ checkingErrors = ebrddt.getErrors();
+ if (checkingErrors.size() > 0) {
+ return false;
+ }
+ return true;
+ }
}
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index 7af1b0cbe2791ad9a94ca05552f525f637e7ed95..8e04bd0ac1afab36aef484a7d7e6ab9e5b1713ce 100755
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -2552,42 +2552,59 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener {
} else if (tp instanceof RequirementPanel) {
TDiagramPanel tdp = getCurrentTDiagramPanel();
if (!(tdp instanceof RequirementDiagramPanel)) {
- System.out.println("No syntax checking for EBRDD: not yet implemented");
- return ret;
- }
- RequirementDiagramPanel rdp= (RequirementDiagramPanel)tdp;
- JDialogSelectRequirements.validated = rdp.validated;
- JDialogSelectRequirements.ignored = rdp.ignored;
- Vector reqsToValidate = new Vector();
- JDialogSelectRequirements jdsreq = new JDialogSelectRequirements(frame, reqsToValidate, rdp.getComponentList(), "Choosing requirements to verify");
- if (!automatic) {
- GraphicLib.centerOnParent(jdsreq);
- jdsreq.setVisible(true); // Blocked until dialog has been closed
- }
- if (reqsToValidate.size() > 0) {
- rdp.validated = JDialogSelectRequirements.validated;
- rdp.ignored = JDialogSelectRequirements.ignored;
- b = gtm.generateTMsForRequirementAnalysis(reqsToValidate, rdp);
- if (b) {
- //setMode(MainGUI.GEN_SYSTEMC_OK);
- setMode(MainGUI.REQ_OK);
- ret = true;
- if (!automatic) {
+ if (tdp instanceof EBRDDPanel) {
+
+ b = gtm.makeEBRDD((EBRDDPanel)tdp);
+ if (b) {
JOptionPane.showMessageDialog(frame,
- "0 error, " + getCheckingWarnings().size() + " warning(s). You can now verify requirements' satisfiability",
- "Syntax analysis successful on requirements",
+ "0 error, " + getCheckingWarnings().size() + " warning(s).",
+ "Syntax analysis successful on EBRDD",
JOptionPane.INFORMATION_MESSAGE);
- }
-
- } else {
- if (!automatic) {
+ } else {
JOptionPane.showMessageDialog(frame,
- "The requirement diagram contains several errors",
+ "The EBRDD contains several errors",
"Syntax analysis failed",
JOptionPane.INFORMATION_MESSAGE);
}
- }
- }
+ } else {
+ return ret;
+ }
+ //System.out.println("No syntax checking for EBRDD: not yet implemented");
+ } else {
+ RequirementDiagramPanel rdp= (RequirementDiagramPanel)tdp;
+ JDialogSelectRequirements.validated = rdp.validated;
+ JDialogSelectRequirements.ignored = rdp.ignored;
+ Vector reqsToValidate = new Vector();
+ JDialogSelectRequirements jdsreq = new JDialogSelectRequirements(frame, reqsToValidate, rdp.getComponentList(), "Choosing requirements to verify");
+ if (!automatic) {
+ GraphicLib.centerOnParent(jdsreq);
+ jdsreq.setVisible(true); // Blocked until dialog has been closed
+ }
+ if (reqsToValidate.size() > 0) {
+ rdp.validated = JDialogSelectRequirements.validated;
+ rdp.ignored = JDialogSelectRequirements.ignored;
+ b = gtm.generateTMsForRequirementAnalysis(reqsToValidate, rdp);
+ if (b) {
+ //setMode(MainGUI.GEN_SYSTEMC_OK);
+ setMode(MainGUI.REQ_OK);
+ ret = true;
+ if (!automatic) {
+ JOptionPane.showMessageDialog(frame,
+ "0 error, " + getCheckingWarnings().size() + " warning(s). You can now verify requirements' satisfiability",
+ "Syntax analysis successful on requirements",
+ JOptionPane.INFORMATION_MESSAGE);
+ }
+
+ } else {
+ if (!automatic) {
+ JOptionPane.showMessageDialog(frame,
+ "The requirement diagram contains several errors",
+ "Syntax analysis failed",
+ JOptionPane.INFORMATION_MESSAGE);
+ }
+ }
+ }
+ }
} else if (tp instanceof ProactiveDesignPanel) {
// System.out.println("!!!!!!!!!!!!1");
//newTurtleModeling();
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index 423519b078890faf90dbe30aa3bb09592e823fe7..add7019b5d71cbb3b912b1b631fcd2e680ce5542 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -277,7 +277,7 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
jp.add(buttonStart);
jp.add(buttonStopAndClose);
jp.add(buttonClose);
- mainpanel.add(jp, BorderLayout.SOUTH);
+ mainpanel.add(jp, BorderLayout.NORTH);
GridBagLayout gridbag02 = new GridBagLayout();