Author: chatellier Date: 2011-03-31 16:06:07 +0000 (Thu, 31 Mar 2011) New Revision: 3223 Log: Fix tree nextPath navigation Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -28,6 +28,7 @@ <fr.ifremer.isisfish.entities.Cell id='bean' javaBean='null'/> <import> + static org.nuiton.i18n.I18n.n_ java.awt.event.MouseEvent; fr.ifremer.isisfish.entities.Cell; com.bbn.openmap.gui.Tool; @@ -48,7 +49,8 @@ protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueZones")); - setNextPath("$root/$zones"); + setNextPath(n_("isisfish.input.tree.zones")); + new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -27,6 +27,7 @@ <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> <import> + static org.nuiton.i18n.I18n.n_ java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; </import> @@ -34,7 +35,7 @@ protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueMetiers")); - setNextPath("$root/$metiers"); + setNextPath(n_("isisfish.input.tree.metiers")); addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -33,7 +33,7 @@ <Boolean id='sensitivity' javaBean='false'/> <!-- Next button title --> - <java.lang.String id='buttonTitle' javaBean='""'/> + <java.lang.String id='buttonTitle' javaBean='null'/> <!-- Next path --> <java.lang.String id='nextPath' javaBean='null'/> @@ -129,8 +129,12 @@ } } protected void goTo() { - // FIXME echatellier 20110306 use new tree api - //getParentContainer(InputUI.class).setTreeSelection(getNextPath()); + // FIXME il ne faut pas appeler le parent + // on ne sais jamais de quel type est le parent + InputUI inputUI = getParentContainer(InputUI.class); + if (inputUI != null) { + inputUI.getHandler().setTreeSelection(this, nextPath); + } } /** @@ -228,5 +232,5 @@ ]]></script> <JPanel id='body' constraints='BorderLayout.CENTER' layout='{new BorderLayout()}' /> <JButton id='next' text='{getButtonTitle()}' constraints='BorderLayout.SOUTH' - visible='{getNextPath() != null}' onActionPerformed='goTo()' decorator='boxed'/> + visible='{getButtonTitle() != null}' onActionPerformed='goTo()' decorator='boxed'/> </JPanel> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-03-31 16:06:07 UTC (rev 3223) @@ -589,13 +589,32 @@ * Called by specific UI (CellUI to change node). * * @param inputUI context ui (to get context value tree helper...) - * @param topiaId node id to select + * @param nodeId node id to select */ - public void setTreeSelection(InputContentUI<?> inputUI, String topiaId) { + public void setTreeSelection(InputContentUI<?> inputUI, String nodeId) { + setTreeSelection(inputUI, null, nodeId); + } + + /** + * Change tree selection with new node id. + * + * Called by specific UI (CellUI to change node). + * + * @param inputUI context ui (to get context value tree helper...) + * @param parentNodeId find node to select from this node + * @param nodeId node id to select + */ + public void setTreeSelection(InputContentUI<?> inputUI, String parentNodeId, String nodeId) { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); TreeModel fisheryTreeModel = inputUI.getContextValue(TreeModel.class); - FisheryTreeNode newSelectNode = fisheryTreeHelper.findNode((FisheryTreeNode)fisheryTreeModel.getRoot(), topiaId); - fisheryTreeHelper.selectNode(newSelectNode); + FisheryTreeNode fromNode = (FisheryTreeNode)fisheryTreeModel.getRoot(); + if (parentNodeId != null) { + fromNode = fisheryTreeHelper.findNode(fromNode, parentNodeId); + } + FisheryTreeNode newSelectNode = fisheryTreeHelper.findNode(fromNode, nodeId); + if (newSelectNode != null) { + fisheryTreeHelper.selectNode(newSelectNode); + } } /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -28,6 +28,7 @@ <import> static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.n_ java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; </import> @@ -36,7 +37,7 @@ protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueTripTypes")); - setNextPath("$root/$tripTypes"); + setNextPath(n_("isisfish.input.tree.triptypes")); // install change listener // (depends on sensitivity c'ant be done on constructor) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -28,6 +28,7 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> + static org.nuiton.i18n.I18n.n_ fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; </import> <script><![CDATA[ @@ -35,7 +36,7 @@ protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueGears")); - setNextPath("$root/$gears"); + setNextPath(n_("isisfish.input.tree.gears")); // install change listener // (depends on sensitivity can't be done on constructor) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -28,6 +28,7 @@ <fr.ifremer.isisfish.entities.Port id='bean' javaBean='null'/> <import> + static org.nuiton.i18n.I18n.n_ fr.ifremer.isisfish.entities.Port; fr.ifremer.isisfish.entities.Cell; com.bbn.openmap.gui.Tool; @@ -73,7 +74,7 @@ }; setButtonTitle(_("isisfish.input.continueSpecies")); - setNextPath("$root/$species"); + setNextPath(n_("isisfish.input.tree.species")); addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -26,10 +26,13 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> + <import> + static org.nuiton.i18n.I18n.n_ + </import> <script><![CDATA[ protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueStrategies")); - setNextPath("$root/$strategies"); + setNextPath(n_("isisfish.input.tree.strategies")); // install change listener // (depends on sensitivity can't be done on constructor) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -28,6 +28,7 @@ <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/> <import> + static org.nuiton.i18n.I18n.n_ fr.ifremer.isisfish.entities.Species; jaxx.runtime.swing.editor.NumberEditor; java.beans.PropertyChangeEvent; @@ -55,6 +56,21 @@ }); } + at Override +protected void goTo() { + // FIXME il ne faut pas appeler le parent + // on ne sais jamais de quel type est le parent + InputUI inputUI = getParentContainer(InputUI.class); + if (inputUI != null) { + if (getBean() == null) { + inputUI.getHandler().setTreeSelection(this, n_("isisfish.input.tree.species"), n_("isisfish.input.tree.populations")); + } + else { + inputUI.getHandler().setTreeSelection(this, getBean().getTopiaId(), n_("isisfish.input.tree.populations")); + } + } +} + public void refresh() { Species species = (Species)getVerifier().getEntity(Species.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -28,6 +28,7 @@ <fr.ifremer.isisfish.entities.TripType id='bean' javaBean='null'/> <import> + static org.nuiton.i18n.I18n.n_ fr.ifremer.isisfish.entities.TripType; fr.ifremer.isisfish.types.TimeUnit; java.beans.PropertyChangeEvent; @@ -37,7 +38,7 @@ setButtonTitle(_("isisfish.input.continueVesselTypes")); -setNextPath("$root/$vesselTypes"); +setNextPath(n_("isisfish.input.tree.vesseltypes")); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -28,6 +28,7 @@ <fr.ifremer.isisfish.entities.VesselType id='bean' javaBean='null'/> <import> + static org.nuiton.i18n.I18n.n_ fr.ifremer.isisfish.entities.VesselType; fr.ifremer.isisfish.entities.TripType; fr.ifremer.isisfish.types.TimeUnit; @@ -41,7 +42,8 @@ protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueSetOfVessels")); - setNextPath("$root/$setOfVessels"); + setNextPath(n_("isisfish.input.tree.setofvessels")); + addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-31 16:06:07 UTC (rev 3223) @@ -28,6 +28,7 @@ <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/> <import> + static org.nuiton.i18n.I18n.n_ javax.swing.event.ListSelectionEvent; fr.ifremer.isisfish.entities.Cell; fr.ifremer.isisfish.entities.Zone; @@ -48,6 +49,10 @@ protected OMToolSet toolSet = new OMToolSet(); protected void $afterCompleteSetup() { + + setButtonTitle(_("isisfish.input.continuePorts")); + setNextPath(n_("isisfish.input.tree.ports")); + toolSet.setupListeners(zoneMap); toolMap.add((Tool)toolSet); @@ -64,9 +69,6 @@ } }; - setButtonTitle(_("isisfish.input.continuePorts")); - setNextPath("$root/$ports"); - addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2011-03-31 16:06:07 UTC (rev 3223) @@ -22,7 +22,7 @@ */ package fr.ifremer.isisfish.ui.input.tree; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import javax.swing.tree.TreeModel; @@ -68,25 +68,25 @@ // first level nodes FisheryTreeNode cellsChild = new FisheryTreeNode(Cell.class, - _("isisfish.input.tree.cells"), null, new CellsNodeLoador()); + n_("isisfish.input.tree.cells"), null, new CellsNodeLoador()); FisheryTreeNode zonesChild = new FisheryTreeNode(Zone.class, - _("isisfish.input.tree.zones"), null, new ZonesNodeLoador()); + n_("isisfish.input.tree.zones"), null, new ZonesNodeLoador()); FisheryTreeNode portsChild = new FisheryTreeNode(Port.class, - _("isisfish.input.tree.ports"), null, new PortsNodeLoador()); + n_("isisfish.input.tree.ports"), null, new PortsNodeLoador()); FisheryTreeNode speciesChild = new FisheryTreeNode(Species.class, - _("isisfish.input.tree.species"), null, new SpeciesNodeLoador()); + n_("isisfish.input.tree.species"), null, new SpeciesNodeLoador()); FisheryTreeNode gearsChild = new FisheryTreeNode(Gear.class, - _("isisfish.input.tree.gears"), null, new GearsNodeLoador()); + n_("isisfish.input.tree.gears"), null, new GearsNodeLoador()); FisheryTreeNode metiersChild = new FisheryTreeNode(Metier.class, - _("isisfish.input.tree.metiers"), null, new MetiersNodeLoador()); + n_("isisfish.input.tree.metiers"), null, new MetiersNodeLoador()); FisheryTreeNode tripTypesChild = new FisheryTreeNode(TripType.class, - _("isisfish.input.tree.triptypes"), null, new TripTypesNodeLoador()); + n_("isisfish.input.tree.triptypes"), null, new TripTypesNodeLoador()); FisheryTreeNode vesselTypesChild = new FisheryTreeNode(VesselType.class, - _("isisfish.input.tree.vesseltypes"), null, new VesselTypesNodeLoador()); + n_("isisfish.input.tree.vesseltypes"), null, new VesselTypesNodeLoador()); FisheryTreeNode setOfVesselsChild = new FisheryTreeNode(SetOfVessels.class, - _("isisfish.input.tree.setofvessels"), null, new SetOfVesselsNodeLoador()); + n_("isisfish.input.tree.setofvessels"), null, new SetOfVesselsNodeLoador()); FisheryTreeNode strategiesChild = new FisheryTreeNode(Strategy.class, - _("isisfish.input.tree.strategies"), null, new StrategiesNodeLoador()); + n_("isisfish.input.tree.strategies"), null, new StrategiesNodeLoador()); root.add(cellsChild); root.add(zonesChild); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2011-03-31 16:06:07 UTC (rev 3223) @@ -23,6 +23,8 @@ package fr.ifremer.isisfish.ui.input.tree; +import static org.nuiton.i18n.I18n._; + import java.awt.Component; import javax.swing.JTree; @@ -77,7 +79,7 @@ FisheryTreeNode node = (FisheryTreeNode)value; if (!node.isStaticNode() || node.isStringNode()) { - stringValue = node.getId(); + stringValue = _(node.getId()); } else { FisheryRegion fisheryRegion = provider.getFisheryRegion(); TopiaContext topiaContext = ((FisheryRegionImpl)fisheryRegion).getTopiaContext(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-03-31 16:02:49 UTC (rev 3222) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2011-03-31 16:06:07 UTC (rev 3223) @@ -22,7 +22,7 @@ */ package fr.ifremer.isisfish.ui.input.tree.loadors; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.util.List; @@ -67,7 +67,7 @@ // Create clients static nodes FisheryTreeNode speciesPopulationStaticNode = new FisheryTreeNode( - Population.class, _("isisfish.input.tree.populations"), + Population.class, n_("isisfish.input.tree.populations"), null, new PopulationsNodeLoador(species)); speciesNode.add(speciesPopulationStaticNode);