- Isis-fish-commits - mailman.cloud.codelutin.com

r2469 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 06 Jul '09

06 Jul '09

Author: sletellier Date: 2009-07-06 15:30:38 +0000 (Mon, 06 Jul 2009) New Revision: 2469 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx Log: Set maturity group to null when groups are recreating Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-07-06 15:29:28 UTC (rev 2468) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-07-06 15:30:38 UTC (rev 2469) @@ -222,8 +222,11 @@ } try { + Population pop = (Population)getContextValue(InputSaveVerifier.class).getEntity(Population.class); + // remove maturity group + pop.setMaturityGroup(null); + // remove all old group - Population pop = (Population)getContextValue(InputSaveVerifier.class).getEntity(Population.class); TopiaContext isisContext = pop.getTopiaContext(); pop.clearPopulationGroup();

1 0

r2468 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 06 Jul '09

06 Jul '09

Author: sletellier Date: 2009-07-06 15:29:28 +0000 (Mon, 06 Jul 2009) New Revision: 2468 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Log: Lenght min, max and age are editable Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-07-06 15:28:24 UTC (rev 2467) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-07-06 15:29:28 UTC (rev 2468) @@ -204,7 +204,9 @@ <cell columns='2' fill='horizontal' weightx='1.0'>  <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' - enabled='false' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/> + onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' + enabled='{getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' + decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/> </cell> </row> <row> @@ -215,13 +217,15 @@  <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' toolTipText="isisfish.populationGroup.minimumLength" - enabled='false' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/> + onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' + enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/> </cell> <cell fill='both' weightx='0.5'>  <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' toolTipText="isisfish.populationGroup.maximumLength" - enabled='false' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/> + onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' + enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/> </cell> </row> <row>

1 0

r2467 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 06 Jul '09

06 Jul '09

Author: sletellier Date: 2009-07-06 15:28:24 +0000 (Mon, 06 Jul 2009) New Revision: 2467 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Refreshing all matrix and the new season is selected in creation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-07-06 09:57:40 UTC (rev 2466) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-07-06 15:28:24 UTC (rev 2467) @@ -864,14 +864,15 @@ return null; } - public void createPopulationSeasonInfo(Population pop) { + public PopulationSeasonInfo createPopulationSeasonInfo(Population pop) { if (log.isDebugEnabled()) { log.debug("createSeasonInfo called"); } + PopulationSeasonInfo seasonInfo = null; try { PopulationSeasonInfoDAO dao = IsisFishDAOHelper .getPopulationSeasonInfoDAO(pop.getTopiaContext()); - PopulationSeasonInfo seasonInfo = dao.create(); + seasonInfo = dao.create(); seasonInfo.setFirstMonth(Month.MONTH[0]); seasonInfo.setLastMonth(Month.MONTH[3]); pop.addPopulationSeasonInfo(seasonInfo); @@ -885,6 +886,7 @@ } showMsgBox(eee); } + return seasonInfo; } public void removePopulationSeasonInfo(Population pop, Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-07-06 09:57:40 UTC (rev 2466) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-07-06 15:28:24 UTC (rev 2467) @@ -95,6 +95,7 @@ lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); } popInfo.setLengthChangeMatrix(lengthChangeMatrix); + matrixPanelPopulationSeasonLengthChange.setMatrix(lengthChangeMatrix); } } catch(Exception eee) { if (log.isErrorEnabled()) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-07-06 09:57:40 UTC (rev 2466) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-07-06 15:28:24 UTC (rev 2467) @@ -53,6 +53,7 @@ public void propertyChange(PropertyChangeEvent evt) { if (getPopulationSeasonInfo() != null) { getPopulationSeasonInfo().setFirstMonth(new Month(seasonInterval.getFirst())); + setReproductionDistributionMatrix(); } } }); @@ -61,6 +62,7 @@ public void propertyChange(PropertyChangeEvent evt) { if (getPopulationSeasonInfo() != null) { getPopulationSeasonInfo().setLastMonth(new Month(seasonInterval.getLast())); + setReproductionDistributionMatrix(); } } }); @@ -80,7 +82,8 @@ create.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - getContextValue(InputAction.class).createPopulationSeasonInfo(getBean()); + PopulationSeasonInfo seasonNew = getContextValue(InputAction.class).createPopulationSeasonInfo(getBean()); + setPopulationSeasonInfo((PopulationSeasonInfoImpl)seasonNew); setPopulationSeasonInfoCombo(); } });

1 0

r2466 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result
by chatellier＠users.labs.libre-entreprise.org 06 Jul '09

06 Jul '09

Author: chatellier Date: 2009-07-06 09:57:40 +0000 (Mon, 06 Jul 2009) New Revision: 2466 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java Log: 1777, on ne peut pas selectionner des cellules sur la carte Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2009-07-06 09:18:31 UTC (rev 2465) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2009-07-06 09:57:40 UTC (rev 2466) @@ -24,6 +24,8 @@ import javax.swing.ButtonGroup; import javax.swing.JPanel; +import fr.ifremer.isisfish.map.CellSelectionLayer; + public abstract class SimpleResultatMapBeanUI extends JPanel implements SimpleResultatMapBeanUICallback{ protected void init(){ @@ -140,7 +142,10 @@ if(__resultatMap__ == null){ fr.ifremer.isisfish.map.IsisMapBean result = new fr.ifremer.isisfish.map.IsisMapBean(); result.setToolTipText(_("isisfish.simpleResult.resultatMap")); - + + // EC-20090706 : fix bug 1777 : no selection on result map + result.setSelectionMode(CellSelectionLayer.NO_SELECTION); + __resultatMap__ = result; } return __resultatMap__;

1 0

r2465 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/ui/input main/java/fr/ifremer/isisfish/ui/sensitivity test/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 06 Jul '09

06 Jul '09

Author: chatellier Date: 2009-07-06 09:18:31 +0000 (Mon, 06 Jul 2009) New Revision: 2465 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java Log: Another hack for tree truncated labels... Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java 2009-07-02 18:11:02 UTC (rev 2464) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java 2009-07-06 09:18:31 UTC (rev 2465) @@ -20,7 +20,6 @@ import java.awt.Component; import java.awt.Dimension; -import java.awt.Rectangle; import javax.swing.JTree; @@ -36,10 +35,7 @@ * * Last update : $Date$ * By : $Author$ - * @deprecated since 3.2.0.5-rc1 : n'est plus utilise dans le code, il faut - * supprimer cette classe des que possible. */ - at Deprecated public class InputNavigationTreeCellRenderer extends NavigationTreeCellRenderer { /** @@ -50,34 +46,23 @@ public InputNavigationTreeCellRenderer(JAXXContext context) { super(context); } - - protected boolean inLoop; - + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { - Component c = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, - row, hasFocus); + Component c = super.getTreeCellRendererComponent(tree, value, sel, + expanded, leaf, row, hasFocus); - // ca c'est pas bien, mais ca fait une boucle infinie - if (!inLoop) { - inLoop = true; - // bugfix from http://forums.sun.com/thread.jspa?forumID=256&threadID=277338 - setPreferredSize(new Dimension((int) tree.getPreferredSize().getWidth(), (int) delegate.getPreferredSize().getHeight())); - inLoop = false; + // bugfix from http://forums.sun.com/thread.jspa?forumID=256&threadID=277338 + // hack from : http://forums.sun.com/thread.jspa?threadID=542069&tstart=824 + + if (delegate.getPreferredSize().getWidth() < 300) { + delegate.setPreferredSize(new Dimension(300, (int) delegate + .getPreferredSize().getHeight())); } - - + return c; } - - public void setPreferredSize(Dimension preferredSize){ - if (preferredSize.getWidth() == 0) { - delegate.setPreferredSize(null); - } else { - delegate.setPreferredSize(preferredSize); - } - } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-07-02 18:11:02 UTC (rev 2464) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-07-06 09:18:31 UTC (rev 2465) @@ -22,7 +22,7 @@ <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> - <jaxx.runtime.swing.navigation.NavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> + <InputNavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> @@ -108,7 +108,9 @@ setContextValue(model); navigation.setModel(model); setTreeSelection("$root"); - //TC-20090702 Fix bug #1772 + + /*TC-20090702 Fix bug #1772 + EC-20090706 no working solution found model.nodeChanged(model.getRoot()); java.util.Enumeration<?> e = model.getRoot().children(); while (e.hasMoreElements()) { @@ -125,7 +127,7 @@ NavigationTreeNode n2 = (NavigationTreeNode) e2.nextElement(); n2.getJAXXContextValue(InputUI.this); } - } + }*/ } } @@ -248,13 +250,15 @@ </Table> <JPanel id="treePanel" name="treePanel" layout='{new BorderLayout()}'> <JScrollPane constraints='BorderLayout.CENTER'> - <JTree id="navigation" selectionModel='{getNavigationSelectionModel()}' cellRenderer='{getNavigationTreeCellRenderer()}' rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + <JTree id="navigation" selectionModel='{getNavigationSelectionModel()}' cellRenderer='{getNavigationTreeCellRenderer()}' + rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}' + rowHeight="0" /> </JScrollPane> </JPanel> </JPanel> <JPanel id='inputPanePrincipal' layout='{getCardlayoutPrincipal()}' minimumSize="{new java.awt.Dimension(0,0)}"> <NoneUI id='noneUI' constraints='"none"'/> - <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> + <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> </JPanel> </JSplitPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-07-02 18:11:02 UTC (rev 2464) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-07-06 09:18:31 UTC (rev 2465) @@ -21,7 +21,7 @@ <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> - <jaxx.runtime.swing.navigation.NavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> + <fr.ifremer.isisfish.ui.input.InputNavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> @@ -113,7 +113,9 @@ setContextValue(model); navigation.setModel(model); setTreeSelection("$root"); - //TC-20090702 Fix bug #1772 + + /*TC-20090702 Fix bug #1772 + EC-20090706 no working solution found model.nodeChanged(model.getRoot()); java.util.Enumeration<?> e = model.getRoot().children(); while (e.hasMoreElements()) { @@ -130,7 +132,7 @@ NavigationTreeNode n2 = (NavigationTreeNode) e2.nextElement(); n2.getJAXXContextValue(SensitivityTabUI.this); } - } + }*/ } } public void repaintNode(String path) { Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-07-02 18:11:02 UTC (rev 2464) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-07-06 09:18:31 UTC (rev 2465) @@ -28,8 +28,6 @@ import javax.swing.JOptionPane; import javax.swing.JTree; import javax.swing.SwingUtilities; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r2464 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input src/main/java/fr/ifremer/isisfish/ui/sensitivity
by tchemit＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: tchemit Date: 2009-07-02 18:11:02 +0000 (Thu, 02 Jul 2009) New Revision: 2464 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx Log: Fix bug 1772 ( https://labs.libre-entreprise.org/tracker/index.php?func=detail&aid=1772&gr… ) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-07-02 16:39:15 UTC (rev 2463) +++ isis-fish/trunk/changelog.txt 2009-07-02 18:11:02 UTC (rev 2464) @@ -1,4 +1,5 @@ isis-fish (3.2.0.4-rc2) xxx + * Fix bug 1772 ( https://labs.libre-entreprise.org/tracker/index.php?func=detail&aid=1772&gr… ) * Fix bug 1900 ( https://labs.libre-entreprise.org/tracker/index.php?func=detail&aid=1900&gr… ) * Fix simulation plan subjob number : start at 0 * Fix bug, database migration asked twice Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java 2009-07-02 16:39:15 UTC (rev 2463) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java 2009-07-02 18:11:02 UTC (rev 2464) @@ -36,7 +36,10 @@ * * Last update : $Date$ * By : $Author$ + * @deprecated since 3.2.0.5-rc1 : n'est plus utilise dans le code, il faut + * supprimer cette classe des que possible. */ + at Deprecated public class InputNavigationTreeCellRenderer extends NavigationTreeCellRenderer { /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-07-02 16:39:15 UTC (rev 2463) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-07-02 18:11:02 UTC (rev 2464) @@ -22,7 +22,7 @@ <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> - <fr.ifremer.isisfish.ui.input.InputNavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> + <jaxx.runtime.swing.navigation.NavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> @@ -108,6 +108,24 @@ setContextValue(model); navigation.setModel(model); setTreeSelection("$root"); + //TC-20090702 Fix bug #1772 + model.nodeChanged(model.getRoot()); + java.util.Enumeration<?> e = model.getRoot().children(); + while (e.hasMoreElements()) { + NavigationTreeNode n = (NavigationTreeNode) e.nextElement(); + String contextPath = n.getContextPath(); + if (contextPath.equals("$root/$cells")) { + //TC-20090702 : ce noeud est trop long a recharger + continue; + } + log.debug("reload node " + contextPath); + model.nodeChanged(n); + java.util.Enumeration<?> e2 = n.children(); + while (e2.hasMoreElements()) { + NavigationTreeNode n2 = (NavigationTreeNode) e2.nextElement(); + n2.getJAXXContextValue(InputUI.this); + } + } } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-07-02 16:39:15 UTC (rev 2463) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-07-02 18:11:02 UTC (rev 2464) @@ -21,7 +21,7 @@ <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> - <fr.ifremer.isisfish.ui.input.InputNavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> + <jaxx.runtime.swing.navigation.NavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> @@ -113,6 +113,24 @@ setContextValue(model); navigation.setModel(model); setTreeSelection("$root"); + //TC-20090702 Fix bug #1772 + model.nodeChanged(model.getRoot()); + java.util.Enumeration<?> e = model.getRoot().children(); + while (e.hasMoreElements()) { + NavigationTreeNode n = (NavigationTreeNode) e.nextElement(); + String contextPath = n.getContextPath(); + if (contextPath.equals("$root/$cells")) { + //TC-20090702 : ce noeud est trop long a recharger + continue; + } + log.debug("reload node " + contextPath); + model.nodeChanged(n); + java.util.Enumeration<?> e2 = n.children(); + while (e2.hasMoreElements()) { + NavigationTreeNode n2 = (NavigationTreeNode) e2.nextElement(); + n2.getJAXXContextValue(SensitivityTabUI.this); + } + } } } public void repaintNode(String path) {

1 0

r2463 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: chatellier Date: 2009-07-02 16:39:15 +0000 (Thu, 02 Jul 2009) New Revision: 2463 Modified: isis-fish/trunk/pom.xml Log: Change version Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-07-02 16:36:23 UTC (rev 2462) +++ isis-fish/trunk/pom.xml 2009-07-02 16:39:15 UTC (rev 2463) @@ -13,7 +13,7 @@ <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.2.0.5-SNAPSHOT</version> + <version>3.2.0.5-rc1-SNAPSHOT</version>  <dependencies> @@ -546,7 +546,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>1.2</version> + <version>2.1</version> </plugin> </plugins> </reporting>

1 0

r2462 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: chatellier Date: 2009-07-02 16:36:23 +0000 (Thu, 02 Jul 2009) New Revision: 2462 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx Log: Creattino d'un nouveau model a chaque refresh(). L'utilisation du model existant marche pas (avec les selections , etc...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-02 16:26:57 UTC (rev 2461) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-02 16:36:23 UTC (rev 2462) @@ -62,15 +62,13 @@ setBean(null); setBean((SetOfVesselsImpl) setOfVessels); - EffortDescriptionListModel model = (EffortDescriptionListModel)fieldEffortDescriptionEffortDescriptionList.getModel(); + EffortDescriptionListModel model = new EffortDescriptionListModel(); // getBean().getPossibleMetiers() can be null at region creation if (getBean() != null && getBean().getPossibleMetiers() != null) { java.util.List<EffortDescription> effortDescriptions = new ArrayList<EffortDescription>(getBean().getPossibleMetiers()); model.setEffortDescriptions(effortDescriptions); } - else { - model.setEffortDescriptions(null); - } + fieldEffortDescriptionEffortDescriptionList.setModel(model); } @Override @@ -107,7 +105,7 @@ <JScrollPane> <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="{javax.swing.ListSelectionModel.SINGLE_SELECTION}" onValueChanged='effortDescriptionSelectionChanged()' - model='{new EffortDescriptionListModel()}' cellRenderer='{new EffortDescriptionListRenderer()}' + cellRenderer='{new EffortDescriptionListRenderer()}' enabled='{isActif()}' decorator='boxed' /> </JScrollPane> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-07-02 16:26:57 UTC (rev 2461) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-07-02 16:36:23 UTC (rev 2462) @@ -83,14 +83,12 @@ } protected void setEffortDescriptionEffortDescriptionList() { - EffortDescriptionListModel model = (EffortDescriptionListModel)fieldEffortDescriptionEffortDescriptionList.getModel(); + EffortDescriptionListModel model = new EffortDescriptionListModel(); if (getBean() != null && getBean().getPossibleMetiers() != null) { java.util.List<EffortDescription> effortDescriptions = new ArrayList<EffortDescription>(getBean().getPossibleMetiers()); model.setEffortDescriptions(effortDescriptions); } - else { - model.setEffortDescriptions(null); - } + fieldEffortDescriptionEffortDescriptionList.setModel(model); } protected void addEffortDescriptions() { @@ -108,7 +106,6 @@ getInputAction().removeEffortDescription(getBean(), selectedEffortDescription); } setEffortDescriptionEffortDescriptionList(); - fieldEffortDescriptionEffortDescriptionList.clearSelection(); // bug selected index still exists } ]]> </script> @@ -136,7 +133,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - model='{new EffortDescriptionListModel()}' cellRenderer='{new EffortDescriptionListRenderer()}' + cellRenderer='{new EffortDescriptionListRenderer()}' onValueChanged='onFieldEffortDescriptionEffortDescriptionListValueChanged()' enabled='{isActif()}' decorator='boxed' /> </JScrollPane> </cell>

1 0

r2461 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: tchemit Date: 2009-07-02 16:26:57 +0000 (Thu, 02 Jul 2009) New Revision: 2461 Modified: isis-fish/trunk/changelog.txt Log: update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-07-02 16:24:47 UTC (rev 2460) +++ isis-fish/trunk/changelog.txt 2009-07-02 16:26:57 UTC (rev 2461) @@ -1,5 +1,5 @@ isis-fish (3.2.0.4-rc2) xxx - + * Fix bug 1900 ( https://labs.libre-entreprise.org/tracker/index.php?func=detail&aid=1900&gr… ) * Fix simulation plan subjob number : start at 0 * Fix bug, database migration asked twice * Fix VCSSVN getRemoteStatus(), not showed added status file

1 0

r2460 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by tchemit＠users.labs.libre-entreprise.org 02 Jul '09

02 Jul '09

Author: tchemit Date: 2009-07-02 16:24:47 +0000 (Thu, 02 Jul 2009) New Revision: 2460 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: #BUG 1900 : region does not update after loading another region on nodes previously opened... Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -63,6 +63,9 @@ // otherwize, setBean has no effect setBean(null); setBean((CellImpl) cell); + + // reload region in map + refreshRegionInMap(cellMap); cellChanged = false; jaxx.runtime.SwingUtil.fillComboBox(fieldCell, getRegion().getCell(), getBean()); 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/InputContentUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -106,6 +106,21 @@ getParentContainer(InputUI.class).setTreeSelection(getNextPath()); } +/** + * Mettre a jour la region dans une map si necessaire. + * + * @param map la map a mettre a jour si necessaire + */ +protected void refreshRegionInMap(fr.ifremer.isisfish.map.IsisMapBean map) { + FisheryRegion fisheryRegion = map.getFisheryRegion(); + FisheryRegion regionFromContext = getRegion(); + if (fisheryRegion == null || !fisheryRegion.equals(regionFromContext)) { + log.info("use now " + regionFromContext + " in map " + map); + map.setFisheryRegion(regionFromContext); + } +} + + // TODO this method cause a lot of probleme // must cast TopiaEntity to impl in inherited UIs... // 20090602 chatellier : useless method ? cause a lot of cast problem Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -36,9 +36,6 @@ boolean portChanged = true; -portMap.setFisheryRegion(getRegion()); -//portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); -//portMap.setActiveMouseMode(new SelectMouseMode()); toolSet.setupListeners(portMap); toolMap.add((Component)toolSet); setMapListener(); @@ -53,8 +50,8 @@ } if (evt.getNewValue() != null) { - } } + } }); @Override @@ -65,7 +62,9 @@ // otherwize, setBean has no effect setBean(null); setBean((PortImpl) port); - + // reload region in map + refreshRegionInMap(portMap); + fillList(); } @@ -129,7 +128,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0' > - <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' /> + <JTextField id="fieldPortName" text='{SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' /> </cell> </row> <row> @@ -153,7 +152,7 @@ <row> <cell columns='2' fill='both' weighty='0.3' weightx='1.0' > <JScrollPane> - <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldPortComment" text='{SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -176,7 +175,7 @@ </Table> <JPanel id='map' layout='{new BorderLayout()}'> <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> - <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed'/> + <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed' fisheryRegion='{getRegion()}'/> </JPanel> </JSplitPane> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-07-02 16:16:41 UTC (rev 2459) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-07-02 16:24:47 UTC (rev 2460) @@ -64,6 +64,9 @@ setBean(null); setBean((ZoneImpl) zone); + // reload region in map + refreshRegionInMap(zoneMap); + if (getBean() != null) { setZoneCells(); zoneMap.setSelectedCells(getBean().getCell());

1 0