From 1a67f8997fb8930b12bb60125fd72eaaaca2b54b Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 23 Jul 2010 20:13:30 +0000 Subject: [PATCH] Tweaks to GUI simulator transition table. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1994 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/simulator/ChoiceListFlexi.java | 8 +++++--- prism/src/userinterface/simulator/GUISimulator.java | 2 +- .../userinterface/simulator/GUISimulatorUpdatesTable.java | 5 ----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/prism/src/simulator/ChoiceListFlexi.java b/prism/src/simulator/ChoiceListFlexi.java index 8d368340..d9565342 100644 --- a/prism/src/simulator/ChoiceListFlexi.java +++ b/prism/src/simulator/ChoiceListFlexi.java @@ -169,10 +169,12 @@ public class ChoiceListFlexi implements Choice */ public String getUpdateString(int i) { - String s = "("; - for (Update up : updates.get(i)) + String s = ""; + boolean first = true; + for (Update up : updates.get(i)) { + if (first) first = false; else s+= " & "; s += up; - s += ")"; + } return s; } diff --git a/prism/src/userinterface/simulator/GUISimulator.java b/prism/src/userinterface/simulator/GUISimulator.java index 0e5b9adb..cb27037b 100644 --- a/prism/src/userinterface/simulator/GUISimulator.java +++ b/prism/src/userinterface/simulator/GUISimulator.java @@ -3304,7 +3304,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect if (pathActive) { switch (column) { case 0: - return "Module/Action"; + return "Module/[action]"; case 1: { if (parsedModel != null && parsedModel.getModelType() == ModelType.CTMC) return "Rate"; diff --git a/prism/src/userinterface/simulator/GUISimulatorUpdatesTable.java b/prism/src/userinterface/simulator/GUISimulatorUpdatesTable.java index 7180a986..c97e304d 100644 --- a/prism/src/userinterface/simulator/GUISimulatorUpdatesTable.java +++ b/prism/src/userinterface/simulator/GUISimulatorUpdatesTable.java @@ -34,13 +34,8 @@ import javax.swing.table.*; import javax.swing.border.*; import javax.swing.event.*; -import prism.ModelType; import userinterface.GUIPrism; -/** - * - * @author ug60axh - */ public class GUISimulatorUpdatesTable extends JTable implements ListSelectionListener { public static Color[] DISTRIBUTION_COLOURS = { new Color(255, 255, 255), //white