From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:26 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2744 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input: .	formule
Date: Fri, 06 Nov 2009 17:59:02 +0100
Message-ID: <20091106165902.DA26C16C48A@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3586132659250802949=="

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

Author: chatellier
Date: 2009-11-06 16:59:01 +0000 (Fri, 06 Nov 2009)
New Revision: 2744

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/formule/
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/formule/Formule=
ComboModel.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/formule/Formule=
ComboRenderer.java
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquatio=
nUI.jaxx
Log:
Model, renderer, toussa...

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOne=
EquationUI.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/InputOneEquati=
onUI.jaxx	2009-11-05 15:22:34 UTC (rev 2743)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquati=
onUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
@@ -34,6 +34,7 @@
     <script><![CDATA[
 import fr.ifremer.isisfish.entities.Formule;
 import fr.ifremer.isisfish.entities.Equation;
+import fr.ifremer.isisfish.ui.input.formule.FormuleComboModel;
 import java.lang.reflect.Method;
 import org.nuiton.topia.TopiaContext;
 import jaxx.runtime.swing.Item;
@@ -139,32 +140,20 @@
=20
 }
=20
-protected void setComboModel(){
+protected void setComboModel() {
     if (getBean() !=3D  null){
         TopiaContext isisContext =3D getBean().getTopiaContext();
         java.util.List<Formule> formules =3D null;
-        if (nameEquation !=3D null){
+        if (nameEquation !=3D null) {
             formules =3D getAction().getFormules(isisContext, nameEquation);
+            FormuleComboModel formulesModel =3D new FormuleComboModel(formul=
es);
+            formuleComboBox.setModel(formulesModel);
+            // fix default selection
+            formuleComboBox.setSelectedItem(selectedEquation);
         }
-        if (formules !=3D null){
-            java.util.List<Item> items =3D new ArrayList<Item>();
-            items.add(new Item("null", " ", null, false));
-            for (Formule f : formules) {
-                // chatellier 20090526 equals seams to not work
-                //boolean selected =3D f.equals(selectedEquation);
-                /*if (log.isDebugEnabled()) {
-                    log.debug("Compare formula");
-                    log.debug(" first : name=3D" + f.getName() + ", category=
=3D" + f.getCategory());
-                    log.debug(" second : name=3D" + selectedEquation.getName=
() + ", category=3D" + selectedEquation.getCategory());
-                }*/
-                boolean selected =3D f.equals(selectedEquation);
-                items.add(new Item(f.getName(), f.getName(), f, selected));
-            }
-            formuleComboBox.setItems(items);
-        }
     }
 }
-protected void saveModel(){
+protected void saveModel() {
     getContextValue(InputAction.class).saveAsModel(nameEquation, "Java", edi=
tor.getText());
     setComboModel();
     setInfoText(_("isisfish.message.saveModel.finished"));
@@ -178,8 +167,8 @@
         getContextValue(InputAction.class).openEditor(nameEquation, "new", c=
lazz, editor.getText(), editor);
     }
 }
-protected void setEditorText(){
-    if (getFormule() !=3D null){
+protected void setEditorText() {
+    if (getFormule() !=3D null) {
         editor.setText(getFormule().getContent());
     }
     else {
@@ -200,13 +189,14 @@
 }
     ]]>
     </script>
-    <Table id=3D'body'>
+    <Table>
         <row>
             <cell fill=3D'horizontal' anchor=3D'east'>
                 <JLabel id=3D'lbl' text=3D'{getLblText()}' enabled=3D'{isAct=
if()}'/>
             </cell>
             <cell fill=3D'horizontal' weightx=3D'1.0'>
-                <JComboBox id=3D"formuleComboBox" onActionPerformed=3D'formu=
leChanged()' enabled=3D'{isActif()}'/>
+                <JComboBox id=3D"formuleComboBox" onActionPerformed=3D'formu=
leChanged()' enabled=3D'{isActif()}'
+                    renderer=3D"{new fr.ifremer.isisfish.ui.input.formule.Fo=
rmuleComboRenderer()}" />
             </cell>
         </row>
         <row>

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/formule/For=
muleComboModel.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/formule/Formul=
eComboModel.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/formule/Formul=
eComboModel.java	2009-11-06 16:59:01 UTC (rev 2744)
@@ -0,0 +1,76 @@
+/* *##%
+ * Copyright (C) 2009 Code Lutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *##%*/
+
+package fr.ifremer.isisfish.ui.input.formule;
+
+import java.util.List;
+
+import javax.swing.DefaultComboBoxModel;
+
+import fr.ifremer.isisfish.entities.Formule;
+
+/**
+ * Model pour la liste des {@link Formule}.
+ *=20
+ * Pas de selection par defaut.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author: chatellier $
+ */
+public class FormuleComboModel extends DefaultComboBoxModel {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D 6171850179969290032L;
+
+    /** Formules list */
+    protected List<Formule> formules;
+
+    /**
+     * Constructor with formules list.
+     *=20
+     * @param formules formules list
+     */
+    public FormuleComboModel(List<Formule> formules) {
+        super();
+        this.formules =3D formules;
+    }
+
+    /*
+     * @see javax.swing.ListModel#getElementAt(int)
+     */
+    @Override
+    public Object getElementAt(int index) {
+        return formules.get(index);
+    }
+
+    /*
+     * @see javax.swing.ListModel#getSize()
+     */
+    @Override
+    public int getSize() {
+        int size =3D 0;
+
+        if (formules !=3D null) {
+            size =3D formules.size();
+        }
+        return size;
+    }
+}


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/inp=
ut/formule/FormuleComboModel.java
___________________________________________________________________
Added: svn:keywords
   + "Author Date Id Revision HeadURL"

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/formule/For=
muleComboRenderer.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/formule/Formul=
eComboRenderer.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/formule/Formul=
eComboRenderer.java	2009-11-06 16:59:01 UTC (rev 2744)
@@ -0,0 +1,64 @@
+/* *##%
+ * Copyright (C) 2009 Code Lutin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *##%*/
+
+package fr.ifremer.isisfish.ui.input.formule;
+
+import java.awt.Component;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
+
+import fr.ifremer.isisfish.entities.Formule;
+
+/**
+ * Renderer pour la combo des {@link Formule}.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author: chatellier $
+ */
+public class FormuleComboRenderer extends DefaultListCellRenderer implements
+        ListCellRenderer {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D -8277883340386163087L;
+
+    /*
+     * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.=
swing.JList, java.lang.Object, int, boolean, boolean)
+     */
+    @Override
+    public Component getListCellRendererComponent(JList list, Object value,
+            int index, boolean isSelected, boolean cellHasFocus) {
+
+        // this must be used to have alterned highlight rows and default
+        // selection color
+        JLabel c =3D (JLabel) super.getListCellRendererComponent(list, value,
+                index, isSelected, cellHasFocus);
+
+        // there is no default selection
+        if (value !=3D null) {
+            Formule formule =3D (Formule) value;
+            c.setText(formule.getName());
+        }
+        return c;
+    }
+}


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/inp=
ut/formule/FormuleComboRenderer.java
___________________________________________________________________
Added: svn:keywords
   + "Author Date Id Revision HeadURL"


--===============3586132659250802949==--