diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml index f44c85c35bfda2554143d2926f0ea6c166adba0a..68180c9d4a9c4902552fa8dfbf5a9b828b2fb73f 100755 --- a/modeling/DIPLODOCUS/SmartCardProtocol.xml +++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml @@ -2,6 +2,22 @@ <TURTLEGMODELING version="1.0beta"> +<Modeling type="Avatar Analysis" nameTab="Analysis" > +</Modeling> + + + + +<Modeling type="Avatar Analysis" nameTab="Analysis" > +<SequenceDiagramPanelZV name="MyScenario0" minX="10" maxX="2500" minY="10" maxY="1500" > + +</SequenceDiagramPanelZV> + +</Modeling> + + + + <Modeling type="TML Component Design" nameTab="AppC" > <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="0" maxX="2724" minY="0" maxY="916" channels="true" events="true" requests="true" zoom="1.0000000000000018" > <CONNECTOR type="126" id="1" > diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java index f64dd00aa93d7f896fb00cdaca660bc575746830..5b3b8980f3f1eda376d7f9732f19cfe04805a746 100644 --- a/src/main/java/ui/MainGUI.java +++ b/src/main/java/ui/MainGUI.java @@ -6634,6 +6634,14 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per return (tp.panelAt(index) instanceof ui.sd.SequenceDiagramPanel); } + public boolean isSDCreatedZV(TURTLEPanel tp, String s) { + int index = tp.tabbedPane.indexOfTab(s); + if (index == -1) { + return false; + } + return (tp.panelAt(index) instanceof ui.sd2.SequenceDiagramPanel); + } + public boolean isSDZVCreated(int index, String s) { return isSDZVCreated(tabs.elementAt(index), s); } @@ -6990,7 +6998,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per public boolean createUniqueSequenceDiagramZV(TURTLEPanel tp, String s) { int i; for (i = 0; i < 1000; i++) { - if (!isSDCreated(tp, s + i)) { + if (!isSDCreatedZV(tp, s + i)) { break; } } diff --git a/src/main/java/ui/TURTLEPanelPopupListener.java b/src/main/java/ui/TURTLEPanelPopupListener.java index b6c22e0e74601a975557588ea205aba12b7a15bf..7285a96c2ad9de8463f0bec0bcde804662dc94ac 100644 --- a/src/main/java/ui/TURTLEPanelPopupListener.java +++ b/src/main/java/ui/TURTLEPanelPopupListener.java @@ -138,7 +138,10 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t menu.add(newavatarcd); menu.add(newavatarad); } - menu.add(newsd); + + if (mgui.isExperimentalOn()) { + menu.add(newsd); + } menu.add(newsdzv); menu.add(newsdfromucd); @@ -209,7 +212,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t } newucd.setEnabled(tp.isUCDEnabled()); - newsd.setEnabled(tp.isSDEnabled()); + newsd.setEnabled(tp.isSDEnabled()&&mgui.isExperimentalOn()); newsdzv.setEnabled(tp.isSDEnabled()); newsdfromucd.setEnabled(tp.isSDEnabled() && (mgui.getCurrentTDiagramPanel() instanceof UseCaseDiagramPanel)); newreq.setEnabled(tp.isReqEnabled());