From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:10 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2306 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Tue, 02 Jun 2009 16:21:13 +0200
Message-ID: <20090602142113.6DEED461BF7@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7425747755786840862=="

--===============7425747755786840862==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: chatellier
Date: 2009-06-02 14:21:12 +0000 (Tue, 02 Jun 2009)
New Revision: 2306

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifi=
er.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.j=
ava
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.j=
axx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx
Log:
Update cancel refreshAll UI.

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.j=
axx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	20=
09-06-02 14:14:55 UTC (rev 2305)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	20=
09-06-02 14:21:12 UTC (rev 2306)
@@ -15,7 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
- *##%*/ -->
+ *##%*/
+-->
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <script><![CDATA[

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSav=
eVerifier.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerif=
ier.java	2009-06-02 14:14:55 UTC (rev 2305)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerif=
ier.java	2009-06-02 14:21:12 UTC (rev 2306)
@@ -41,9 +41,6 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
=20
-import jaxx.runtime.JAXXAction;
-import jaxx.runtime.JAXXContext;
-import jaxx.runtime.JAXXInitialContext;
 import jaxx.runtime.swing.ErrorDialogUI;
 import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode;
=20
@@ -69,14 +66,18 @@
  * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 ao=C3=BB 2008) $
  * by : $Author: sletellier $
  */
-public class InputSaveVerifier implements JAXXAction, SaveVerifier {
+public class InputSaveVerifier implements SaveVerifier {
=20
     /** Class logger. */
-    private static Log log =3D LogFactory.getLog(InputAction.class);
-   =20
+    private static Log log =3D LogFactory.getLog(InputSaveVerifier.class);
+
+    /** New button. Used to create new {@link #type} component. */
     protected JButton currentNewButton =3D null;
+    /** Delete button. */
     protected JButton currentDeleteButton =3D null;
+    /** Save button. */
     protected JButton currentSaveButton =3D null;
+    /** Cancel button. */
     protected JButton currentCancelButton =3D null;
=20
     protected ActionListener saveListener =3D new ActionListener() {
@@ -85,21 +86,21 @@
             topiaSave();
         }
     };
-   =20
+
     protected ActionListener cancelListener =3D new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
             topiaCancel();
         }
     };
-   =20
+
     protected ActionListener newListener =3D new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
             topiaCreate();
         }
     };
-   =20
+
     protected ActionListener deleteListener =3D new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
@@ -107,6 +108,7 @@
         }
     };
=20
+    /** Entity type for new creation. */
     protected String type =3D null;
=20
     protected boolean editable =3D false;
@@ -116,21 +118,17 @@
     protected String currentOnglet =3D null;
=20
     protected TopiaContext isisContext =3D null;
-    protected Map<String, TopiaEntity> currentEntities =3D new HashMap <Stri=
ng, TopiaEntity>();
-    protected List<InputContentUI> currentPanels =3D new ArrayList <InputCon=
tentUI>();
+   =20
+    /**
+     * Map entity key to {@link TopiaEntity}.
+     */
+    protected Map<String, TopiaEntity> currentEntities =3D new HashMap<Strin=
g, TopiaEntity>();
+    protected ArrayList<InputContentUI> currentPanels =3D new ArrayList<Inpu=
tContentUI>();
=20
     protected InputUI rootUI;
     protected SensitivityTabUI sensUI;
=20
-    public InputSaveVerifier() {
-    }
-
     @Override
-    public JAXXInitialContext init(JAXXContext parentContent, Object... data=
s) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
     public int checkEdit() {
         int response =3D JOptionPane.NO_OPTION;
         if (editable) {
@@ -198,26 +196,34 @@
      * Refresh all ui component where name match "input&lt;entity type witho=
ut
      * package &gt;.*"
      */
-    public void topiaRemove() {
+    protected void topiaRemove() {
         if (log.isTraceEnabled()) {
             log.trace("remove called");
         }
         String msg =3D "";
         try {
             boolean doDelete;
-            TopiaEntity topiaEntity =3D (TopiaEntity) currentNode.getJAXXCon=
textValue(rootUI);
+            TopiaEntity topiaEntity =3D (TopiaEntity) currentNode
+                    .getJAXXContextValue(rootUI);
             List<TopiaEntity> allWillBeRemoved =3D topiaEntity.getComposite(=
);
             if (allWillBeRemoved.size() > 0) {
-                String label =3D _("isisfish.message.delete.object", topiaEn=
tity.toString());
+                String label =3D _("isisfish.message.delete.object", topiaEn=
tity
+                        .toString());
                 String text =3D "";
                 for (TopiaEntity e : allWillBeRemoved) {
-                    text +=3D ClassUtils.getShortClassName(e.getClass()) + "=
 - " + e.toString() + "\n";
+                    text +=3D ClassUtils.getShortClassName(e.getClass()) + "=
 - "
+                            + e.toString() + "\n";
                 }
-                int resp =3D showTextAreaConfirmationMessage(null, label, te=
xt, _("isisfish.message.delete.entities"), JOptionPane.YES_NO_OPTION);
+                int resp =3D showTextAreaConfirmationMessage(null, label, te=
xt,
+                        _("isisfish.message.delete.entities"),
+                        JOptionPane.YES_NO_OPTION);
                 doDelete =3D resp =3D=3D JOptionPane.YES_OPTION;
             } else {
-                String text =3D _("isisfish.message.confirm.delete.object", =
topiaEntity.toString());
-                int resp =3D JOptionPane.showConfirmDialog(null, text, _("is=
isfish.message.delete.entity"), JOptionPane.YES_NO_OPTION);
+                String text =3D _("isisfish.message.confirm.delete.object",
+                        topiaEntity.toString());
+                int resp =3D JOptionPane.showConfirmDialog(null, text,
+                        _("isisfish.message.delete.entity"),
+                        JOptionPane.YES_NO_OPTION);
                 doDelete =3D resp =3D=3D JOptionPane.YES_OPTION;
             }
=20
@@ -230,7 +236,8 @@
             }
         } catch (Exception eee) {
             if (log.isErrorEnabled()) {
-                log.error("Can't remove entity: " + currentEntities.get(0), =
eee);
+                log.error("Can't remove entity: "
+                                        + currentEntities.get(0), eee);
             }
             ErrorDialogUI.showError(eee);
         }
@@ -251,15 +258,17 @@
      * @param option
      * @return user response
      */
-    protected int showTextAreaConfirmationMessage(Component parent, String l=
abelMessage, String textMessage, String title, int option) {
+    protected int showTextAreaConfirmationMessage(Component parent,
+            String labelMessage, String textMessage, String title, int optio=
n) {
         JLabel labelForMessage =3D new JLabel(labelMessage);
         JTextArea areaForMessage =3D new JTextArea(textMessage);
         areaForMessage.setEditable(false);
         areaForMessage.setAutoscrolls(true);
         JScrollPane spMessage =3D new JScrollPane(areaForMessage);
         spMessage.setPreferredSize(new Dimension(500, 100)); // don't remove=
 popup is huge
-       =20
-        int response =3D JOptionPane.showConfirmDialog(parent, new Object[]{=
labelForMessage, spMessage}, title, option);
+
+        int response =3D JOptionPane.showConfirmDialog(parent, new Object[] {
+                labelForMessage, spMessage }, title, option);
         return response;
     }
=20
@@ -302,10 +311,16 @@
         }
     }
=20
-    public void topiaSave() {
+    /**
+     * Save all non saved entities.
+     *=20
+     * Change registred button states.
+     * Commi opened topia context.
+     */
+    protected void topiaSave() {
         try {
             noModif();
-            for (TopiaEntity t : currentEntities.values()){
+            for (TopiaEntity t : currentEntities.values()) {
                 t.update();
                 if (log.isDebugEnabled()) {
                     log.debug("updating : " + t);
@@ -326,28 +341,34 @@
      * Cancel all modification on entity (rollback), and force reload it and
      * refresh all ui component that name match 'type'Tab
      */
-    public void topiaCancel() {
+    protected void topiaCancel() {
         try {
             noModif();
             isisContext.rollbackTransaction();
             Map<String, TopiaEntity> canceledEntity =3D new HashMap<String, =
TopiaEntity>();
-            for (Entry<String, TopiaEntity> currentEntity : currentEntities.=
entrySet()) {
-                TopiaEntity t =3D isisContext.findByTopiaId(currentEntity.ge=
tValue().getTopiaId());
-           =20
-                   // TODO a quoi ca sert de recharger les entit=C3=A9s ?
-                    // desynchronise la pr=C3=A9c=C3=A9dente
-                    // fix : org.hibernate.NonUniqueObjectException: a diffe=
rent object with the
-                    // same identifier value was already associated with the=
 session
-                    //((TopiaContextImpl)isisContext).getHibernate().evict(t=
2);
-                    //t.setTopiaId(null);
+            for (Entry<String, TopiaEntity> currentEntity : currentEntities
+                    .entrySet()) {
+                TopiaEntity t =3D isisContext.findByTopiaId(currentEntity
+                        .getValue().getTopiaId());
=20
-                    rootUI.repaintNode(currentNode.getContextPath());
-                    rootUI.setTreeSelection(currentNode.getContextPath());
+                // TODO a quoi ca sert de recharger les entit=C3=A9s ?
+                // desynchronise la pr=C3=A9c=C3=A9dente
+                // fix : org.hibernate.NonUniqueObjectException: a different=
 object with the
+                // same identifier value was already associated with the ses=
sion
+                //((TopiaContextImpl)isisContext).getHibernate().evict(t2);
+                //t.setTopiaId(null);
=20
-                    String key =3D currentEntity.getKey();
-                    canceledEntity.put(key, t);
-                    addCurrentEntity(t);
-               }
+                rootUI.repaintNode(currentNode.getContextPath());
+                rootUI.setTreeSelection(currentNode.getContextPath());
+
+                String key =3D currentEntity.getKey();
+                canceledEntity.put(key, t);
+                addCurrentEntity(t);
+            }
+
+            // refresh all registred panel
+            // to discard modification in UI
+            refreshAll();
             rootUI.setInfoText(_("isisfish.message.cancel.finished"));
         } catch (Exception eee) {
             if (log.isErrorEnabled()) {
@@ -357,55 +378,98 @@
         }
     }
=20
-    protected void showMsgBox(Exception eee) {
-        ErrorDialogUI.showError(eee);
+    /**
+     * Display exception into jaxx error dialog component.
+     *=20
+     * @param e exception to display
+     */
+    protected void showMsgBox(Exception e) {
+        ErrorDialogUI.showError(e);
     }
=20
     protected void setPanelsActifs() {
-        if (!currentPanels.isEmpty()) {
-            for (InputContentUI panel : currentPanels) {
-                panel.setActif(editable);
-            }
+        for (InputContentUI panel : currentPanels) {
+            panel.setActif(editable);
         }
     }
=20
+    /**
+     * Refresh all registred {@link InputContentUI} component.
+     *=20
+     * Call {@link InputContentUI#refresh()} method on each component.=20
+     */
     public void refreshAll() {
-        for (InputContentUI panel : currentPanels) {
+       =20
+        // chatellier 20090602 refresh() call addCurrentPanel
+        // and cause ConcurentModificationException.
+        List<InputContentUI> panelsToRefresh =3D (ArrayList<InputContentUI>)=
currentPanels.clone();
+        for (InputContentUI panel : panelsToRefresh) {
             panel.refresh();
             panel.setActif(editable);
         }
     }
=20
+    /**
+     * Add entity to check for modification.
+     *=20
+     * The verifier register to entity using {@link TopiaEntity#addPropertyC=
hangeListener(PropertyChangeListener)}.
+     * So modification have to be done on current entity.
+     *=20
+     * To check for embedded entity, add it too.
+     *=20
+     * Remove all entity with key=20
+     *=20
+     * @param currentEntity entity to check
+     * @param key specific key (defaut to topiaId)
+     */
     public void addCurrentEntity(TopiaEntity currentEntity, String key) {
         if (currentEntity !=3D null) {
             editable =3D true;
             isisContext =3D currentEntity.getTopiaContext();
-            currentEntity.addPropertyChangeListener(new PropertyChangeListen=
er() {
-                @Override
-                public void propertyChange(PropertyChangeEvent evt) {
-                    if (log.isDebugEnabled()) {
-                        log.debug("PropertyChanged : "
-                                + evt.getPropertyName()
-                                + " New Value : " + evt.getNewValue());
-                    }
-                    topiaChanged();
-                }
-            });
-            TopiaEntity entity =3D getEntity(currentEntity.getClass());
-            if (entity !=3D null) {
-                currentEntities.remove(entity);
-            }
+            currentEntity
+                    .addPropertyChangeListener(new PropertyChangeListener() {
+                        @Override
+                        public void propertyChange(PropertyChangeEvent evt) {
+                            if (log.isDebugEnabled()) {
+                                log.debug("PropertyChanged : "
+                                        + evt.getPropertyName()
+                                        + " New Value : " + evt.getNewValue(=
));
+                            }
+                            topiaChanged();
+                        }
+                    });
+            // chatellier 20090602 , pas sur du code suivant
+            // plutot ne rien faire, si une autre entite de la meme
+            // cl=C3=A9 est ajout=C3=A9e, elle sera ecras=C3=A9e
+            //TopiaEntity entity =3D getEntity(currentEntity.getClass());
+            //if (entity !=3D null) {
+            //    currentEntities.remove(entity);
+            //}
+
             this.currentEntities.put(key, currentEntity);
             setPanelsActifs();
         }
     }
=20
+    /**
+     * Add entity to check for modification.
+     *=20
+     * The verifier register to entity using {@link TopiaEntity#addPropertyC=
hangeListener(PropertyChangeListener)}.
+     * So modification have to be done on current entity.
+     *=20
+     * To check for embedded entity, add it too.
+     *=20
+     * Remove all entity with key=20
+     *=20
+     * @param currentEntity entity to check
+     */
     public void addCurrentEntity(TopiaEntity currentEntity) {
-        if (currentEntity !=3D null){
+        if (currentEntity !=3D null) {
             addCurrentEntity(currentEntity, currentEntity.getTopiaId());
         }
     }
-    public void reset(){
+
+    public void reset() {
         removeAllEntity();
         removeAllPanels();
         this.currentCancelButton =3D null;
@@ -415,7 +479,8 @@
         this.currentOnglet =3D null;
         this.currentNode =3D null;
     }
-    public void removeAllEntity(){
+
+    public void removeAllEntity() {
         currentEntities.clear();
         editable =3D false;
         noModif();
@@ -449,6 +514,7 @@
=20
     public void setSaveButton(JButton saveButton, Boolean listener) {
         if (listener) {
+            // TODO what is it for (remove/readd) ?
             saveButton.removeActionListener(saveListener);
             saveButton.addActionListener(saveListener);
         }
@@ -463,6 +529,7 @@
=20
     public void setNewButton(JButton newButton, String t, Boolean listener) {
         if (listener) {
+            // TODO what is it for (remove/readd) ?
             newButton.removeActionListener(newListener);
             newButton.addActionListener(newListener);
         }
@@ -502,13 +569,13 @@
         return currentEntities.values();
     }
=20
-    public <E extends TopiaEntity>  E getEntity(Class<E> clazz, String key){
-        return (E)currentEntities.get(key);
+    public <E extends TopiaEntity> E getEntity(Class<E> clazz, String key) {
+        return (E) currentEntities.get(key);
     }
-   =20
-    public <E extends TopiaEntity>  E getEntity(Class<E> clazz){
-        for (TopiaEntity te : currentEntities.values()){
-            if (clazz.isInstance(te)){
+
+    public <E extends TopiaEntity> E getEntity(Class<E> clazz) {
+        for (TopiaEntity te : currentEntities.values()) {
+            if (clazz.isInstance(te)) {
                 return (E) te;
             }
         }
@@ -543,7 +610,7 @@
         this.currentNode =3D currentNode;
     }
=20
-    void setRootPanel(InputUI inputUI) {
+    protected void setRootPanel(InputUI inputUI) {
         this.rootUI =3D inputUI;
     }
=20

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapE=
vents.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.=
java	2009-06-02 14:14:55 UTC (rev 2305)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.=
java	2009-06-02 14:21:12 UTC (rev 2306)
@@ -20,9 +20,6 @@
=20
 import java.awt.event.MouseEvent;
=20
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import com.bbn.openmap.Layer;
 import com.bbn.openmap.event.MapMouseListener;
 import com.bbn.openmap.event.MapMouseMode;

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
TabUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.=
jaxx	2009-06-02 14:14:55 UTC (rev 2305)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.=
jaxx	2009-06-02 14:21:12 UTC (rev 2306)
@@ -39,6 +39,10 @@
     getVerifier().setNewButton(create, "Strategy");
     getVerifier().setDeleteButton(remove);
     Strategy strategy =3D (Strategy)getVerifier().getEntity(Strategy.class);
+   =20
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((StrategyImpl) strategy);
=20
     if (getBean() !=3D null) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
UI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jax=
x	2009-06-02 14:14:55 UTC (rev 2305)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jax=
x	2009-06-02 14:21:12 UTC (rev 2306)
@@ -23,14 +23,12 @@
 import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
=20
 getVerifier().addCurrentPanel(this);
-
 public void refresh() {
     if (isSens()){
         strategyTab.addChangeListener(new SensitivityTabbedPaneListener());
     } else {
         strategyTab.addChangeListener(new InputTabbedPaneListener());
     }
-    getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI);
 }
     ]]></script>
     <JPanel id=3D'body' layout=3D'{new BorderLayout()}'>


--===============7425747755786840862==--