diff --git a/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java b/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
index a87dee6454d5a001acfd042a554d53f0279a0200..33a6f909c6a87703decd80e671e7735a0885cef9 100644
--- a/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
+++ b/src/tmltranslator/tomappingsystemc2/MappedSystemCTask.java
@@ -60,7 +60,7 @@ public class MappedSystemCTask {
private TMLMapping tmlmapping;
private int commentNum;
private boolean debug;
- private boolean optimize;
+ // private boolean optimize;
private StaticAnalysis _analysis;
private LiveVariableNode _startAnaNode=null;
@@ -91,7 +91,7 @@ public class MappedSystemCTask {
functionSig="";
commentText="";
commentNum=0;
- optimize=false;
+ // optimize=false;
_analysis = new StaticAnalysis(_task, _channels, _events, _requests, _depChannels);
_startAnaNode = _analysis.startAnalysis();
@@ -110,7 +110,7 @@ public class MappedSystemCTask {
//_startAnaNode = _analysis.startAnalysis();
//_analysis.determineCheckpoints(aStatistics); //NEW
debug = _debug;
- optimize=_optimize;
+ // optimize=_optimize;
basicCPPCode();
makeClassCode();
}
@@ -215,12 +215,12 @@ public class MappedSystemCTask {
hcode = Conversion.indentString(hcode, 4);
cppcode = Conversion.indentString(cppcode, 4);
}
-
- private String makeDestructor(){
- String dest=reference + "::~" + reference + "(){" + CR;
- if (commentNum!=0) dest+="delete[] _comment" + SCCR;
- return dest+"}"+CR;
- }
+//
+// private String makeDestructor(){
+// String dest=reference + "::~" + reference + "(){" + CR;
+// if (commentNum!=0) dest+="delete[] _comment" + SCCR;
+// return dest+"}"+CR;
+// }
private String makeConstructorSignature(){
String constSig=reference+ "(ID iID, Priority iPriority, std::string iName, CPU** iCPUs, unsigned int iNumOfCPUs"+CR;
@@ -596,7 +596,7 @@ public class MappedSystemCTask {
} else if (currElem instanceof TMLSendEvent){
if (debug) TraceManager.addDev("Checking Send\n");
- TMLSendEvent sendEvt=(TMLSendEvent)currElem;
+ // TMLSendEvent sendEvt=(TMLSendEvent)currElem;
cmdName= "_send" + currElem.getID();
hcode+="TMLSendCommand " + cmdName + SCCR;
handleParameters(currElem, cmdName, false, getFormattedLiveVarStr(currElem));
@@ -604,7 +604,7 @@ public class MappedSystemCTask {
} else if (currElem instanceof TMLSendRequest){
if (debug) TraceManager.addDev("Checking Request\n");
- TMLSendRequest sendReq=(TMLSendRequest)currElem;
+ //TMLSendRequest sendReq=(TMLSendRequest)currElem;
cmdName= "_request" + currElem.getID();
hcode+="TMLRequestCommand " + cmdName + SCCR;
handleParameters(currElem, cmdName, false, getFormattedLiveVarStr(currElem));
@@ -612,7 +612,7 @@ public class MappedSystemCTask {
} else if (currElem instanceof TMLWaitEvent){
if (debug) TraceManager.addDev("Checking Wait\n");
- TMLWaitEvent waitEvt = (TMLWaitEvent)currElem;
+ // TMLWaitEvent waitEvt = (TMLWaitEvent)currElem;
cmdName= "_wait" + currElem.getID();
hcode+="TMLWaitCommand " + cmdName + SCCR;
handleParameters(currElem, cmdName, true, getFormattedLiveVarStr(currElem));
@@ -808,8 +808,11 @@ public class MappedSystemCTask {
LinkedList<HwCommunicationNode> commNodeRefList = tmlmapping.findNodesForElement(writeCmd.getChannel(0));
for(int i=1; i<writeCmd.getNbOfChannels(); i++){
LinkedList<HwCommunicationNode> commNodeCmpList = tmlmapping.findNodesForElement(writeCmd.getChannel(i));
+
if (commNodeCmpList.size()!=commNodeRefList.size()) return false;
- Iterator it = commNodeCmpList.iterator();
+
+ Iterator<HwCommunicationNode> it = commNodeCmpList.iterator();
+
for(HwCommunicationNode cmnode: commNodeRefList) {
if (it.next()!=cmnode) return false;
}
@@ -900,7 +903,7 @@ public class MappedSystemCTask {
private String makeAttributesCode() {
String code = "";
- int i;
+ // int i;
for(TMLAttribute att: task.getAttributes()) {
//if (!att.name.endsWith("__req")){ //NEW
if (att.hasInitialValue())
@@ -917,7 +920,7 @@ public class MappedSystemCTask {
private String makeAttributesDeclaration() {
String code = "";
- int i;
+ // int i;
for(TMLAttribute att: task.getAttributes()) {
//if (!att.name.endsWith("__req")){ //NEW
code += "ParamType " + att.name;
diff --git a/src/ui/AvatarMethodologyPanel.java b/src/ui/AvatarMethodologyPanel.java
index b1de004ee3c4512b0d6e99b56240945d1ef2510f..2ada171991325a2579d07e685e5efae98f57550e 100755
--- a/src/ui/AvatarMethodologyPanel.java
+++ b/src/ui/AvatarMethodologyPanel.java
@@ -55,22 +55,26 @@ import ui.avatarmethodology.*;
import java.util.*;
public class AvatarMethodologyPanel extends TURTLEPanel {
- public AvatarMethodologyDiagramPanel dmd;
+
+ public AvatarMethodologyDiagramPanel dmd;
public AvatarMethodologyPanel(MainGUI _mgui) {
super(_mgui);
tabbedPane = new JTabbedPane();
- UIManager.put("TabbedPane.tabAreaBackground", _mgui.BACK_COLOR);
- UIManager.put("TabbedPane.selected", _mgui.BACK_COLOR);
+ UIManager.put("TabbedPane.tabAreaBackground", MainGUI.BACK_COLOR);
+ UIManager.put("TabbedPane.selected", MainGUI.BACK_COLOR);
SwingUtilities.updateComponentTreeUI(tabbedPane);
//tabbedPane.setOpaque(true);
cl = new ChangeListener() {
- public void stateChanged(ChangeEvent e){
- mgui.paneDiplodocusMethodologyAction(e);
- }
- };
+
+ @Override
+ public void stateChanged(ChangeEvent e){
+ mgui.paneDiplodocusMethodologyAction(e);
+ }
+ };
+
tabbedPane.addChangeListener(cl);
tabbedPane.addMouseListener(new TURTLEPanelPopupListener(this, mgui));
@@ -92,7 +96,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
TGConnectingPoint p1, p2;
p1 = tgc1.getTGConnectingPointAtIndex(0);
p2 = tgc2.getTGConnectingPointAtIndex(0);
- Vector listPoint = new Vector();
+ Vector<Point> listPoint = new Vector<Point>();
Point p = new Point(210, 235);
listPoint.add(p);
TGConnector tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -103,7 +107,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
// Reqs -> Analysis
p1 = tgc2.getTGConnectingPointAtIndex(1);
p2 = tgc3.getTGConnectingPointAtIndex(0);
- listPoint = new Vector();
+ listPoint = new Vector<Point>();
p = new Point(310, 335);
listPoint.add(p);
tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -114,7 +118,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
// Analysis -> Design
p1 = tgc3.getTGConnectingPointAtIndex(1);
p2 = tgc4.getTGConnectingPointAtIndex(0);
- listPoint = new Vector();
+ listPoint = new Vector<Point>();
p = new Point(410, 435);
listPoint.add(p);
tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -125,7 +129,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
// Design -> Prototyping
p1 = tgc4.getTGConnectingPointAtIndex(1);
p2 = tgc5.getTGConnectingPointAtIndex(0);
- listPoint = new Vector();
+ listPoint = new Vector<Point>();
p = new Point(510, 535);
listPoint.add(p);
tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
@@ -136,13 +140,11 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
// Reqs -> Prop
p1 = tgc2.getTGConnectingPointAtIndex(2);
p2 = tgc6.getTGConnectingPointAtIndex(0);
- listPoint = new Vector();
+ listPoint = new Vector<Point>();
tgco = TGComponentManager.addConnector(p1.getX(), p1.getY(), TGComponentManager.AVATARMETHODOLOGY_CONNECTOR, dmd, p1, p2, listPoint);
p1.setFree(false);
p2.setFree(false);
dmd.getComponentList().add(0, tgco);
-
-
}
public void init() {
@@ -159,7 +161,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
}
public boolean addAvatarMethodologyDiagram(String s) {
- AvatarMethodologyDiagramToolbar dmdt = new AvatarMethodologyDiagramToolbar(mgui);
+ AvatarMethodologyDiagramToolbar dmdt = new AvatarMethodologyDiagramToolbar( mgui );
toolbars.add(dmdt);
toolBarPanel = new JPanel();
@@ -176,7 +178,7 @@ public class AvatarMethodologyPanel extends TURTLEPanel {
JScrollDiagramPanel jsp = new JScrollDiagramPanel(dmd);
dmd.jsp = jsp;
jsp.setWheelScrollingEnabled(true);
- jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
+ jsp.getVerticalScrollBar().setUnitIncrement( MainGUI.INCREMENT );
toolBarPanel.add(dmdt, BorderLayout.NORTH);
toolBarPanel.add(jsp, BorderLayout.CENTER);
tabbedPane.addTab(s, IconManager.imgic99, toolBarPanel, "Opens avatar methodology");
diff --git a/src/ui/DesignPanel.java b/src/ui/DesignPanel.java
index 2378089435aa561f8fa783ca121ad3abefa932c8..6066e45eb35ef287e5d9b36d3ad1f2fe1d96bfef 100755
--- a/src/ui/DesignPanel.java
+++ b/src/ui/DesignPanel.java
@@ -53,9 +53,10 @@ import ui.cd.*;
import ui.ad.*;
public class DesignPanel extends TURTLEPanel implements TURTLEDesignPanelInterface {
- public TClassDiagramPanel tcdp;
- public java.util.List<TClassInterface> validated, ignored;
+ public TClassDiagramPanel tcdp;
+
+ public java.util.List<TClassInterface> validated, ignored;
public DesignPanel(MainGUI _mgui) {
super(_mgui);
diff --git a/src/ui/MalformedConfigurationException.java b/src/ui/MalformedConfigurationException.java
index 587cb692d84536481f2fa94a47493033c5f834dd..fb5b2e9265f65745d4d12d87ee6bbe08280a139d 100755
--- a/src/ui/MalformedConfigurationException.java
+++ b/src/ui/MalformedConfigurationException.java
@@ -48,6 +48,11 @@ package ui;
public class MalformedConfigurationException extends Exception {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3702606106817772428L;
+
public MalformedConfigurationException(String s) {
super(s);
}
diff --git a/src/ui/TMLArchiPanel.java b/src/ui/TMLArchiPanel.java
index 0302cf8d7d8df95a5fd17dfc91542c03ff981193..9c5cf4f6470421677f32b5b34ca5c5eb61fa7cb0 100755
--- a/src/ui/TMLArchiPanel.java
+++ b/src/ui/TMLArchiPanel.java
@@ -80,10 +80,10 @@ public class TMLArchiPanel extends TURTLEPanel {
//Class diagram
tmlap = new TMLArchiDiagramPanel(mgui, toolBarTML);
tmlap.setName("DIPLODOCUS architecture and mapping Diagram");
- toolBarTML.setPanel(tmlap);
- // Diagram toolbar
-
-
+
+ toolBarTML.setPanel(tmlap);
+ // Diagram toolbar
+
tmlap.tp = this;
tdp = tmlap;
panels.add(tmlap); // Always first in list
diff --git a/src/ui/TURTLEPanelPopupListener.java b/src/ui/TURTLEPanelPopupListener.java
index f1906a26c08647bfadca72672371ea402d79b195..6efdf669c8155d100d0f1fdfc90293dd7228c053 100755
--- a/src/ui/TURTLEPanelPopupListener.java
+++ b/src/ui/TURTLEPanelPopupListener.java
@@ -72,9 +72,11 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
public void mousePressed(MouseEvent e) {
checkForPopup(e);
}
+
public void mouseReleased(MouseEvent e) {
checkForPopup(e);
}
+
public void mouseClicked(MouseEvent e) {
checkForPopup(e);
}
@@ -95,7 +97,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
sort = createMenuItem("Sort");
newucd = createMenuItem("New Use Case Diagram");
newsd = createMenuItem("New Sequence Diagram (old version)");
- newsdzv = createMenuItem("New Sequence Diagram");
+ newsdzv = createMenuItem("New Sequence Diagram");
newsdfromucd = createMenuItem("New Sequence Diagram (from Use Case Diagram)");
newreq = createMenuItem("New Requirement Diagram");
newebrdd = createMenuItem("New Event-Based Requirement Description Diagram");
@@ -117,12 +119,13 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
menu.add(sort);
menu.addSeparator();
menu.add(newucd);
+
if (mgui.isAvatarOn()) {
menu.add(newavatarcd);
menu.add(newavatarad);
}
menu.add(newsd);
- menu.add(newsdzv);
+ menu.add(newsdzv);
menu.add(newsdfromucd);
menu.addSeparator();
@@ -187,7 +190,7 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
newucd.setEnabled(tp.isUCDEnabled());
newsd.setEnabled(tp.isSDEnabled());
- newsdzv.setEnabled(tp.isSDEnabled());
+ newsdzv.setEnabled(tp.isSDEnabled());
newsdfromucd.setEnabled(tp.isSDEnabled() && (mgui.getCurrentTDiagramPanel() instanceof UseCaseDiagramPanel));
newreq.setEnabled(tp.isReqEnabled());
newebrdd.setEnabled(tp.isReqEnabled());
@@ -202,61 +205,61 @@ public class TURTLEPanelPopupListener extends MouseAdapter /* popup menus onto t
private Action listener = new AbstractAction() {
- @Override
- public void actionPerformed(ActionEvent e) {
- JMenuItem item = (JMenuItem)e.getSource();
- String ac = item.getActionCommand();
- if(ac.equals("Rename")) {
- tp.requestRenameTab(tp.tabbedPane.getSelectedIndex());
- } else if (ac.equals("Remove")) {
- tp.requestRemoveTab(tp.tabbedPane.getSelectedIndex());
- } else if (ac.equals("Move to the left")) {
- tp.requestMoveLeftTab(tp.tabbedPane.getSelectedIndex());
- } else if (ac.equals("Move to the right")) {
- tp.requestMoveRightTab(tp.tabbedPane.getSelectedIndex());
- } else if (ac.equals("Sort")) {
- GraphicLib.sortJTabbedPane(tp.tabbedPane, tp.panels, 1, tp.tabbedPane.getTabCount());
- mgui.changeMade(null, -1);
- } else if (ac.equals("New Use Case Diagram")) {
- mgui.createUniqueUseCaseDiagram(tp, "Use Case Diagram");
- mgui.changeMade(null, -1);
- } else if (item == newsd) {
- mgui.createUniqueSequenceDiagram(tp, "MyScenario");
- mgui.changeMade(null, -1);
- } else if (item == newsdzv) {
- mgui.createUniqueSequenceDiagramZV(tp, "MyScenario");
- mgui.changeMade(null, -1);
- } else if (item == newsdfromucd) {
- mgui.createSequenceDiagramFromUCD(tp, "ScenarioFromUCD", (UseCaseDiagramPanel)(mgui.getCurrentTDiagramPanel()));
- mgui.changeMade(null, -1);
- } else if (ac.equals("New Requirement Diagram")) {
- mgui.createRequirementDiagram(tp, "Requirement Diagram");
- mgui.changeMade(null, -1);
- } else if (ac.equals("New Attack Tree Diagram")) {
- mgui.createAttackTreeDiagram(tp, "Attack Tree");
- mgui.changeMade(null, -1);
- } else if (ac.equals("New Event-Based Requirement Description Diagram")) {
- mgui.createEBRDD(tp, "EBRDD");
- mgui.changeMade(null, -1);
- } else if (ac.equals("New ProActive State Machine Diagram")) {
- mgui.createProActiveSMD(tp, "ProActive SMD");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarrd) {
- mgui.createAvatarRD(tp, "AVATAR RD");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarpd) {
- mgui.createAvatarPD(tp, "AVATAR PD");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarcd) {
- mgui.createUniqueAvatarCD(tp, "Context Diagram");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarad) {
- mgui.createUniqueAvatarAD(tp, "Activity Diagram");
- mgui.changeMade(null, -1);
- } else if (e.getSource() == newavatarmad) {
- mgui.createAvatarMAD(tp, "Modeling Assumptions Diagram");
- mgui.changeMade(null, -1);
- }
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JMenuItem item = (JMenuItem)e.getSource();
+ String ac = item.getActionCommand();
+ if(ac.equals("Rename")) {
+ tp.requestRenameTab(tp.tabbedPane.getSelectedIndex());
+ } else if (ac.equals("Remove")) {
+ tp.requestRemoveTab(tp.tabbedPane.getSelectedIndex());
+ } else if (ac.equals("Move to the left")) {
+ tp.requestMoveLeftTab(tp.tabbedPane.getSelectedIndex());
+ } else if (ac.equals("Move to the right")) {
+ tp.requestMoveRightTab(tp.tabbedPane.getSelectedIndex());
+ } else if (ac.equals("Sort")) {
+ GraphicLib.sortJTabbedPane(tp.tabbedPane, tp.panels, 1, tp.tabbedPane.getTabCount());
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New Use Case Diagram")) {
+ mgui.createUniqueUseCaseDiagram(tp, "Use Case Diagram");
+ mgui.changeMade(null, -1);
+ } else if (item == newsd) {
+ mgui.createUniqueSequenceDiagram(tp, "MyScenario");
+ mgui.changeMade(null, -1);
+ } else if (item == newsdzv) {
+ mgui.createUniqueSequenceDiagramZV(tp, "MyScenario");
+ mgui.changeMade(null, -1);
+ } else if (item == newsdfromucd) {
+ mgui.createSequenceDiagramFromUCD(tp, "ScenarioFromUCD", (UseCaseDiagramPanel)(mgui.getCurrentTDiagramPanel()));
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New Requirement Diagram")) {
+ mgui.createRequirementDiagram(tp, "Requirement Diagram");
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New Attack Tree Diagram")) {
+ mgui.createAttackTreeDiagram(tp, "Attack Tree");
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New Event-Based Requirement Description Diagram")) {
+ mgui.createEBRDD(tp, "EBRDD");
+ mgui.changeMade(null, -1);
+ } else if (ac.equals("New ProActive State Machine Diagram")) {
+ mgui.createProActiveSMD(tp, "ProActive SMD");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarrd) {
+ mgui.createAvatarRD(tp, "AVATAR RD");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarpd) {
+ mgui.createAvatarPD(tp, "AVATAR PD");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarcd) {
+ mgui.createUniqueAvatarCD(tp, "Context Diagram");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarad) {
+ mgui.createUniqueAvatarAD(tp, "Activity Diagram");
+ mgui.changeMade(null, -1);
+ } else if (e.getSource() == newavatarmad) {
+ mgui.createAvatarMAD(tp, "Modeling Assumptions Diagram");
+ mgui.changeMade(null, -1);
}
- };
+ }
+ };
}
diff --git a/src/ui/tmldd/TMLArchiCPUNode.java b/src/ui/tmldd/TMLArchiCPUNode.java
index 13c73292359f6dfe274f977e7f32c00058b591e9..7e03e7e7395346e78d56e0881f9fb2450edd71e3 100755
--- a/src/ui/tmldd/TMLArchiCPUNode.java
+++ b/src/ui/tmldd/TMLArchiCPUNode.java
@@ -457,12 +457,12 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
removeInternalComponent(tgc);
}
-
- public Vector getArtifactList() {
- Vector v = new Vector();
+ public Vector<TMLArchiArtifact> getArtifactList() {
+ Vector<TMLArchiArtifact> v = new Vector<TMLArchiArtifact>();
+
for(int i=0; i<nbInternalTGComponent; i++) {
if (tgcomponent[i] instanceof TMLArchiArtifact) {
- v.add(tgcomponent[i]);
+ v.add( (TMLArchiArtifact) tgcomponent[i] );
}
}
return v;
diff --git a/src/ui/tmldd/TMLArchiDiagramPanel.java b/src/ui/tmldd/TMLArchiDiagramPanel.java
index 45a86cc8ed0855851b5377de999ca4b309020d90..ecdc1bf26f5f9c803eda4bd1d44fb04b10ecdc7a 100755
--- a/src/ui/tmldd/TMLArchiDiagramPanel.java
+++ b/src/ui/tmldd/TMLArchiDiagramPanel.java
@@ -212,36 +212,38 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
return true;
}*/
- public LinkedList getListOfNodes() {
- LinkedList ll = new LinkedList();
+ public List<TMLArchiNode> getListOfNodes() {
+ List<TMLArchiNode> ll = new LinkedList<TMLArchiNode>();
TGComponent tgc;
- Iterator iterator = componentList.listIterator();
+ Iterator<TGComponent> iterator = componentList.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
+
if (tgc instanceof TMLArchiCPUNode) {
- ll.add(tgc);
+ ll.add( (TMLArchiCPUNode) tgc );
}
if (tgc instanceof TMLArchiHWANode) {
- ll.add(tgc);
+ ll.add( (TMLArchiHWANode) tgc );
}
if (tgc instanceof TMLArchiCommunicationNode) {
- ll.add(tgc);
+ ll.add( (TMLArchiCommunicationNode) tgc );
}
}
return ll;
}
- public LinkedList getListOfLinks() {
- LinkedList ll = new LinkedList();
+ public List<TGComponent> getListOfLinks() {
+ List<TGComponent> ll = new LinkedList<TGComponent> ();
TGComponent tgc;
- Iterator iterator = componentList.listIterator();
+ Iterator<TGComponent> iterator = componentList.listIterator();
while(iterator.hasNext()) {
- tgc = (TGComponent)(iterator.next());
+ tgc = iterator.next();
+
if (tgc instanceof TMLArchiConnectorNode) {
ll.add(tgc);
}
@@ -251,19 +253,22 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
}
public boolean isMapped(String _ref, String _name) {
- ListIterator iterator = getListOfNodes().listIterator();
+ Iterator<TMLArchiNode> iterator = getListOfNodes().listIterator();
TMLArchiNode node;
- Vector v;
+ Vector<TMLArchiArtifact> v;
TMLArchiArtifact artifact;
int i;
String name = _ref + "::" + _name;
while(iterator.hasNext()) {
- node = (TMLArchiNode)(iterator.next());
+ node = iterator.next();
+
if (node instanceof TMLArchiCPUNode) {
- v = ((TMLArchiCPUNode)(node)).getArtifactList();
+ v = ((TMLArchiCPUNode) node ).getArtifactList();
+
for(i=0; i<v.size(); i++) {
- artifact = (TMLArchiArtifact)(v.get(i));
+ artifact = v.get(i);
+
if (artifact.getValue().equals(name)) {
return true;
}
@@ -275,19 +280,18 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
}
public void renameMapping(String oldName, String newName) {
- ListIterator iterator = getListOfNodes().listIterator();
+ Iterator<TMLArchiNode> iterator = getListOfNodes().listIterator();
TMLArchiNode node;
- Vector v;
+ Vector<TMLArchiArtifact> v;
TMLArchiArtifact artifact;
- ArrayList<TMLArchiCommunicationArtifact> ChannelList;
- ArrayList<TMLArchiEventArtifact> EventList;
+ List<TMLArchiCommunicationArtifact> ChannelList;
+ List<TMLArchiEventArtifact> EventList;
int i;
while(iterator.hasNext()) {
- node = (TMLArchiNode)(iterator.next());
+ node = iterator.next();
// Task mapping
-
if ((node instanceof TMLArchiCPUNode) || (node instanceof TMLArchiHWANode)) {
if (node instanceof TMLArchiCPUNode) {
v = ((TMLArchiCPUNode)(node)).getArtifactList();
@@ -298,7 +302,7 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
}
for(i=0; i<v.size(); i++) {
- artifact = (TMLArchiArtifact)(v.get(i));
+ artifact = v.get(i);
if (artifact.getReferenceTaskName().compareTo(oldName) == 0) {
artifact.setReferenceTaskName(newName);
}
@@ -325,14 +329,13 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
}
public void setPriority( String _name, int _priority ) {
-
- ListIterator iterator = getListOfNodes().listIterator();
+ Iterator<TMLArchiNode> iterator = getListOfNodes().iterator();
TMLArchiNode node;
- Vector v;
- TMLArchiArtifact artifact;
- ArrayList<TMLArchiCommunicationArtifact> ChannelList;
- ArrayList<TMLArchiEventArtifact> EventList;
- int i;
+ //Vector v;
+ // TMLArchiArtifact artifact;
+ List<TMLArchiCommunicationArtifact> ChannelList;
+ List<TMLArchiEventArtifact> EventList;
+ // int i;
while(iterator.hasNext()) {
node = (TMLArchiNode)(iterator.next());
@@ -359,13 +362,13 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
public int getMaxPriority( String _name ) {
- ListIterator iterator = getListOfNodes().listIterator();
+ Iterator<TMLArchiNode> iterator = getListOfNodes().iterator();
TMLArchiNode node;
- Vector v;
- TMLArchiArtifact artifact;
- ArrayList<TMLArchiCommunicationArtifact> ChannelList;
- ArrayList<TMLArchiEventArtifact> EventList;
- int i;
+ // Vector v;
+ //TMLArchiArtifact artifact;
+ List<TMLArchiCommunicationArtifact> ChannelList;
+ List<TMLArchiEventArtifact> EventList;
+ //int i;
int prio = 0;
while(iterator.hasNext()) {
@@ -387,34 +390,34 @@ public class TMLArchiDiagramPanel extends TDiagramPanel implements TDPWithAttrib
}
}
}
+
return prio;
}
public void setCurrentView(int _index) {
- TraceManager.addDev("SelectedView=" + _index);
- view = _index;
- repaint();
+ TraceManager.addDev("SelectedView=" + _index);
+ view = _index;
+ repaint();
}
public boolean inCurrentView(TGComponent tgc) {
- switch(view) {
- case VIEW_ALL:
- return true;
- case VIEW_ARCHITECTURE_ONLY:
- return (tgc instanceof TMLArchiElementInterface);
- case VIEW_TASK_MAPPING:
- return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiTaskInterface);
- case VIEW_CHANNEL_MAPPING:
- return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiChannelInterface);
- case VIEW_COMM_PATTERN:
- return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiCPInterface);
- case VIEW_COMM_PATTERN_MAPPING:
- return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiCPInterface) || (tgc instanceof TMLArchiPortInterface);
- case VIEW_SECURITY_MAPPING:
- return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiSecurityInterface) || (tgc instanceof TMLArchiTaskInterface);
- default:
- return true;
- }
+ switch(view) {
+ case VIEW_ALL:
+ return true;
+ case VIEW_ARCHITECTURE_ONLY:
+ return (tgc instanceof TMLArchiElementInterface);
+ case VIEW_TASK_MAPPING:
+ return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiTaskInterface);
+ case VIEW_CHANNEL_MAPPING:
+ return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiChannelInterface);
+ case VIEW_COMM_PATTERN:
+ return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiCPInterface);
+ case VIEW_COMM_PATTERN_MAPPING:
+ return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiCPInterface) || (tgc instanceof TMLArchiPortInterface);
+ case VIEW_SECURITY_MAPPING:
+ return (tgc instanceof TMLArchiElementInterface) || (tgc instanceof TMLArchiSecurityInterface) || (tgc instanceof TMLArchiTaskInterface);
+ default:
+ return true;
+ }
}
-
}//End of class