Commit fb0e8917 authored by Ludovic Apvrille's avatar Ludovic Apvrille
Browse files

Resolving last problems

parent f290c4c5
......@@ -6053,7 +6053,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) {
......@@ -6081,7 +6081,7 @@ public class GTURTLEModeling {
camsp.structureChanged();
makePostLoading(camsp, beginIndex);
}
}
}*/
} else if (tdp instanceof AvatarADPanel) {
nl = doc.getElementsByTagName("AvatarADPanelCopy");
......@@ -6283,8 +6283,8 @@ public class GTURTLEModeling {
loadAvatarMethodology(node);
} else if (type.compareTo("Sysmlsec Methodology") == 0) {
loadSysmlsecMethodology(node);
} else if (type.compareTo("SystemC-AMS") == 0) {
loadSystemCAMS(node);
/*} else if (type.compareTo("SystemC-AMS") == 0) {
loadSystemCAMS(node);*/
} else if (type.compareTo("TML Design") == 0) {
loadTMLDesign(node);
} else if (type.compareTo("TML Component Design") == 0) {
......@@ -6789,7 +6789,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;
......@@ -6815,7 +6815,7 @@ public class GTURTLEModeling {
}
}
}
}
}*/
public void loadTMLDesign(Node node) throws MalformedModelingException, SAXException {
Element elt = (Element) node;
......@@ -7086,10 +7086,10 @@ public class GTURTLEModeling {
((AvatarADPanel)tdp).setConnectorsToFront();
}
if (tdp instanceof CAMSBlockDiagramPanel) {
/*if (tdp instanceof CAMSBlockDiagramPanel) {
//TraceManager.addDev("Connectors...");
((CAMSBlockDiagramPanel)tdp).setConnectorsToFront();
}
}*/
}
// AVATAR
......@@ -8994,7 +8994,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);
......@@ -9023,9 +9023,9 @@ public class GTURTLEModeling {
// mgui.resetAllDIPLOIDs();
// listE.useDIPLOIDs();
// mgui.setMode(MainGUI.GEN_DESIGN_OK);
return true;
//return true;
// }
}
//}
public boolean checkSyntaxTMLMapping(Vector<TGComponent> nodesToTakeIntoAccount, TMLArchiPanel tmlap, boolean optimize) {
List<TMLError> warningsOptimize = new ArrayList<TMLError>();
......
......@@ -3332,7 +3332,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
}
}
} else if (tp instanceof SystemCAMSPanel) { //Ajout CD
/*} else if (tp instanceof SystemCAMSPanel) { //Ajout CD
SystemCAMSPanel camsp = (SystemCAMSPanel)tp;
JDialogSelectSystemCAMSBlock.validated = camsp.validated;
......@@ -3367,7 +3367,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
JOptionPane.INFORMATION_MESSAGE);
}
}
}
}*/
} else if (tp instanceof TMLArchiPanel) {
tmlap = (TMLArchiPanel)tp;
......@@ -8392,9 +8392,9 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
mgui.newAvatarMADs();
} else if (e.getSource() == newAVATARAnalysis) {
mgui.newAvatarAnalysis();
} else if (e.getSource() == newSystemCAMS) { //ajout CD
} /*else if (e.getSource() == newSystemCAMS) { //ajout CD
mgui.newSystemCAMS();
}
}*/
}
};
}
......
......@@ -2614,7 +2614,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))
......@@ -2622,7 +2622,7 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
return o.hasBlockWithName();
}
});
}
}*/
public String findAvatarSMDStateName(String name) {
return this.findGoodName (name, new NameChecker () {
......
......@@ -1906,7 +1906,7 @@ public class TGComponentManager {
} else if (tgc instanceof TMLArchiHWANode) {
return TMLARCHI_HWANODE;
/*} else if (tgc instanceof TMLArchiCAMSNode) {
return TMLARCHI_CAMSNODE;*//
return TMLARCHI_CAMSNODE;*/
} else if (tgc instanceof TMLArchiMemoryNode) {
return TMLARCHI_MEMORYNODE;
} else if (tgc instanceof TMLArchiDMANode) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment