Author: sletellier Date: 2009-05-12 15:03:20 +0000 (Tue, 12 May 2009) New Revision: 2220 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx Log: UI optimisation 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-05-12 14:40:58 UTC (rev 2219) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-05-12 15:03:20 UTC (rev 2220) @@ -72,7 +72,6 @@ import jaxx.runtime.swing.navigation.NavigationUtil; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.FisheryRegionImpl; -import jaxx.runtime.swing.navigation.NavigationTreeCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeModel; import jaxx.runtime.Decorator; import jaxx.runtime.JXPathDecorator; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-05-12 14:40:58 UTC (rev 2219) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-05-12 15:03:20 UTC (rev 2220) @@ -58,17 +58,15 @@ protected InputContentUI currentUI = null; protected TopiaEntity currentEntity = null; - public SensitivityNavigationTreeSelectionAdapter(SensitivityTabUI context, boolean register) { + public SensitivityNavigationTreeSelectionAdapter(SensitivityTabUI context) { super(SensitivityTabUI.class, null, context, Strategy.PER_UI_TYPE); if (context.getNavigation() == null) { throw new IllegalArgumentException("could not have a null 'navigation' in ui " + context); } - if (register) { - // register in tree this listener - context.getNavigation().addTreeSelectionListener(this); - } + // register in tree this listener + context.getNavigation().addTreeSelectionListener(this); } @Override 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-05-12 14:40:58 UTC (rev 2219) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-05-12 15:03:20 UTC (rev 2220) @@ -21,6 +21,8 @@ <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> + <jaxx.runtime.swing.navigation.NavigationTreeCellRenderer id='navigationTreeCellRenderer' constructorParams='this'/> + <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> <java.awt.CardLayout id='cardlayoutPrincipal'/> @@ -33,7 +35,6 @@ import fr.ifremer.isisfish.ui.input.InputAction; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import jaxx.runtime.swing.navigation.NavigationTreeCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeModel; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; @@ -46,6 +47,7 @@ // end code constructor getVerifier().setSensPanel(this); +new fr.ifremer.isisfish.ui.sensitivity.SensitivityNavigationTreeSelectionAdapter(this); factors.addMouseListener(new MouseListener() { @Override @@ -125,12 +127,9 @@ String regionName = getRegion().getName(); setContextValue(getRegion()); NavigationTreeModel model = SensitivityNavigationTreeSelectionAdapter.getTreeModel(regionName, getRegion()); - navigation.setSelectionModel(navigationSelectionModel); - navigation.setCellRenderer(new NavigationTreeCellRenderer(this)); setContextValue(model); navigation.setModel(model); - new SensitivityNavigationTreeSelectionAdapter(this, true); setTreeSelection("$root"); } } @@ -187,7 +186,10 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTree id="navigation" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + <JTree id="navigation" rootVisible="true" selectionRow='0' + selectionModel='{getNavigationSelectionModel()}' + cellRenderer='{getNavigationTreeCellRenderer()}' + model='{new DefaultTreeModel(null)}'/> </JScrollPane> </cell> </row>