diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index 68c920251480ac891c66f97705f055d9cacfa322..6d2b02513fdc4ee0521f2086735c7dbffa4fb406 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/MicroWaveOven.c generated_src/Door.c generated_src/Magnetron.c generated_src/Controller.c generated_src/ControlPanel.c generated_src/Bell.c
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/B1.c generated_src/B0.c
\ No newline at end of file
diff --git a/src/ui/window/JDialogReferenceCP.java b/src/ui/window/JDialogReferenceCP.java
index 9a99bb444d4c50f179368104de4d5e5173ef3651..80fda930feee52f1af9867cadcd8d1e29a589f9e 100644
--- a/src/ui/window/JDialogReferenceCP.java
+++ b/src/ui/window/JDialogReferenceCP.java
@@ -37,13 +37,13 @@ The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms.
/**
- * Class JDialogReferenceCP
- * Dialog for mapping CPs onto the architecture
- * Creation: 22/08/2014
- * @version 1.0 22/08/2014
- * @author Ludovic APVRILLE, Andrea ENRICI
- * @see
- */
+* Class JDialogReferenceCP
+* Dialog for mapping CPs onto the architecture
+* Creation: 22/08/2014
+* @version 1.0 22/08/2014
+* @author Ludovic APVRILLE, Andrea ENRICI
+* @see
+*/
package ui.window;
@@ -62,20 +62,20 @@ import myutil.*;
public class JDialogReferenceCP extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
-
+
private final static int STORAGE = 0;
private final static int TRANSFER = 1;
private final static int CONTROLLER = 2;
-
+
private boolean regularClose;
-
- private Frame frame;
- private TMLArchiCPNode cp;
- protected JTextField nameOfCP;
+
+ private Frame frame;
+ private TMLArchiCPNode cp;
+ protected JTextField nameOfCP;
private String name = "";
private LinkedList<TMLArchiNode> availableUnits;
private Vector<String> mappedUnits;
-
+
private ArrayList<TMLCommunicationPatternPanel> listCPs = new ArrayList<TMLCommunicationPatternPanel>();
private Vector<String> communicationPatternsSL = new Vector<String>();
@@ -84,45 +84,45 @@ public class JDialogReferenceCP extends javax.swing.JDialog implements ActionLis
private HashSet<String> sdStorageInstances = new HashSet<String>();
private HashSet<String> sdTransferInstances = new HashSet<String>();
private HashSet<String> sdControllerInstances = new HashSet<String>();
-
+
private Vector<String> mappableArchUnitsSL = new Vector<String>();
private Vector<String> sdInstancesSL = new Vector<String>();
private int indexListCPsNames = 0;
private int indexListInstancesNames = 0;
private int indexListArchUnitsNames = 0;
-
+
private boolean emptyCPsList = false;
private boolean emptyInstancesList = false;
private boolean emptyArchUnitsList = false;
private boolean cancelled = false;
-
- // Panel1
+
+ // Panel1
private JPanel panel1;
- private JComboBox sdInstancesCB, mappableArchUnitsCB, communicationPatternsCB;
- private JButton mapButton;
-
- //Panel2
+ private JComboBox sdInstancesCB, mappableArchUnitsCB, communicationPatternsCB;
+ private JButton mapButton;
+
+ //Panel2
private JPanel panel2;
- private JList listMappedUnits;
- private JButton upButton;
- private JButton downButton;
- private JButton removeButton;
-
- // Main Panel
- private JButton closeButton;
- private JButton cancelButton;
-
- /** Creates new form */
- public JDialogReferenceCP( JFrame _frame, String _title, TMLArchiCPNode _cp, /*LinkedList<TMLArchiNode> _availableUnits,*/
- Vector<String> _mappedUnits, String _name ) {
-
+ private JList listMappedUnits;
+ private JButton upButton;
+ private JButton downButton;
+ private JButton removeButton;
+
+ // Main Panel
+ private JButton closeButton;
+ private JButton cancelButton;
+
+ /** Creates new form */
+ public JDialogReferenceCP( JFrame _frame, String _title, TMLArchiCPNode _cp, /*LinkedList<TMLArchiNode> _availableUnits,*/
+ Vector<String> _mappedUnits, String _name ) {
+
super( _frame, _title, true );
frame = _frame;
cp = _cp;
name = _name;
-
+
if( _mappedUnits.size() > 0 ) {
mappedUnits.clear(); //take into account the elements already mapped
mappedUnits.addAll( 0, _mappedUnits );
@@ -130,620 +130,626 @@ public class JDialogReferenceCP extends javax.swing.JDialog implements ActionLis
else {
mappedUnits = new Vector<String>();
}
-
- initComponents();
+
+ initComponents();
myInitComponents();
- pack();
- }
-
- private void myInitComponents() {
- removeButton.setEnabled( false );
- upButton.setEnabled( false );
- downButton.setEnabled( false );
- if( mappableArchUnitsSL.size() > 0 ) {
- mapButton.setEnabled( true );
- }
- else {
- mapButton.setEnabled( false );
- }
- //makeComboBoxes();
- }
-
- private void initComponents() {
-
- Container c = getContentPane();
- GridBagLayout gridbag0 = new GridBagLayout();
- GridBagLayout gridbag1 = new GridBagLayout();
- GridBagLayout gridbag2 = new GridBagLayout();
- GridBagLayout gridbag3 = new GridBagLayout();
- GridBagLayout gridbag4 = new GridBagLayout();
- GridBagConstraints c0 = new GridBagConstraints();
- GridBagConstraints c1 = new GridBagConstraints();
- GridBagConstraints c2 = new GridBagConstraints();
- GridBagConstraints c3 = new GridBagConstraints();
- GridBagConstraints c4 = new GridBagConstraints();
-
- setFont(new Font("Helvetica", Font.PLAIN, 14));
- c.setLayout(gridbag0);
-
- setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
- panel1 = new JPanel();
- panel1.setLayout(gridbag1);
- panel1.setBorder(new javax.swing.border.TitledBorder("CP attributes"));
- panel1.setMinimumSize(new Dimension(325, 250));
-
- panel2 = new JPanel();
- panel2.setLayout(gridbag2);
- panel2.setBorder(new javax.swing.border.TitledBorder("Managing mapping"));
- panel2.setMinimumSize(new Dimension(325, 250));
-
- // first line panel1
- c1.weighty = 1.0;
- c1.weightx = 1.0;
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- c1.fill = GridBagConstraints.BOTH;
- c1.gridheight = 3;
- panel1.add(new JLabel(" "), c1);
-
- // second line panel1
- c1.gridwidth = 1;
- c1.gridheight = 1;
- c1.weighty = 1.0;
- c1.weightx = 1.0;
- c1.anchor = GridBagConstraints.CENTER;
- c1.fill = GridBagConstraints.HORIZONTAL;
- c1.anchor = GridBagConstraints.CENTER;
-
- // third line panel1
- panel1.add(new JLabel("Name:"), c1);
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- nameOfCP = new JTextField( name );
- nameOfCP.setMinimumSize( new Dimension(150, 50) );
- panel1.add( nameOfCP, c1 );
-
- //fouth line panel1
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- c1.fill = GridBagConstraints.BOTH;
- c1.gridheight = 3;
- panel1.add(new JLabel(" "), c1); //adds some vertical space in between two JLabels
-
- listCPs = cp.getTDiagramPanel().getMGUI().getAllTMLCP();
- if( listCPs.size() == 0 ) {
- communicationPatternsSL.add( "No CP to reference" );
- emptyCPsList = true;
- }
- else {
- createListCPsNames(); //create communicationPatternsSL (ArrayList<String>) out of listCPs
- indexListCPsNames = indexOf( cp.getReference() );
- }
-
- //fifth line panel1
- panel1.add( new JLabel( "Available CPs:"), c1 );
- communicationPatternsCB = new JComboBox( communicationPatternsSL );
- communicationPatternsCB.setSelectedIndex( indexListCPsNames );
- communicationPatternsCB.addActionListener( this );
- communicationPatternsCB.setMinimumSize( new Dimension(150, 50) );
- panel1.add( communicationPatternsCB, c1 );
-
- //sixth line panel1
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- c1.fill = GridBagConstraints.BOTH;
- c1.gridheight = 3;
- panel1.add(new JLabel(" "), c1);
-
- indexListInstancesNames = 0;
- if( listCPs.size() == 0 ) {
- sdInstancesSL.add( "No instances to map" );
- emptyInstancesList = true;
- }
- else {
- createListOfInstances();
- sdInstancesSL = new Vector<String>( listInstancesHash.get( indexListCPsNames ) );
- indexListInstancesNames = indexOf( cp.getReference() );
- }
-
- //seventh line panel1
- panel1.add( new JLabel( "Instance:" ), c1 );
- sdInstancesCB = new JComboBox( sdInstancesSL );
- sdInstancesCB.setSelectedIndex( 0 );
- sdInstancesCB.addActionListener( this );
- sdInstancesCB.setMinimumSize( new Dimension(150, 50) );
- panel1.add( sdInstancesCB, c1 );
-
- //eigth line panel1
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- c1.fill = GridBagConstraints.BOTH;
- c1.gridheight = 3;
- panel1.add(new JLabel(" "), c1);
-
- String selectedInstance = new Vector<String>( listInstancesHash.get( indexListCPsNames ) ).get(0);
- if( sdStorageInstances.contains( selectedInstance ) ) {
- mappableArchUnitsSL = makeListOfMappableArchUnits( STORAGE );
+ pack();
+ }
+
+ private void myInitComponents() {
+ removeButton.setEnabled( false );
+ upButton.setEnabled( false );
+ downButton.setEnabled( false );
+ if( mappableArchUnitsSL.size() > 0 ) {
+ mapButton.setEnabled( true );
+ }
+ else {
+ mapButton.setEnabled( false );
+ }
+ //makeComboBoxes();
+ }
+
+ private void initComponents() {
+
+ Container c = getContentPane();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagLayout gridbag2 = new GridBagLayout();
+ GridBagLayout gridbag3 = new GridBagLayout();
+ GridBagLayout gridbag4 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = new GridBagConstraints();
+ GridBagConstraints c2 = new GridBagConstraints();
+ GridBagConstraints c3 = new GridBagConstraints();
+ GridBagConstraints c4 = new GridBagConstraints();
+
+ setFont(new Font("Helvetica", Font.PLAIN, 14));
+ c.setLayout(gridbag0);
+
+ setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+ panel1 = new JPanel();
+ panel1.setLayout(gridbag1);
+ panel1.setBorder(new javax.swing.border.TitledBorder("CP attributes"));
+ panel1.setMinimumSize(new Dimension(325, 250));
+
+ panel2 = new JPanel();
+ panel2.setLayout(gridbag2);
+ panel2.setBorder(new javax.swing.border.TitledBorder("Managing mapping"));
+ panel2.setMinimumSize(new Dimension(325, 250));
+
+ // first line panel1
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.fill = GridBagConstraints.BOTH;
+ c1.gridheight = 3;
+ panel1.add(new JLabel(" "), c1);
+
+ // second line panel1
+ c1.gridwidth = 1;
+ c1.gridheight = 1;
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.anchor = GridBagConstraints.CENTER;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ c1.anchor = GridBagConstraints.CENTER;
+
+ // third line panel1
+ panel1.add(new JLabel("Name:"), c1);
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ nameOfCP = new JTextField( name );
+ nameOfCP.setMinimumSize( new Dimension(150, 50) );
+ panel1.add( nameOfCP, c1 );
+
+ //fouth line panel1
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.fill = GridBagConstraints.BOTH;
+ c1.gridheight = 3;
+ panel1.add(new JLabel(" "), c1); //adds some vertical space in between two JLabels
+
+ listCPs = cp.getTDiagramPanel().getMGUI().getAllTMLCP();
+ if( listCPs.size() == 0 ) {
+ communicationPatternsSL.add( "No CP to reference" );
+ emptyCPsList = true;
+ }
+ else {
+ createListCPsNames(); //create communicationPatternsSL (ArrayList<String>) out of listCPs
+ indexListCPsNames = indexOf( cp.getReference() );
+ }
+
+ //fifth line panel1
+ panel1.add( new JLabel( "Available CPs:"), c1 );
+ communicationPatternsCB = new JComboBox( communicationPatternsSL );
+ communicationPatternsCB.setSelectedIndex( indexListCPsNames );
+ communicationPatternsCB.addActionListener( this );
+ communicationPatternsCB.setMinimumSize( new Dimension(150, 50) );
+ panel1.add( communicationPatternsCB, c1 );
+
+ //sixth line panel1
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.fill = GridBagConstraints.BOTH;
+ c1.gridheight = 3;
+ panel1.add(new JLabel(" "), c1);
+
+ indexListInstancesNames = 0;
+ if( listCPs.size() == 0 ) {
+ sdInstancesSL.add( "No instances to map" );
+ emptyInstancesList = true;
+ }
+ else {
+ createListOfInstances();
+ sdInstancesSL = new Vector<String>( listInstancesHash.get( indexListCPsNames ) );
+ indexListInstancesNames = indexOf( cp.getReference() );
+ }
+
+ //seventh line panel1
+ panel1.add( new JLabel( "Instance:" ), c1 );
+ sdInstancesCB = new JComboBox( sdInstancesSL );
+ sdInstancesCB.setSelectedIndex( 0 );
+ sdInstancesCB.addActionListener( this );
+ sdInstancesCB.setMinimumSize( new Dimension(150, 50) );
+ panel1.add( sdInstancesCB, c1 );
+
+ //eigth line panel1
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.fill = GridBagConstraints.BOTH;
+ c1.gridheight = 3;
+ panel1.add(new JLabel(" "), c1);
+
+ String selectedInstance = new Vector<String>( listInstancesHash.get( indexListCPsNames ) ).get(0);
+ if( sdStorageInstances.contains( selectedInstance ) ) {
+ mappableArchUnitsSL = makeListOfMappableArchUnits( STORAGE );
+ }
+ else {
+ if( sdTransferInstances.contains( selectedInstance ) ) {
+ mappableArchUnitsSL = makeListOfMappableArchUnits( TRANSFER );
}
else {
- if( sdTransferInstances.contains( selectedInstance ) ) {
- mappableArchUnitsSL = makeListOfMappableArchUnits( TRANSFER );
- }
- else {
- if( sdControllerInstances.contains( selectedInstance ) ) {
- mappableArchUnitsSL = makeListOfMappableArchUnits( CONTROLLER );
- }
+ if( sdControllerInstances.contains( selectedInstance ) ) {
+ mappableArchUnitsSL = makeListOfMappableArchUnits( CONTROLLER );
}
}
-
- indexListArchUnitsNames = 0;
- if( mappableArchUnitsSL.size() == 0 ) {
- mappableArchUnitsSL.add( "No mappable units" );
- emptyArchUnitsList = true;
- }
- /*else {
- makeListOfMappableArchUnits();
- indexListArchUnitsNames = indexOf( cp.getReference() );
- }*/
-
- //nineth line panel1
- mappableArchUnitsCB = new JComboBox( mappableArchUnitsSL );
- panel1.add( new JLabel("Available architecture units:"), c1 );
- mappableArchUnitsCB.setSelectedIndex( 0 );
- mappableArchUnitsCB.setMinimumSize( new Dimension(150, 50) );
- mappableArchUnitsCB.addActionListener( this );
- panel1.add( mappableArchUnitsCB, c1 );
-
- //tenth line panel1
- c1.gridwidth = GridBagConstraints.REMAINDER; //end row
- c1.fill = GridBagConstraints.BOTH;
- c1.gridheight = 3;
- panel1.add(new JLabel(" "), c1);
-
- //eleventh line panel1
- c1.gridheight = 1;
- c1.fill = GridBagConstraints.HORIZONTAL;
- mapButton = new JButton("Map");
- mapButton.addActionListener(this);
- panel1.add(mapButton, c1);
-
- // 1st line panel2
- listMappedUnits = new JList();
- listMappedUnits.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- listMappedUnits.addListSelectionListener(this);
- JScrollPane scrollPane = new JScrollPane( listMappedUnits );
- scrollPane.setSize(300, 250);
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- c2.fill = GridBagConstraints.BOTH;
- c2.gridheight = 5;
- c2.weighty = 10.0;
- c2.weightx = 10.0;
- panel2.add(scrollPane, c2);
-
- // 2nd line panel2
- c2.weighty = 1.0;
- c2.weightx = 1.0;
- c2.fill = GridBagConstraints.BOTH;
- c2.gridheight = 1;
- panel2.add(new JLabel(""), c2);
-
- // third line panel2
- c2.gridwidth = GridBagConstraints.REMAINDER; //end row
- c2.fill = GridBagConstraints.HORIZONTAL;
- upButton = new JButton("Up");
- upButton.addActionListener(this);
- panel2.add(upButton, c2);
-
- downButton = new JButton("Down");
- downButton.addActionListener(this);
- panel2.add(downButton, c2);
-
- removeButton = new JButton("Remove unit");
- removeButton.addActionListener(this);
- panel2.add(removeButton, c2);
-
- // panel3
- /*c3.gridwidth = GridBagConstraints.REMAINDER; //end row
- c3.fill = GridBagConstraints.BOTH;
- c3.gridheight = 1;
- c3.weighty = 1;
- c3.weightx = 10.0;
- synchronous = new JRadioButton("synchronous");
- synchronous.addActionListener(this);
- panel3.add(synchronous, c3);
-
- isBroadcast = new JCheckBox("Broadcast channel");
- isBroadcast.setSelected(connector.isBroadcast());
- panel3.add(isBroadcast, c3);
-
- asynchronous = new JRadioButton("asynchronous");
- asynchronous.addActionListener(this);
- panel3.add(asynchronous, c3);
- ButtonGroup bt = new ButtonGroup();
- bt.add(synchronous);
- bt.add(asynchronous);
- asynchronous.setSelected(connector.isAsynchronous());
- synchronous.setSelected(!connector.isAsynchronous());
- isLossy = new JCheckBox("Lossy channel");
- isLossy.setSelected(connector.isLossy());
- panel3.add(isLossy, c3);
-
- c3.gridwidth = 3;
- labelFIFO = new JLabel("Size of FIFO:");
- panel3.add(labelFIFO, c3);
- c3.gridwidth = GridBagConstraints.REMAINDER; //end row
- sizeOfFIFO = new JTextField(""+connector.getSizeOfFIFO());
- panel3.add(sizeOfFIFO, c3);
-
- blocking = new JCheckBox("Blocking on write when FIFO is full");
- blocking.setSelected(connector.isBlocking());
- panel3.add(blocking, c3);
-
-
- c4.gridwidth = GridBagConstraints.REMAINDER; //end row
- c4.fill = GridBagConstraints.BOTH;
- c4.gridheight = 1;
- c4.weighty = 1;
- c4.weightx = 10.0;
- //panel3.add(new JLabel(" "), c3);
-
- isPrivate = new JCheckBox("Private channel (an attacker cannot listen to it)");
- isPrivate.setSelected(connector.isPrivate());
- panel4.add(isPrivate, c4);
-
- updateSynchronousElements();*/
-
-
- // main panel;
- c0.gridwidth = 1;
- c0.gridheight = 10;
- c0.weighty = 1.0;
- c0.weightx = 1.0;
- c0.fill = GridBagConstraints.BOTH;
-
- c.add(panel1, c0);
- c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- c.add(panel2, c0);
-
- c0.gridwidth = 1;
- c0.gridheight = 1;
- c0.fill = GridBagConstraints.VERTICAL;
- closeButton = new JButton("Save and Close", IconManager.imgic25);
- //closeButton.setPreferredSize(new Dimension(600, 50));
- closeButton.addActionListener(this);
- c.add(closeButton, c0);
- c0.gridwidth = GridBagConstraints.REMAINDER; //end row
- cancelButton = new JButton("Cancel", IconManager.imgic27);
- cancelButton.addActionListener(this);
- c.add(cancelButton, c0);
-
- /*JPanel panelButton = new JPanel();
- closeButton = new JButton("Save and Close", IconManager.imgic25);
- //closeButton.setPreferredSize(new Dimension(600, 50));
- closeButton.addActionListener(this);
- panelButton.add(closeButton);
- cancelButton = new JButton("Cancel", IconManager.imgic27);
- cancelButton.addActionListener(this);
- panelButton.add(cancelButton);
-
- JPanel middlePanel = new JPanel(new BorderLayout());
- middlePanel.add(panel3, BorderLayout.NORTH);
- middlePanel.add(panel4, BorderLayout.CENTER);
- middlePanel.add(panelButton, BorderLayout.SOUTH);
-
- JPanel topPanel = new JPanel();
- topPanel.add(panel1);
- topPanel.add(panel2);
- c.setLayout(new BorderLayout());
- c.add(topPanel, BorderLayout.CENTER);
- c.add(middlePanel, BorderLayout.SOUTH);*/
-
- }
-
- public void actionPerformed(ActionEvent evt) {
- //String command = evt.getActionCommand();
-
- // Compare the action command to the known actions.
- if (evt.getSource() == closeButton) {
- closeDialog();
- } else if (evt.getSource() == mapButton) {
- mapInstance();
- } else if (evt.getSource() == cancelButton) {
- cancelDialog();
- } else if (evt.getSource() == removeButton) {
- removeMappedInstance();
- } else if (evt.getSource() == downButton) {
- downMappedInstance();
- } else if (evt.getSource() == upButton) {
- upMappedInstance();
- } else if( evt.getSource() == sdInstancesCB ) { //user has selected another instance
- //update the list associated to the mappable arch units according to the instance type
- updateMappableArchUnits();
- } else if( evt.getSource() == communicationPatternsCB ) { //user has selected another CP. Previous mapping will be deleted
- updateSDInstancesList();
- updateMappableArchUnits();
- emptyMappedUnitsList();
+ }
+
+ indexListArchUnitsNames = 0;
+ if( mappableArchUnitsSL.size() == 0 ) {
+ mappableArchUnitsSL.add( "No mappable units" );
+ emptyArchUnitsList = true;
+ }
+ /*else {
+ makeListOfMappableArchUnits();
+ indexListArchUnitsNames = indexOf( cp.getReference() );
+ }*/
+
+ //nineth line panel1
+ mappableArchUnitsCB = new JComboBox( mappableArchUnitsSL );
+ panel1.add( new JLabel("Available architecture units:"), c1 );
+ mappableArchUnitsCB.setSelectedIndex( 0 );
+ mappableArchUnitsCB.setMinimumSize( new Dimension(150, 50) );
+ mappableArchUnitsCB.addActionListener( this );
+ panel1.add( mappableArchUnitsCB, c1 );
+
+ //tenth line panel1
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.fill = GridBagConstraints.BOTH;
+ c1.gridheight = 3;
+ panel1.add(new JLabel(" "), c1);
+
+ //eleventh line panel1
+ c1.gridheight = 1;
+ c1.fill = GridBagConstraints.HORIZONTAL;
+ mapButton = new JButton("Map");
+ mapButton.addActionListener(this);
+ panel1.add(mapButton, c1);
+
+ // 1st line panel2
+ listMappedUnits = new JList();
+ listMappedUnits.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ listMappedUnits.addListSelectionListener(this);
+ JScrollPane scrollPane = new JScrollPane( listMappedUnits );
+ scrollPane.setSize(300, 250);
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c2.fill = GridBagConstraints.BOTH;
+ c2.gridheight = 5;
+ c2.weighty = 10.0;
+ c2.weightx = 10.0;
+ panel2.add(scrollPane, c2);
+
+ // 2nd line panel2
+ c2.weighty = 1.0;
+ c2.weightx = 1.0;
+ c2.fill = GridBagConstraints.BOTH;
+ c2.gridheight = 1;
+ panel2.add(new JLabel(""), c2);
+
+ // third line panel2
+ c2.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c2.fill = GridBagConstraints.HORIZONTAL;
+ upButton = new JButton("Up");
+ upButton.addActionListener(this);
+ panel2.add(upButton, c2);
+
+ downButton = new JButton("Down");
+ downButton.addActionListener(this);
+ panel2.add(downButton, c2);
+
+ removeButton = new JButton("Remove unit");
+ removeButton.addActionListener(this);
+ panel2.add(removeButton, c2);
+
+ // panel3
+ /*c3.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c3.fill = GridBagConstraints.BOTH;
+ c3.gridheight = 1;
+ c3.weighty = 1;
+ c3.weightx = 10.0;
+ synchronous = new JRadioButton("synchronous");
+ synchronous.addActionListener(this);
+ panel3.add(synchronous, c3);
+
+ isBroadcast = new JCheckBox("Broadcast channel");
+ isBroadcast.setSelected(connector.isBroadcast());
+ panel3.add(isBroadcast, c3);
+
+ asynchronous = new JRadioButton("asynchronous");
+ asynchronous.addActionListener(this);
+ panel3.add(asynchronous, c3);
+ ButtonGroup bt = new ButtonGroup();
+ bt.add(synchronous);
+ bt.add(asynchronous);
+ asynchronous.setSelected(connector.isAsynchronous());
+ synchronous.setSelected(!connector.isAsynchronous());
+ isLossy = new JCheckBox("Lossy channel");
+ isLossy.setSelected(connector.isLossy());
+ panel3.add(isLossy, c3);
+
+ c3.gridwidth = 3;
+ labelFIFO = new JLabel("Size of FIFO:");
+ panel3.add(labelFIFO, c3);
+ c3.gridwidth = GridBagConstraints.REMAINDER; //end row
+ sizeOfFIFO = new JTextField(""+connector.getSizeOfFIFO());
+ panel3.add(sizeOfFIFO, c3);
+
+ blocking = new JCheckBox("Blocking on write when FIFO is full");
+ blocking.setSelected(connector.isBlocking());
+ panel3.add(blocking, c3);
+
+
+ c4.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c4.fill = GridBagConstraints.BOTH;
+ c4.gridheight = 1;
+ c4.weighty = 1;
+ c4.weightx = 10.0;
+ //panel3.add(new JLabel(" "), c3);
+
+ isPrivate = new JCheckBox("Private channel (an attacker cannot listen to it)");
+ isPrivate.setSelected(connector.isPrivate());
+ panel4.add(isPrivate, c4);
+
+ updateSynchronousElements();*/
+
+
+ // main panel;
+ c0.gridwidth = 1;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.fill = GridBagConstraints.BOTH;
+
+ c.add(panel1, c0);
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c.add(panel2, c0);
+
+ c0.gridwidth = 1;
+ c0.gridheight = 1;
+ c0.fill = GridBagConstraints.VERTICAL;
+ closeButton = new JButton("Save and Close", IconManager.imgic25);
+ //closeButton.setPreferredSize(new Dimension(600, 50));
+ closeButton.addActionListener(this);
+ c.add(closeButton, c0);
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+ cancelButton = new JButton("Cancel", IconManager.imgic27);
+ cancelButton.addActionListener(this);
+ c.add(cancelButton, c0);
+
+ /*JPanel panelButton = new JPanel();
+ closeButton = new JButton("Save and Close", IconManager.imgic25);
+ //closeButton.setPreferredSize(new Dimension(600, 50));
+ closeButton.addActionListener(this);
+ panelButton.add(closeButton);
+ cancelButton = new JButton("Cancel", IconManager.imgic27);
+ cancelButton.addActionListener(this);
+ panelButton.add(cancelButton);
+
+ JPanel middlePanel = new JPanel(new BorderLayout());
+ middlePanel.add(panel3, BorderLayout.NORTH);
+ middlePanel.add(panel4, BorderLayout.CENTER);
+ middlePanel.add(panelButton, BorderLayout.SOUTH);
+
+ JPanel topPanel = new JPanel();
+ topPanel.add(panel1);
+ topPanel.add(panel2);
+ c.setLayout(new BorderLayout());
+ c.add(topPanel, BorderLayout.CENTER);
+ c.add(middlePanel, BorderLayout.SOUTH);*/
+
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ //String command = evt.getActionCommand();
+
+ // Compare the action command to the known actions.
+ if (evt.getSource() == closeButton) {
+ closeDialog();
+ } else if (evt.getSource() == mapButton) {
+ mapInstance();
+ } else if (evt.getSource() == cancelButton) {
+ cancelDialog();
+ } else if (evt.getSource() == removeButton) {
+ removeMappedInstance();
+ } else if (evt.getSource() == downButton) {
+ downMappedInstance();
+ } else if (evt.getSource() == upButton) {
+ upMappedInstance();
+ } else if( evt.getSource() == sdInstancesCB ) { //user has selected another instance
+ //update the list associated to the mappable arch units according to the instance type
+ updateMappableArchUnits();
+ } else if( evt.getSource() == communicationPatternsCB ) { //user has selected another CP. Previous mapping will be deleted
+ updateSDInstancesList();
+ updateMappableArchUnits();
+ emptyMappedUnitsList();
+ }
+ } //End of method
+
+ private void mapInstance() {
+
+ if( listInstancesHash.get( communicationPatternsCB.getSelectedIndex() ).size() > 0 ) {
+ sdInstancesCB.removeActionListener(this);
+ mappedUnits.add( communicationPatternsCB.getSelectedItem().toString() + "." + sdInstancesCB.getSelectedItem().toString() +
+ " -> " + mappableArchUnitsCB.getSelectedItem().toString() );
+ //remove the mapped instance from the list
+ HashSet<String> SDinstancesHash = listInstancesHash.get( communicationPatternsCB.getSelectedIndex() );
+ //for(String element: SDinstancesHash) {
+ Iterator<String> i = SDinstancesHash.iterator();
+ while( i.hasNext() ) {
+ String element = i.next();
+ TraceManager.addDev( "Comparing " + element + " with " + sdInstancesCB.getSelectedItem().toString() );
+ if( element.equals( sdInstancesCB.getSelectedItem().toString() ) ) {
+ i.remove();
+ TraceManager.addDev( "Removing instance: " + element );
+ break;
+ }
}
- } //End of method
-
- private void mapInstance() {
-
- if( listInstancesHash.get( communicationPatternsCB.getSelectedIndex() ).size() > 0 ) {
- mappedUnits.add( communicationPatternsCB.getSelectedItem().toString() + "." + sdInstancesCB.getSelectedItem().toString() +
- " -> " + mappableArchUnitsCB.getSelectedItem().toString() );
- //remove the mapped instance from the list
- HashSet<String> SDinstancesHash = listInstancesHash.get( communicationPatternsCB.getSelectedIndex() );
- Iterator<String> i = SDinstancesHash.iterator();
- while( i.hasNext() ) {
- String element = i.next();
- TraceManager.addDev( "Comparing " + element + " with " + sdInstancesCB.getSelectedItem().toString() );
- if( element.equals( sdInstancesCB.getSelectedItem().toString() ) ) {
- i.remove();
- TraceManager.addDev( "Removing instance: " + element );
- break;
+ sdInstancesSL = new Vector<String>( SDinstancesHash );
+ TraceManager.addDev( "The DS after removing instance: " + sdInstancesSL.toString() );
+ listInstancesHash.set( communicationPatternsCB.getSelectedIndex(), SDinstancesHash );
+ makeSDInstancesComboBox( sdInstancesSL );
+ TraceManager.addDev("Nex list done");
+ listMappedUnits.setListData( mappedUnits );
+ removeButton.setEnabled( true );
+ if( SDinstancesHash.size() == 0 ) {
+ mapButton.setEnabled( false );
+ } else {
+ sdInstancesCB.addActionListener(this);
+ sdInstancesCB.setSelectedIndex(0);
}
}
- sdInstancesSL = new Vector<String>( SDinstancesHash );
- TraceManager.addDev( "The DS after removing instance: " + sdInstancesSL.toString() );
- listInstancesHash.set( communicationPatternsCB.getSelectedIndex(), SDinstancesHash );
- makeSDInstancesComboBox( sdInstancesSL );
+ }
+
+ private void removeMappedInstance() {
+ mappedUnits.removeElementAt( listMappedUnits.getSelectedIndex() );
listMappedUnits.setListData( mappedUnits );
- removeButton.setEnabled( true );
- if( SDinstancesHash.size() == 0 ) {
- mapButton.setEnabled( false );
+ if( mappedUnits.size() == 0 ) {
+ removeButton.setEnabled( false );
}
}
- }
-
- private void removeMappedInstance() {
- mappedUnits.removeElementAt( listMappedUnits.getSelectedIndex() );
- listMappedUnits.setListData( mappedUnits );
- if( mappedUnits.size() == 0 ) {
- removeButton.setEnabled( false );
+
+ private void downMappedInstance() {
}
- }
-
- private void downMappedInstance() {
- }
-
- private void upMappedInstance() {
- }
-
-
- /*private void updateAddButton() {
+
+ private void upMappedInstance() {
+ }
+
+
+ /*private void updateAddButton() {
TraceManager.addDev("updateAddButton");
-
-
- if ((i1 > -1) && (i2 > -1)) {
- AvatarSignal as1 = (AvatarSignal)(available1.elementAt(i1));
- AvatarSignal as2 = (AvatarSignal)(available2.elementAt(i2));
-
- mapButton.setEnabled(as1.isCompatibleWith(as2));
+
+
+ if ((i1 > -1) && (i2 > -1)) {
+ AvatarSignal as1 = (AvatarSignal)(available1.elementAt(i1));
+ AvatarSignal as2 = (AvatarSignal)(available2.elementAt(i2));
+
+ mapButton.setEnabled(as1.isCompatibleWith(as2));
}
- }*/
-
- private void updateSDInstancesList() {
-
- if( listInstancesHash.get( communicationPatternsCB.getSelectedIndex() ).size() > 0 ) {
- makeSDInstancesComboBox( new Vector<String>( listInstancesHash.get( communicationPatternsCB.getSelectedIndex() ) ) );
- }
- else {
- Vector<String> emptyList = new Vector<String>();
- emptyList.add( "No instances to map" );
- makeSDInstancesComboBox( emptyList );
- }
- }
-
- private void updateMappableArchUnits() {
-
- Vector<String> mappableArchUnits = new Vector<String>();
- String selectedInstance = sdInstancesCB.getSelectedItem().toString();
-
- if( sdStorageInstances.contains( selectedInstance ) ) {
- mappableArchUnits = makeListOfMappableArchUnits( STORAGE );
+ }*/
+
+ private void updateSDInstancesList() {
+
+ if( listInstancesHash.get( communicationPatternsCB.getSelectedIndex() ).size() > 0 ) {
+ makeSDInstancesComboBox( new Vector<String>( listInstancesHash.get( communicationPatternsCB.getSelectedIndex() ) ) );
+ }
+ else {
+ Vector<String> emptyList = new Vector<String>();
+ emptyList.add( "No instances to map" );
+ makeSDInstancesComboBox( emptyList );
+ }
}
- else {
- if( sdTransferInstances.contains( selectedInstance ) ) {
- mappableArchUnits = makeListOfMappableArchUnits( TRANSFER );
+
+ private void updateMappableArchUnits() {
+
+ Vector<String> mappableArchUnits = new Vector<String>();
+ String selectedInstance = sdInstancesCB.getSelectedItem().toString();
+
+ if( sdStorageInstances.contains( selectedInstance ) ) {
+ mappableArchUnits = makeListOfMappableArchUnits( STORAGE );
}
else {
- if( sdControllerInstances.contains( selectedInstance ) ) {
- mappableArchUnits = makeListOfMappableArchUnits( CONTROLLER );
+ if( sdTransferInstances.contains( selectedInstance ) ) {
+ mappableArchUnits = makeListOfMappableArchUnits( TRANSFER );
+ }
+ else {
+ if( sdControllerInstances.contains( selectedInstance ) ) {
+ mappableArchUnits = makeListOfMappableArchUnits( CONTROLLER );
+ }
}
}
+ TraceManager.addDev( "Before makingArchComboBox: " + mappableArchUnits.toString() );
+ makeArchitectureUnitsComboBox( mappableArchUnits );
+ for( int i = 0; i < mappableArchUnitsCB.getModel().getSize(); i++ ) {
+ TraceManager.addDev( "After makingArchComboBox: " + mappableArchUnitsCB.getModel().getElementAt(i) );
+ }
}
- TraceManager.addDev( "Before makingArchComboBox: " + mappableArchUnits.toString() );
- makeArchitectureUnitsComboBox( mappableArchUnits );
- for( int i = 0; i < mappableArchUnitsCB.getModel().getSize(); i++ ) {
- TraceManager.addDev( "After makingArchComboBox: " + mappableArchUnitsCB.getModel().getElementAt(i) );
+
+ private void emptyMappedUnitsList() {
+ listMappedUnits.removeAll();
+ mappedUnits.clear();
}
- }
-
- private void emptyMappedUnitsList() {
- listMappedUnits.removeAll();
- mappedUnits.clear();
- }
-
- private void makeArchitectureUnitsComboBox( Vector<String> newList ) {
-
- mappableArchUnitsCB.removeAllItems();
- for( String s: newList ) {
- mappableArchUnitsCB.addItem( s );
+
+ private void makeArchitectureUnitsComboBox( Vector<String> newList ) {
+
+ mappableArchUnitsCB.removeAllItems();
+ for( String s: newList ) {
+ mappableArchUnitsCB.addItem( s );
+ }
}
- }
-
- private void makeSDInstancesComboBox( Vector<String> newList ) {
-
- sdInstancesCB.removeAllItems();
- for( String s: newList ) {
- sdInstancesCB.addItem( s );
+
+ private void makeSDInstancesComboBox( Vector<String> newList ) {
+
+ sdInstancesCB.removeAllItems();
+ for( String s: newList ) {
+ sdInstancesCB.addItem( s );
+ }
}
- }
-
- public void closeDialog() {
- regularClose = true;
+
+ public void closeDialog() {
+ regularClose = true;
cancelled = false;
name = nameOfCP.getText();
TraceManager.addDev( "Before closing the dialog, name is: " + name + ", " + nameOfCP.getText() );
/*if( mappedUnits.size() > 1 ) {
- JOptionPane.showMessageDialog( frame, "Only one Bus/Bridge unit can be mapped per Transfer instance",
- "Error", JOptionPane.INFORMATION_MESSAGE );
- return;
+ JOptionPane.showMessageDialog( frame, "Only one Bus/Bridge unit can be mapped per Transfer instance",
+ "Error", JOptionPane.INFORMATION_MESSAGE );
+ return;
}*/
dispose();
- }
-
- public void cancelDialog() {
- cancelled = true;
- dispose();
- }
-
- public boolean hasBeenCancelled() {
- return cancelled;
- }
-
- public void valueChanged( ListSelectionEvent e ) {
- int i = listMappedUnits.getSelectedIndex() ;
+ }
- if( i == -1 ) {
- removeButton.setEnabled( false );
- upButton.setEnabled( false );
- downButton.setEnabled( false );
+ public void cancelDialog() {
+ cancelled = true;
+ dispose();
}
- else {
- removeButton.setEnabled( true );
- if( i > 0 ) {
- upButton.setEnabled( true );
- }
- else {
+
+ public boolean hasBeenCancelled() {
+ return cancelled;
+ }
+
+ public void valueChanged( ListSelectionEvent e ) {
+ int i = listMappedUnits.getSelectedIndex() ;
+
+ if( i == -1 ) {
+ removeButton.setEnabled( false );
upButton.setEnabled( false );
+ downButton.setEnabled( false );
+ }
+ else {
+ removeButton.setEnabled( true );
+ if( i > 0 ) {
+ upButton.setEnabled( true );
+ }
+ else {
+ upButton.setEnabled( false );
+ }
+ /*if (i != localSignalAssociations.size() - 1) {
+ downButton.setEnabled(true);
+ } else {
+ downButton.setEnabled(false);
+ }*/
}
- /*if (i != localSignalAssociations.size() - 1) {
- downButton.setEnabled(true);
- } else {
- downButton.setEnabled(false);
- }*/
}
- }
-
- public String getNodeName() {
- return name;
- }
-
- public String getCPReference() {
- if( emptyCPsList ) {
- return "";
+
+ public String getNodeName() {
+ return name;
}
- return (String)( communicationPatternsCB.getSelectedItem() );
- }
-
- public boolean isRegularClose() {
- return regularClose;
- }
-
- public Vector<String> getMappedUnits() {
- return mappedUnits;
- }
-
- public int indexOf( String name ) {
- int i = 0;
- if( communicationPatternsSL.size() > 0 ) {
- for( String s : communicationPatternsSL ) {
- if( s.equals( name ) ) {
- return i;
+ public String getCPReference() {
+ if( emptyCPsList ) {
+ return "";
+ }
+ return (String)( communicationPatternsCB.getSelectedItem() );
+ }
+
+ public boolean isRegularClose() {
+ return regularClose;
+ }
+
+ public Vector<String> getMappedUnits() {
+ return mappedUnits;
+ }
+
+ public int indexOf( String name ) {
+
+ int i = 0;
+ if( communicationPatternsSL.size() > 0 ) {
+ for( String s : communicationPatternsSL ) {
+ if( s.equals( name ) ) {
+ return i;
+ }
+ i++;
}
- i++;
}
+ return 0;
}
- return 0;
- }
-
- private void createListCPsNames() {
- if( listCPs.size() > 0 ) {
- for( int i = 0; i < listCPs.size(); i++ ) {
- communicationPatternsSL.add( listCPs.get(i).getName() );
+
+ private void createListCPsNames() {
+ if( listCPs.size() > 0 ) {
+ for( int i = 0; i < listCPs.size(); i++ ) {
+ communicationPatternsSL.add( listCPs.get(i).getName() );
+ }
}
}
- }
-
- private void createListOfInstances() {
-
- //j indexes the CP and k indexes the components within a TMLSDPanel
- HashSet<String> sdInstancesNames = new HashSet<String>();
-
- if( listCPs.size() > 0 ) {
- for( int j = 0; j < listCPs.size(); j++ ) {
- Vector<TDiagramPanel> panelList = listCPs.get(j).getPanels(); //the list of AD and SD panels for a given CP
- for( TDiagramPanel panel: panelList ) {
- //TraceManager.addDev( "Into createListInstances, panel name: " + panel.getName() );
- if( panel instanceof TMLSDPanel ) {
- //TraceManager.addDev( "Found TMLSDPanel named: " + panel.getName() );
- LinkedList componentsList = panel.getComponentList();
- for( int k = 0; k < componentsList.size(); k++ ) {
- TGComponent elem = (TGComponent) componentsList.get(k);
- if( elem instanceof TMLSDInstance ) {
- //TraceManager.addDev( "Found a TMLSDInstance named: " + elem.getName() );
- sdInstancesNames.add( elem.getName() );
- if( elem instanceof TMLSDStorageInstance ) {
- sdStorageInstances.add( elem.getName() );
- }
- if( elem instanceof TMLSDTransferInstance ) {
- sdTransferInstances.add( elem.getName() );
- }
- if( elem instanceof TMLSDControllerInstance ) {
- sdControllerInstances.add( elem.getName() );
+
+ private void createListOfInstances() {
+
+ //j indexes the CP and k indexes the components within a TMLSDPanel
+ HashSet<String> sdInstancesNames = new HashSet<String>();
+
+ if( listCPs.size() > 0 ) {
+ for( int j = 0; j < listCPs.size(); j++ ) {
+ Vector<TDiagramPanel> panelList = listCPs.get(j).getPanels(); //the list of AD and SD panels for a given CP
+ for( TDiagramPanel panel: panelList ) {
+ //TraceManager.addDev( "Into createListInstances, panel name: " + panel.getName() );
+ if( panel instanceof TMLSDPanel ) {
+ //TraceManager.addDev( "Found TMLSDPanel named: " + panel.getName() );
+ LinkedList componentsList = panel.getComponentList();
+ for( int k = 0; k < componentsList.size(); k++ ) {
+ TGComponent elem = (TGComponent) componentsList.get(k);
+ if( elem instanceof TMLSDInstance ) {
+ //TraceManager.addDev( "Found a TMLSDInstance named: " + elem.getName() );
+ sdInstancesNames.add( elem.getName() );
+ if( elem instanceof TMLSDStorageInstance ) {
+ sdStorageInstances.add( elem.getName() );
+ }
+ if( elem instanceof TMLSDTransferInstance ) {
+ sdTransferInstances.add( elem.getName() );
+ }
+ if( elem instanceof TMLSDControllerInstance ) {
+ sdControllerInstances.add( elem.getName() );
+ }
}
}
}
}
+ listInstancesHash.add( j, sdInstancesNames );
+ sdInstancesNames = new HashSet<String>(); //better instead of using clear method
}
- listInstancesHash.add( j, sdInstancesNames );
- sdInstancesNames = new HashSet<String>(); //better instead of using clear method
}
}
- }
-
- private Vector<String> makeListOfMappableArchUnits( int instanceType ) {
-
- //0 = storage, 1 = transfer, 2 = controller
- Vector<TMLArchiPanel> listArchiPanels = cp.getTDiagramPanel().getMGUI().getTMLArchiDiagramPanels();
- TDiagramPanel panel = listArchiPanels.get(0).getPanels().get(0); //Do not manage the case with more than 1 architecture panel
- LinkedList componentList = panel.getComponentList();
- Vector<String> list = new Vector<String>();
-
- for( int k = 0; k < componentList.size(); k++ ) {
- if( componentList.get(k) instanceof TMLArchiNode ) {
- if( ( (TMLArchiNode) componentList.get(k) ).getComponentType() == instanceType ) {
- //TraceManager.addDev( "Found a CPU named: " + elem.getName() );
- list.add( ( (TMLArchiNode) componentList.get(k) ).getName() );
+
+ private Vector<String> makeListOfMappableArchUnits( int instanceType ) {
+
+ //0 = storage, 1 = transfer, 2 = controller
+ Vector<TMLArchiPanel> listArchiPanels = cp.getTDiagramPanel().getMGUI().getTMLArchiDiagramPanels();
+ TDiagramPanel panel = listArchiPanels.get(0).getPanels().get(0); //Do not manage the case with more than 1 architecture panel
+ LinkedList componentList = panel.getComponentList();
+ Vector<String> list = new Vector<String>();
+
+ for( int k = 0; k < componentList.size(); k++ ) {
+ if( componentList.get(k) instanceof TMLArchiNode ) {
+ if( ( (TMLArchiNode) componentList.get(k) ).getComponentType() == instanceType ) {
+ //TraceManager.addDev( "Found a CPU named: " + elem.getName() );
+ list.add( ( (TMLArchiNode) componentList.get(k) ).getName() );
+ }
}
}
+ return list;
}
- return list;
- }
-
- /*private void eliminateInstancesWithSameName() {
+
+ /*private void eliminateInstancesWithSameName() {
if( listInstances.size() > 0 ) {
- for( int i = 0; i < listInstances.size(); i++ ) {
- TraceManager.addDev( "Into first loop, i = " + i );
- String nameToFind = listInstances.get(i).getName();
- if( i < listInstance.size() - 1 ) {
- for( int j = i+1; j < listInstances.size(); j++ ) {
- TraceManager.addDev( "Into second loop, j = " + j + " looking for " + nameToFind );
- if( nameToFind.equals( listInstances.get(j).getName() ) ) {
- listInstances.set( j, null );
- TraceManager.addDev( "Removed instance " + nameToFind );
- }
- }
- }
- }
+ for( int i = 0; i < listInstances.size(); i++ ) {
+ TraceManager.addDev( "Into first loop, i = " + i );
+ String nameToFind = listInstances.get(i).getName();
+ if( i < listInstance.size() - 1 ) {
+ for( int j = i+1; j < listInstances.size(); j++ ) {
+ TraceManager.addDev( "Into second loop, j = " + j + " looking for " + nameToFind );
+ if( nameToFind.equals( listInstances.get(j).getName() ) ) {
+ listInstances.set( j, null );
+ TraceManager.addDev( "Removed instance " + nameToFind );
}
- }*/
-
- /*private void createListInstancesNames() {
+ }
+ }
+ }
+ }
+ }*/
+
+ /*private void createListInstancesNames() {
if( listInstances.size() > 0 ) {
- for( int i = 0; i < listInstances.size(); i++ ) {
- listInstancesStrings.add( listInstances.get(i).getName() );
- TraceManager.addDev( "Adding TMLSDInstance " + listInstances.get(i).getName() );
- }
+ for( int i = 0; i < listInstances.size(); i++ ) {
+ listInstancesStrings.add( listInstances.get(i).getName() );
+ TraceManager.addDev( "Adding TMLSDInstance " + listInstances.get(i).getName() );
}
- }*/
-
+ }
+ }*/
+
} //End of class