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> <!-- Custom version --> - <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>