From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:33 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2937 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input	input/gear
 input/metier sensitivity
Date: Fri, 22 Jan 2010 16:39:11 +0100
Message-ID: <20100122153911.6D19F2FACE3@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6013164732941510778=="

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

Author: chatellier
Date: 2010-01-22 15:39:11 +0000 (Fri, 22 Jan 2010)
New Revision: 2937

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitivi=
tyTableModel.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBloc=
kingLayerUI.java
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.=
jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopula=
tionSelectivityModel.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSe=
asonInfoTargetSpeciesTableModel.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHel=
per.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationC=
ontinuousPanelUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitivi=
tyAction.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitivi=
tyUI.jaxx
Log:
Enable to add factors from tables (target factor equation, selectivity equati=
on)

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputCon=
tentUI.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/InputContentUI=
.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI=
.jaxx	2010-01-22 15:39:11 UTC (rev 2937)
@@ -47,6 +47,8 @@
              }
          }}' />
=20
+    <fr.ifremer.isisfish.ui.sensitivity.TableBlockingLayerUI id=3D"tableLaye=
rUI" constructorParams=3D'this' />
+
     <script><![CDATA[
 import javax.swing.JComponent;
 import fr.ifremer.isisfish.entities.FisheryRegion;
@@ -134,16 +136,25 @@
                 String sensitivityFactorName =3D className + "." + method;
                 isSensitivityFactorEnabled =3D SensitivityUtils.isSensitivit=
yFactorEnabled(sensitivityFactorName);
             }
-
+           =20
             // install correct layer depending if factor enable
             if (isSensitivityFactorEnabled) {
                 jaxx.runtime.swing.BlockingLayerUI2 ui =3D layerUI2.clone();
                 SwingUtil.getLayer(boxed).setUI(ui);
             } else {
-                jaxx.runtime.swing.BlockingLayerUI ui =3D layerUI.clone();
-                ui.setBlock(true);
-                ui.setUseIcon(isActif());
-                SwingUtil.getLayer(boxed).setUI(ui);
+                if (boxed instanceof JTable) {
+                    //fr.ifremer.isisfish.ui.sensitivity.TableBlockingLayerU=
I layerui =3D
+                    //    new fr.ifremer.isisfish.ui.sensitivity.TableBlocki=
ngLayerUI();
+                    //layerui.parent =3D this;
+                    //layerui.verifier =3D getVerifier();
+                    SwingUtil.getLayer(boxed).setUI(tableLayerUI);
+                }
+                else {
+                    jaxx.runtime.swing.BlockingLayerUI ui =3D layerUI.clone(=
);
+                    ui.setBlock(true);
+                    ui.setUseIcon(isActif());
+                    SwingUtil.getLayer(boxed).setUI(ui);
+                }
             }
         }
     }
@@ -160,9 +171,9 @@
     }
=20
     JComponent source =3D (JComponent) e.getSource();
-    Class classBean =3D (Class)source.getClientProperty("bean");
+    Class<? extends TopiaEntity> classBean =3D (Class<? extends TopiaEntity>=
)source.getClientProperty("bean");
     String beanID =3D (String)source.getClientProperty("beanID");
-    TopiaEntity bean =3D null;
+    /*TopiaEntity bean =3D null;
     if (beanID =3D=3D null) {
         bean =3D getVerifier().getEntity(classBean);
     }
@@ -174,7 +185,59 @@
         wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean=
));
         wizard.pack();
         wizard.setVisible(true);
+    }*/
+   =20
+    String property =3D (String)source.getClientProperty("method");
+    displayFactorWizard(source, classBean, beanID, property);
+}
+
+/**
+ * Display factor wizard for bean/property in registred in verifier.
+ */
+public void displayFactorWizard(JComponent source, Class<? extends TopiaEnti=
ty> classBean, String beanID, String property) {
+
+    if (log.isDebugEnabled()) {
+        log.debug("Event intercepted " + source);
+        log.debug(" client property (bean) : " + classBean);
+        log.debug(" client property (beanID) : " + beanID);
+        log.debug(" client property (method) : " + property);
     }
+
+    TopiaEntity bean =3D null;
+    if (beanID =3D=3D null) {
+        bean =3D getVerifier().getEntity(classBean);
+    }
+    else {
+        bean =3D getVerifier().getEntity(classBean, beanID);
+    }
+   =20
+    if (bean !=3D null) {
+   =20
+        JComponent editor =3D source;
+       =20
+        // This is a special case for table source component
+        // If current entity is displayed by a JTable component
+        // we need to find a better component than
+        // can display 'property' on 'bean'
+        if (editor instanceof JTable) {
+            editor =3D EditorHelper.getEditorForValue(bean, property);
+        }
+
+        if (editor !=3D null) {
+            FactorWizardUI wizard =3D new FactorWizardUI(this);
+            wizard.initNew(editor, bean, EditorHelper.canBeContinue(editor, =
bean));
+            wizard.pack();
+            wizard.setVisible(true);
+        }
+        else if (log.isWarnEnabled()) {
+            log.warn("Can't find editor for " + classBean.getSimpleName() + =
"#" + property);
+        }
+    }
+    else {
+        if (log.isErrorEnabled()) {
+            log.error("Can't find bean in current verifier (classBean =3D " =
+ classBean + ", beanID =3D " + beanID + ")");
+        }
+    }
 }
=20
 /**

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/Gea=
rPopulationSelectivityModel.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/gear/GearPopul=
ationSelectivityModel.java	2010-01-22 15:38:16 UTC (rev 2936)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopul=
ationSelectivityModel.java	2010-01-22 15:39:11 UTC (rev 2937)
@@ -1,5 +1,5 @@
 /* *##%
- * Copyright (C) 2009 Code Lutin
+ * Copyright (C) 2009-2010 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -35,6 +35,7 @@
 import fr.ifremer.isisfish.entities.Equation;
 import fr.ifremer.isisfish.entities.Gear;
 import fr.ifremer.isisfish.entities.Selectivity;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel;
=20
 /**
  * Table model for {@link Gear}#{@link Selectivity}.
@@ -49,7 +50,7 @@
  * Last update : $Date$
  * By : $Author$
  */
-public class GearPopulationSelectivityModel extends AbstractTableModel imple=
ments TableCellRenderer {
+public class GearPopulationSelectivityModel extends AbstractTableModel imple=
ments TableCellRenderer, SensitivityTableModel {
=20
     /** Log. */
     private static Log log =3D LogFactory.getLog(GearPopulationSelectivityMo=
del.class);
@@ -228,4 +229,25 @@
         return c;
     }
=20
+    /*
+     * @see fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel#getProp=
ertyAtColumn(int)
+     */
+    @Override
+    public String getPropertyAtColumn(int column) {
+        String result =3D null;
+        if (column =3D=3D 1) {
+            result =3D "equation";
+        }
+        return result;
+    }
+   =20
+    /*
+     * @see fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel#getBean=
AtRow(int)
+     */
+    @Override
+    public Object getBeanAtRow(int rowIndex) {
+        Object result =3D null;
+        result =3D selectivities.get(rowIndex);
+        return result;
+    }
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/M=
etierSeasonInfoTargetSpeciesTableModel.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/metier/MetierS=
easonInfoTargetSpeciesTableModel.java	2010-01-22 15:38:16 UTC (rev 2936)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierS=
easonInfoTargetSpeciesTableModel.java	2010-01-22 15:39:11 UTC (rev 2937)
@@ -1,5 +1,5 @@
 /* *##%
- * Copyright (C) 2009 Ifremer, Code Lutin
+ * Copyright (C) 2009-2010 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,6 +36,7 @@
 import fr.ifremer.isisfish.entities.Equation;
 import fr.ifremer.isisfish.entities.MetierSeasonInfo;
 import fr.ifremer.isisfish.entities.TargetSpecies;
+import fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel;
=20
 /**
  * Table model for {@link MetierSeasonInfo}#{@link TargetSpecies}.
@@ -51,7 +52,7 @@
  * Last update : $Date$
  * By : $Author$
  */
-public class MetierSeasonInfoTargetSpeciesTableModel extends AbstractTableMo=
del implements TableCellRenderer {
+public class MetierSeasonInfoTargetSpeciesTableModel extends AbstractTableMo=
del implements TableCellRenderer, SensitivityTableModel {
=20
     /** Log. */
     private static Log log =3D LogFactory.getLog(MetierSeasonInfoTargetSpeci=
esTableModel.class);
@@ -236,4 +237,25 @@
         return c;
     }
=20
+    /*
+     * @see fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel#getProp=
ertyAtColumn(int)
+     */
+    @Override
+    public String getPropertyAtColumn(int column) {
+        String property =3D null;
+        if (column =3D=3D 1) {
+            property =3D "targetFactorEquation";
+        }
+        return property;
+    }
+
+    /*
+     * @see fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel#getBean=
AtRow(int)
+     */
+    @Override
+    public Object getBeanAtRow(int rowIndex) {
+        Object value =3D null;
+        value =3D targetSpeciesList.get(rowIndex);
+        return value;
+    }
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Ed=
itorHelper.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/sensitivity/EditorHe=
lper.java	2010-01-22 15:38:16 UTC (rev 2936)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHe=
lper.java	2010-01-22 15:39:11 UTC (rev 2937)
@@ -161,11 +161,12 @@
                 InputOneEquationUI ui =3D new InputOneEquationUI(
                         new JAXXInitialContext().add(new InputAction()));
                 ui.setSelectedEquation(origine.getSelectedEquation());
-                ui.setLblText(origine.getLblText());
-                ui.setNameEquation(origine.getNameEquation());
+                ui.setText(origine.getText());
+                ui.setFormuleCategory(origine.getFormuleCategory());
                 ui.setClazz(origine.getClazz());
-                ui.setMethodGet(origine.getMethodGet());
-                ui.setMethodSet(origine.getMethodSet());
+                //ui.setMethodGet(origine.getMethodGet());
+                //ui.setMethodSet(origine.getMethodSet());
+                ui.setBeanProperty(origine.getBeanProperty());
                 ui.setBean(entity);
                 ui.setActif(true);
                 ui.refresh();
@@ -264,11 +265,12 @@
             EquationContinuousPanelUI ui =3D new EquationContinuousPanelUI(
                     new JAXXInitialContext().add(new InputAction()));
             ui.setSelectedEquation(origine.getSelectedEquation());
-            ui.setLblText(origine.getLblText());
-            ui.setNameEquation(origine.getNameEquation());
+            ui.setText(origine.getText());
+            ui.setFormuleCategory(origine.getFormuleCategory());
             ui.setClazz(origine.getClazz());
-            ui.setMethodGet(origine.getMethodGet());
-            ui.setMethodSet(origine.getMethodSet());
+            //ui.setMethodGet(origine.getMethodGet());
+            //ui.setMethodSet(origine.getMethodSet());
+            ui.setBeanProperty(origine.getBeanProperty());
             ui.setBean(entity);
             result =3D ui;
         } else if (component instanceof MatrixEditor) {
@@ -321,12 +323,13 @@
             InputOneEquationUI origine =3D (InputOneEquationUI) component;
             EquationContinuousPanelUI ui =3D new EquationContinuousPanelUI(
                     new JAXXInitialContext().add(new InputAction()));
-            ui.setLblText(origine.getLblText());
-            ui.setNameEquation(origine.getNameEquation());
+            ui.setText(origine.getText());
+            ui.setFormuleCategory(origine.getFormuleCategory());
             ui.getEditor().getEditor().setText((String) factor.getValue());
             ui.setClazz(origine.getClazz());
-            ui.setMethodGet(origine.getMethodGet());
-            ui.setMethodSet(origine.getMethodSet());
+            //ui.setMethodGet(origine.getMethodGet());
+            //ui.setMethodSet(origine.getMethodSet());
+            ui.setBeanProperty(origine.getBeanProperty());
             ui.setBean(origine.getBean());
=20
             EquationContinuousDomain equationDomain =3D (EquationContinuousD=
omain) domain;
@@ -437,9 +440,11 @@
                 InputOneEquationUI origine =3D (InputOneEquationUI) componen=
t;
                 InputOneEquationUI ui =3D new InputOneEquationUI(new JAXXIni=
tialContext().add(new InputAction()));
                 ui.getEditor().setText((String) value);
-                ui.setLblText(origine.getLblText());
-                ui.setNameEquation(origine.getNameEquation());
+                ui.setText(origine.getText());
+                ui.setFormuleCategory(origine.getFormuleCategory());
                 ui.setClazz(origine.getClazz());
+                /// ??? was not set before
+                ui.setBeanProperty(origine.getBeanProperty());
                 ui.setFormule((Formule) value);
                 ui.setActif(true);
                 ui.refresh();
@@ -702,14 +707,14 @@
      * @param fieldName
      * @return method return value
      */
-    protected static Object getMethodValue(TopiaEntity entity, String fieldN=
ame) {
+    protected static Object getMethodValue(Object entity, String fieldName) {
         Object result =3D null;
         try {
             // fieldName maybe be sometime lower case
             String getMethod =3D "get" + StringUtils.capitalize(fieldName);
=20
             Method m =3D entity.getClass().getMethod(getMethod);
-            result =3D m.invoke(entity, (Object[]) null);
+            result =3D m.invoke(entity);
         } catch (Exception ex) {
             if (log.isErrorEnabled()) {
                 log.error("Can't get entity value", ex);
@@ -805,7 +810,8 @@
                 log.debug("Factor " + factor.getName() + " denoted entity " =
+ entity);
             }
            =20
-            Method method =3D entity.getClass().getMethod("get" + property);
+            String getter =3D "get" + StringUtils.capitalize(property);
+            Method method =3D entity.getClass().getMethod(getter);
             typeClazz =3D method.getReturnType();
            =20
             if (log.isDebugEnabled()) {
@@ -856,4 +862,30 @@
=20
         return result;
     }
+
+    /**
+     * Get editor for editing value.
+     *=20
+     * @param bean bean
+     * @param  beanProperty bean property
+     * @return component
+     */
+    public static JComponent getEditorForValue(Object bean, String beanPrope=
rty) {
+        Object basicType =3D getMethodValue(bean, beanProperty);
+       =20
+        JComponent component =3D null;
+
+        if (basicType instanceof Equation) {
+            Equation basicEquation =3D (Equation)basicType;
+            InputOneEquationUI equationComponent =3D new InputOneEquationUI(
+                    new JAXXInitialContext().add(new InputAction()));
+            equationComponent.setFormuleCategory(basicEquation.getCategory()=
);
+            equationComponent.setBean((TopiaEntity)bean);
+            equationComponent.setBeanProperty(beanProperty);
+            equationComponent.putClientProperty("method", beanProperty);
+            component =3D equationComponent;
+        }
+
+        return component;
+    }
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Eq=
uationContinuousPanelUI.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/sensitivity/Equation=
ContinuousPanelUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Equation=
ContinuousPanelUI.jaxx	2010-01-22 15:39:11 UTC (rev 2937)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,17 +19,17 @@
  -->
 <ContinuousPanelContainerUI>
=20
-    <!-- bean property -->
-    <fr.ifremer.isisfish.entities.Formule id=3D'formule' javaBean=3D'null'/>
-    <String id=3D'lblText' javaBean=3D'null'/>
+    <String id=3D'text' javaBean=3D'null'/>
     <org.nuiton.topia.persistence.TopiaEntity id=3D'bean' javaBean=3D'null'/>
+    <String id=3D'beanProperty' javaBean=3D'null'/>
+    <!-- For editor doc purpose -->
     <Class id=3D'clazz' javaBean=3D'null'/>
-    <String id=3D'methodGet' javaBean=3D'null'/>
-    <String id=3D'methodSet' javaBean=3D'null'/>
-    <String id=3D'nameEquation' javaBean=3D'null'/>
+    <String id=3D'formuleCategory' javaBean=3D'null'/>
     <fr.ifremer.isisfish.entities.Equation id=3D'selectedEquation' javaBean=
=3D'null'/>
+    <!-- bean property -->
+    <fr.ifremer.isisfish.entities.Formule id=3D'formule' javaBean=3D'null'/>
=20
-     <script><![CDATA[
+    <script><![CDATA[
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableModel;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDo=
main;
@@ -65,7 +65,7 @@
     datas.add(domain);
 }
=20
-protected AbstractTableModel getTableModel(){
+protected AbstractTableModel getTableModel() {
     AbstractTableModel model =3D new AbstractTableModel() {
         @Override
         public int getRowCount() {
@@ -168,7 +168,7 @@
         Pattern p =3D Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=3D=
\\s*)([\\d\\.]+).*\\;$");
         Matcher matcher =3D p.matcher(line);
         if (matcher.find()) {
-            String fullVariableName =3D bean.toString() + "." + StringUtils.=
uncapitalize(methodGet) + "." + variableName;
+            String fullVariableName =3D bean.toString() + "." + StringUtils.=
uncapitalize(beanProperty) + "." + variableName;
             line =3D matcher.group(1) +  "context.getValueAndCompute(\"" + f=
ullVariableName + "\", " + matcher.group(2) + ");";
         }
         result +=3D line + "\n";
@@ -237,8 +237,7 @@
         setTable();
     }
 }
-     ]]>
-     </script>
+    ]]></script>
     <Table id=3D'content' constraints=3D'BorderLayout.CENTER'>
         <row>
             <cell fill=3D'both' columns=3D'2' weightx=3D'1' weighty=3D'0.5'>
@@ -258,9 +257,9 @@
         </row>
         <row>
             <cell fill=3D'both' columns=3D'2' weightx=3D'1' weighty=3D'0.5'>
-                <fr.ifremer.isisfish.ui.input.InputOneEquationUI id=3D'edito=
r' formule=3D'{getFormule()}' lblText=3D'{getLblText()}'
-                constructorParams=3D'this' bean=3D'{getBean()}' clazz=3D'{ge=
tClazz()}' methodGet=3D'{getMethodGet()}' actif=3D'{isContinueSelected()}'
-                methodSet=3D'{getMethodSet()}' nameEquation=3D'{getNameEquat=
ion()}' selectedEquation=3D'{getSelectedEquation()}'
+                <fr.ifremer.isisfish.ui.input.InputOneEquationUI id=3D'edito=
r' formule=3D'{getFormule()}' text=3D'{getText()}'
+                constructorParams=3D'this' bean=3D'{getBean()}' clazz=3D'{ge=
tClazz()}' beanProperty=3D'{getBeanProperty()}' actif=3D'{isContinueSelected(=
)}'
+                formuleCategory=3D'{getFormuleCategory()}' selectedEquation=
=3D'{getSelectedEquation()}'
                 visible=3D'{isContinuePossible()}' enabled=3D'{isContinueSel=
ected()}'/>
             </cell>
         </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Se=
nsitivityAction.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/sensitivity/Sensitiv=
ityAction.java	2010-01-22 15:38:16 UTC (rev 2936)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitiv=
ityAction.java	2010-01-22 15:39:11 UTC (rev 2937)
@@ -28,6 +28,8 @@
 import java.util.List;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.math.matrix.MatrixND;
@@ -65,9 +67,10 @@
                 EquationContinuousPanelUI equationPanel =3D (EquationContinu=
ousPanelUI) panel;
=20
                 TopiaEntity bean =3D equationPanel.getBean();
-                String methodSet =3D equationPanel.getMethodSet();
-                Method m =3D bean.getClass().getMethod("set" + methodSet,
-                        String.class);
+                //String methodSet =3D equationPanel.getMethodSet();
+                String property =3D equationPanel.getBeanProperty();
+                property =3D StringUtils.capitalize(property) + "Content";
+                Method m =3D bean.getClass().getMethod("set" + property, Str=
ing.class);
                 m.invoke(bean, equationPanel.getEditor().getEditor().getText=
());
=20
                 // Save equation

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensi=
tivityTableModel.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/sensitivity/Sensitiv=
ityTableModel.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitiv=
ityTableModel.java	2010-01-22 15:39:11 UTC (rev 2937)
@@ -0,0 +1,52 @@
+/* *##%
+ * Copyright (C) 2010 Ifremer, Code Lutin, Chatellier Eric
+ *
+ * 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.sensitivity;
+
+import javax.swing.table.TableModel;
+
+/**
+ * Sensitivity interface for {@link TableModel}.
+ *=20
+ * Used by {@link TableBlockingLayerUI} to known if event at mouse position
+ * is sensitivity enabled.
+ *=20
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public interface SensitivityTableModel {
+
+    /**
+     * Get value at row.
+     *=20
+     * @param rowIndex row index
+     * @return value at row/column
+     */
+    Object getBeanAtRow(int rowIndex);
+   =20
+    /**
+     * Get property name at column.
+     *=20
+     * @param column column
+     * @return property name at column (can be {@code null})
+     */
+    String getPropertyAtColumn(int column);
+}
\ No newline at end of file


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

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Se=
nsitivityUI.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/sensitivity/Sensitiv=
ityUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Sensitiv=
ityUI.jaxx	2010-01-22 15:39:11 UTC (rev 2937)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Table=
BlockingLayerUI.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/sensitivity/TableBlo=
ckingLayerUI.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlo=
ckingLayerUI.java	2010-01-22 15:39:11 UTC (rev 2937)
@@ -0,0 +1,149 @@
+/* *##%
+ * Copyright (C) 2010 Ifremer, Code Lutin, Chatellier Eric
+ *
+ * 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.sensitivity;
+
+import java.awt.Cursor;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JComponent;
+import javax.swing.JScrollBar;
+import javax.swing.JTable;
+import javax.swing.table.TableModel;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jdesktop.jxlayer.JXLayer;
+import org.jdesktop.jxlayer.plaf.AbstractLayerUI;
+import org.jdesktop.jxlayer.plaf.LayerUI;
+import org.nuiton.topia.persistence.TopiaEntity;
+
+import fr.ifremer.isisfish.ui.input.InputContentUI;
+
+/**
+ * A layer for factorizable entities properties in {@link JTable} component.
+ *=20
+ * This is a {@link LayerUI} that check if :
+ * <ul>
+ *  <li>component is {@link JScrollBar} : clic allowed</li>
+ *  <li>component is {@link JTable} and table model is {@link SensitivityTab=
leModel} : do sensitivity stuff</li>
+ * </ul>
+ *=20
+ * Tree {@link MouseEvent}s are managed:
+ * <ul>
+ *  <li>{@link MouseEvent#MOUSE_CLICKED} : display factor interface dependin=
g on sensitivity enabled table column</li>
+ *  <li>{@link MouseEvent#MOUSE_MOVED} : change cursor depending on sensitiv=
ity enabled table column</li>
+ *  <li>{@link MouseEvent#MOUSE_EXITED} : back to default cursor</li>
+ * </ul>
+ *=20
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class TableBlockingLayerUI extends AbstractLayerUI<JComponent> {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D 1877010363682882308L;
+
+    /** Class logger. */
+    private static Log log =3D LogFactory.getLog(TableBlockingLayerUI.class);
+
+    /** Parent UI. */
+    protected InputContentUI parent;
+
+    /**
+     * Init layer with parent.
+     *=20
+     * @param parent parent
+     */
+    public TableBlockingLayerUI(InputContentUI parent) {
+        this.parent =3D parent;
+    }
+
+    /*
+     * @see org.jdesktop.jxlayer.plaf.AbstractLayerUI#processMouseEvent(java=
.awt.event.MouseEvent, org.jdesktop.jxlayer.JXLayer)
+     */
+    @Override
+    protected void processMouseEvent(MouseEvent event, JXLayer</*? extends *=
/JComponent> layer) {
+
+        // scrollbar can be moved
+        if (!(event.getSource() instanceof JScrollBar)) {
+            event.consume();
+        }
+
+        if (event.getSource() instanceof JTable) {
+
+            JTable tableSource =3D (JTable) event.getSource();
+            TableModel model =3D tableSource.getModel();
+
+            if (model instanceof SensitivityTableModel) {
+                SensitivityTableModel sensitivityTableModel =3D (Sensitivity=
TableModel) model;
+
+                // mouse exit table
+                if (event.getID() =3D=3D MouseEvent.MOUSE_EXITED) {
+                    Cursor cursor =3D new Cursor(Cursor.DEFAULT_CURSOR);
+                    tableSource.setCursor(cursor);
+                } else {
+                    int rowIndex =3D tableSource.rowAtPoint(event.getPoint()=
);
+                    int columnIndex =3D tableSource.columnAtPoint(event.getP=
oint());
+
+                    if (rowIndex >=3D 0 && columnIndex >=3D 0) {
+
+                        // test if sensitivity property is enabled
+                        SensitivityTableModel sensitivityModel =3D (Sensitiv=
ityTableModel) model;
+                        TopiaEntity value =3D (TopiaEntity) sensitivityTable=
Model.getBeanAtRow(rowIndex);
+                        Class<? extends TopiaEntity> beanClass =3D value.get=
Class();
+                        String property =3D sensitivityModel.getPropertyAtCo=
lumn(columnIndex);
+                        String sensitivityName =3D beanClass.getSimpleName()=
.replaceFirst("Impl", "") + "." + property;
+
+                        if (SensitivityUtils.isSensitivityFactorEnabled(sens=
itivityName)) {
+
+                            // clic sur la table
+                            if (event.getID() =3D=3D MouseEvent.MOUSE_CLICKE=
D) {
+                                if (log.isDebugEnabled()) {
+                                    log.debug("Clic done on an enabled facto=
r : " + sensitivityName);
+                                }
+
+                                parent.displayFactorWizard(tableSource, bean=
Class, value.getTopiaId(), property);
+                            }
+
+                            // mouse moved over table
+                            else if (event.getID() =3D=3D MouseEvent.MOUSE_M=
OVED) {
+                                Cursor cursor =3D new Cursor(Cursor.CROSSHAI=
R_CURSOR);
+                                tableSource.setCursor(cursor);
+                            }
+                        } else {
+                            Cursor cursor =3D new Cursor(Cursor.DEFAULT_CURS=
OR);
+                            tableSource.setCursor(cursor);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+     * @see org.jdesktop.jxlayer.plaf.AbstractLayerUI#processMouseMotionEven=
t(java.awt.event.MouseEvent, org.jdesktop.jxlayer.JXLayer)
+     */
+    @Override
+    protected void processMouseMotionEvent(MouseEvent e, JXLayer<JComponent>=
 l) {
+        processMouseEvent(e, l);
+    }
+}
\ No newline at end of file


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


--===============6013164732941510778==--