Résolution #34 LRafraichissement labels de taille

AppThinker/src/AppThinkerMenuBar.java

@@ -49,7 +49,7 @@ public class AppThinkerMenuBar extends JMenuBar {
         });
         _fileMenu.add(_newProject);
         _openProject = new JMenuItem("Open project");
-        _openProject.setIcon(new ImageIcon(getClass().getResource("img/x16/openProject.png")));
+        _openProject.setIcon(new ImageIcon(getClass().getResource("img/x16/importProject.png")));
         _openProject.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -136,33 +136,6 @@ public class AppThinkerMenuBar extends JMenuBar {
         if(composition.getType() == Composition.UML_DIAGRAM){
             _compositionMenu = new JMenu("Composition");
             UmlToolbar apptt = (UmlToolbar) composition.getToolbar();
-            JMenuItem newClass = new JMenuItem("New class");
-            newClass.setIcon(new ImageIcon(getClass().getResource("img/x16/newClass.png")));
-            newClass.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    apptt.setCurrentTool(UmlToolbar.CLASS_TOOL);
-                }
-            });
-            _compositionMenu.add(newClass);
-            JMenuItem newAssociation = new JMenuItem("New association");
-            newAssociation.setIcon(new ImageIcon(getClass().getResource("img/x16/newAssociation.png")));
-            newAssociation.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    apptt.setCurrentTool(UmlToolbar.ASSOCIATION_TOOL);
-                }
-            });
-            _compositionMenu.add(newAssociation);
-            JMenuItem newLink = new JMenuItem("New link");
-            newLink.setIcon(new ImageIcon(getClass().getResource("img/x16/newLink.png")));
-            newLink.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    apptt.setCurrentTool(UmlToolbar.LINK_TOOL);
-                }
-            });
-            _compositionMenu.add(newLink);
             JMenuItem selectElement = new JMenuItem("Select");
             selectElement.setIcon(new ImageIcon(getClass().getResource("img/x16/select.png")));
             selectElement.addActionListener(new ActionListener() {
@@ -190,6 +163,64 @@ public class AppThinkerMenuBar extends JMenuBar {
                 }
             });
             _compositionMenu.add(deleteElement);
+
+
+            JMenuItem newClass = new JMenuItem("New class");
+            newClass.setIcon(new ImageIcon(getClass().getResource("img/x16/newClass.png")));
+            newClass.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    apptt.setCurrentTool(UmlToolbar.CLASS_TOOL);
+                }
+            });
+            _compositionMenu.add(newClass);
+
+            JMenuItem strongRelation = new JMenuItem("Strong relation");
+            strongRelation.setIcon(new ImageIcon(getClass().getResource("img/x16/strongRelation.png")));
+            strongRelation.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    apptt.setCurrentTool(UmlToolbar.STRONG_TOOL);
+                }
+            });
+            _compositionMenu.add(strongRelation);
+            JMenuItem weakRelation = new JMenuItem("Weak relation");
+            weakRelation.setIcon(new ImageIcon(getClass().getResource("img/x16/weakRelation.png")));
+            weakRelation.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    apptt.setCurrentTool(UmlToolbar.WEAK_TOOL);
+                }
+            });
+            _compositionMenu.add(weakRelation);
+            JMenuItem compositionRelation = new JMenuItem("Composition relation");
+            compositionRelation.setIcon(new ImageIcon(getClass().getResource("img/x16/compositionRelation.png")));
+            compositionRelation.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    apptt.setCurrentTool(UmlToolbar.COMPOSITION_TOOL);
+                }
+            });
+            _compositionMenu.add(compositionRelation);
+            JMenuItem aggregationRelation = new JMenuItem("Aggregation relation");
+            aggregationRelation.setIcon(new ImageIcon(getClass().getResource("img/x16/aggregationRelation.png")));
+            aggregationRelation.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    apptt.setCurrentTool(UmlToolbar.AGGREGATION_TOOL);
+                }
+            });
+            _compositionMenu.add(aggregationRelation);
+            JMenuItem inheritanceRelation = new JMenuItem("Inheritance relation");
+            inheritanceRelation.setIcon(new ImageIcon(getClass().getResource("img/x16/inheritanceRelation.png")));
+            inheritanceRelation.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    apptt.setCurrentTool(UmlToolbar.INHERITANCE_TOOL);
+                }
+            });
+            _compositionMenu.add(inheritanceRelation);
+
             this.add(_compositionMenu);
         }
     }

AppThinker/src/AppThinkerStatusbar.java

@@ -28,13 +28,13 @@ public class AppThinkerStatusbar extends JPanel {
 
         JPanel actionBar = new JPanel();
 
-        _posXLabel = new JLabel("PX : 0 |");
+        _posXLabel = new JLabel("PX : - |");
         actionBar.add(_posXLabel);
-        _posYLabel = new JLabel("PY : 0 |");
+        _posYLabel = new JLabel("PY : - |");
         actionBar.add(_posYLabel);
-        _sizeXLabel = new JLabel("SX : 0 |");
+        _sizeXLabel = new JLabel("SX : - |");
         actionBar.add(_sizeXLabel);
-        _sizeYLabel = new JLabel("SY : 0");
+        _sizeYLabel = new JLabel("SY : -");
         actionBar.add(_sizeYLabel);
 
         this.add(actionBar);
@@ -76,7 +76,7 @@ public class AppThinkerStatusbar extends JPanel {
      * @param sizeY La taille Y.
      */
     public void setSizeLabel(int sizeX, int sizeY){
-        this._sizeXLabel.setText("SX : " + Integer.toString(sizeX));
-        this._sizeYLabel.setText("SY : " + Integer.toString(sizeY));
+        this._sizeXLabel.setText("SX : " + ((sizeX == 0) ? "-" : Integer.toString(sizeX)) + " |");
+        this._sizeYLabel.setText("SY : " + ((sizeY == 0) ? "-" : Integer.toString(sizeY)));
     }
 }

AppThinker/src/AppThinkerWindow.java

@@ -157,7 +157,7 @@ public class AppThinkerWindow extends JFrame {
 
         //Ajout du diagramme à la fenêtre
         JScrollPane compositionPane = new JScrollPane(_composition);
-        compositionPane.setBackground(new Color(218, 233, 244));
+        _composition.setBackground(new Color(218, 233, 244));
         _contentPanel.add(compositionPane, BorderLayout.CENTER);
 
         //Modification de la barre de statut

AppThinker/src/UmlDiagram.java

@@ -106,9 +106,8 @@ public class UmlDiagram extends Composition {
                 if(m.isStatic()) g2.drawLine(a.getPosX()-a.getSizeX()/2+10, posCounter+1, a.getPosX()+a.getSizeX()/2-10, posCounter+1);
             }
             //Si la classe est sélectionnée
-            if((Class)_selected == a){
+            if(a == (Class)_selected){
                 g2.setColor(new Color(39, 76, 94));
-                AppThinker.getWindow().getStatusbar().setSizeLabel(a.getSizeX(), a.getSizeY());
                 //Top Left
                 g2.fillOval(posX-4, posY-4, 8, 8);
                 //Top
@@ -128,7 +127,6 @@ public class UmlDiagram extends Composition {
                 //Total rectangle
                 g2.drawRect(posX, posY, a.getSizeX(), a.getSizeY());
             }
-            else AppThinker.getWindow().getStatusbar().setSizeLabel(0, 0);
         }
     }
 
@@ -265,8 +263,10 @@ public class UmlDiagram extends Composition {
         }
         if(classSelected == false && linkSelected == false && cornerSelection == null) _selected = null;
         //Si la classe est sélectionnée, on enregistre le décalage entre la souris et le centre de la classe
+        AppThinker.getWindow().getStatusbar().setSizeLabel(0, 0);
         if(_selected instanceof Class){
             Class a = (Class) _selected;
+            AppThinker.getWindow().getStatusbar().setSizeLabel(a.getSizeX(), a.getSizeY());
             _shiftX = getX - a.getPosX();
             _shiftY = getY - a.getPosY();
         }
@@ -327,11 +327,20 @@ public class UmlDiagram extends Composition {
             case UmlToolbar.CLASS_TOOL:
                 this.addClass(new Class(e.getX(), e.getY(), Class.RECTANGLE));
                 break;
-            case UmlToolbar.ASSOCIATION_TOOL:
-                System.out.println("On ajoute une association");
+            case UmlToolbar.STRONG_TOOL:
+                System.out.println("On ajoute une relation forte.");
                 break;
-            case UmlToolbar.LINK_TOOL:
-                System.out.println("On ajoute un lien");
+            case UmlToolbar.WEAK_TOOL:
+                System.out.println("On ajoute une relation faible.");
+                break;
+            case UmlToolbar.COMPOSITION_TOOL:
+                System.out.println("On ajoute une relation de composition.");
+                break;
+            case UmlToolbar.AGGREGATION_TOOL:
+                System.out.println("On ajoute une relation d'agrégation.");
+                break;
+            case UmlToolbar.INHERITANCE_TOOL:
+                System.out.println("On ajoute une relation d'héritage.");
                 break;
             default:
                 this.select(e.getX(), e.getY());
@@ -362,9 +371,9 @@ public class UmlDiagram extends Composition {
     @Override
     public void mouseDragged(MouseEvent e) {
         //Mise à jour des coordonnées de la souris dans la statusbar
+        AppThinker.getWindow().getStatusbar().setPosLabel(e.getX(), e.getY());
         int posX = e.getX();
         int posY = e.getY();
-        AppThinker.getWindow().getStatusbar().setPosLabel(posX, posY);
         if(_selected instanceof Class){
             Class a = (Class)_selected;
             int shiftX = 0;
@@ -384,7 +393,6 @@ public class UmlDiagram extends Composition {
                     case "SE":
                         a.resizeDown(posY);
                         a.resizeRight(posX);
-                    //Redimensionnement bas
                     case "S":
                         a.resizeDown(posY);
                         break;
@@ -400,6 +408,7 @@ public class UmlDiagram extends Composition {
                         a.resizeLeft(posX);
                         break;
                 }
+                AppThinker.getWindow().getStatusbar().setSizeLabel(a.getSizeX(), a.getSizeY());
             }
             //Sinon on déplace
             else{
@@ -426,6 +435,7 @@ public class UmlDiagram extends Composition {
         //Si une classe est sélectionnée
         if (_selected instanceof Class) {
             Class a = (Class) _selected;
+            AppThinker.getWindow().getStatusbar().setSizeLabel(a.getSizeX(), a.getSizeY());
             int posX = a.getPosX() - (a.getSizeX() / 2);
             int posY = a.getPosY() - (a.getSizeY() / 2);
             //Si la souris est à proximité d'un lien, on affiche le curseur de redimensionnement

AppThinker/src/UmlToolbar.java

@@ -15,8 +15,11 @@ public class UmlToolbar extends JPanel {
     public static final int COPY_TOOL = 3;
     public static final int PASTE_TOOL = 4;
     public static final int CLASS_TOOL = 5;
-    public static final int ASSOCIATION_TOOL = 6;
-    public static final int LINK_TOOL = 7;
+    public static final int STRONG_TOOL = 6;
+    public static final int WEAK_TOOL = 7;
+    public static final int COMPOSITION_TOOL = 8;
+    public static final int AGGREGATION_TOOL = 9;
+    public static final int INHERITANCE_TOOL = 10;
 
     private int _currentTool = 0;
 
@@ -31,8 +34,11 @@ public class UmlToolbar extends JPanel {
 
     private JPanel _modelisationPanel;
     private JButton _newClass;
-    private JButton _newAssociation;
-    private JButton _newLink;
+    private JButton _newStrong;
+    private JButton _newWeak;
+    private JButton _newComposition;
+    private JButton _newAggregation;
+    private JButton _newInheritance;
 
     private UmlDiagram _umlDiagram;
 
@@ -135,30 +141,71 @@ public class UmlToolbar extends JPanel {
             }
         });
         _modelisationPanel.add(_newClass);
-        _newAssociation = new JButton();
-        _newAssociation.setSize(32, 32);
-        _newAssociation.setBorderPainted(false);
-        _newAssociation.setIcon(new ImageIcon(getClass().getResource("img/x32/newAssociation.png")));
-        _newAssociation.setToolTipText("Add a new association.");
-        _newAssociation.addActionListener(new ActionListener() {
+
+        _newStrong = new JButton();
+        _newStrong.setSize(32, 32);
+        _newStrong.setBorderPainted(false);
+        _newStrong.setIcon(new ImageIcon(getClass().getResource("img/x32/strongRelation.png")));
+        _newStrong.setToolTipText("<html>Add a <b>strong relation</b>.<br>A <b>strong relation</b> is a relation that will always be verified.<br><i>Eg: Teachers teach courses.</i></html>");
+        _newStrong.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                setCurrentTool(UmlToolbar.ASSOCIATION_TOOL);
+                setCurrentTool(UmlToolbar.STRONG_TOOL);
             }
         });
-        _modelisationPanel.add(_newAssociation);
-        _newLink = new JButton();
-        _newLink.setSize(32, 32);
-        _newLink.setBorderPainted(false);
-        _newLink.setIcon(new ImageIcon(getClass().getResource("img/x32/newLink.png")));
-        _newLink.setToolTipText("Add a new link.");
-        _newLink.addActionListener(new ActionListener() {
+        _modelisationPanel.add(_newStrong);
+
+        _newWeak = new JButton();
+        _newWeak.setSize(32, 32);
+        _newWeak.setBorderPainted(false);
+        _newWeak.setIcon(new ImageIcon(getClass().getResource("img/x32/weakRelation.png")));
+        _newWeak.setToolTipText("<html>Add a <b>weak relation</b>.<br>A <b>weak relation</b> is a relation that only exists at a particular time.<br><i>Eg: A person has a job when he works for a company.</i></html>");
+        _newWeak.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                setCurrentTool(UmlToolbar.LINK_TOOL);
+                setCurrentTool(UmlToolbar.WEAK_TOOL);
             }
         });
-        _modelisationPanel.add(_newLink);
+        _modelisationPanel.add(_newWeak);
+
+        _newComposition = new JButton();
+        _newComposition.setSize(32, 32);
+        _newComposition.setBorderPainted(false);
+        _newComposition.setIcon(new ImageIcon(getClass().getResource("img/x32/compositionRelation.png")));
+        _newComposition.setToolTipText("<html>Add a <b>composition relation</b>.<br>It corresponds to the verb <b>'to have'</b>, <b>with the uniqueness</b> of the component side.<br><i>Eg: A caddie have 4 wheels.</i></html>");
+        _newComposition.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                setCurrentTool(UmlToolbar.COMPOSITION_TOOL);
+            }
+        });
+        _modelisationPanel.add(_newComposition);
+
+        _newAggregation = new JButton();
+        _newAggregation.setSize(32, 32);
+        _newAggregation.setBorderPainted(false);
+        _newAggregation.setIcon(new ImageIcon(getClass().getResource("img/x32/aggregationRelation.png")));
+        _newAggregation.setToolTipText("<html>Add an <b>aggregation relation</b>.<br>It corresponds to the verb <b>'to have'</b>, <b>without the uniqueness</b> of the component side.<br><i>Eg: A room has 4 walls. (One wall may be the wall of another room).</i></html>");
+        _newAggregation.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                setCurrentTool(UmlToolbar.AGGREGATION_TOOL);
+            }
+        });
+        _modelisationPanel.add(_newAggregation);
+
+        _newInheritance = new JButton();
+        _newInheritance.setSize(32, 32);
+        _newInheritance.setBorderPainted(false);
+        _newInheritance.setIcon(new ImageIcon(getClass().getResource("img/x32/inheritanceRelation.png")));
+        _newInheritance.setToolTipText("<html>Add an <b>inheritance relation</b>.<br>A class is <b>a specification</b> of another class.<br><i>Eg: An employer is a person.</i></html>");
+        _newInheritance.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                setCurrentTool(UmlToolbar.INHERITANCE_TOOL);
+            }
+        });
+        _modelisationPanel.add(_newInheritance);
 
         this.add(_editionPanel, BorderLayout.CENTER);
         this.add(_modelisationPanel, BorderLayout.CENTER);
@@ -189,8 +236,11 @@ public class UmlToolbar extends JPanel {
         _redo.setEnabled(enabled);
 
         _newClass.setEnabled(enabled);
-        _newAssociation.setEnabled(enabled);
-        _newLink.setEnabled(enabled);
+        _newStrong.setEnabled(enabled);
+        _newWeak.setEnabled(enabled);
+        _newComposition.setEnabled(enabled);
+        _newAggregation.setEnabled(enabled);
+        _newInheritance.setEnabled(enabled);
     }
 
     /**
@@ -210,32 +260,41 @@ public class UmlToolbar extends JPanel {
         if(this._currentTool == UmlToolbar.SELECT_TOOL) _umlDiagram.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
         else _umlDiagram.setCursor(new Cursor(Cursor.CROSSHAIR_CURSOR));
         switch(currentTool){
-            case 1:
+            case EDIT_TOOL:
                 if(_umlDiagram.getSelected() instanceof Class){
                     _umlDiagram.editClass((Class) _umlDiagram.getSelected());
                 }
                 AppThinker.getWindow().getStatusbar().setStatusMessage("Edit tool - Click an item to edit its properties.");
                 break;
-            case 2:
+            case DELETE_TOOL:
                 if(_umlDiagram.getSelected() instanceof Class){
                     _umlDiagram.removeClass((Class) _umlDiagram.getSelected());
                 }
                 AppThinker.getWindow().getStatusbar().setStatusMessage("Delete tool - Click an item to delete it.");
                 break;
-            case 3:
+            case COPY_TOOL:
                 AppThinker.getWindow().getStatusbar().setStatusMessage("Copy tool - Click an item to copy it.");
                 break;
-            case 4:
+            case PASTE_TOOL:
                 AppThinker.getWindow().getStatusbar().setStatusMessage("Paste tool - Click everywhere to paste the last copied item.");
                 break;
-            case 5:
+            case CLASS_TOOL:
                 AppThinker.getWindow().getStatusbar().setStatusMessage("Class tool - Click everywhere to add a new class.");
                 break;
-            case 6:
-                AppThinker.getWindow().getStatusbar().setStatusMessage("Association tool - Click everywhere to add a new association.");
+            case STRONG_TOOL:
+                AppThinker.getWindow().getStatusbar().setStatusMessage("Strong relation tool - Click on a class, hold, and release on another class.");
                 break;
-            case 7:
-                AppThinker.getWindow().getStatusbar().setStatusMessage("Link tool - Click on a class, hold, and release on another class.");
+            case WEAK_TOOL:
+                AppThinker.getWindow().getStatusbar().setStatusMessage("Weak relation tool - Click on a class, hold, and release on another class.");
+                break;
+            case COMPOSITION_TOOL:
+                AppThinker.getWindow().getStatusbar().setStatusMessage("Composition relation tool - Click on a class, hold, and release on another class.");
+                break;
+            case AGGREGATION_TOOL:
+                AppThinker.getWindow().getStatusbar().setStatusMessage("Aggregation relation tool - Click on a class, hold, and release on another class.");
+                break;
+            case INHERITANCE_TOOL:
+                AppThinker.getWindow().getStatusbar().setStatusMessage("Inheritance relation tool - Click on a class, hold, and release on another class.");
                 break;
             default:
                 AppThinker.getWindow().getStatusbar().setStatusMessage("Select tool - Click an item to select it or move it.");