diff --git a/src/ui/window/JDialogAvatarProperty.java b/src/ui/window/JDialogAvatarProperty.java
new file mode 100755
index 0000000000000000000000000000000000000000..8d0a22c3a975339deafa6232071fac5fbef5427d
--- /dev/null
+++ b/src/ui/window/JDialogAvatarProperty.java
@@ -0,0 +1,188 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+ludovic.apvrille AT enst.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 JDialogAvatarProperty
+ * Dialog for managing property attributes
+ * Creation: 26/04/2010
+ * @version 1.0 26/04/2010
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+package ui.window;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+
+import ui.*;
+
+public class JDialogAvatarProperty extends javax.swing.JDialog implements ActionListener {
+ private JPanel panel1;
+
+ private String name;
+ private boolean livenessSelected;
+ private boolean hasBeenCancelled = false;
+ private JTextField myName;
+ private JRadioButton reachability, liveness;
+
+ // Main Panel
+ private JButton closeButton;
+ private JButton cancelButton;
+
+ //private String id1, id2;
+
+ /** Creates new form */
+ public JDialogAvatarProperty(Frame f, String _name, boolean _livenessSelected) {
+
+ super(f, "Setting property attributes", true);
+
+ name = _name;
+ livenessSelected = _livenessSelected;
+
+ initComponents();
+ myInitComponents();
+ pack();
+ }
+
+
+ private void myInitComponents() {
+ }
+
+ private void initComponents() {
+ Container c = getContentPane();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = 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("Property"));
+
+ panel1.setPreferredSize(new Dimension(200, 100));
+
+ // first line panel1
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.fill = GridBagConstraints.BOTH;
+ c1.gridheight = 1;
+ panel1.add(new JLabel(" "), c1);
+
+ // second line panel1
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ myName = new JTextField(name, 30);
+ myName.setEditable(true);
+ panel1.add(myName, c1);
+
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ reachability = new JRadioButton("Reachability");
+ reachability.setSelected(!livenessSelected);
+ panel1.add(reachability, c1);
+
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ liveness = new JRadioButton("Liveness");
+ liveness.setSelected(livenessSelected);
+ panel1.add(liveness, c1);
+
+ ButtonGroup bg = new ButtonGroup();
+ bg.add(reachability);
+ bg.add(liveness);
+
+ // main panel;
+ c0.gridwidth = 1;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+
+ c.add(panel1, c0);
+
+ c0.gridwidth = 1;
+ c0.gridheight = 1;
+ c0.fill = GridBagConstraints.HORIZONTAL;
+ 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);
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ String command = evt.getActionCommand();
+
+ // Compare the action command to the known actions.
+ if (command.equals("Save and Close")) {
+ closeDialog();
+ } else if (command.equals("Cancel")) {
+ cancelDialog();
+ }
+ }
+
+ public boolean hasBeenCancelled() {
+ return hasBeenCancelled;
+ }
+
+
+ public void closeDialog() {
+ dispose();
+ }
+
+ public boolean isLivenessSelected() {
+ return liveness.isSelected();
+ }
+
+ public String getName() {
+ return myName.getText();
+ }
+
+ public void cancelDialog() {
+ hasBeenCancelled = true;
+ dispose();
+ }
+}
diff --git a/src/ui/window/JDialogAvatarPropertyConnector.java b/src/ui/window/JDialogAvatarPropertyConnector.java
new file mode 100755
index 0000000000000000000000000000000000000000..8c269c2150e6cf9446f0e9a57b18f88e61f3ee22
--- /dev/null
+++ b/src/ui/window/JDialogAvatarPropertyConnector.java
@@ -0,0 +1,167 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+
+ludovic.apvrille AT enst.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 JDialogAvatarPropertyConnector
+ * Dialog for managing properties on connectors
+ * Creation: 26/04/2010
+ * @version 1.0 26/04/2010
+ * @author Ludovic APVRILLE
+ * @see
+ */
+
+package ui.window;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+
+import ui.*;
+
+public class JDialogAvatarPropertyConnector extends javax.swing.JDialog implements ActionListener {
+ private JPanel panel1;
+
+ private boolean negated;
+ private boolean hasBeenCancelled = false;
+ private JCheckBox isNegated;
+
+ // Main Panel
+ private JButton closeButton;
+ private JButton cancelButton;
+
+ //private String id1, id2;
+
+ /** Creates new form */
+ public JDialogAvatarPropertyConnector(Frame f, boolean _negated) {
+
+ super(f, "Setting negation on property", true);
+
+ negated = _negated;
+
+ initComponents();
+ myInitComponents();
+ pack();
+ }
+
+
+ private void myInitComponents() {
+ }
+
+ private void initComponents() {
+ Container c = getContentPane();
+ GridBagLayout gridbag0 = new GridBagLayout();
+ GridBagLayout gridbag1 = new GridBagLayout();
+ GridBagConstraints c0 = new GridBagConstraints();
+ GridBagConstraints c1 = 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("Property"));
+
+ panel1.setPreferredSize(new Dimension(200, 100));
+
+ // first line panel1
+ c1.weighty = 1.0;
+ c1.weightx = 1.0;
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ c1.fill = GridBagConstraints.BOTH;
+ c1.gridheight = 1;
+ panel1.add(new JLabel(" "), c1);
+
+ // second line panel1
+ c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+ isNegated = new JCheckBox("Not");
+ isNegated.setSelected(negated);
+ panel1.add(isNegated, c1);
+
+ // main panel;
+ c0.gridwidth = 1;
+ c0.gridheight = 10;
+ c0.weighty = 1.0;
+ c0.weightx = 1.0;
+ c0.gridwidth = GridBagConstraints.REMAINDER; //end row
+
+ c.add(panel1, c0);
+
+ c0.gridwidth = 1;
+ c0.gridheight = 1;
+ c0.fill = GridBagConstraints.HORIZONTAL;
+ 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);
+ }
+
+ public void actionPerformed(ActionEvent evt) {
+ String command = evt.getActionCommand();
+
+ // Compare the action command to the known actions.
+ if (command.equals("Save and Close")) {
+ closeDialog();
+ } else if (command.equals("Cancel")) {
+ cancelDialog();
+ }
+ }
+
+ public boolean hasBeenCancelled() {
+ return hasBeenCancelled;
+ }
+
+
+ public void closeDialog() {
+ dispose();
+ }
+
+ public boolean isNegated() {
+ return isNegated.isSelected();
+ }
+
+ public void cancelDialog() {
+ hasBeenCancelled = true;
+ dispose();
+ }
+}