Skip to content
Snippets Groups Projects
Commit b992bf34 authored by Ludovic Apvrille's avatar Ludovic Apvrille
Browse files

Update on window of syntax checking

parent a92541fb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/ui/window/JDialogSelectCPDiagrams.java
+ 326
− 314
View file @ b992bf34
/**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 JDialogSelectCPDiagrams
* Dialog for managing diagrams to be validated
* Creation: 02/06/2014
* @version 1.0 02/06/2014
* @author Ludovic APVRILLE, Andrea ENRICI
* @see
*/
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 JDialogSelectCPDiagrams
* Dialog for managing diagrams to be validated
* Creation: 02/06/2014
* @version 1.0 02/06/2014
* @author Ludovic APVRILLE, Andrea ENRICI
* @see
*/
package ui.window;
......@@ -62,251 +62,263 @@ import ui.tmlcp.*;
public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements ActionListener, ListSelectionListener {
public static Vector validated, ignored;
private static boolean optimized = true;
private Vector val, ign, back; //val for validated, ign for ignored
//subpanels
private JPanel panel1, panel2, panel3, panel4, panel5, panel6;
private JList listIgnored;
private JList listValidated;
private JButton allValidated;
private JButton addOneValidated;
private JButton addOneIgnored;
private JButton allIgnored;
protected JCheckBox optimize;
// protected JTextField clockField;
public static Vector validated, ignored;
private static boolean optimized = true;
private Vector val, ign, back; //val for validated, ign for ignored
//subpanels
private JPanel panel1, panel2, panel3, panel4, panel5, panel6;
private JList listIgnored;
private JList listValidated;
private JButton allValidated;
private JButton addOneValidated;
private JButton addOneIgnored;
private JButton allIgnored;
protected JCheckBox optimize;
// protected JTextField clockField;
// Main Panel
private JButton closeButton;
private JButton cancelButton;
private JButton closeButton;
private JButton cancelButton;
/** Creates new form */
public JDialogSelectCPDiagrams( Frame f, Vector _back, LinkedList componentList, String title ) {
super(f, title, true);
TraceManager.addDev( "Printing list of components: " + Arrays.toString( componentList.toArray()) );
back = _back;
if( ( validated == null ) || ( ignored == null ) ) {
val = makeNewVal( componentList ); //componentList must already contain something. Val contains a list of all TMLArchiNodes
//originally contained in componentList
ign = new Vector(); //empty
//val and ign are the lists that are printed in the Syntax Analysis window
}
else {
val = validated; //validated and ignored, the public vectors come from the instance of TMLArchiPanel
ign = ignored;
checkDiagram( val, componentList );
checkDiagram( ign, componentList );
addNewDiagram( val, componentList, ign );
public JDialogSelectCPDiagrams( Frame f, Vector _back, LinkedList componentList, String title ) {
super(f, title, true);
TraceManager.addDev( "Printing list of components: " + Arrays.toString( componentList.toArray()) );
back = _back;
if( ( validated == null ) || ( ignored == null ) ) {
val = makeNewVal( componentList ); //componentList must already contain something. Val contains a list of all TMLArchiNodes
//originally contained in componentList
ign = new Vector(); //empty
//val and ign are the lists that are printed in the Syntax Analysis window
}
else {
val = validated; //validated and ignored, the public vectors come from the instance of TMLArchiPanel
ign = ignored;
checkDiagram( val, componentList );
checkDiagram( ign, componentList );
addNewDiagram( val, componentList, ign );
}
initComponents();
myInitComponents();
pack();
}
initComponents();
myInitComponents();
pack();
}
//From componentList, filter out all the elements which are not TMLArchiNode
private Vector makeNewVal( LinkedList list ) {
Vector v = new Vector();
TGComponent tgc;
for( int i = 0; i < list.size(); i++ ) {
tgc = (TGComponent)( list.get(i) );
//System.out.println(tgc);
if ( ( tgc instanceof TMLCPRefSD ) || ( tgc instanceof TMLCPRefAD ) ) {
v.addElement( tgc );
}
//From componentList, filter out all the elements which are not TMLArchiNode
private Vector makeNewVal( LinkedList list ) {
Vector v = new Vector();
TGComponent tgc;
for( int i = 0; i < list.size(); i++ ) {
tgc = (TGComponent)( list.get(i) );
//System.out.println(tgc);
if ( ( tgc instanceof TMLCPRefSD ) || ( tgc instanceof TMLCPRefAD ) ) {
v.addElement( tgc );
}
}
return v;
}
return v;
}
private void checkDiagram( Vector tobeChecked, LinkedList source ) {
TMLCPRefSD sd;
TMLCPRefAD cp;
for(int i = 0; i < tobeChecked.size(); i++ ) {
// sd = (TMLCPRefSD)( tobeChecked.elementAt(i) );
// cp = (TMLCPRefAD)( tobeChecked.elementAt(i) );
if( tobeChecked.elementAt(i) instanceof TMLCPRefSD ) {
sd = (TMLCPRefSD) tobeChecked.elementAt(i);
if( !source.contains( sd) ) {
tobeChecked.removeElementAt(i);
i--;
}
}
else {
if( tobeChecked.elementAt(i) instanceof TMLCPRefAD ) {
cp = (TMLCPRefAD) tobeChecked.elementAt(i);
if( !source.contains( cp ) ) {
tobeChecked.removeElementAt(i);
i--;
}
}
}
private void checkDiagram( Vector tobeChecked, LinkedList source ) {
TMLCPRefSD sd;
TMLCPRefAD cp;
for(int i = 0; i < tobeChecked.size(); i++ ) {
// sd = (TMLCPRefSD)( tobeChecked.elementAt(i) );
// cp = (TMLCPRefAD)( tobeChecked.elementAt(i) );
if( tobeChecked.elementAt(i) instanceof TMLCPRefSD ) {
sd = (TMLCPRefSD) tobeChecked.elementAt(i);
if( !source.contains( sd) ) {
tobeChecked.removeElementAt(i);
i--;
}
}
else {
if( tobeChecked.elementAt(i) instanceof TMLCPRefAD ) {
cp = (TMLCPRefAD) tobeChecked.elementAt(i);
if( !source.contains( cp ) ) {
tobeChecked.removeElementAt(i);
i--;
}
}
}
}
}
}
/*public void setValidated( Vector _input ) {
validated = _input;
}
public void setIgnored( Vector _ignored ) {
ignored = _ignored;
}
public Vector getValidated() {
return validated;
}
public Vector getIgnored() {
return ignored;
}*/
public void addNewDiagram( Vector added, LinkedList source, Vector notSource ) {
TGComponent tgc;
for( int i = 0; i < source.size(); i++ ) {
tgc = (TGComponent)( source.get(i) );
if( ( tgc instanceof TMLCPRefSD ) && ( tgc instanceof TMLCPRefAD ) && ( !added.contains(tgc) ) && ( !notSource.contains(tgc) ) ) {
added.addElement( tgc );
//System.out.println("New element");
/*public void setValidated( Vector _input ) {
validated = _input;
}
public void setIgnored( Vector _ignored ) {
ignored = _ignored;
}
public Vector getValidated() {
return validated;
}
}
}
public Vector getIgnored() {
return ignored;
}*/
public void addNewDiagram( Vector added, LinkedList source, Vector notSource ) {
TGComponent tgc;
for( int i = 0; i < source.size(); i++ ) {
tgc = (TGComponent)( source.get(i) );
if( ( tgc instanceof TMLCPRefSD ) && ( tgc instanceof TMLCPRefAD ) && ( !added.contains(tgc) ) && ( !notSource.contains(tgc) ) ) {
added.addElement( tgc );
//System.out.println("New element");
}
}
}
private void myInitComponents() {
setButtons();
}
private void initComponents() {
Container c = getContentPane();
GridBagLayout gridbag1 = new GridBagLayout();
GridBagConstraints c1 = new GridBagConstraints();
setFont( new Font( "Helvetica", Font.PLAIN, 14) );
c.setLayout( new BorderLayout() );
setDefaultCloseOperation( JFrame.DISPOSE_ON_CLOSE );
// ignored list
panel1 = new JPanel();
panel1.setLayout( new BorderLayout() );
panel1.setBorder( new javax.swing.border.TitledBorder( "Diagrams ignored" ) );
listIgnored = new JList( ign );
//listIgnored.setPreferredSize(new Dimension(200, 250));
listIgnored.setSelectionMode( ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
listIgnored.addListSelectionListener( this );
JScrollPane scrollPane1 = new JScrollPane( listIgnored );
panel1.add( scrollPane1, BorderLayout.CENTER );
panel1.setPreferredSize( new Dimension( 200, 250) );
c.add( panel1, BorderLayout.WEST );
// validated list
panel2 = new JPanel();
panel2.setLayout( new BorderLayout() );
panel2.setBorder( new javax.swing.border.TitledBorder( "Diagrams taken into account" ) );
listValidated = new JList( val );
//listValidated.setPreferredSize(new Dimension(200, 250));
listValidated.setSelectionMode( ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
listValidated.addListSelectionListener( this );
JScrollPane scrollPane2 = new JScrollPane( listValidated );
panel2.add( scrollPane2, BorderLayout.CENTER );
panel2.setPreferredSize( new Dimension(200, 250) );
c.add( panel2, BorderLayout.EAST );
// central buttons
panel3 = new JPanel();
panel3.setLayout(gridbag1);
c1.weighty = 1.0;
c1.weightx = 1.0;
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
c1.fill = GridBagConstraints.HORIZONTAL;
c1.gridheight = 1;
allValidated = new JButton(IconManager.imgic50);
allValidated.setPreferredSize(new Dimension(50, 25));
allValidated.addActionListener(this);
allValidated.setActionCommand("allValidated");
panel3.add(allValidated, c1);
addOneValidated = new JButton(IconManager.imgic48);
addOneValidated.setPreferredSize(new Dimension(50, 25));
addOneValidated.addActionListener(this);
addOneValidated.setActionCommand("addOneValidated");
panel3.add(addOneValidated, c1);
panel3.add(new JLabel(" "), c1);
addOneIgnored = new JButton(IconManager.imgic46);
addOneIgnored.addActionListener(this);
addOneIgnored.setPreferredSize(new Dimension(50, 25));
addOneIgnored.setActionCommand("addOneIgnored");
panel3.add(addOneIgnored, c1);
allIgnored = new JButton(IconManager.imgic44);
allIgnored.addActionListener(this);
allIgnored.setPreferredSize(new Dimension(50, 25));
allIgnored.setActionCommand("allIgnored");
panel3.add(allIgnored, c1);
c.add(panel3, BorderLayout.CENTER);
// main panel;
panel6 = new JPanel();
panel6.setLayout(new BorderLayout());
panel5 = new JPanel();
GridBagLayout gridbag2 = new GridBagLayout();
private void initComponents() {
Container c = getContentPane();
GridBagLayout gridbag1 = new GridBagLayout();
GridBagConstraints c1 = new GridBagConstraints();
GridBagLayout gridbag2 = new GridBagLayout();
GridBagConstraints c2 = new GridBagConstraints();
panel5.setLayout(gridbag2);
c2.weighty = 1.0;
setFont( new Font( "Helvetica", Font.PLAIN, 14) );
c.setLayout( new BorderLayout() );
setDefaultCloseOperation( JFrame.DISPOSE_ON_CLOSE );
c.setLayout(gridbag2);
c2.weighty = 1.0;
c2.weightx = 1.0;
c2.gridwidth = 1;
c2.fill = GridBagConstraints.HORIZONTAL;
c2.gridheight = 1;
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
// optimize = new JCheckBox("Optimize TML specification");
// optimize.setSelected(optimized);
// panel5.add(optimize, c2);
c2.gridwidth = 1; //end row
// panel5.add(new JLabel("Master clock (in MHz)"), c2);
// c2.gridwidth = GridBagConstraints.REMAINDER; //end row
// clockField = new JTextField("" + clock);
// panel5.add(clockField, c2);
panel4 = new JPanel();
panel4.setLayout(new FlowLayout());
closeButton = new JButton("Start Syntax Analysis", IconManager.imgic37);
//closeButton.setPreferredSize(new Dimension(600, 50));
closeButton.addActionListener(this);
closeButton.setPreferredSize(new Dimension(200, 30));
cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
cancelButton.setPreferredSize(new Dimension(200, 30));
panel4.add(cancelButton);
panel4.add(closeButton);
panel6.add(panel5, BorderLayout.NORTH);
panel6.add(panel4, BorderLayout.SOUTH);
c.add(panel6, BorderLayout.SOUTH);
// ignored list
panel1 = new JPanel();
panel1.setLayout( new BorderLayout() );
panel1.setBorder( new javax.swing.border.TitledBorder( "Diagrams ignored" ) );
listIgnored = new JList( ign );
//listIgnored.setPreferredSize(new Dimension(200, 250));
listIgnored.setSelectionMode( ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
listIgnored.addListSelectionListener( this );
JScrollPane scrollPane1 = new JScrollPane( listIgnored );
panel1.add( scrollPane1, BorderLayout.CENTER );
panel1.setPreferredSize( new Dimension( 200, 250) );
c.add( panel1, c2);
// central buttons
panel3 = new JPanel();
panel3.setLayout(gridbag1);
c1.weighty = 1.0;
c1.weightx = 1.0;
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
c1.fill = GridBagConstraints.HORIZONTAL;
c1.gridheight = 1;
allValidated = new JButton(IconManager.imgic50);
allValidated.setPreferredSize(new Dimension(50, 25));
allValidated.addActionListener(this);
allValidated.setActionCommand("allValidated");
panel3.add(allValidated, c1);
addOneValidated = new JButton(IconManager.imgic48);
addOneValidated.setPreferredSize(new Dimension(50, 25));
addOneValidated.addActionListener(this);
addOneValidated.setActionCommand("addOneValidated");
panel3.add(addOneValidated, c1);
panel3.add(new JLabel(" "), c1);
addOneIgnored = new JButton(IconManager.imgic46);
addOneIgnored.addActionListener(this);
addOneIgnored.setPreferredSize(new Dimension(50, 25));
addOneIgnored.setActionCommand("addOneIgnored");
panel3.add(addOneIgnored, c1);
allIgnored = new JButton(IconManager.imgic44);
allIgnored.addActionListener(this);
allIgnored.setPreferredSize(new Dimension(50, 25));
allIgnored.setActionCommand("allIgnored");
panel3.add(allIgnored, c1);
c.add(panel3, c2);
// validated list
panel2 = new JPanel();
panel2.setLayout( new BorderLayout() );
panel2.setBorder( new javax.swing.border.TitledBorder( "Diagrams taken into account" ) );
listValidated = new JList( val );
//listValidated.setPreferredSize(new Dimension(200, 250));
listValidated.setSelectionMode( ListSelectionModel.MULTIPLE_INTERVAL_SELECTION );
listValidated.addListSelectionListener( this );
JScrollPane scrollPane2 = new JScrollPane( listValidated );
panel2.add( scrollPane2, BorderLayout.CENTER );
panel2.setPreferredSize( new Dimension(200, 250) );
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
c.add( panel2, c2 );
// main panel;
panel6 = new JPanel();
panel6.setLayout(new BorderLayout());
panel5 = new JPanel();
/*GridBagLayout gridbag3 = new GridBagLayout();
GridBagConstraints c3 = new GridBagConstraints();
panel5.setLayout(gridbag3);
c3.weighty = 1.0;
c3.weightx = 1.0;
c3.fill = GridBagConstraints.HORIZONTAL;
c3.gridheight = 1;
c3.gridwidth = GridBagConstraints.REMAINDER; //end row
// optimize = new JCheckBox("Optimize TML specification");
// optimize.setSelected(optimized);
// panel5.add(optimize, c2);
c3.gridwidth = 1; //end row
// panel5.add(new JLabel("Master clock (in MHz)"), c2);
// c2.gridwidth = GridBagConstraints.REMAINDER; //end row
// clockField = new JTextField("" + clock);
// panel5.add(clockField, c2);*/
panel4 = new JPanel();
panel4.setLayout(new FlowLayout());
closeButton = new JButton("Start Syntax Analysis", IconManager.imgic37);
//closeButton.setPreferredSize(new Dimension(600, 50));
closeButton.addActionListener(this);
closeButton.setPreferredSize(new Dimension(200, 30));
cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
cancelButton.setPreferredSize(new Dimension(200, 30));
panel4.add(cancelButton);
panel4.add(closeButton);
panel6.add(panel5, BorderLayout.NORTH);
panel6.add(panel4, BorderLayout.SOUTH);
c.add(panel6, c2);
}
public void actionPerformed( ActionEvent evt ) {
public void actionPerformed( ActionEvent evt ) {
String command = evt.getActionCommand();
// Compare the action command to the known actions.
if (command.equals("Start Syntax Analysis")) {
closeDialog();
......@@ -322,8 +334,8 @@ public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements Acti
allIgnored();
}
}
private void addOneIgnored() {
int [] list = listValidated.getSelectedIndices();
Vector v = new Vector();
......@@ -333,13 +345,13 @@ public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements Acti
ign.addElement(o);
v.addElement(o);
}
val.removeAll(v);
listIgnored.setListData(ign);
listValidated.setListData(val);
setButtons();
}
private void addOneValidated() {
int [] list = listIgnored.getSelectedIndices();
Vector v = new Vector();
......@@ -349,13 +361,13 @@ public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements Acti
val.addElement(o);
v.addElement(o);
}
ign.removeAll(v);
listIgnored.setListData(ign);
listValidated.setListData(val);
setButtons();
}
private void allValidated() {
val.addAll(ign);
ign.removeAllElements();
......@@ -363,7 +375,7 @@ public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements Acti
listValidated.setListData(val);
setButtons();
}
private void allIgnored() {
ign.addAll(val);
val.removeAllElements();
......@@ -371,48 +383,48 @@ public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements Acti
listValidated.setListData(val);
setButtons();
}
public void closeDialog() {
back.removeAllElements();
for( int i = 0; i < val.size(); i++ ) {
back.addElement( val.elementAt(i) );
}
validated = val;
ignored = ign;
dispose();
back.removeAllElements();
for( int i = 0; i < val.size(); i++ ) {
back.addElement( val.elementAt(i) );
}
validated = val;
ignored = ign;
dispose();
}
public void cancelDialog() {
dispose();
}
private void setButtons() {
int i1 = listIgnored.getSelectedIndex();
int i2 = listValidated.getSelectedIndex();
if (i1 == -1) {
addOneValidated.setEnabled(false);
} else {
addOneValidated.setEnabled(true);
//listValidated.clearSelection();
}
if (i2 == -1) {
addOneIgnored.setEnabled(false);
} else {
addOneIgnored.setEnabled(true);
//listIgnored.clearSelection();
}
if (ign.size() ==0) {
allValidated.setEnabled(false);
} else {
allValidated.setEnabled(true);
}
if (val.size() ==0) {
allIgnored.setEnabled(false);
closeButton.setEnabled(false);
......@@ -421,24 +433,24 @@ public class JDialogSelectCPDiagrams extends javax.swing.JDialog implements Acti
closeButton.setEnabled(true);
}
}
/* public int getClock() {
try {
int c = Integer.decode(clockField.getText()).intValue();
if (c > 0) {
return c;
}
} catch (Exception e) {
}
return clock;
}
*/
/* public int getClock() {
try {
int c = Integer.decode(clockField.getText()).intValue();
if (c > 0) {
return c;
}
} catch (Exception e) {
}
return clock;
}
*/
public void valueChanged(ListSelectionEvent e) {
setButtons();
}
public boolean getOptimize() {
return optimized;
}
public boolean getOptimize() {
return optimized;
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment