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

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

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

01 Jul '09

Author: sletellier Date: 2009-07-01 09:57:59 +0000 (Wed, 01 Jul 2009) New Revision: 2449 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Debug jaxx and npe Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-06-30 12:39:09 UTC (rev 2448) +++ isis-fish/trunk/pom.xml 2009-07-01 09:57:59 UTC (rev 2449) @@ -359,7 +359,7 @@ <labs.project>isis-fish</labs.project>  - <jaxx.version>1.5</jaxx.version> + <jaxx.version>1.5.1-SNAPSHOT</jaxx.version> <topia.version>2.1.6.1-SNAPSHOT</topia.version> <topia.service.version>1.0.3</topia.service.version> <lutinmatrix.version>1.3</lutinmatrix.version> @@ -465,17 +465,6 @@ <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> <version>${i18n.version}</version> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - <specificGoal>parserJava</specificGoal> - <includes> - <param>**\/**UI.java</param> - </includes> - </entry> - </entries> - </configuration> <executions> <execution> <goals> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-06-30 12:39:09 UTC (rev 2448) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-07-01 09:57:59 UTC (rev 2449) @@ -84,7 +84,7 @@ protected void setEffortDescriptionEffortDescriptionList() { EffortDescriptionListModel model = (EffortDescriptionListModel)fieldEffortDescriptionEffortDescriptionList.getModel(); - if (getBean() != null) { + if (getBean() != null && getBean().getPossibleMetiers() != null) { java.util.List<EffortDescription> effortDescriptions = new ArrayList<EffortDescription>(getBean().getPossibleMetiers()); model.setEffortDescriptions(effortDescriptions); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-06-30 12:39:09 UTC (rev 2448) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-07-01 09:57:59 UTC (rev 2449) @@ -75,8 +75,10 @@ // otherwize, setBean has no effect setPopInfo(null); setPopInfo((PopulationSeasonInfoImpl)pi); - - populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy()); + + if (getPopInfo() != null && getPopInfo().getMigrationMatrix() != null){ + populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().copy()); + } } @Override 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-06-30 12:39:09 UTC (rev 2448) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-07-01 09:57:59 UTC (rev 2449) @@ -222,9 +222,13 @@ } protected void setReproductionDistributionMatrix() { - MatrixND reproductionDistribution = getPopulationSeasonInfo().getReproductionDistribution(); - // must be a copy (otherwise, modify current entity matrix) - fieldPopulationSeasonReproductionDistribution.setMatrix(reproductionDistribution.copy()); + if (getPopulationSeasonInfo() != null){ + MatrixND reproductionDistribution = getPopulationSeasonInfo().getReproductionDistribution(); + // must be a copy (otherwise, modify current entity matrix) + if (reproductionDistribution != null){ + fieldPopulationSeasonReproductionDistribution.setMatrix(reproductionDistribution.copy()); + } + } } // TODO une methode isXXX ne prend pas de parametre Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2009-06-30 12:39:09 UTC (rev 2448) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2009-07-01 09:57:59 UTC (rev 2449) @@ -80,7 +80,7 @@ <JComboBox id="fieldGearParamType" onActionPerformed='gearParamChanged()' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue().getValues()}' onKeyReleased='gearParamChanged()' enabled='{isActif()}'/> + <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='gearParamChanged()' enabled='{isActif()}'/> </cell> </row> </Table> 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-06-30 12:39:09 UTC (rev 2448) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-07-01 09:57:59 UTC (rev 2449) @@ -79,19 +79,21 @@ } protected void setSelectivityTableModel() { - 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); + 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() { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-06-30 12:39:09 UTC (rev 2448) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-07-01 09:57:59 UTC (rev 2449) @@ -88,7 +88,9 @@ items.add(new Item(tt.getTopiaId(), tt.getName(), tt, false)); } vesselTypeTripType.setItems(items); - vesselTypeTripType.setSelectedValues(getBean().getTripType().toArray()); + if (getBean() != null && getBean().getTripType() != null){ + vesselTypeTripType.setSelectedValues(getBean().getTripType().toArray()); + } } protected void tripTypeChanged(){ java.util.List<TripType> tripTypes = new java.util.ArrayList<TripType>(); @@ -197,7 +199,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane> - <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' + <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType() == null ? null : getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"TripType"'/> </JScrollPane> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-06-30 12:39:09 UTC (rev 2448) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-07-01 09:57:59 UTC (rev 2449) @@ -95,6 +95,9 @@ @Override public boolean onMouseClicked() { getBean().setCell(zoneMap.getSelectedCells()); + if (getBean().getCell() != null){ + zoneCells.setSelectedValues(getBean().getCell().toArray()); + } return true; } }; @@ -138,7 +141,7 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}' + <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell() == null ? null : getBean().getCell().toArray()}' onMouseClicked='if ( isActif() ) { zoneCellsChange(); }' decorator='boxed'/> </JScrollPane>

1 0