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

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

02 Jul '09

Author: tchemit Date: 2009-07-02 16:16:41 +0000 (Thu, 02 Jul 2009) New Revision: 2459 Modified: isis-fish/trunk/pom.xml Log: use extraImportList instead of extraImport in jaxx plugin Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-07-02 13:48:42 UTC (rev 2458) +++ isis-fish/trunk/pom.xml 2009-07-02 16:16:41 UTC (rev 2459) @@ -450,10 +450,7 @@ <goal>generate</goal> </goals> <configuration> - <extraImports> - <value>jaxx.runtime.SwingUtil</value> - <value>static jaxx.runtime.Util.getStringValue</value> - </extraImports> + <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.Util.getStringValue</extraImportList> <addSourcesToClassPath>true</addSourcesToClassPath> <addProjectClassPath>true</addProjectClassPath> </configuration>

1 0

r2458 - 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 13:48:42 +0000 (Thu, 02 Jul 2009) New Revision: 2458 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx Log: Some field are still 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-02 08:31:00 UTC (rev 2457) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-07-02 13:48:42 UTC (rev 2458) @@ -100,8 +100,8 @@ @Override public void setActionButtons() { - //getVerifier().setSaveButton(save); - //getVerifier().setCancelButton(cancel); + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); } protected void setNaturalDeathRateMatrix() { @@ -194,7 +194,7 @@ _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/--> <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' - enabled='false' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> </cell> </row> <row> @@ -236,7 +236,7 @@ </JScrollPane> </cell> </row> -  + </row> </Table> </fr.ifremer.isisfish.ui.input.InputContentUI>

1 0

r2457 - 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 08:31:00 +0000 (Thu, 02 Jul 2009) New Revision: 2457 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx Log: Fix NPE 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-01 17:05:51 UTC (rev 2456) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2009-07-02 08:31:00 UTC (rev 2457) @@ -63,7 +63,8 @@ setBean((SetOfVesselsImpl) setOfVessels); EffortDescriptionListModel model = (EffortDescriptionListModel)fieldEffortDescriptionEffortDescriptionList.getModel(); - if (getBean() != null) { + // 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); }

1 0

r2456 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input resources/i18n
by chatellier＠users.labs.libre-entreprise.org 01 Jul '09

01 Jul '09

Author: chatellier Date: 2009-07-01 17:05:51 +0000 (Wed, 01 Jul 2009) New Revision: 2456 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/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties Log: Le nom du traget species ne peut pas ?\195?\170tre le nom d'un model, il n'y en a pas au debut. (nom du metier + nom de l'espece + nom de la saison) 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-01 16:46:19 UTC (rev 2455) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-07-01 17:05:51 UTC (rev 2456) @@ -735,13 +735,17 @@ } public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, - Species species, String targetFactorEquationName, - String targetFactorEquationContent, boolean primaryCatch) { + Species species, String targetFactorEquationContent, boolean primaryCatch) { if (log.isDebugEnabled()) { log.debug("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquationContent); } try { + // build targetFactorEquation name + String targetFactorEquationName = metier.getName() + "-" + species.getName() + + "(" + m.getFirstMonth() + "-" + m.getLastMonth() + ")"; + + TargetSpeciesDAO dao = IsisFishDAOHelper.getTargetSpeciesDAO(metier .getTopiaContext()); TargetSpecies targetSpecies = dao.create(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-07-01 16:46:19 UTC (rev 2455) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-07-01 17:05:51 UTC (rev 2456) @@ -108,12 +108,13 @@ protected void add() { Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); if (getMetierSeasonInfo() != null && species != null) { - Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem(); + // il n'y en a pas a la creaion de la base + //Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem(); getContextValue(InputAction.class).addTargetSpecies( getBean(), getMetierSeasonInfo(), (Species)species, - selectedFormule.getName(), + /* selectedFormule.getName(), */ targetFactor.getEditor().getText(), fieldPrimaryCatch.isSelected()); setTableTargetSpeciesModel(); Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-01 16:46:19 UTC (rev 2455) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-01 17:05:51 UTC (rev 2456) @@ -631,6 +631,7 @@ isisfish.message.script.commit=Enter commit message isisfish.message.setting.cache.aspects=Setting Cache aspects isisfish.message.setting.trace.aspects=Setting Trace aspects +isisfish.message.simulation.after=Result exports isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Preparing simulation

1 0

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

01 Jul '09

Author: chatellier Date: 2009-07-01 16:46:19 +0000 (Wed, 01 Jul 2009) New Revision: 2455 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx Log: Fix NPE Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-07-01 16:38:42 UTC (rev 2454) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-07-01 16:46:19 UTC (rev 2455) @@ -86,11 +86,15 @@ protected void setTableTargetSpeciesModel() { if (getMetierSeasonInfo() != null) { java.util.List<TargetSpecies> targetSpecies = new ArrayList<TargetSpecies>(); - // move collection to list - // and add all entity to verifier - for (TargetSpecies oneTargetSpecies : getMetierSeasonInfo().getSpeciesTargetSpecies()) { - getVerifier().addCurrentEntity(oneTargetSpecies); - targetSpecies.add(oneTargetSpecies); + + // SpeciesTargetSpecies can be null durring region creation + if (getMetierSeasonInfo().getSpeciesTargetSpecies() != null) { + // move collection to list + // and add all entity to verifier + for (TargetSpecies oneTargetSpecies : getMetierSeasonInfo().getSpeciesTargetSpecies()) { + getVerifier().addCurrentEntity(oneTargetSpecies); + targetSpecies.add(oneTargetSpecies); + } } // set table model

1 0

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

01 Jul '09

Author: chatellier Date: 2009-07-01 16:38:42 +0000 (Wed, 01 Jul 2009) New Revision: 2454 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx Log: Always set table model (to force data clearing) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-07-01 16:08:08 UTC (rev 2453) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-07-01 16:38:42 UTC (rev 2454) @@ -79,21 +79,25 @@ } protected void setSelectivityTableModel() { + + java.util.List<Selectivity> selectivitiesList = new ArrayList<Selectivity>(); + + // set model even if no selectivity + // to clear data if (getBean().getPopulationSelectivity() != null){ - java.util.List<Selectivity> selectivitiesList = new ArrayList<Selectivity>(); // move collection to list // and add all entity to verifier for (Selectivity oneSelectivity : getBean().getPopulationSelectivity()) { getVerifier().addCurrentEntity(oneSelectivity); selectivitiesList.add(oneSelectivity); } + } - // set table model - GearPopulationSelectivityModel model = new GearPopulationSelectivityModel(selectivitiesList); - selectivityTable.setModel(model); - selectivityTable.setDefaultRenderer(Equation.class, model); - selectivityTable.setDefaultEditor(Equation.class, new EquationTableEditor()); - } + // set table model + GearPopulationSelectivityModel model = new GearPopulationSelectivityModel(selectivitiesList); + selectivityTable.setModel(model); + selectivityTable.setDefaultRenderer(Equation.class, model); + selectivityTable.setDefaultEditor(Equation.class, new EquationTableEditor()); } protected void addSelectivity() {

1 0

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

01 Jul '09

Author: chatellier Date: 2009-07-01 16:08:08 +0000 (Wed, 01 Jul 2009) New Revision: 2453 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx Log: Enabled port modification 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-01 16:07:56 UTC (rev 2452) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-07-01 16:08:08 UTC (rev 2453) @@ -93,7 +93,7 @@ for (Cell c : portMap.getSelectedCells()) { if (getBean() != null) { if (getBean().getCell() != null) { - if (getBean().getCell().getTopiaId().equals(c.getTopiaId())){ + if (!getBean().getCell().getTopiaId().equals(c.getTopiaId())){ getBean().setCell(c); return true; }

1 0

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

01 Jul '09

Author: chatellier Date: 2009-07-01 16:07:56 +0000 (Wed, 01 Jul 2009) New Revision: 2452 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx Log: Set center alignment 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-01 15:54:40 UTC (rev 2451) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-07-01 16:07:56 UTC (rev 2452) @@ -133,7 +133,7 @@ <cell> <JLabel text="isisfish.cell.name" enabled='{isActif()}'/> </cell> - <cell fill='horizontal' weightx='1.0'> + <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' decorator='boxed' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> </cell> @@ -142,7 +142,7 @@ <cell> <JLabel text="isisfish.cell.latitude" enabled='{isActif()}'/> </cell> - <cell fill='horizontal' weightx='1.0'> + <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/> </cell> </row> @@ -150,7 +150,7 @@ <cell> <JLabel text="isisfish.cell.longitude" enabled='{isActif()}'/> </cell> - <cell fill='horizontal' weightx='1.0'> + <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/> </cell> </row> @@ -158,13 +158,13 @@ <cell> <JLabel text="isisfish.cell.land" enabled='{isActif()}'/> </cell> - <cell fill='horizontal' weightx='1.0'> + <cell fill='horizontal' weightx='1.0'> <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}' decorator='boxed'/> </cell> </row> <row> <cell columns='2' fill='horizontal'> - <JLabel text="isisfish.cell.comments" enabled='{isActif()}'/> + <JLabel text="isisfish.cell.comments" enabled='{isActif()}' horizontalAlignment="center"/> </cell> </row> <row> @@ -176,10 +176,10 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text='isisfish.common.save' decorator='boxed'/> + <JButton id='save' text='isisfish.common.save' decorator='boxed'/> </cell> - <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text='isisfish.common.cancel' decorator='boxed'/> + <cell fill='horizontal' weightx='0.5'> + <JButton id='cancel' text='isisfish.common.cancel' decorator='boxed'/> </cell> </row> </Table>

1 0

r2451 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 01 Jul '09

01 Jul '09

Author: chatellier Date: 2009-07-01 15:54:40 +0000 (Wed, 01 Jul 2009) New Revision: 2451 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Fix i18n translation Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-07-01 10:03:24 UTC (rev 2450) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-07-01 15:54:40 UTC (rev 2451) @@ -631,6 +631,7 @@ isisfish.message.script.commit=Indiquez vos modifications isisfish.message.setting.cache.aspects=Mise en place des aspects Cache isisfish.message.setting.trace.aspects=Mise en place des aspects Trace +isisfish.message.simulation.after=Export des r\u00E9sultats isisfish.message.simulation.ended=Simulation termin\u00E9e isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Pr\u00E9paration de la simulation @@ -1103,7 +1104,7 @@ isisfish.wizardGroupCreation.timeStep=Pas de temps (en mois) isisfish.wizardGroupCreation.title=Cr\u00E9ation du groupe isisfish.wizardGroupCreation.undefinedGrowthEquation=L'\u00E9quation utilis\u00E9e est la courbe de croissance de la population. Elle doit \u00EAtre pr\u00E9alablement d\u00E9finie. -isisfish.zone.cells=cellules de la Zone +isisfish.zone.cells=Cellules de la zone isisfish.zone.comments=Commentaires isisfish.zone.name=Nom region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite=

1 0

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

01 Jul '09

Author: tchemit Date: 2009-07-01 10:03:24 +0000 (Wed, 01 Jul 2009) New Revision: 2450 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java Log: fix bug 1858 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-07-01 09:57:59 UTC (rev 2449) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-07-01 10:03:24 UTC (rev 2450) @@ -182,43 +182,26 @@ return null; } - ChildBuilder<TopiaEntity> childParentBuilder = new ChildBuilder<TopiaEntity>(builder) { - - Decorator<? extends TopiaEntity> decorator; - - public void init(Class<? extends TopiaEntity> klass) { - decorator = jaxx.runtime.PropertyDecorator.newDecorator(klass, "name"); - } - - public Decorator<? extends TopiaEntity> getDecorator(TopiaEntity child) { - return decorator; - } - - public String getJXPath(TopiaEntity child) { - return "..[@topiaId=\"" + child.getTopiaId() + "\"]"; - } - - public String getNavigationPath(TopiaEntity child) { - return child.getTopiaId(); - } - }; - ChildBuilder<TopiaEntity> childBuilder = new ChildBuilder<TopiaEntity>(builder) { Decorator<? extends TopiaEntity> decorator; + @Override public void init(Class<? extends TopiaEntity> klass) { decorator = jaxx.runtime.PropertyDecorator.newDecorator(klass, "name"); } + @Override public Decorator<? extends TopiaEntity> getDecorator(TopiaEntity child) { return decorator; } + @Override public String getJXPath(TopiaEntity child) { return "..[@topiaId=\"" + child.getTopiaId() + "\"]"; } + @Override public String getNavigationPath(TopiaEntity child) { return child.getTopiaId(); } @@ -240,7 +223,7 @@ NavigationTreeNode species = builder.build(root, _("isisfish.input.tree.species"), "../species", "$species", SpeciesUI.class, null); for (Species specie : fisheryRegion.getSpecies()) { - NavigationTreeNode speciesChild = builder.build(species, specie.toString(), "..[@topiaId=\"" + specie.getTopiaId() + "\"]", specie.getTopiaId(), SpeciesUI.class, null); + NavigationTreeNode speciesChild = builder.build(species,jaxx.runtime.PropertyDecorator.newDecorator(Species.class, "name"), "..[@topiaId=\"" + specie.getTopiaId() + "\"]", specie.getTopiaId(), SpeciesUI.class, null); NavigationTreeNode populations = builder.build(speciesChild, _("isisfish.input.tree.populations"), "../population", "$populations", PopulationUI.class, null); childBuilder.build(populations, true, Population.class, specie.getPopulation(), PopulationUI.class, null); } 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-07-01 09:57:59 UTC (rev 2449) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-07-01 10:03:24 UTC (rev 2450) @@ -47,6 +47,7 @@ import javax.swing.JPanel; import javax.swing.event.TreeSelectionEvent; import java.awt.Component; +import jaxx.runtime.PropertyDecorator; /** @author letellier */ public class SensitivityNavigationTreeSelectionAdapter extends NavigationTreeSelectionAdapterWithCardLayout { @@ -149,43 +150,26 @@ return null; } - ChildBuilder<TopiaEntity> childParentBuilder = new ChildBuilder<TopiaEntity>(builder) { - - Decorator<? extends TopiaEntity> decorator; - - public void init(Class<? extends TopiaEntity> klass) { - decorator = jaxx.runtime.PropertyDecorator.newDecorator(klass, "name"); - } - - public Decorator<? extends TopiaEntity> getDecorator(TopiaEntity child) { - return decorator; - } - - public String getJXPath(TopiaEntity child) { - return "..[@topiaId=\"" + child.getTopiaId() + "\"]"; - } - - public String getNavigationPath(TopiaEntity child) { - return child.getTopiaId(); - } - }; - ChildBuilder<TopiaEntity> childBuilder = new ChildBuilder<TopiaEntity>(builder) { Decorator<? extends TopiaEntity> decorator; + @Override public void init(Class<? extends TopiaEntity> klass) { decorator = jaxx.runtime.PropertyDecorator.newDecorator(klass, "name"); } + @Override public Decorator<? extends TopiaEntity> getDecorator(TopiaEntity child) { return decorator; } + @Override public String getJXPath(TopiaEntity child) { return "..[@topiaId=\"" + child.getTopiaId() + "\"]"; } + @Override public String getNavigationPath(TopiaEntity child) { return child.getTopiaId(); } @@ -207,7 +191,7 @@ NavigationTreeNode species = builder.build(root, _("isisfish.input.tree.species"), "../species", "$species", SpeciesUI.class, null); for (Species specie : fisheryRegion.getSpecies()) { - NavigationTreeNode speciesChild = builder.build(species, specie.toString(), "..[@topiaId=\"" + specie.getTopiaId() + "\"]", specie.getTopiaId(), SpeciesUI.class, null); + NavigationTreeNode speciesChild = builder.build(species, PropertyDecorator.newDecorator(Species.class, "name"), "..[@topiaId=\"" + specie.getTopiaId() + "\"]", specie.getTopiaId(), SpeciesUI.class, null); NavigationTreeNode populations = builder.build(speciesChild, _("isisfish.input.tree.populations"), "../population", "$populations", PopulationUI.class, null); childBuilder.build(populations, true, Population.class, specie.getPopulation(), PopulationUI.class, null); }

1 0