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&group_id=8&atid=113 ) 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&group_id=8&atid=113 ) * Fix bug 1900 ( https://labs.libre-entreprise.org/tracker/index.php?func=detail&aid=1900&group_id=8&atid=113 ) * 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) {