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

r2472 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: actions simulator/launcher
by chatellier＠users.labs.libre-entreprise.org July 7, 2009

July 7, 2009

Author: chatellier Date: 2009-07-07 10:15:31 +0000 (Tue, 07 Jul 2009) New Revision: 2472 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Add timing debug logs Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-07-07 09:09:10 UTC (rev 2471) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-07-07 10:15:31 UTC (rev 2472) @@ -206,6 +206,10 @@ log.info(" prescript file : " + simulationPrescript); } + if (log.isDebugEnabled()) { + log.debug("Timing : init isis simulation action : " + new java.util.Date()); + } + String name = simulationId; // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date()); SimulationControl control = new SimulationControl(name); @@ -237,9 +241,17 @@ if (log.isInfoEnabled()) { log.info("Compressing simulation as zip : " + simulationResultArchive); + if (log.isDebugEnabled()) { + log.debug("Timing : before zipping results : " + new java.util.Date()); + } } + ZipUtil.compress(simulationResultArchive, simulationStorage.getFile(), null, true); + if (log.isDebugEnabled()) { + log.debug("Timing : after zipping results : " + new java.util.Date()); + } + simulationStorage.getStorage().closeContext(); // remove simulation @@ -248,6 +260,10 @@ } simulationStorage.delete(false); + if (log.isDebugEnabled()) { + log.debug("Timing : end isis simulation action : " + new java.util.Date()); + } + // FIXME integrer ca dans le process normal d'init IsisFish.quit(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-07-07 09:09:10 UTC (rev 2471) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-07-07 10:15:31 UTC (rev 2472) @@ -104,9 +104,15 @@ } } + if (log.isDebugEnabled()) { + log.debug("Timing : before import zip : " + new java.util.Date()); + } simulation = SimulationStorage .importAndRenameZip(simulationZip, id); - + if (log.isDebugEnabled()) { + log.debug("Timing : after import zip : " + new java.util.Date()); + } + // add missing control informations // TODO again region database directory hack // force region reading in simulation directory @@ -414,10 +420,10 @@ SimulationContext context = SimulationContext.get(); - context.closeDB(); - context.closeDBResult(); + //context.closeDB(); + //context.closeDBResult(); - try { + /*try { // close all transaction if (context.getSimulationStorage() != null) { context.getSimulationStorage().closeMemStorage(); @@ -427,7 +433,7 @@ if (log.isWarnEnabled()) { log.warn("Can't close all transaction", eee); } - } + }*/ SimulationContext.remove();

1 0

r2471 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org July 7, 2009

July 7, 2009

Author: chatellier Date: 2009-07-07 09:09:10 +0000 (Tue, 07 Jul 2009) New Revision: 2471 Modified: isis-fish/trunk/pom.xml Log: Deplacement de assembly hors du profile release. (c'est long quand on en fait beaucoup) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-07-06 15:31:36 UTC (rev 2470) +++ isis-fish/trunk/pom.xml 2009-07-07 09:09:10 UTC (rev 2471) @@ -498,6 +498,25 @@ </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-4</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> @@ -731,24 +750,6 @@ </configuration> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-3</version> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> </profile>

1 0

r2470 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org July 6, 2009

July 6, 2009

Author: sletellier Date: 2009-07-06 15:31:36 +0000 (Mon, 06 Jul 2009) New Revision: 2470 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx Log: Maturity group can be null Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-07-06 15:30:38 UTC (rev 2469) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-07-06 15:31:36 UTC (rev 2470) @@ -63,13 +63,10 @@ setBean((PopulationImpl) population); if (getBean() != null) { - // TODO : Selection equation - if (getBean() != null) { - if (getBean().getPopulationGroup() != null) { - jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true); - } - setTableAgeLengthModel(); - } + if (getBean().getPopulationGroup() != null) { + jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true); + } + setTableAgeLengthModel(); } getVerifier().addCurrentPanel(growthEquation, growthReverseEquation); } @@ -101,8 +98,8 @@ } protected void matureClassChanged(){ Object selected = fieldPopulationBasicsMatureClass.getSelectedItem(); - if (selected != null){ - getBean().setMaturityGroup((PopulationGroup) selected); + if (getBean() != null){ + getBean().setMaturityGroup((PopulationGroup) selected); } } protected void setTableAgeLengthModel(){ @@ -180,7 +177,7 @@ </row> <row> <cell columns='3' fill='both' weightx='1.0'> - <JTable id='tableAgeLength' rowHeight='24' enabled='{isActif()}' decorator='boxed'/> + <JTable id='tableAgeLength' rowHeight='24' enabled='false' decorator='boxed'/> </cell> </row> <row>

1 0

r2469 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org July 6, 2009

July 6, 2009

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 July 6, 2009

July 6, 2009

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 July 6, 2009

July 6, 2009

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 July 6, 2009

July 6, 2009

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 July 6, 2009

July 6, 2009

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 July 2, 2009

July 2, 2009

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 July 2, 2009

July 2, 2009

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