From f6baab235781ba14d4d15758676338114f50ffcb Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Thu, 4 Jun 2009 08:56:12 +0000
Subject: [PATCH] New commands and toolbar
---
src/remotesimulation/CommandParser.java | 4 +--
src/ui/JToolBarMainTurtle.java | 28 ++++++++++---------
.../JFrameInteractiveSimulation.java | 6 ++--
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/remotesimulation/CommandParser.java b/src/remotesimulation/CommandParser.java
index 41aba94539..948aae866a 100755
--- a/src/remotesimulation/CommandParser.java
+++ b/src/remotesimulation/CommandParser.java
@@ -199,8 +199,8 @@ public class CommandParser {
// get-command-and-task
params = new int[1];
paramNames = new String[1];
- params[0] = 1;
- paramNames[0] = "Task id";
+ params[0] = 0;
+ paramNames[0] = "Task id (or \"all\")";
sc = new SimulationCommand("get-command-of-task", "gcot", "14", params, paramNames, "Returns the current command of the task provided as argument");
commandList.add(sc);
diff --git a/src/ui/JToolBarMainTurtle.java b/src/ui/JToolBarMainTurtle.java
index 19a0c8743d..d794469117 100755
--- a/src/ui/JToolBarMainTurtle.java
+++ b/src/ui/JToolBarMainTurtle.java
@@ -172,6 +172,21 @@ public class JToolBarMainTurtle extends JToolBar {
}
addSeparator();
+
+ if (MainGUI.systemcOn) {
+ button = add(mgui.actions[TGUIAction.ACT_GEN_SYSTEMC]);
+ button.addMouseListener(mgui.mouseHandler);
+
+ button = add(mgui.actions[TGUIAction.ACT_SIMU_SYSTEMC]);
+ button.addMouseListener(mgui.mouseHandler);
+ addSeparator();
+
+ button = add(mgui.actions[TGUIAction.ACT_GEN_TMLTXT]);
+ button.addMouseListener(mgui.mouseHandler);
+ addSeparator();
+ }
+
+ addSeparator();
button = add(mgui.actions[TGUIAction.ACT_GEN_JAVA]);
button.addMouseListener(mgui.mouseHandler);
@@ -187,19 +202,6 @@ public class JToolBarMainTurtle extends JToolBar {
addSeparator();
- if (MainGUI.systemcOn) {
- button = add(mgui.actions[TGUIAction.ACT_GEN_SYSTEMC]);
- button.addMouseListener(mgui.mouseHandler);
-
- button = add(mgui.actions[TGUIAction.ACT_SIMU_SYSTEMC]);
- button.addMouseListener(mgui.mouseHandler);
- addSeparator();
-
- button = add(mgui.actions[TGUIAction.ACT_GEN_TMLTXT]);
- button.addMouseListener(mgui.mouseHandler);
- addSeparator();
- }
-
if ((ConfigurationTTool.ExternalCommand1.length() > 0) && (ConfigurationTTool.ExternalCommand1Host.length() > 0)) {
button = add(mgui.actions[TGUIAction.EXTERNAL_ACTION_1]);
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index d9c15a3025..8007c8352d 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -1329,9 +1329,11 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
return;
}
- for(TMLTask task: tmap.getTMLModeling().getTasks()) {
+ sendCommand("get-command-of-task all");
+
+ /*for(TMLTask task: tmap.getTMLModeling().getTasks()) {
sendCommand("get-command-of-task " + task.getID());
- }
+ }*/
}
private void updateRunningCommand(String id, String command) {
--
GitLab