From a91a242710fe74ac2d17d18d4cf4cd06ca7c709d Mon Sep 17 00:00:00 2001 From: Valentin Boulanger Date: Wed, 9 Dec 2020 12:48:52 +0100 Subject: [PATCH] =?UTF-8?q?R=C3=A9solution=20tickets=20#4=20#22=20Enregist?= =?UTF-8?q?rement=20projet=20et=20modificateurs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 + .idea/libraries/AppThinker.xml | 9 + .idea/misc.xml | 9 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + AppThinker/Documentation/AppThinker.html | 38 +- AppThinker/Documentation/AppThinkerGrid.html | 406 ------------ .../Documentation/AppThinkerMenuBar.html | 42 +- .../Documentation/AppThinkerStatusbar.html | 4 +- .../Documentation/AppThinkerToolbar.html | 62 +- .../Documentation/AppThinkerWindow.html | 45 +- AppThinker/Documentation/Argument.html | 21 +- .../ArgumentsPropertiesWindow.html | 487 +++++++++++++++ AppThinker/Documentation/Attribute.html | 265 +++++++- AppThinker/Documentation/Class.html | 115 +++- .../Documentation/ClassPropertiesWindow.html | 581 ++++++++++++++++++ AppThinker/Documentation/Link.html | 17 +- AppThinker/Documentation/Method.html | 269 +++++++- AppThinker/Documentation/Project.html | 45 +- AppThinker/Documentation/Selectpoint.html | 499 --------------- AppThinker/Documentation/UmlDiagram.html | 87 ++- .../Documentation/allclasses-frame.html | 8 +- .../Documentation/allclasses-noframe.html | 8 +- .../Documentation/class-use/AppThinker.html | 4 +- .../class-use/AppThinkerMenuBar.html | 4 +- .../class-use/AppThinkerStatusbar.html | 4 +- .../class-use/AppThinkerToolbar.html | 8 +- .../class-use/AppThinkerWindow.html | 4 +- .../Documentation/class-use/Argument.html | 4 +- ...nt.html => ArgumentsPropertiesWindow.html} | 24 +- .../Documentation/class-use/Attribute.html | 4 +- AppThinker/Documentation/class-use/Class.html | 30 +- ...erGrid.html => ClassPropertiesWindow.html} | 51 +- AppThinker/Documentation/class-use/Link.html | 4 +- .../Documentation/class-use/Method.html | 23 +- .../Documentation/class-use/Project.html | 24 +- .../Documentation/class-use/UmlDiagram.html | 32 +- AppThinker/Documentation/constant-values.html | 72 +-- AppThinker/Documentation/deprecated-list.html | 4 +- AppThinker/Documentation/help-doc.html | 4 +- .../Documentation/index-files/index-1.html | 36 +- .../Documentation/index-files/index-10.html | 22 +- .../Documentation/index-files/index-11.html | 44 +- .../Documentation/index-files/index-12.html | 98 ++- .../Documentation/index-files/index-13.html | 234 ++++++- .../Documentation/index-files/index-14.html | 180 +----- .../Documentation/index-files/index-15.html | 20 +- .../Documentation/index-files/index-16.html | 38 +- .../Documentation/index-files/index-17.html | 127 ---- .../Documentation/index-files/index-18.html | 139 ----- .../Documentation/index-files/index-2.html | 80 ++- .../Documentation/index-files/index-3.html | 68 +- .../Documentation/index-files/index-4.html | 28 +- .../Documentation/index-files/index-5.html | 208 ++++++- .../Documentation/index-files/index-6.html | 216 +------ .../Documentation/index-files/index-7.html | 40 +- .../Documentation/index-files/index-8.html | 56 +- .../Documentation/index-files/index-9.html | 52 +- AppThinker/Documentation/index.html | 2 +- AppThinker/Documentation/overview-tree.html | 22 +- AppThinker/Documentation/package-frame.html | 8 +- AppThinker/Documentation/package-summary.html | 40 +- AppThinker/Documentation/package-tree.html | 22 +- AppThinker/Documentation/package-use.html | 8 +- AppThinker/Documentation/serialized-form.html | 448 ++++++++++++-- AppThinker/src/AppThinker.java | 127 +++- AppThinker/src/AppThinkerMenuBar.java | 1 + AppThinker/src/AppThinkerStatusbar.java | 2 +- AppThinker/src/AppThinkerToolbar.java | 1 + AppThinker/src/Argument.java | 3 +- AppThinker/src/Attribute.java | 106 +++- AppThinker/src/Class.java | 3 +- AppThinker/src/ClassPropertiesWindow.java | 63 +- AppThinker/src/Link.java | 4 +- AppThinker/src/Method.java | 105 +++- AppThinker/src/Project.java | 3 +- AppThinker/src/UmlDiagram.java | 8 +- appthinker.iml | 11 + 78 files changed, 3754 insertions(+), 2258 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/libraries/AppThinker.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml delete mode 100644 AppThinker/Documentation/AppThinkerGrid.html create mode 100644 AppThinker/Documentation/ArgumentsPropertiesWindow.html create mode 100644 AppThinker/Documentation/ClassPropertiesWindow.html delete mode 100644 AppThinker/Documentation/Selectpoint.html rename AppThinker/Documentation/class-use/{Selectpoint.html => ArgumentsPropertiesWindow.html} (75%) rename AppThinker/Documentation/class-use/{AppThinkerGrid.html => ClassPropertiesWindow.html} (55%) delete mode 100644 AppThinker/Documentation/index-files/index-17.html delete mode 100644 AppThinker/Documentation/index-files/index-18.html create mode 100644 appthinker.iml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..291b150 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/../../../../:\Documents\appthinker\.idea/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/libraries/AppThinker.xml b/.idea/libraries/AppThinker.xml new file mode 100644 index 0000000..45c91e2 --- /dev/null +++ b/.idea/libraries/AppThinker.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..00c8cd4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..8ed23ec --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/AppThinker/Documentation/AppThinker.html b/AppThinker/Documentation/AppThinker.html index 886f596..4e2d772 100644 --- a/AppThinker/Documentation/AppThinker.html +++ b/AppThinker/Documentation/AppThinker.html @@ -2,9 +2,9 @@ - + AppThinker - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
+ + + + @@ -356,7 +372,7 @@ extends java.lang.Object
  • Frames
    • diff --git a/AppThinker/Documentation/AppThinkerGrid.html b/AppThinker/Documentation/AppThinkerGrid.html deleted file mode 100644 index db80923..0000000 --- a/AppThinker/Documentation/AppThinkerGrid.html +++ /dev/null @@ -1,406 +0,0 @@ - - - - - -AppThinkerGrid - - - - - - - - -
    - - -
    Skip navigation links
    - - - - -
    -
    - - - -
    - -
    -
    - - -
    - - -
    - - -
    -

    Class AppThinkerGrid

    -
    -
    -
      -
    • java.lang.Object
      • -
    • -
        -
      • java.awt.Component
        • -
      • -
          -
        • java.awt.Container
          • -
        • -
            -
          • javax.swing.JComponent
            • -
          • -
              -
            • javax.swing.JPanel
              • -
            • -
                -
              • AppThinkerGrid
                • -
              -
              • -
            -
            • -
          -
          • -
        -
        • -
      -
      • -
    -
    -
      -
    • -
      -
      All Implemented Interfaces:
      -
      java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable, javax.accessibility.Accessible
      -
      -
      -
      -
      public class AppThinkerGrid
-extends javax.swing.JPanel
      -
      Affiche une grille de projet pour l'affichage du diagramme.
      -
      -
      Author:
      -
      V.BOULANGER
      -
      See Also:
      -
      Serialized Form
      -
      -
      • -
    -
    -
    -
      -
    • - -
        -
      • - - -

        Nested Class Summary

        -
          -
        • - - -

          Nested classes/interfaces inherited from class javax.swing.JPanel

          -javax.swing.JPanel.AccessibleJPanel
          • -
        -
          -
        • - - -

          Nested classes/interfaces inherited from class javax.swing.JComponent

          -javax.swing.JComponent.AccessibleJComponent
          • -
        -
          -
        • - - -

          Nested classes/interfaces inherited from class java.awt.Container

          -java.awt.Container.AccessibleAWTContainer
          • -
        -
          -
        • - - -

          Nested classes/interfaces inherited from class java.awt.Component

          -java.awt.Component.AccessibleAWTComponent, java.awt.Component.BaselineResizeBehavior, java.awt.Component.BltBufferStrategy, java.awt.Component.FlipBufferStrategy
          • -
        -
        • -
      - -
        -
      • - - -

        Field Summary

        -
          -
        • - - -

          Fields inherited from class javax.swing.JComponent

          -listenerList, TOOL_TIP_TEXT_KEY, ui, UNDEFINED_CONDITION, WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, WHEN_FOCUSED, WHEN_IN_FOCUSED_WINDOW
          • -
        -
          -
        • - - -

          Fields inherited from class java.awt.Component

          -accessibleContext, BOTTOM_ALIGNMENT, CENTER_ALIGNMENT, LEFT_ALIGNMENT, RIGHT_ALIGNMENT, TOP_ALIGNMENT
          • -
        -
          -
        • - - -

          Fields inherited from interface java.awt.image.ImageObserver

          -ABORT, ALLBITS, ERROR, FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, WIDTH
          • -
        -
        • -
      - -
        -
      • - - -

        Constructor Summary

        - - - - - - - - -
        Constructors 
        Constructor and Description
        AppThinkerGrid(Project project) -
        Constructeur de la classe AppThinkerGrid.
        -
        -
        • -
      - -
        -
      • - - -

        Method Summary

        - - - - - - - - - - -
        All Methods Instance Methods Concrete Methods 
        Modifier and TypeMethod and Description
        UmlDiagramgetDiagram() -
        Récupère le diagramme de la grille.
        -
        -
          -
        • - - -

          Methods inherited from class javax.swing.JPanel

          -getAccessibleContext, getUI, getUIClassID, paramString, setUI, updateUI
          • -
        -
          -
        • - - -

          Methods inherited from class javax.swing.JComponent

          -addAncestorListener, addNotify, addVetoableChangeListener, computeVisibleRect, contains, createToolTip, disable, enable, firePropertyChange, firePropertyChange, firePropertyChange, fireVetoableChange, getActionForKeyStroke, getActionMap, getAlignmentX, getAlignmentY, getAncestorListeners, getAutoscrolls, getBaseline, getBaselineResizeBehavior, getBorder, getBounds, getClientProperty, getComponentGraphics, getComponentPopupMenu, getConditionForKeyStroke, getDebugGraphicsOptions, getDefaultLocale, getFontMetrics, getGraphics, getHeight, getInheritsPopupMenu, getInputMap, getInputMap, getInputVerifier, getInsets, getInsets, getListeners, getLocation, getMaximumSize, getMinimumSize, getNextFocusableComponent, getPopupLocation, getPreferredSize, getRegisteredKeyStrokes, getRootPane, getSize, getToolTipLocation, getToolTipText, getToolTipText, getTopLevelAncestor, getTransferHandler, getVerifyInputWhenFocusTarget, getVetoableChangeListeners, getVisibleRect, getWidth, getX, getY, grabFocus, hide, isDoubleBuffered, isLightweightComponent, isManagingFocus, isOpaque, isOptimizedDrawingEnabled, isPaintingForPrint, isPaintingOrigin, isPaintingTile, isRequestFocusEnabled, isValidateRoot, paint, paintBorder, paintChildren, paintComponent, paintImmediately, paintImmediately, print, printAll, printBorder, printChildren, printComponent, processComponentKeyEvent, processKeyBinding, processKeyEvent, processMouseEvent, processMouseMotionEvent, putClientProperty, registerKeyboardAction, registerKeyboardAction, removeAncestorListener, removeNotify, removeVetoableChangeListener, repaint, repaint, requestDefaultFocus, requestFocus, requestFocus, requestFocusInWindow, requestFocusInWindow, resetKeyboardActions, reshape, revalidate, scrollRectToVisible, setActionMap, setAlignmentX, setAlignmentY, setAutoscrolls, setBackground, setBorder, setComponentPopupMenu, setDebugGraphicsOptions, setDefaultLocale, setDoubleBuffered, setEnabled, setFocusTraversalKeys, setFont, setForeground, setInheritsPopupMenu, setInputMap, setInputVerifier, setMaximumSize, setMinimumSize, setNextFocusableComponent, setOpaque, setPreferredSize, setRequestFocusEnabled, setToolTipText, setTransferHandler, setUI, setVerifyInputWhenFocusTarget, setVisible, unregisterKeyboardAction, update
          • -
        -
          -
        • - - -

          Methods inherited from class java.awt.Container

          -add, add, add, add, add, addContainerListener, addImpl, addPropertyChangeListener, addPropertyChangeListener, applyComponentOrientation, areFocusTraversalKeysSet, countComponents, deliverEvent, doLayout, findComponentAt, findComponentAt, getComponent, getComponentAt, getComponentAt, getComponentCount, getComponents, getComponentZOrder, getContainerListeners, getFocusTraversalKeys, getFocusTraversalPolicy, getLayout, getMousePosition, insets, invalidate, isAncestorOf, isFocusCycleRoot, isFocusCycleRoot, isFocusTraversalPolicyProvider, isFocusTraversalPolicySet, layout, list, list, locate, minimumSize, paintComponents, preferredSize, printComponents, processContainerEvent, processEvent, remove, remove, removeAll, removeContainerListener, setComponentZOrder, setFocusCycleRoot, setFocusTraversalPolicy, setFocusTraversalPolicyProvider, setLayout, transferFocusDownCycle, validate, validateTree
          • -
        -
          -
        • - - -

          Methods inherited from class java.awt.Component

          -action, add, addComponentListener, addFocusListener, addHierarchyBoundsListener, addHierarchyListener, addInputMethodListener, addKeyListener, addMouseListener, addMouseMotionListener, addMouseWheelListener, bounds, checkImage, checkImage, coalesceEvents, contains, createImage, createImage, createVolatileImage, createVolatileImage, disableEvents, dispatchEvent, enable, enableEvents, enableInputMethods, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, getBackground, getBounds, getColorModel, getComponentListeners, getComponentOrientation, getCursor, getDropTarget, getFocusCycleRootAncestor, getFocusListeners, getFocusTraversalKeysEnabled, getFont, getForeground, getGraphicsConfiguration, getHierarchyBoundsListeners, getHierarchyListeners, getIgnoreRepaint, getInputContext, getInputMethodListeners, getInputMethodRequests, getKeyListeners, getLocale, getLocation, getLocationOnScreen, getMouseListeners, getMouseMotionListeners, getMousePosition, getMouseWheelListeners, getName, getParent, getPeer, getPropertyChangeListeners, getPropertyChangeListeners, getSize, getToolkit, getTreeLock, gotFocus, handleEvent, hasFocus, imageUpdate, inside, isBackgroundSet, isCursorSet, isDisplayable, isEnabled, isFocusable, isFocusOwner, isFocusTraversable, isFontSet, isForegroundSet, isLightweight, isMaximumSizeSet, isMinimumSizeSet, isPreferredSizeSet, isShowing, isValid, isVisible, keyDown, keyUp, list, list, list, location, lostFocus, mouseDown, mouseDrag, mouseEnter, mouseExit, mouseMove, mouseUp, move, nextFocus, paintAll, postEvent, prepareImage, prepareImage, processComponentEvent, processFocusEvent, processHierarchyBoundsEvent, processHierarchyEvent, processInputMethodEvent, processMouseWheelEvent, remove, removeComponentListener, removeFocusListener, removeHierarchyBoundsListener, removeHierarchyListener, removeInputMethodListener, removeKeyListener, removeMouseListener, removeMouseMotionListener, removeMouseWheelListener, removePropertyChangeListener, removePropertyChangeListener, repaint, repaint, repaint, resize, resize, setBounds, setBounds, setComponentOrientation, setCursor, setDropTarget, setFocusable, setFocusTraversalKeysEnabled, setIgnoreRepaint, setLocale, setLocation, setLocation, setName, setSize, setSize, show, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle
          • -
        -
          -
        • - - -

          Methods inherited from class java.lang.Object

          -clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
          • -
        -
        • -
      -
      • -
    -
    -
    -
      -
    • - -
        -
      • - - -

        Constructor Detail

        - - - -
          -
        • -

          AppThinkerGrid

          -
          public AppThinkerGrid(Project project)
          -
          Constructeur de la classe AppThinkerGrid.
          -
          -
          Parameters:
          -
          project - Le projet associé.
          -
          -
          • -
        -
        • -
      - -
        -
      • - - -

        Method Detail

        - - - -
          -
        • -

          getDiagram

          -
          public UmlDiagram getDiagram()
          -
          Récupère le diagramme de la grille.
          -
          -
          Returns:
          -
          Le diagramme de la grille.
          -
          -
          • -
        -
        • -
      -
      • -
    -
    -
    - - -
    - - -
    Skip navigation links
    - - - - -
    -
    - - - -
    - -
    -
    - - -
    - - -
    - - - diff --git a/AppThinker/Documentation/AppThinkerMenuBar.html b/AppThinker/Documentation/AppThinkerMenuBar.html index cac74f3..b7e53e8 100644 --- a/AppThinker/Documentation/AppThinkerMenuBar.html +++ b/AppThinker/Documentation/AppThinkerMenuBar.html @@ -2,9 +2,9 @@ - + AppThinkerMenuBar - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10}; +var methods = {"i0":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
    @@ -244,14 +244,8 @@ extends javax.swing.JMenuBar void -disableEditing() -
    Désactive les boutons d'édition lorsqu'aucun projet n'est ouvert.
    - - - -void -enableEditing() -
    Active les boutons d'édition lorsqu'un projet est ouvert.
    +setProjectEnable(boolean enabled) +
    Active/Désactive les boutons relatifs au projet.
    @@ -322,24 +316,18 @@ extends javax.swing.JMenuBar

    Method Detail

    - - - -
      -
    • -

      enableEditing

      -
      public void enableEditing()
      -
      Active les boutons d'édition lorsqu'un projet est ouvert.
      -
      • -
    - +
    • -

      disableEditing

      -
      public void disableEditing()
      -
      Désactive les boutons d'édition lorsqu'aucun projet n'est ouvert.
      +

      setProjectEnable

      +
      public void setProjectEnable(boolean enabled)
      +
      Active/Désactive les boutons relatifs au projet.
      +
      +
      Parameters:
      +
      enabled - Le paramètre d'activation.
      +
    @@ -369,7 +357,7 @@ extends javax.swing.JMenuBar
diff --git a/AppThinker/src/AppThinker.java b/AppThinker/src/AppThinker.java index 8808a0d..ed106ba 100644 --- a/AppThinker/src/AppThinker.java +++ b/AppThinker/src/AppThinker.java @@ -1,5 +1,7 @@ import javax.swing.*; +import javax.swing.filechooser.FileNameExtensionFilter; import java.awt.*; +import java.io.*; /** * La classe principale du logiciel AppThinker. @@ -32,34 +34,143 @@ public class AppThinker { */ public static void newProject(){ _project = new Project(); - _window.setTitle("AppThinker | " + _project.getName()); - _window.getMenubar().setProjectEnable(true); - _project.getUmlDiagram().getToolbar().setEnabled(true); - _window.getStatusbar().setStatusMessage("The project was created."); + displayProject(); _window.getStatusbar().setFileMessage(_project.getName()); _window.setProject(_project); - AppThinker.getProject().getUmlDiagram().displayDiagram(); + _project.getUmlDiagram().displayDiagram(); + _window.getStatusbar().setStatusMessage("The project was created."); + } + + /** + * Opère les modifications nécessaires sur la fenêtre pour accueillir le projet. + */ + public static void displayProject(){ + + _window.setTitle((_project.getPath() == null) ? "AppThinker - " + _project.getName() + "*" : "AppThinker - " + _project.getName() + " (" + _project.getPath() + ")"); + _window.getMenubar().setProjectEnable(true); + _project.getUmlDiagram().getToolbar().setEnabled(true); } /** * Ouvre un projet existant dans la fenêtre. */ public static void openProject(){ - //_window.getGrid().repaint(); + FileNameExtensionFilter fileFilter = new FileNameExtensionFilter("AppThinker project", "appt"); + JFileChooser dialog = new JFileChooser(); + dialog.setDialogType(JFileChooser.OPEN_DIALOG); + dialog.setDialogTitle("Open an AppThinker project"); + dialog.setFileFilter(fileFilter); + dialog.setAcceptAllFileFilterUsed(false); + if(dialog.showOpenDialog(null) == JFileChooser.APPROVE_OPTION){ + ObjectInputStream ois = null; + Project project = null; + try { + final FileInputStream fichier = new FileInputStream(dialog.getSelectedFile().getPath()); + ois = new ObjectInputStream(fichier); + project = (Project) ois.readObject(); + } catch (final java.io.IOException e) { + e.printStackTrace(); + } catch (final ClassNotFoundException e) { + e.printStackTrace(); + } finally { + try { + if (ois != null) { + ois.close(); + _project = project; + _window.getStatusbar().setFileMessage(_project.getName()); + _window.setProject(_project); + _project.getUmlDiagram().displayDiagram(); + displayProject(); + } + } catch (final IOException ex) { + ex.printStackTrace(); + } + } + } } /** * Sauvegarde le projet en cours. */ public static void saveProject(){ - + //Si le projet ne contient pas de path, on demande à l'enregistrer dans un emplacement + FileNameExtensionFilter fileFilter = new FileNameExtensionFilter("AppThinker project", "appt"); + String path = _project.getPath(); + if(path == null){ + JFileChooser dialog = new JFileChooser(); + dialog.setDialogTitle("Save an AppThinker project"); + dialog.setDialogType(JFileChooser.SAVE_DIALOG); + dialog.setFileFilter(fileFilter); + dialog.setAcceptAllFileFilterUsed(false); + if(dialog.showOpenDialog(null) == JFileChooser.APPROVE_OPTION){ + String filePath = dialog.getSelectedFile().getPath(); + path = (filePath.contains(".appt")) ? filePath : filePath + ".appt"; + } + } + //On serialize le projet dans un fichier + _project.setPath(path); + ObjectOutputStream oos = null; + try { + final FileOutputStream fichier = new FileOutputStream(path); + oos = new ObjectOutputStream(fichier); + oos.writeObject(_project); + oos.flush(); + } catch (final java.io.IOException e) { + e.printStackTrace(); + } finally { + try { + if (oos != null) { + oos.flush(); + oos.close(); + displayProject(); + _window.getStatusbar().setStatusMessage("The project was saved successfully."); + } + } catch (final IOException ex) { + ex.printStackTrace(); + } + } } /** * Sauvegarde le projet en cours à un autre emplacement. */ public static void saveAsProject(){ + //Enregistrer le projet sous un autre emplacement + FileNameExtensionFilter fileFilter = new FileNameExtensionFilter("AppThinker project", "appt"); + String path = _project.getPath(); + JFileChooser dialog = new JFileChooser(); + dialog.setDialogTitle("Save an AppThinker project"); + dialog.setDialogType(JFileChooser.SAVE_DIALOG); + dialog.setFileFilter(fileFilter); + dialog.setAcceptAllFileFilterUsed(false); + if(dialog.showOpenDialog(null) == JFileChooser.APPROVE_OPTION){ + String filePath = dialog.getSelectedFile().getPath(); + path = (filePath.contains(".appt")) ? filePath : filePath + ".appt"; + } + + //On serialize le projet dans un fichier + _project.setPath(path); + ObjectOutputStream oos = null; + try { + final FileOutputStream fichier = new FileOutputStream(path); + oos = new ObjectOutputStream(fichier); + oos.writeObject(_project); + oos.flush(); + } catch (final java.io.IOException e) { + e.printStackTrace(); + } finally { + try { + if (oos != null) { + oos.flush(); + oos.close(); + displayProject(); + _window.getStatusbar().setStatusMessage("The project was saved on a new location."); + } + } catch (final IOException ex) { + ex.printStackTrace(); + } + } } /** @@ -70,7 +181,7 @@ public class AppThinker { _window.getMenubar().setProjectEnable(false); _project.getUmlDiagram().getToolbar().setEnabled(false); _window.getStatusbar().setStatusMessage("The project has been closed."); - _window.getStatusbar().setFileMessage("No open project."); + _window.getStatusbar().setFileMessage("No project opened."); _window.clearProject(); _project = null; } diff --git a/AppThinker/src/AppThinkerMenuBar.java b/AppThinker/src/AppThinkerMenuBar.java index 6bf1150..760ae34 100644 --- a/AppThinker/src/AppThinkerMenuBar.java +++ b/AppThinker/src/AppThinkerMenuBar.java @@ -180,6 +180,7 @@ public class AppThinkerMenuBar extends JMenuBar { /** * Active/Désactive les boutons relatifs au projet. + * @param enabled Le paramètre d'activation. */ public void setProjectEnable(boolean enabled){ _saveProject.setEnabled(enabled); diff --git a/AppThinker/src/AppThinkerStatusbar.java b/AppThinker/src/AppThinkerStatusbar.java index 943ed95..fdd5392 100644 --- a/AppThinker/src/AppThinkerStatusbar.java +++ b/AppThinker/src/AppThinkerStatusbar.java @@ -39,7 +39,7 @@ public class AppThinkerStatusbar extends JPanel { this.add(actionBar); - _fileLabel = new JLabel("No open project."); + _fileLabel = new JLabel("No project opened."); _fileLabel.setHorizontalAlignment(JLabel.RIGHT); this.add(_fileLabel); } diff --git a/AppThinker/src/AppThinkerToolbar.java b/AppThinker/src/AppThinkerToolbar.java index 6178335..bec324c 100644 --- a/AppThinker/src/AppThinkerToolbar.java +++ b/AppThinker/src/AppThinkerToolbar.java @@ -38,6 +38,7 @@ public class AppThinkerToolbar extends JPanel { /** * Constructeur de la classe AppThinkerToolbar + * @param diagram Le diagramme UML auquel appartient la toolbar. */ public AppThinkerToolbar(UmlDiagram diagram){ _umlDiagram = diagram; diff --git a/AppThinker/src/Argument.java b/AppThinker/src/Argument.java index 3dc5188..68445d1 100644 --- a/AppThinker/src/Argument.java +++ b/AppThinker/src/Argument.java @@ -1,10 +1,11 @@ +import java.io.Serializable; import java.util.List; /** * Gère un argument d'une méthode. * @author V.BOULANGER */ -public class Argument { +public class Argument implements Serializable { public static int _argumentId; diff --git a/AppThinker/src/Attribute.java b/AppThinker/src/Attribute.java index 9f2b065..74d57ca 100644 --- a/AppThinker/src/Attribute.java +++ b/AppThinker/src/Attribute.java @@ -1,10 +1,12 @@ import org.w3c.dom.Attr; +import java.io.Serializable; + /** * Gère un attribut. * @author V.BOULANGER */ -public class Attribute { +public class Attribute implements Serializable { public static int _attributeId = 0; public static final String PRIVATE = "-"; @@ -15,6 +17,12 @@ public class Attribute { private String _access; private String _type; private String _name; + private boolean _isStatic; + private boolean _isFinal; + private boolean _isAbstract; + private boolean _isSynchronized; + private boolean _isVolatile; + private boolean _isTransient; /** * Constructeur - Crée une instance de Attribute. @@ -96,4 +104,100 @@ public class Attribute { public void setName(String name) { this._name = name; } + + /** + * Retourne si l'attribut est statique ou non. + * @return true : l'attribut est statique, false: l'attribut n'est pas statique. + */ + public boolean isStatic() { + return _isStatic; + } + + /** + * Paramètre la caractéristique statique de l'attribut. + * @param s true : l'attribut est statique, false : l'attribut n'est pas statique + */ + public void setStatic(boolean s) { + this._isStatic = s; + } + + /** + * Retourne si l'attribut est final ou non. + * @return true : l'attribut est final, false: l'attribut n'est pas final. + */ + public boolean isFinal() { + return _isFinal; + } + + /** + * Paramètre la caractéristique final de l'attribut. + * @param f true : l'attribut est final, false : l'attribut n'est pas final + */ + public void setFinal(boolean f) { + this._isFinal = f; + } + + /** + * Retourne si l'attribut est abstrait ou non. + * @return true : l'attribut est abstrait, false: l'attribut n'est pas abstrait. + */ + public boolean isAbstract() { + return _isAbstract; + } + + /** + * Paramètre la caractéristique abstraite de l'attribut. + * @param a true : l'attribut est abstrait, false : l'attribut n'est pas abstrait. + */ + public void setAbstract(boolean a) { + this._isAbstract = a; + } + + /** + * Retourne si l'attribut est synchronisé ou non. + * @return true : l'attribut est synchronisé, false: l'attribut n'est pas synchronisé. + */ + public boolean isSynchronized() { + return _isSynchronized; + } + + /** + * Paramètre la caractéristique synchronisée de l'attribut. + * @param s true : l'attribut est synchronisé, false : l'attribut n'est pas synchronisé. + */ + public void setSynchronized(boolean s) { + this._isSynchronized = s; + } + + /** + * Retourne si l'attribut est volatile ou non. + * @return true : l'attribut est volatile, false: l'attribut n'est pas volatile. + */ + public boolean isVolatile() { + return _isVolatile; + } + + /** + * Paramètre la caractéristique volatile de l'attribut. + * @param v true : l'attribut est volatile, false : l'attribut n'est pas volatile + */ + public void setVolatile(boolean v) { + this._isVolatile = v; + } + + /** + * Retourne si l'attribut est transitoire ou non. + * @return true : l'attribut est transitoire, false: l'attribut n'est pas transitoire. + */ + public boolean isTransient() { + return _isTransient; + } + + /** + * Paramètre la caractéristique transitoire de l'attribut. + * @param t true : l'attribut est transitoire, false : l'attribut n'est pas transitoire + */ + public void setTransient(boolean t) { + this._isTransient = t; + } } diff --git a/AppThinker/src/Class.java b/AppThinker/src/Class.java index a956745..dbb6616 100644 --- a/AppThinker/src/Class.java +++ b/AppThinker/src/Class.java @@ -1,5 +1,6 @@ import javax.swing.*; import java.awt.*; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -7,7 +8,7 @@ import java.util.List; * Gère une classe du projet. * @author V.BOULANGER */ -public class Class { +public class Class implements Serializable { public static int _classId = 0; public static final int RECTANGLE = 0; diff --git a/AppThinker/src/ClassPropertiesWindow.java b/AppThinker/src/ClassPropertiesWindow.java index da231dc..6076555 100644 --- a/AppThinker/src/ClassPropertiesWindow.java +++ b/AppThinker/src/ClassPropertiesWindow.java @@ -19,11 +19,11 @@ public class ClassPropertiesWindow extends JFrame { private JTextField _nameField; private JTable _attributesTable; private JScrollPane _scrollAttributes; - private String[] _attributesColumns = {"Name", "Access modifier", "Type"}; + private String[] _attributesColumns = {"Name", "Access modifier", "Type", "Static", "Final", "Abstract", "Synchronised", "Volatile", "Transient"}; private DefaultTableModel _attributeModel; private JTable _methodsTable; private JScrollPane _scrollMethods; - private String[] _methodsColumns = {"Name", "Access modifier", "Type", "Arguments"}; + private String[] _methodsColumns = {"Name", "Access modifier", "Type", "Arguments", "Static", "Final", "Abstract", "Synchronised", "Volatile", "Transient"}; private DefaultTableModel _methodModel; @@ -170,6 +170,7 @@ public class ClassPropertiesWindow extends JFrame { /** * Ouvre une fenêtre d'édition des arguments pour la méthode sélectionnée + * @param m La méthode dans laquelle seront modifiés les arguments. */ public void openArgumentsWindow(Method m){ ArgumentsPropertiesWindow argsWin = new ArgumentsPropertiesWindow(this, _umlDiagram, m); @@ -221,7 +222,7 @@ public class ClassPropertiesWindow extends JFrame { access = "PROTECTED"; break; } - _attributeModel.addRow(new Object[]{attr.getName(), access, attr.getType()}); + _attributeModel.addRow(new Object[]{attr.getName(), access, attr.getType(), attr.isStatic(), attr.isFinal(), attr.isAbstract(), attr.isSynchronized(), attr.isVolatile(), attr.isTransient()}); } //On ajoute les contrôles pour chaque colonne JComboBox accessComboBox = new JComboBox(); @@ -245,6 +246,25 @@ public class ClassPropertiesWindow extends JFrame { typeComboBox.addItem("String"); TableColumn typeColumn = _attributesTable.getColumn(_attributesColumns[2]); typeColumn.setCellEditor(new DefaultCellEditor(typeComboBox)); + + JCheckBox staticComboBox = new JCheckBox(); + TableColumn staticColumn = _attributesTable.getColumn(_attributesColumns[3]); + staticColumn.setCellEditor(new DefaultCellEditor(staticComboBox)); + JCheckBox finalComboBox = new JCheckBox(); + TableColumn finalColumn = _attributesTable.getColumn(_attributesColumns[4]); + finalColumn.setCellEditor(new DefaultCellEditor(finalComboBox)); + JCheckBox abstractComboBox = new JCheckBox(); + TableColumn abstractColumn = _attributesTable.getColumn(_attributesColumns[5]); + abstractColumn.setCellEditor(new DefaultCellEditor(abstractComboBox)); + JCheckBox synchronizedComboBox = new JCheckBox(); + TableColumn synchronizedColumn = _attributesTable.getColumn(_attributesColumns[6]); + synchronizedColumn.setCellEditor(new DefaultCellEditor(synchronizedComboBox)); + JCheckBox volatileComboBox = new JCheckBox(); + TableColumn volatileColumn = _attributesTable.getColumn(_attributesColumns[7]); + volatileColumn.setCellEditor(new DefaultCellEditor(volatileComboBox)); + JCheckBox transientComboBox = new JCheckBox(); + TableColumn transientColumn = _attributesTable.getColumn(_attributesColumns[8]); + transientColumn.setCellEditor(new DefaultCellEditor(transientComboBox)); } /** @@ -285,7 +305,7 @@ public class ClassPropertiesWindow extends JFrame { access = "PROTECTED"; break; } - _methodModel.addRow(new Object[]{meth.getName(), access, meth.getType(), "..."}); + _methodModel.addRow(new Object[]{meth.getName(), access, meth.getType(), "...", meth.isStatic(), meth.isFinal(), meth.isAbstract(), meth.isSynchronized(), meth.isVolatile(), meth.isTransient()}); } //On ajoute les contrôles pour chaque colonne JComboBox accessComboBox = new JComboBox(); @@ -314,6 +334,25 @@ public class ClassPropertiesWindow extends JFrame { argsField.setEnabled(false); TableColumn argColumn = _methodsTable.getColumn(_methodsColumns[3]); argColumn.setCellEditor(new DefaultCellEditor(argsField)); + + JCheckBox staticComboBox = new JCheckBox(); + TableColumn staticColumn = _methodsTable.getColumn(_methodsColumns[4]); + staticColumn.setCellEditor(new DefaultCellEditor(staticComboBox)); + JCheckBox finalComboBox = new JCheckBox(); + TableColumn finalColumn = _methodsTable.getColumn(_methodsColumns[5]); + finalColumn.setCellEditor(new DefaultCellEditor(finalComboBox)); + JCheckBox abstractComboBox = new JCheckBox(); + TableColumn abstractColumn = _methodsTable.getColumn(_methodsColumns[6]); + abstractColumn.setCellEditor(new DefaultCellEditor(abstractComboBox)); + JCheckBox synchronizedComboBox = new JCheckBox(); + TableColumn synchronizedColumn = _methodsTable.getColumn(_methodsColumns[7]); + synchronizedColumn.setCellEditor(new DefaultCellEditor(synchronizedComboBox)); + JCheckBox volatileComboBox = new JCheckBox(); + TableColumn volatileColumn = _methodsTable.getColumn(_methodsColumns[8]); + volatileColumn.setCellEditor(new DefaultCellEditor(volatileComboBox)); + JCheckBox transientComboBox = new JCheckBox(); + TableColumn transientColumn = _methodsTable.getColumn(_methodsColumns[9]); + transientColumn.setCellEditor(new DefaultCellEditor(transientComboBox)); } @@ -340,8 +379,14 @@ public class ClassPropertiesWindow extends JFrame { _class.getAttributes().get(i).setAccess(Attribute.PROTECTED); break; } - _class.getAttributes().get(i).setType(vect.get(2).toString()); _class.getAttributes().get(i).setName(vect.get(0).toString()); + _class.getAttributes().get(i).setType(vect.get(2).toString()); + _class.getAttributes().get(i).setStatic((boolean) vect.get(3)); + _class.getAttributes().get(i).setFinal((boolean) vect.get(4)); + _class.getAttributes().get(i).setAbstract((boolean) vect.get(5)); + _class.getAttributes().get(i).setSynchronized((boolean) vect.get(6)); + _class.getAttributes().get(i).setVolatile((boolean) vect.get(7)); + _class.getAttributes().get(i).setTransient((boolean) vect.get(8)); } //Enregistrement des méthodes _methodsTable.editCellAt(0,0); @@ -359,8 +404,14 @@ public class ClassPropertiesWindow extends JFrame { _class.getMethods().get(i).setAccess(Method.PROTECTED); break; } - _class.getMethods().get(i).setType(vect.get(2).toString()); _class.getMethods().get(i).setName(vect.get(0).toString()); + _class.getMethods().get(i).setType(vect.get(2).toString()); + _class.getMethods().get(i).setStatic((boolean) vect.get(4)); + _class.getMethods().get(i).setFinal((boolean) vect.get(5)); + _class.getMethods().get(i).setAbstract((boolean) vect.get(6)); + _class.getMethods().get(i).setSynchronized((boolean) vect.get(7)); + _class.getMethods().get(i).setVolatile((boolean) vect.get(8)); + _class.getMethods().get(i).setTransient((boolean) vect.get(9)); } //Rafraichissement de l'affichage diff --git a/AppThinker/src/Link.java b/AppThinker/src/Link.java index 60df2ce..5c84871 100644 --- a/AppThinker/src/Link.java +++ b/AppThinker/src/Link.java @@ -1,8 +1,10 @@ +import java.io.Serializable; + /** * Gère un lien entre deux classes. * @author V.BOULANGER */ -public class Link { +public class Link implements Serializable{ public static int _linkId = 0; public static final int STRONG = 0; diff --git a/AppThinker/src/Method.java b/AppThinker/src/Method.java index 5f95d0e..cd843ff 100644 --- a/AppThinker/src/Method.java +++ b/AppThinker/src/Method.java @@ -1,3 +1,4 @@ +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -5,7 +6,7 @@ import java.util.List; * Gère une méthode. * @author V.BOULANGER */ -public class Method { +public class Method implements Serializable { public static int _methodId = 0; public static final String PRIVATE = "-"; @@ -17,6 +18,12 @@ public class Method { private String _type; private String _name; private List _arguments; + private boolean _isStatic; + private boolean _isFinal; + private boolean _isAbstract; + private boolean _isSynchronized; + private boolean _isVolatile; + private boolean _isTransient; /** * Constructeur - Crée une instance de Method. @@ -140,4 +147,100 @@ public class Method { public void clearArguments(){ this._arguments.clear(); } + + /** + * Retourne si l'attribut est statique ou non. + * @return true : l'attribut est statique, false: l'attribut n'est pas statique. + */ + public boolean isStatic() { + return _isStatic; + } + + /** + * Paramètre la caractéristique statique de l'attribut. + * @param s true : l'attribut est statique, false : l'attribut n'est pas statique + */ + public void setStatic(boolean s) { + this._isStatic = s; + } + + /** + * Retourne si l'attribut est final ou non. + * @return true : l'attribut est final, false: l'attribut n'est pas final. + */ + public boolean isFinal() { + return _isFinal; + } + + /** + * Paramètre la caractéristique final de l'attribut. + * @param f true : l'attribut est final, false : l'attribut n'est pas final + */ + public void setFinal(boolean f) { + this._isFinal = f; + } + + /** + * Retourne si l'attribut est abstrait ou non. + * @return true : l'attribut est abstrait, false: l'attribut n'est pas abstrait. + */ + public boolean isAbstract() { + return _isAbstract; + } + + /** + * Paramètre la caractéristique abstraite de l'attribut. + * @param a true : l'attribut est abstrait, false : l'attribut n'est pas abstrait. + */ + public void setAbstract(boolean a) { + this._isAbstract = a; + } + + /** + * Retourne si l'attribut est synchronisé ou non. + * @return true : l'attribut est synchronisé, false: l'attribut n'est pas synchronisé. + */ + public boolean isSynchronized() { + return _isSynchronized; + } + + /** + * Paramètre la caractéristique synchronisée de l'attribut. + * @param s true : l'attribut est synchronisé, false : l'attribut n'est pas synchronisé. + */ + public void setSynchronized(boolean s) { + this._isSynchronized = s; + } + + /** + * Retourne si l'attribut est volatile ou non. + * @return true : l'attribut est volatile, false: l'attribut n'est pas volatile. + */ + public boolean isVolatile() { + return _isVolatile; + } + + /** + * Paramètre la caractéristique volatile de l'attribut. + * @param v true : l'attribut est volatile, false : l'attribut n'est pas volatile + */ + public void setVolatile(boolean v) { + this._isVolatile = v; + } + + /** + * Retourne si l'attribut est transitoire ou non. + * @return true : l'attribut est transitoire, false: l'attribut n'est pas transitoire. + */ + public boolean isTransient() { + return _isTransient; + } + + /** + * Paramètre la caractéristique transitoire de l'attribut. + * @param t true : l'attribut est transitoire, false : l'attribut n'est pas transitoire + */ + public void setTransient(boolean t) { + this._isTransient = t; + } } diff --git a/AppThinker/src/Project.java b/AppThinker/src/Project.java index a6d0d0d..2c927dc 100644 --- a/AppThinker/src/Project.java +++ b/AppThinker/src/Project.java @@ -1,3 +1,4 @@ +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -5,7 +6,7 @@ import java.util.List; * Gère un projet. * @author V.BOULANGER */ -public class Project { +public class Project implements Serializable { public static int _projectId = 0; diff --git a/AppThinker/src/UmlDiagram.java b/AppThinker/src/UmlDiagram.java index 6e22f59..0e7d660 100644 --- a/AppThinker/src/UmlDiagram.java +++ b/AppThinker/src/UmlDiagram.java @@ -3,6 +3,7 @@ import java.awt.*; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * Cette classe permet d'afficher l'ensemble des éléments du projet sous la forme d'un diagramme UML. * @author V.BOULANGER */ -public class UmlDiagram extends JPanel implements MouseListener, MouseMotionListener { +public class UmlDiagram extends JPanel implements MouseListener, MouseMotionListener, Serializable { private Project _project; private AppThinkerToolbar _toolbar; @@ -71,6 +72,8 @@ public class UmlDiagram extends JPanel implements MouseListener, MouseMotionList for(Attribute b : a.getAttributes()){ posCounter += font2.getSize(); g.drawString(b.getAccess() + " " + b.getName() + " : " + b.getType(), posX, posCounter); + //Si l'attribut est statique, on le souligne + if(b.isStatic()) g.drawLine(a.getPosX()-a.getSizeX()/2+10, posCounter+1, a.getPosX()+a.getSizeX()/2-10, posCounter+1); } posCounter += 5; g.setColor(new Color(218, 233, 244)); @@ -90,6 +93,9 @@ public class UmlDiagram extends JPanel implements MouseListener, MouseMotionList //chain = chain.substring(0, chain.length()-2); chain += String.join(", ", listArguments) + ") : " + m.getType(); g.drawString(chain, posX, posCounter); + //Si l'attribut est statique, on le souligne + if(m.isStatic()) g.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){ diff --git a/appthinker.iml b/appthinker.iml new file mode 100644 index 0000000..663df75 --- /dev/null +++ b/appthinker.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file