diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
old mode 100755
new mode 100644
index cc1754a0407b7a6f9f83d296de23c7ca9e855ea7..d79e897533ab4850e6aed4ba112326f35f4953f9
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -104,7 +104,7 @@ import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
import ui.ebrdd.EBRDDPanel;
import ui.ftd.FaultTreeDiagramPanel;
import graph.RG;
-import ui.het.CAMSBlockDiagramPanel;
+//import ui.het.CAMSBlockDiagramPanel;
import ui.iod.InteractionOverviewDiagramPanel;
import ui.ncdd.NCDiagramPanel;
import ui.osad.TURTLEOSActivityDiagramPanel;
@@ -6222,7 +6222,7 @@ public class GTURTLEModeling {
}
}
- } else if (tdp instanceof CAMSBlockDiagramPanel) { //ajout CD 24.07----mark
+ } /*else if (tdp instanceof CAMSBlockDiagramPanel) { //ajout CD 24.07----mark
nl = doc.getElementsByTagName("CAMSBlockDiagramPanelCopy");
if (nl == null) {
@@ -6252,7 +6252,7 @@ public class GTURTLEModeling {
}
}
- } else if (tdp instanceof AvatarADPanel) {
+ } */ else if (tdp instanceof AvatarADPanel) {
nl = doc.getElementsByTagName("AvatarADPanelCopy");
if (nl == null) {
@@ -6454,9 +6454,9 @@ public class GTURTLEModeling {
loadAvatarMethodology(node);
} else if (type.compareTo("Sysmlsec Methodology") == 0) {
loadSysmlsecMethodology(node);
- } else if (type.compareTo("SystemC-AMS") == 0) {
+ } /*else if (type.compareTo("SystemC-AMS") == 0) {
loadSystemCAMS(node);
- } else if (type.compareTo("TML Design") == 0) {
+ }*/ else if (type.compareTo("TML Design") == 0) {
loadTMLDesign(node);
} else if (type.compareTo("TML Component Design") == 0) {
loadTMLComponentDesign(node);
@@ -6986,7 +6986,7 @@ public class GTURTLEModeling {
}
}
- public void loadSystemCAMS(Node node) throws MalformedModelingException, SAXException {
+/* public void loadSystemCAMS(Node node) throws MalformedModelingException, SAXException {
Element elt = (Element) node;
String nameTab;
NodeList diagramNl;
@@ -7012,7 +7012,7 @@ public class GTURTLEModeling {
}
}
}
- }
+ }*/
public void loadTMLDesign(Node node) throws MalformedModelingException, SAXException {
Element elt = (Element) node;
@@ -7288,10 +7288,10 @@ public class GTURTLEModeling {
((AvatarADPanel) tdp).setConnectorsToFront();
}
- if (tdp instanceof CAMSBlockDiagramPanel) {
+ /* if (tdp instanceof CAMSBlockDiagramPanel) {
//TraceManager.addDev("Connectors...");
((CAMSBlockDiagramPanel) tdp).setConnectorsToFront();
- }
+ }*/
}
// AVATAR
@@ -7509,7 +7509,7 @@ public class GTURTLEModeling {
loadDiagram(elt, tdp);
}
- public void loadSystemCAMSDiagram(Element elt, int indexDesign) throws MalformedModelingException, SAXException {
+/*public void loadSystemCAMSDiagram(Element elt, int indexDesign) throws MalformedModelingException, SAXException {
//ajout CD
String name;
TDiagramPanel tdp;
@@ -7523,7 +7523,7 @@ public class GTURTLEModeling {
//TraceManager.addDev("tdp=" + tdp.getName());
loadDiagram(elt, tdp);
- }
+ }*/
public void loadTMLTaskDiagram(Element elt, int indexDesign) throws MalformedModelingException, SAXException {
@@ -9255,7 +9255,7 @@ public class GTURTLEModeling {
}
}
- public boolean checkSyntaxSystemCAMS(Vector<TGComponent> blocksToTakeIntoAccount, SystemCAMSPanel scp, boolean optimize) { //ajout CD 04/07 FIXME
+/* public boolean checkSyntaxSystemCAMS(Vector<TGComponent> blocksToTakeIntoAccount, SystemCAMSPanel scp, boolean optimize) { //ajout CD 04/07 FIXME
// List<TMLError> warningsOptimize = new ArrayList<TMLError>();
// warnings = new LinkedList<CheckingError> ();
// mgui.setMode(MainGUI.VIEW_SUGG_DESIGN_KO);
@@ -9286,7 +9286,7 @@ public class GTURTLEModeling {
// mgui.setMode(MainGUI.GEN_DESIGN_OK);
return true;
// }
- }
+ }*/
public boolean checkSyntaxTMLMapping(Vector<TGComponent> nodesToTakeIntoAccount, TMLArchiPanel tmlap, boolean optimize) {
List<TMLError> warningsOptimize = new ArrayList<TMLError>();
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index d1e4243b04d69f24bb600ff552064f02fbe75686..d079fb56416131eba690924f6da11c3526ea72f3 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -70,7 +70,7 @@ import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
import ui.ebrdd.EBRDDPanel;
import ui.file.*;
import ui.ftd.FaultTreeDiagramPanel;
-import ui.het.CAMSBlockDiagramPanel;
+
import ui.interactivesimulation.JFrameInteractiveSimulation;
import ui.interactivesimulation.SimulationTransaction;
import ui.iod.InteractionOverviewDiagramPanel;
@@ -84,7 +84,7 @@ import ui.tmlcd.TMLTaskDiagramPanel;
import ui.tmlcompd.TMLCCompositeComponent;
import ui.tmlcompd.TMLComponentTaskDiagramPanel;
import ui.tmlcp.TMLCPPanel;
-import ui.tmldd.TMLArchiCAMSNode;
+//import ui.tmldd.TMLArchiCAMSNode;
import ui.tmldd.TMLArchiDiagramPanel;
import ui.tmlsd.TMLSDPanel;
import ui.tree.DiagramTreeModel;
@@ -1060,36 +1060,6 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
return index;
}
- public int addSystemCAMSPanel(String name, int index) { //ajout CD -----Mark
- if (index == -1) {
- index = tabs.size();
- }
- SystemCAMSPanel scp = new SystemCAMSPanel(this);
- tabs.add(index, scp);
- mainTabbedPane.add(scp.tabbedPane, index);
- mainTabbedPane.setToolTipTextAt(index, "Open System C-AMS diagrams ");
- mainTabbedPane.setTitleAt(index, name);
- mainTabbedPane.setIconAt(index, IconManager.imgic60);
- //mainTabbedPane.addTab(name, IconManager.imgic14, dp.tabbedPane, "Opens design diagrams");
- scp.init();
- //ystem.out.println("Design added");
- return index;
- }
-
- public CAMSBlockDiagramPanel addSystemCAMSPanel(String name, int index, TMLArchiCAMSNode parent) {
- if (index == -1) {
- index = tabs.size();
- }
- SystemCAMSPanel scp = new SystemCAMSPanel(this);
- tabs.add(index, scp);
- mainTabbedPane.add(scp.tabbedPane, index);
- mainTabbedPane.setToolTipTextAt(index, "Open System C-AMS diagrams ");
- mainTabbedPane.setTitleAt(index, name);
- mainTabbedPane.setIconAt(index, IconManager.imgic60);
- scp.init();
- return scp.getCAMSBlockDiagramPanel();
- }
-
//Return the list of all the TMLArchiDiagramPanels
public Vector<TMLArchiPanel> getTMLArchiDiagramPanels() {
@@ -1484,11 +1454,11 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
return index;
}
- public int createSystemCAMS(String name) { //ajout CD
+ /* public int createSystemCAMS(String name) { //ajout CD
int index = addSystemCAMSPanel(name, -1);
mainTabbedPane.setSelectedIndex(index);
return index;
- }
+ }*/
public int createADD(String name) {
int index = addADDPanel(name, -1);
@@ -1877,14 +1847,14 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
//frame.repaint();
}
- public void newSystemCAMS() {//ajout CD
+ /* public void newSystemCAMS() {//ajout CD
//TraceManager.addDev("NEW DIPLO Architecture");
addSystemCAMSPanel("SystemC-AMS", -1);
tabs.elementAt(tabs.size() - 1).tabbedPane.setSelectedIndex(0);
mainTabbedPane.setSelectedIndex(tabs.size() - 1);
//paneAction(null);
//frame.repaint();
- }
+ }*/
public void newADD() {
//TraceManager.addDev("NEW Avatar deployment");
@@ -3819,7 +3789,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
}
}
}
- } else if (tp instanceof SystemCAMSPanel) { //Ajout CD
+ }/* else if (tp instanceof SystemCAMSPanel) { //Ajout CD
SystemCAMSPanel camsp = (SystemCAMSPanel) tp;
JDialogSelectSystemCAMSBlock.validated = camsp.validated;
@@ -3858,7 +3828,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
}
}
- } else if (tp instanceof TMLArchiPanel) {
+ }*/else if (tp instanceof TMLArchiPanel) {
tmlap = (TMLArchiPanel) tp;
JDialogSelectTMLNodes.validated = tmlap.validated;
JDialogSelectTMLNodes.ignored = tmlap.ignored;
@@ -6350,10 +6320,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
tp.tabbedPane.setTitleAt(0, name);
}
- public void setSystemCAMSDiagramName(int indexDesign, String name) {
+ /* public void setSystemCAMSDiagramName(int indexDesign, String name) {
TURTLEPanel tp = tabs.elementAt(indexDesign);
tp.tabbedPane.setTitleAt(0, name);
- }
+ }*/
public void setSysmlsecMethodologyDiagramName(int indexDesign, String name) {
TURTLEPanel tp = tabs.elementAt(indexDesign);
@@ -9106,10 +9076,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
} else if (e.getSource() == newAVATARAnalysis) {
ModeManager.setMode(CREATE_NEW_PANEL, actions, mainBar, mgui);
mgui.newAvatarAnalysis();
- } else if (e.getSource() == newSystemCAMS) { //ajout CD
+ } /*else if (e.getSource() == newSystemCAMS) { //ajout CD
ModeManager.setMode(CREATE_NEW_PANEL, actions, mainBar, mgui);
mgui.newSystemCAMS();
- }
+ }*/
}
};
}
diff --git a/src/main/java/ui/TDiagramPanel.java b/src/main/java/ui/TDiagramPanel.java
index d19697e2f1f2df753f686c8ba6762db00600b7f1..fe0c5c52213ce8f5af6637fca6dc86122aefc78b 100755
--- a/src/main/java/ui/TDiagramPanel.java
+++ b/src/main/java/ui/TDiagramPanel.java
@@ -52,10 +52,10 @@ import ui.avatarmad.AvatarMADAssumption;
import ui.avatarrd.AvatarRDRequirement;
import ui.avatarsmd.AvatarSMDState;
import ui.cd.*;
-import ui.het.CAMSBlock;
+/*import ui.het.CAMSBlock;
import ui.het.CAMSBlockConnector;
import ui.het.CAMSBlockDiagramPanel;
-import ui.het.CAMSConnectingPoint;
+import ui.het.CAMSConnectingPoint;*/
import ui.ncdd.NCEqNode;
import ui.ncdd.NCRouteArtifact;
import ui.ncdd.NCSwitchNode;
@@ -114,7 +114,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
protected List<TGComponent> componentList;
protected TGConnectingPoint selectedConnectingPoint;
- protected CAMSConnectingPoint selectedCAMSConnectingPoints;
+ //protected CAMSConnectingPoint selectedCAMSConnectingPoints;
protected TGComponent componentPointed;
protected TGComponent componentPopup;
protected TToolBar ttb;
@@ -184,7 +184,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
protected int y2;
protected Vector<Point> listPoint;
protected TGConnectingPoint p1, p2;
- protected CAMSConnectingPoint cp1, cp2;
+ // protected CAMSConnectingPoint cp1, cp2;
protected int type;
// For component selection
@@ -503,8 +503,8 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
if (this.javaVisible && (tgc.hasPostJavaCode() || tgc.hasPreJavaCode()))
tgc.drawJavaCode(g);
- if (this instanceof CAMSBlockDiagramPanel) //Connecting points should always be visible in System-C AMS panels
- tgc.drawTGConnectingPoint(g, this.type);
+ // if (this instanceof CAMSBlockDiagramPanel) //Connecting points should always be visible in System-C AMS panels
+ // tgc.drawTGConnectingPoint(g, this.type);
}
// Draw name of component selected
@@ -948,9 +948,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
return selectedConnectingPoint;
}
- public CAMSConnectingPoint getSelectedCAMSConnectingPoint() {
+ /* public CAMSConnectingPoint getSelectedCAMSConnectingPoint() {
return selectedCAMSConnectingPoints;
- }
+ }*/
// Adding component
public TGComponent addComponent(int x, int y, boolean swallow) {
@@ -1096,7 +1096,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
listPoint = null;
}
- public void addingCAMSConnector() {
+ /* public void addingCAMSConnector() {
listPoint = new Vector<Point>();
cp1 = getSelectedCAMSConnectingPoint();
x1 = cp1.getX();
@@ -1113,9 +1113,9 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
listPoint.addElement(new Point(x, y));
x1 = x;
y1 = y;
- }
+ }*/
- public void finishAddingConnector(CAMSConnectingPoint cp2) {
+ /* public void finishAddingConnector(CAMSConnectingPoint cp2) {
CAMSBlockConnector camsco = TGComponentManager.addCAMSConnector(cp1.getX(), cp1.getY(), mgui.getIdButtonSelected(), this, cp1, cp2, listPoint);
if (camsco != null) {
TraceManager.addDev("Adding connector");
@@ -1134,7 +1134,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
stopAddingConnector(true);
cp1.setFree(true);
}
- }
+ }*/
// -------------mark
@@ -2804,7 +2804,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
});
}
- public String findCAMSBlockName(String name) {
+ /* public String findCAMSBlockName(String name) {
return this.findGoodName(name, new NameChecker() {
public boolean checkCAMSBlock(CAMSBlock o, String name) {
if (o.getValue().equals(name))
@@ -2812,7 +2812,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
return o.hasBlockWithName();
}
});
- }
+ }*/
public String findAvatarSMDStateName(String name) {
return this.findGoodName(name, new NameChecker() {