diff --git a/src/ui/TMLCommunicationPatternPanel.java b/src/ui/TMLCommunicationPatternPanel.java
index 71affa04227d53da848826011e9e96d89eaf5701..3454ddb758d55d3eed215d2c3bc3bad98df632fb 100755
--- a/src/ui/TMLCommunicationPatternPanel.java
+++ b/src/ui/TMLCommunicationPatternPanel.java
@@ -120,7 +120,7 @@ public class TMLCommunicationPatternPanel extends TURTLEPanel {
toolBarPanel.add( jsp, BorderLayout.CENTER );
tabbedPane.addTab( s, IconManager.imgic18, toolBarPanel, "Open the communication pattern sequence diagram of " + s );
-// Vector<TDiagramPanel> panelList = tmlcpp.getPanels();
+ //Vector<TDiagramPanel> panelList = tmlcpp.getPanels();
/*TDiagramPanel mainCP = panels.get( 0 ); //get the Main CP
TraceManager.addDev( mainCP.getName() );
LinkedList mainCPelems = mainCP.getComponentList();
@@ -177,6 +177,10 @@ public class TMLCommunicationPatternPanel extends TURTLEPanel {
public String toString() {
return "DIPLODOCUS Communication Pattern: " + mgui.getTitleAt(this);
}
+
+ public String getName() {
+ return mgui.getTitleAt(this);
+ }
public boolean removeEnabled(int index) {
if (index ==0) {
diff --git a/src/ui/tmldd/TMLArchiCPNode.java b/src/ui/tmldd/TMLArchiCPNode.java
index 6861ca49db3fc55b316c8982fe6d4c3715c28403..3f1104df06637a609e09061ce6ab60b282db0686 100755
--- a/src/ui/tmldd/TMLArchiCPNode.java
+++ b/src/ui/tmldd/TMLArchiCPNode.java
@@ -176,43 +176,66 @@ public class TMLArchiCPNode extends TMLArchiCommunicationNode implements Swallow
return reference;
}
- public boolean editOndoubleClick(JFrame frame) {
+ public boolean editOndoubleClick( JFrame frame ) {
boolean error = false;
String errors = "";
String tmpName;
+
+ boolean mappedUnitExists = false;
+ TDiagramPanel ttdp = getTDiagramPanel();
+ LinkedList<TMLArchiNode> availableUnits = new LinkedList<TMLArchiNode>();
+ LinkedList<TMLArchiNode> mappedUnits = new LinkedList<TMLArchiNode>();
+ Vector<TMLArchiPanel> archiPanels = getTDiagramPanel().getMGUI().getTMLArchiDiagramPanels();
+
+ TDiagramPanel archiDiagramPanel = archiPanels.get(0).getPanels().get(0); // one ArchiPanel = one ArchiDiagramPanel
+ LinkedList archiComponentsList = archiDiagramPanel.getComponentList();
+ for( int k = 0; k < archiComponentsList.size(); k++ ) {
+ if( archiComponentsList.get(k) instanceof TMLArchiMemoryNode ) {
+ availableUnits.add( (TMLArchiNode) archiComponentsList.get(k) );
+ /*if( mappedUnit.equals( ((TMLArchiNode)archiComponentsList.get(k)).getName()) ) {
+ mappedUnitExists = true;
+ }*/
+ }
+ }
+ /*if( !mappedUnitExists ) {
+ mappedUnit = "";
+ }*/
- JDialogReferenceCommunicationPattern dialog = new JDialogReferenceCommunicationPattern(frame, "Setting CP attributes", this);
+ JDialogReferenceCP dialog = new JDialogReferenceCP( frame, "Setting CP attributes", this, availableUnits, mappedUnits, name );
dialog.setSize(500, 450);
- GraphicLib.centerOnParent(dialog);
- dialog.show(); // blocked until dialog has been closed
+ GraphicLib.centerOnParent(dialog);
+ dialog.show(); // blocked until dialog has been closed
+
+ //setJDialogOptions(jdab);
+ name = dialog.getNodeName();
+ mappedUnits = dialog.getMappedUnits();
- if (!dialog.isRegularClose()) {
+ if( !dialog.isRegularClose() ) {
return false;
}
- if (dialog.getNodeName().length() != 0) {
+ if( dialog.getNodeName().length() != 0 ) {
tmpName = dialog.getNodeName();
tmpName = tmpName.trim();
- if (!TAttribute.isAValidId(tmpName, false, false)) {
- error = true;
+ if( !TAttribute.isAValidId(tmpName, false, false) ) {
+ error = true;
errors += "Name of the node ";
- } else {
- name = tmpName;
- }
+ }
+ else {
+ name = tmpName;
+ }
}
- reference = dialog.getReference();
+ reference = dialog.getCPReference();
- if (error) {
- JOptionPane.showMessageDialog(frame,
- "Invalid value for the following attributes: " + errors,
- "Error",
- JOptionPane.INFORMATION_MESSAGE);
- return false;
+ if( error ) {
+ JOptionPane.showMessageDialog( frame, "Invalid value for the following attributes: " + errors,
+ "Error", JOptionPane.INFORMATION_MESSAGE);
+ return false;
}
- return true;
- }
+ return true;
+ } //End of method editOnDoubleClick
diff --git a/src/ui/window/JDialogReferenceCP.java b/src/ui/window/JDialogReferenceCP.java
new file mode 100644
index 0000000000000000000000000000000000000000..73ca0db17d6412d7e34f8e118b584fb0ea3c5030
--- /dev/null
+++ b/src/ui/window/JDialogReferenceCP.java
@@ -0,0 +1,594 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille, Andrea ENRICI
+
+ludovic.apvrille AT telecom-paristech.fr
+andrea.enrici AT telecom-paristech.fr
+
+This software is a computer program whose purpose is to allow the
+edition of TURTLE analysis, design and deployment diagrams, to
+allow the generation of RT-LOTOS or Java code from this diagram,
+and at last to allow the analysis of formal validation traces
+obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+from INRIA Rhone-Alpes.
+
+This software is governed by the CeCILL license under French law and
+abiding by the rules of distribution of free software. You can use,
+modify and/ or redistribute the software under the terms of the CeCILL
+license as circulated by CEA, CNRS and INRIA at the following URL
+"http://www.cecill.info".
+
+As a counterpart to the access to the source code and rights to copy,
+modify and redistribute granted by the license, users are provided only
+with a limited warranty and the software's author, the holder of the
+economic rights, and the successive licensors have only limited
+liability.
+
+In this respect, the user's attention is drawn to the risks associated
+with loading, using, modifying and/or developing or reproducing the
+software by the user in light of its specific status of free software,
+that may mean that it is complicated to manipulate, and that also
+therefore means that it is reserved for developers and experienced
+professionals having in-depth computer knowledge. Users are therefore
+encouraged to load and test the software's suitability as regards their
+requirements in conditions enabling the security of their systems and/or
+data to be ensured and, more generally, to use and operate it in the
+same conditions as regards security.
+
+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
+ */
+
+package ui.window;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.event.*;
+import java.util.*;
+
+import ui.*;
+import ui.tmldd.*;
+import ui.tmlsd.*;
+import ui.tmlcp.*;
+import ui.avatarbd.*;
+import myutil.*;
+
+
+public class JDialogReferenceCP extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
+
+ private boolean regularClose;
+ private boolean emptyCPsList = false;
+ private boolean emptyInstancesList = false;
+
+ private Frame frame;
+ private TMLArchiCPNode cp;
+ protected JTextField nameOfCP;
+ private String name = "";
+ private LinkedList<TMLArchiNode> availableUnits;
+ private LinkedList<TMLArchiNode> mappedUnits;
+
+ ArrayList<TMLCommunicationPatternPanel> listCPs = new ArrayList<TMLCommunicationPatternPanel>();
+ Vector<String> listCPsNames = new Vector<String>();
+ ArrayList<TMLSDInstance> listInstances = new ArrayList<TMLSDInstance>();
+ Vector<String> listInstancesNames = new Vector<String>();
+ int indexListCPsNames = 0;
+ int indexListInstancesNames = 0;
+
+ private boolean cancelled = false;
+
+ // Panel1
+ private JPanel panel1;
+ private JComboBox SDinstances, architectureUnit, referenceCommunicationPattern;
+ private JButton mapButton;
+
+ //Panel2
+ private JPanel panel2;
+ private JList listMapping;
+ 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,
+ LinkedList<TMLArchiNode> _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 );
+ }
+
+ initComponents();
+ myInitComponents();
+ pack();
+ }
+
+ private void myInitComponents() {
+ removeButton.setEnabled( false );
+ upButton.setEnabled( false );
+ downButton.setEnabled( false );
+ 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 ) {
+ listCPsNames.add( "No CP to reference" );
+ emptyCPsList = true;
+ }
+ else {
+ createListCPsNames(); //create listCPsNames (ArrayList<String>) out of listCPs
+ indexListCPsNames = indexOf( cp.getReference() );
+ //System.out.println("name=" + artifact.getFullValue() + " index=" + index);
+ }
+
+ //fifth line panel1
+ panel1.add( new JLabel( "Available CPs:"), c1 );
+ referenceCommunicationPattern = new JComboBox( listCPsNames );
+ referenceCommunicationPattern.setSelectedIndex( indexListCPsNames );
+ referenceCommunicationPattern.addActionListener( this );
+ referenceCommunicationPattern.setMinimumSize( new Dimension(150, 50) );
+ panel1.add( referenceCommunicationPattern, 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 ) {
+ listInstancesNames.add( "No instances to reference" );
+ emptyInstancesList = true;
+ }
+ else {
+ createListInstances( indexListCPsNames ); //Careful it creates just one list of instances!
+ eliminateInstancesWithSameName();
+ createListInstancesNames();
+ indexListInstancesNames = indexOf( cp.getReference() );
+ //System.out.println("name=" + artifact.getFullValue() + " index=" + index);
+ }
+
+ //seventh line panel1
+ panel1.add(new JLabel("Instance:"), c1);
+ SDinstances = new JComboBox( listInstancesNames );
+ SDinstances.setSelectedIndex( 0 );
+ SDinstances.addActionListener( this );
+ SDinstances.setMinimumSize(new Dimension(150, 50));
+ panel1.add( SDinstances, c1);
+
+ //eigth line panel1
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.fill = GridBagConstraints.BOTH;
+ c1.gridheight = 3;
+ panel1.add(new JLabel(" "), c1);
+
+ /*c1.gridwidth = 1;
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row*/
+
+ //nineth line panel1
+ architectureUnit = new JComboBox();
+ panel1.add(new JLabel("Available architecture units:"), c1);
+ architectureUnit.setMinimumSize(new Dimension(150, 50));
+ architectureUnit.addActionListener(this);
+ panel1.add( architectureUnit, 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
+ listMapping = new JList();
+ listMapping.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ listMapping.addListSelectionListener(this);
+ JScrollPane scrollPane = new JScrollPane(listMapping);
+ //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) {
+ addInstances();
+ } else if (evt.getSource() == cancelButton) {
+ cancelDialog();
+ } else if (evt.getSource() == removeButton) {
+ removeInstances();
+ } else if (evt.getSource() == downButton) {
+ downInstances();
+ } else if (evt.getSource() == upButton) {
+ upInstances();
+ }
+ } //End of method
+
+ private void addInstances() {
+ }
+
+ private void removeInstances() {
+ }
+
+ private void downInstances() {
+ }
+
+ private void upInstances() {
+ }
+
+ /*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));
+ }
+ }*/
+
+ /*private void makeComboBoxes() {
+ signalsBlock1.removeAllItems();
+ signalsBlock2.removeAllItems();
+
+ int i;
+ AvatarSignal as;
+
+ for(i=0; i<available1.size(); i++) {
+ as = (AvatarSignal)(available1.elementAt(i));
+ signalsBlock1.addItem(as.toString());
+ }
+
+ for(i=0; i<available2.size(); i++) {
+ as = (AvatarSignal)(available2.elementAt(i));
+ signalsBlock2.addItem(as.toString());
+ }
+ }*/
+
+ 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;
+ }*/
+ dispose();
+ }
+
+ public void cancelDialog() {
+ cancelled = true;
+ dispose();
+ }
+
+ public boolean hasBeenCancelled() {
+ return cancelled;
+ }
+
+ public void valueChanged( ListSelectionEvent e ) {
+ int i = listMapping.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);
+ }*/
+ }
+ }
+
+ public String getNodeName() {
+ return name;
+ }
+
+ public String getCPReference() {
+ if( emptyCPsList ) {
+ return "";
+ }
+ return (String)( referenceCommunicationPattern.getSelectedItem() );
+ }
+
+ public boolean isRegularClose() {
+ return regularClose;
+ }
+
+ public LinkedList<TMLArchiNode> getMappedUnits() {
+ return mappedUnits;
+ }
+
+ public int indexOf( String name ) {
+
+ int i = 0;
+ if( listCPsNames.size() > 0 ) {
+ for( String s : listCPsNames ) {
+ if( s.equals( name ) ) {
+ return i;
+ }
+ i++;
+ }
+ }
+ return 0;
+ }
+
+ private void createListCPsNames() {
+ if( listCPs.size() > 0 ) {
+ for( int i = 0; i < listCPs.size(); i++ ) {
+ listCPsNames.add( listCPs.get(i).getName() );
+ }
+ }
+ }
+
+ private void createListInstances( int index ) {
+
+ //LinkedList componentList = listCPs.get( index ).tmlcpp.getComponentList();
+ if( listCPs.size() > 0 ) {
+ Vector<TDiagramPanel> panelList = listCPs.get( index ).getPanels();
+ for( int i = 0; i < panelList.size(); i++ ) {
+ TDiagramPanel panel = panelList.get(i);
+ //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 j = 0; j < componentsList.size(); j++ ) {
+ TGComponent elem = (TGComponent) componentsList.get(j);
+ if( elem instanceof TMLSDInstance ) {
+ //TraceManager.addDev( "Found a TMLSDInstance named: " + elem.getName() );
+ listInstances.add( (TMLSDInstance) elem );
+ }
+ }
+ }
+ }
+ }
+ }
+
+ 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 );
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void createListInstancesNames() {
+ if( listInstances.size() > 0 ) {
+ for( int i = 0; i < listInstances.size(); i++ ) {
+ listInstancesNames.add( listInstances.get(i).getName() );
+ TraceManager.addDev( "Adding TMLSDInstance " + listInstances.get(i).getName() );
+ }
+ }
+ }
+
+} //End of class
diff --git a/src/ui/window/JDialogReferenceCommunicationPattern.java b/src/ui/window/JDialogReferenceCommunicationPattern.java
index 71d1291704bc396aac87ae87095f0616e6cddf94..8e1999e93b7dba7701eaac708c34b1c2abbdb4fc 100755
--- a/src/ui/window/JDialogReferenceCommunicationPattern.java
+++ b/src/ui/window/JDialogReferenceCommunicationPattern.java
@@ -62,14 +62,14 @@ import myutil.*;
public class JDialogReferenceCommunicationPattern extends javax.swing.JDialog implements ActionListener {
private boolean regularClose;
- private boolean emptyList = false;
+ private boolean emptyList = false;
private JPanel panel2;
private Frame frame;
private TMLArchiCPNode cp;
protected JTextField name;
- protected JComboBox referenceCommunicationPattern;
+ protected JComboBox referenceCommunicationPattern;
// Main Panel
private JButton closeButton;