Author: sletellier Date: 2009-05-07 17:03:19 +0000 (Thu, 07 May 2009) New Revision: 2200 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/ErrorDialogUI.jaxx isis-fish/trunk/src/main/resources/icons/building.png isis-fish/trunk/src/main/resources/icons/building_add.png Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.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/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java isis-fish/trunk/src/main/resources/log4j.properties Log: Using jaxx-runtime-swing-widget (jaxx 0.5) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/pom.xml 2009-05-07 17:03:19 UTC (rev 2200) @@ -70,6 +70,13 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-runtime-swing-widget</artifactId> + <version>${jaxx.version}</version> + <scope>compile</scope> + </dependency> + <!-- Utilisé dans les scripts --> <dependency> <groupId>org.codelutin</groupId> @@ -344,7 +351,7 @@ <labs.project>isis-fish</labs.project> <!-- Custom version --> - <jaxx.version>1.3</jaxx.version> + <jaxx.version>1.5</jaxx.version> <topia.version>2.1.4</topia.version> <topia.service.version>1.0.2</topia.service.version> <lutinmatrix.version>1.3</lutinmatrix.version> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -481,7 +481,7 @@ double ancienne_val = mat.getValue(x, x) - coef; mat.setValue(x, x, ancienne_val); if (ancienne_val < 0) { - /*#java.util.logging.Logger.getLogger("fr.ifremer.db.InfoSaisonPop.getMatriceMigration").info("Erreur dans la migration, un coef est negatif");#*/ + log.info("Erreur dans la migration, un coef est negatif"); } mat.setValue(x, y, coef); } 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-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -31,6 +31,7 @@ import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.types.TimeUnit; +import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.Item; @@ -39,17 +40,17 @@ if (evt.getOldValue() != null || evt.getNewValue() == null) { // remove previous binding on getBean() //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - fieldEffortDescriptionFishingOperation.setText(""); + fieldEffortDescriptionFishingOperation.setModelText(""); fieldEffortDescriptionFishingOperationDuration.setText(""); - fieldEffortDescriptionGearsNumberPerOperation.setText(""); - fieldEffortDescriptionCrewSize.setText(""); - fieldEffortDescriptionUnitCostOfFishing.setText(""); - fieldEffortDescriptionFixedCrewSalary.setText(""); - fieldEffortDescriptionCrewFoodCost.setText(""); - fieldEffortDescriptionCrewShareRate.setText(""); - fieldEffortDescriptionRepairAndMaintenanceGearCost.setText(""); - fieldEffortDescriptionLandingCosts.setText(""); - fieldEffortDescriptionOtherRunningCost.setText(""); + fieldEffortDescriptionGearsNumberPerOperation.setModelText(""); + fieldEffortDescriptionCrewSize.setModelText(""); + fieldEffortDescriptionUnitCostOfFishing.setModelText(""); + fieldEffortDescriptionFixedCrewSalary.setModelText(""); + fieldEffortDescriptionCrewFoodCost.setModelText(""); + fieldEffortDescriptionCrewShareRate.setModelText(""); + fieldEffortDescriptionRepairAndMaintenanceGearCost.setModelText(""); + fieldEffortDescriptionLandingCosts.setModelText(""); + fieldEffortDescriptionOtherRunningCost.setModelText(""); } if (evt.getNewValue() != null) { // add binding on getBean() @@ -99,6 +100,18 @@ EffortDescriptionImpl selectedEffort = (EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue(); setEffortDescription(selectedEffort); getVerifier().addCurrentEntity(getEffortDescription()); + if (getEffortDescription() != null){ + fieldEffortDescriptionFishingOperation.init(); + fieldEffortDescriptionGearsNumberPerOperation.init(); + fieldEffortDescriptionCrewSize.init(); + fieldEffortDescriptionUnitCostOfFishing.init(); + fieldEffortDescriptionFixedCrewSalary.init(); + fieldEffortDescriptionCrewFoodCost.init(); + fieldEffortDescriptionCrewShareRate.init(); + fieldEffortDescriptionRepairAndMaintenanceGearCost.init(); + fieldEffortDescriptionLandingCosts.init(); + fieldEffortDescriptionOtherRunningCost.init(); + } } ]]> </script> @@ -134,7 +147,13 @@ <JLabel text="isisfish.effortDescription.fishingOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onFocusLost='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/> + <NumberEditor id='fieldEffortDescriptionFishingOperation' constructorParams='this' + bean='{getEffortDescription()}' property='fishingOperation' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/> + <!--JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' + onFocusLost='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/--> </cell> </row> <row> @@ -142,7 +161,10 @@ <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' toolTipText="in hour" onFocusLost='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperationDuration"'/> + <JTextField id="fieldEffortDescriptionFishingOperationDuration" + text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' + toolTipText="in hour" onFocusLost='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperationDuration"'/> </cell> </row> <row> @@ -150,7 +172,13 @@ <JLabel text="isisfish.effortDescription.gearsNumberPerOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onFocusLost='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/> + <NumberEditor id='fieldEffortDescriptionGearsNumberPerOperation' constructorParams='this' + bean='{getEffortDescription()}' property='gearsNumberPerOperation' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/> + <!--JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' + onFocusLost='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/--> </cell> </row> <row> @@ -158,7 +186,13 @@ <JLabel text="isisfish.effortDescription.crewSize" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onFocusLost='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/> + <NumberEditor id='fieldEffortDescriptionCrewSize' constructorParams='this' + bean='{getEffortDescription()}' property='crewSize' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/> + <!--JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' + onFocusLost='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/--> </cell> </row> <row> @@ -166,7 +200,13 @@ <JLabel text="isisfish.effortDescription.unitCostOfFishing" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onFocusLost='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/> + <NumberEditor id='fieldEffortDescriptionUnitCostOfFishing' constructorParams='this' + bean='{getEffortDescription()}' property='unitCostOfFishing' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/> + <!--JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' + onFocusLost='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/--> </cell> </row> <row> @@ -174,7 +214,13 @@ <JLabel text="isisfish.effortDescription.fixedCrewSalary" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onFocusLost='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/> + <NumberEditor id='fieldEffortDescriptionFixedCrewSalary' constructorParams='this' + bean='{getEffortDescription()}' property='fixedCrewSalary' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/> + <!--JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' + onFocusLost='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/--> </cell> </row> <row> @@ -182,7 +228,13 @@ <JLabel text="isisfish.effortDescription.crewFoodCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onFocusLost='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/> + <NumberEditor id='fieldEffortDescriptionCrewFoodCost' constructorParams='this' + bean='{getEffortDescription()}' property='crewFoodCost' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/> + <!--JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' + onFocusLost='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/--> </cell> </row> <row> @@ -190,7 +242,13 @@ <JLabel text="isisfish.effortDescription.crewShareRate" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onFocusLost='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/> + <NumberEditor id='fieldEffortDescriptionCrewShareRate' constructorParams='this' + bean='{getEffortDescription()}' property='crewShareRate' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/> + <!--JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' + onFocusLost='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/--> </cell> </row> <row> @@ -198,7 +256,13 @@ <JLabel text="isisfish.effortDescription.repairAndMaintenanceGearCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onFocusLost='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/> + <NumberEditor id='fieldEffortDescriptionRepairAndMaintenanceGearCost' constructorParams='this' + bean='{getEffortDescription()}' property='repairAndMaintenanceGearCost' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' + _method='"RepairAndMaintenanceGearCost"' useSign='true'/> + <!--JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' + onFocusLost='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/--> </cell> </row> <row> @@ -206,7 +270,13 @@ <JLabel text="isisfish.effortDescription.landingCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onFocusLost='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/> + <NumberEditor id='fieldEffortDescriptionLandingCosts' constructorParams='this' + bean='{getEffortDescription()}' property='landingCosts' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/> + <!--JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' + onFocusLost='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/--> </cell> </row> <row> @@ -214,7 +284,13 @@ <JLabel text="isisfish.effortDescription.otherRunningCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onFocusLost='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/> + <NumberEditor id='fieldEffortDescriptionOtherRunningCost' constructorParams='this' + bean='{getEffortDescription()}' property='otherRunningCost' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/> + <!--JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' + onFocusLost='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/--> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -44,6 +44,7 @@ import fr.ifremer.isisfish.map.CellSelectionLayer; import com.bbn.openmap.event.SelectMouseMode; import fr.ifremer.isisfish.entities.FisheryRegionImpl; +import jaxx.runtime.swing.editor.NumberEditor; protected OMToolSet toolSet = new OMToolSet(); @@ -71,6 +72,12 @@ setBean((FisheryRegionImpl)region); if (region != null){ setFieldMapfilesModel(getBean()); + fieldLatMin.init(); + fieldLatMax.init(); + fieldLongMin.init(); + fieldLongMax.init(); + fieldCellLengthLatitude.init(); + fieldCellLengthLongitude.init(); } } protected void setFieldMapfilesModel(FisheryRegion region){ @@ -148,8 +155,9 @@ <JLabel text="isisfish.fisheryRegion.latitude.min"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLatMin" text='{getBean().getMinLatitude()}' decorator='boxed' - onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> + <NumberEditor id='fieldLatMin' constructorParams='this' + bean='{getBean()}' property='minLatitude' + decorator='boxed' useSign='true'/> </cell> </row> <row> @@ -157,8 +165,9 @@ <JLabel text="isisfish.fisheryRegion.latitude.max"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLatMax" text='{getBean().getMaxLatitude()}' decorator='boxed' - onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> + <NumberEditor id='fieldLatMax' constructorParams='this' + bean='{getBean()}' property='maxLatitude' + decorator='boxed' useSign='true'/> </cell> </row> <row> @@ -166,8 +175,9 @@ <JLabel text="isisfish.fisheryRegion.longitude.min"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLongMin" text='{getBean().getMinLongitude()}' decorator='boxed' - onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> + <NumberEditor id='fieldLongMin' constructorParams='this' + bean='{getBean()}' property='minLongitude' + decorator='boxed' useSign='true'/> </cell> </row> <row> @@ -175,8 +185,9 @@ <JLabel text="isisfish.fisheryRegion.longitude.max"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLongMax" text='{getBean().getMaxLongitude()}' decorator='boxed' - onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> + <NumberEditor id='fieldLongMax' constructorParams='this' + bean='{getBean()}' property='maxLongitude' + decorator='boxed' useSign='true'/> </cell> </row> <row> @@ -189,8 +200,9 @@ <JLabel text="isisfish.fisheryRegion.latitude"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLengthLatitude" text='{getBean().getCellLengthLatitude()}' decorator='boxed' - onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> + <NumberEditor id='fieldCellLengthLatitude' constructorParams='this' + bean='{getBean()}' property='cellLengthLatitude' + decorator='boxed' useSign='true'/> </cell> </row> <row> @@ -198,8 +210,9 @@ <JLabel text="isisfish.fisheryRegion.longitude"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLengthLongitude" text='{getBean().getCellLengthLongitude()}' decorator='boxed' - onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> + <NumberEditor id='fieldCellLengthLongitude' constructorParams='this' + bean='{getBean()}' property='cellLengthLongitude' + decorator='boxed' useSign='true'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -43,6 +43,7 @@ import fr.ifremer.isisfish.ui.WelcomePanelUI; import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.topia.TopiaException; +import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.navigation.NavigationTreeModel; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; @@ -53,7 +54,7 @@ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); fieldGearName.setText(""); fieldGearEffortUnit.setText(""); - fieldGearStandardisationFactor.setText(""); + fieldGearStandardisationFactor.setModelText(""); fieldGearParamName.setText(""); fieldGearComment.setText(""); } @@ -71,6 +72,9 @@ Gear gear = getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); getVerifier().addCurrentPanel(rangeOfValues); + if (getBean() != null){ + fieldGearStandardisationFactor.init(); + } } ]]> </script> @@ -91,7 +95,8 @@ <JLabel text="isisfish.gear.effortUnit" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' + onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -99,7 +104,13 @@ <JLabel text="isisfish.gear.standardisationFactor" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"StandardisationFactor"'/> + <NumberEditor id='fieldGearStandardisationFactor' constructorParams='this' + bean='{getBean()}' property='standardisationFactor' + enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' + _method='"StandardisationFactor"' useSign='true'/> + <!--JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}' + onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"StandardisationFactor"'/--> </cell> </row> <row> @@ -107,7 +118,8 @@ <JLabel text="isisfish.gear.technicalParameter" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' + onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -115,7 +127,8 @@ <JLabel text="isisfish.gear.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='this' decorator='boxed' _bean='{GearImpl.class}' _method='"PossibleValue"'/> + <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='this' + decorator='boxed' _bean='{GearImpl.class}' _method='"PossibleValue"'/> </cell> </row> <row> @@ -124,7 +137,8 @@ </cell> <cell columns="2" fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' + onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> 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-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -81,8 +81,8 @@ import fr.ifremer.isisfish.ui.input.check.CheckRegion; import fr.ifremer.isisfish.ui.input.check.CheckResult; import fr.ifremer.isisfish.ui.input.check.CheckResultFrame; -import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import fr.ifremer.isisfish.util.CellPointcomparator; +import jaxx.runtime.swing.ErrorDialogUI; /** * All code used in input UI. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -51,9 +51,9 @@ import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.ui.SaveVerifier; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; -import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import java.util.Map; import java.util.Map.Entry; +import jaxx.runtime.swing.ErrorDialogUI; /** * InputSaveVerifier. 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-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -44,8 +44,6 @@ <script><![CDATA[ import com.l2fprod.common.swing.renderer.BooleanCellRenderer; -import java.util.logging.Level; -import java.util.logging.Logger; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Metier; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -41,8 +41,6 @@ <Boolean id='metierSeasonSelected' javaBean='false'/> <script><![CDATA[ -import java.util.logging.Level; -import java.util.logging.Logger; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.MetierImpl; import fr.ifremer.isisfish.entities.MetierSeasonInfo; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -39,9 +39,7 @@ import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.MetierImpl; - import java.util.logging.Logger; - import java.util.logging.Level; - + protected boolean init = false; public void refresh() { getVerifier().setSaveButton(save); @@ -77,7 +75,9 @@ <JLabel text="isisfish.metier.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextField id="fieldMetierName" text='{getBean().getName()}' + onKeyReleased='getBean().setName(fieldMetierName.getText())' + enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -85,7 +85,8 @@ <JLabel text="isisfish.common.gear" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' enabled='{isActif()}' decorator='boxed'/> + <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' + enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -93,7 +94,8 @@ <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' + onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -102,7 +104,8 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' + onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -44,8 +44,6 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.table.DefaultTableModel; import org.codelutin.topia.persistence.TopiaEntity; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -92,11 +92,9 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability' - matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' - enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/> - </JScrollPane> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability' + matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' + enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/> </cell> </row> <row> 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-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -47,6 +47,7 @@ import fr.ifremer.isisfish.entities.PopulationImpl; import org.codelutin.math.matrix.AbstractMatrixND; import org.codelutin.math.matrix.MatrixND; +import jaxx.runtime.swing.editor.NumberEditor; addPropertyChangeListener("populationGroup", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -55,10 +56,10 @@ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); fieldPopulationGroupMeanWeight.setText(""); fieldPopulationGroupPrice.setText(""); - fieldPopulationGroupReproductionRate.setText(""); - fieldPopulationGroupAge.setText(""); - fieldPopulationGroupMinLength.setText(""); - fieldPopulationGroupMaxLength.setText(""); + fieldPopulationGroupReproductionRate.setModelText(""); + fieldPopulationGroupAge.setModelText(""); + fieldPopulationGroupMinLength.setModelText(""); + fieldPopulationGroupMaxLength.setModelText(""); fieldPopulationGroupComment.setText(""); fieldPopulationGroupNaturalDeathRate.setMatrix(null); setPopGroupNotNull(false); @@ -93,6 +94,12 @@ getVerifier().addCurrentEntity(getPopulationGroup()); setMatrix(); setPopGroupNotNull(true); + if (getPopulationGroup() != null){ + fieldPopulationGroupReproductionRate.init(); + fieldPopulationGroupAge.init(); + fieldPopulationGroupMinLength.init(); + fieldPopulationGroupMaxLength.init(); + } } else{ setPopGroupNotNull(false); @@ -133,11 +140,9 @@ <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate' - matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' - enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/> - </JScrollPane> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate' + matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/> </cell> </row> <row> @@ -145,7 +150,13 @@ <JLabel text="isisfish.populationGroup.reproductionRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> + <NumberEditor id='fieldPopulationGroupReproductionRate' constructorParams='this' + bean='{getPopulationGroup()}' property='reproductionRate' + useSign='true' enabled='{isPopGroupNotNull()}' decorator='boxed' + _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> + <!--JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' + onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/--> </cell> </row> <row> @@ -153,7 +164,13 @@ <JLabel text="isisfish.populationGroup.age" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/> + <NumberEditor id='fieldPopulationGroupAge' constructorParams='this' + bean='{getPopulationGroup()}' property='age' + useSign='true' enabled='{isPopGroupNotNull()}' decorator='boxed' + _bean='{PopulationGroupImpl.class}' _method='"Age"'/> + <!--JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' + onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/--> </cell> </row> <row> @@ -161,10 +178,24 @@ <JLabel text="isisfish.populationGroup.length" enabled='{isPopGroupNotNull()}'/> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' toolTipText="minimum length" onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/> + <NumberEditor id='fieldPopulationGroupMinLength' constructorParams='this' + bean='{getPopulationGroup()}' property='minLength' + toolTipText="minimum length" useSign='true' + enabled='{isPopGroupNotNull()}' decorator='boxed' + _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/> + <!--JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' + toolTipText="minimum length" onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/--> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' toolTipText="maximum length" onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/> + <NumberEditor id='fieldPopulationGroupMaxLength' constructorParams='this' + bean='{getPopulationGroup()}' property='maxLength' + toolTipText="maximum length" useSign='true' + enabled='{isPopGroupNotNull()}' decorator='boxed' + _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/> + <!--JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' + toolTipText="maximum length" onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' + enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/--> </cell> </row> <row> @@ -173,7 +204,8 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed'/> + <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' + onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -204,9 +204,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' linearModel="true" enabled='{isActif()}'/> - </JScrollPane> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' linearModel="true" enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -185,9 +185,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationImmigrationTable' linearModel="true" enabled='{isActif()}'/> - </JScrollPane> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationImmigrationTable' linearModel="true" enabled='{isActif()}'/> </cell> </row> <row> 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-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -55,8 +55,6 @@ import org.codelutin.math.matrix.MatrixND; import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -215,9 +213,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' linearModel='{true}' enabled='{isActif()}'/> - </JScrollPane> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' linearModel='{true}' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -30,15 +30,14 @@ import fr.ifremer.isisfish.entities.PopulationImpl; import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -import java.util.logging.Level; -import java.util.logging.Logger; +import jaxx.runtime.swing.editor.NumberEditor; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { // remove previous binding on getBean() //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - fieldPopulationMonthGapBetweenReproRecrutement.setText(""); + fieldPopulationMonthGapBetweenReproRecrutement.setModelText(""); fieldPopulationRecruitmentComment.setText(""); } if (evt.getNewValue() != null) { @@ -69,6 +68,7 @@ if(getBean() != null && getBean().getRecruitmentDistribution() != null){ fieldPopulationRecruitmentDistribution.setMatrix(getBean().getRecruitmentDistribution().copy()); + fieldPopulationMonthGapBetweenReproRecrutement.init(); } fieldPopulationRecruitmentDistribution.addMatrixListener(listener); } @@ -92,7 +92,13 @@ <JLabel text="isisfish.populationRecruitment.monthgapgetweenreprorecruitment" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}' onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/> + <NumberEditor id='fieldPopulationMonthGapBetweenReproRecrutement' constructorParams='this' + bean='{getBean()}' property='monthGapBetweenReproRecrutement' useSign='true' + enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' + _method='"MonthGapBetweenReproRecrutement"'/> + <!--JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}' + onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/--> </cell> </row> <row> @@ -100,11 +106,9 @@ <JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActif()}'/> </cell> <cell fill='both' weightx='1.0'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' - matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' - enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/> - </JScrollPane> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' + matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' + enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -17,7 +17,7 @@ import org.codelutin.math.matrix.MatrixND; import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; +import jaxx.runtime.swing.ErrorDialogUI; protected MatrixPanelListener listener = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -167,9 +167,7 @@ </row> <row> <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/> - </JScrollPane> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -31,6 +31,7 @@ import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.SetOfVessels; +import jaxx.runtime.swing.editor.NumberEditor; import fr.ifremer.isisfish.entities.SetOfVesselsImpl; boolean init = false; @@ -60,6 +61,8 @@ jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true); init=false; getVerifier().addCurrentPanel(technicalEfficiency); + fieldSetOfVesselsNumberOfVessels.init(); + fieldSetOfVesselsFixedCosts.init(); } } protected void portChanged(){ @@ -107,7 +110,13 @@ <JLabel text="isisfish.setOfVessels.numberOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}' onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/> + <NumberEditor id='fieldSetOfVesselsNumberOfVessels' constructorParams='this' + bean='{getBean()}' property='numberOfVessels' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/> + <!--JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}' + onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/--> </cell> </row> <row> @@ -115,9 +124,13 @@ <JLabel text="isisfish.setOfVessels.fixedCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}' + <NumberEditor id='fieldSetOfVesselsFixedCosts' constructorParams='this' + bean='{getBean()}' property='fixedCosts' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/> + <!--JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}' onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/> + enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/--> </cell> </row> <row> @@ -135,7 +148,8 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' + onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -43,6 +43,7 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.entities.SpeciesImpl; +import jaxx.runtime.swing.editor.NumberEditor; setButtonTitle(_("isisfish.input.continuePopulations")); addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -53,7 +54,7 @@ fieldSpeciesName.setText(""); fieldSpeciesScientificName.setText(""); fieldSpeciesCodeRubbin.setText(""); - fieldSpeciesCEE.setText(0 + ""); + fieldSpeciesCEE.setModelText(0 + ""); fieldSpeciesComment.setText(""); } if (evt.getNewValue() != null) { @@ -71,8 +72,10 @@ setBean((SpeciesImpl) species); if (getBean() != null){ setNextPath("$root/$species/" + getBean().getTopiaId() + "/$populations"); + fieldSpeciesCEE.init(); } } + ]]> </script> <Table id='body'> @@ -84,7 +87,9 @@ <JLabel text="isisfish.species.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextField id="fieldSpeciesName" text='{getBean().getName()}' + onKeyReleased='getBean().setName(fieldSpeciesName.getText())' + enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -92,7 +97,9 @@ <JLabel text="isisfish.species.scientificName" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"ScientificName"'/> + <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}' + onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' + enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"ScientificName"'/> </cell> </row> <row> @@ -100,7 +107,9 @@ <JLabel text="isisfish.species.rubbinCode" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeRubbin"'/> + <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}' + onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}' + decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeRubbin"'/> </cell> </row> <row> @@ -108,7 +117,13 @@ <JLabel text="isisfish.species.cee" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}' onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeCEE"'/> + <NumberEditor id='fieldSpeciesCEE' constructorParams='this' + bean='{getBean()}' property='codeCEE' + decorator='boxed' _bean='{SpeciesImpl.class}' + useSign='true' _method='"CodeCEE"'/> + <!--JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}' + onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeCEE"'/--> </cell> </row> <row> @@ -125,7 +140,8 @@ </cell> <cell fill='both' columns='2' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' + onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -47,6 +47,7 @@ import fr.ifremer.isisfish.entities.StrategyImpl; import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; +import jaxx.runtime.swing.editor.NumberEditor; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; @@ -62,7 +63,7 @@ // remove previous binding on getBean() //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); numberOfTrips.setText(""); - fieldStrategyMonthInfoMinInactivityDays.setText(""); + fieldStrategyMonthInfoMinInactivityDays.setModelText(""); fieldStrategyMonthInfoProportion.setMatrix(null); } if (evt.getNewValue() != null) { @@ -104,6 +105,7 @@ fieldStrategyMonthInfoTripType.addActionListener(listener); } setMatrix(); + fieldStrategyMonthInfoMinInactivityDays.init(); } matrixListener = new MatrixPanelListener() { @@ -131,7 +133,8 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())' enabled='{isActif()}' decorator='boxed'/> + <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())' + enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -139,7 +142,8 @@ <JLabel text="isisfish.strategyMonthInfo.numberOfTrips" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5' anchor='west'> - <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/> + <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}' + decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/> </cell> </row> <row> @@ -147,14 +151,20 @@ <JLabel text="isisfish.strategyMonthInfo.minInactivityDays" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/> + <NumberEditor id='fieldStrategyMonthInfoMinInactivityDays' constructorParams='this' + bean='{getStrategyMonthInfo()}' property='minInactivityDays' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/> + <!--JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' + onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/--> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> - </JScrollPane> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' + linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' + enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -45,8 +45,7 @@ import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import java.util.logging.Level; -import java.util.logging.Logger; +import jaxx.runtime.swing.editor.NumberEditor; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -54,7 +53,7 @@ // remove previous binding on getBean() //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); fieldStrategyName.setText(""); - fieldStrategyProportionSetOfVessels.setText("0.0"); + fieldStrategyProportionSetOfVessels.setModelText("0.0"); fieldStrategyComment.setText(""); } if (evt.getNewValue() != null) { @@ -74,6 +73,7 @@ if (getBean() != null){ getVerifier().addCurrentPanel(strategyInactivity); setSetOfVesselsModel(); + fieldStrategyProportionSetOfVessels.init(); } } protected void setSetOfVesselsModel() { @@ -112,9 +112,13 @@ <JLabel text="isisfish.strategy.proportionSetOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldStrategyProportionSetOfVessels" text='{getBean().getProportionSetOfVessels()}' + <NumberEditor id='fieldStrategyProportionSetOfVessels' constructorParams='this' + bean='{getBean()}' property='proportionSetOfVessels' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/> + <!--JTextField id="fieldStrategyProportionSetOfVessels" text='{getBean().getProportionSetOfVessels()}' onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/> + enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/--> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -81,7 +81,9 @@ <JLabel text="isisfish.tripType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextField id="fieldTripTypeName" text='{getBean().getName()}' + onKeyReleased='getBean().setName(fieldTripTypeName.getText())' + enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -89,7 +91,9 @@ <JLabel text="isisfish.tripType.duration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' toolTipText="in hour" onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"TripDuration"'/> + <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' toolTipText="in hour" + onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' + enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"TripDuration"'/> </cell> </row> <row> @@ -97,7 +101,9 @@ <JLabel text="isisfish.tripType.minTime" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{getBean().getMinTimeBetweenTrip().getHour()}' onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"MinTimeBetweenTrip"'/> + <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{getBean().getMinTimeBetweenTrip().getHour()}' + onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' + enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"MinTimeBetweenTrip"'/> </cell> </row> <row> @@ -106,7 +112,8 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' + onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> 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-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -40,6 +40,7 @@ import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.VesselTypeImpl; import fr.ifremer.isisfish.entities.TripType; +import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.Item; import fr.ifremer.isisfish.types.TimeUnit; @@ -51,13 +52,13 @@ // remove previous binding on getBean() //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldVesselTypeName.setText(""); - fieldVesselTypeLength.setText(""); - fieldVesselTypeSpeed.setText(""); + fieldVesselTypeLength.setModelText(""); + fieldVesselTypeSpeed.setModelText(""); fieldVesselTypeMaxTripDuration.setText(""); - fieldVesselTypeActivityRange.setText(""); - fieldVesselTypeMinCrewSize.setText(""); - fieldVesselTypeSpeed.setText(""); - fieldVesselTypeUnitFuelCostOfTravel.setText(""); + fieldVesselTypeActivityRange.setModelText(""); + fieldVesselTypeMinCrewSize.setModelText(""); + fieldVesselTypeSpeed.setModelText(""); + fieldVesselTypeUnitFuelCostOfTravel.setModelText(""); fieldVesselTypeComment.setText(""); } if (evt.getNewValue() != null) { @@ -75,6 +76,13 @@ setBean((VesselTypeImpl) vesselType); if (getBean() != null){ setListModel(); + fieldVesselTypeLength.init(); + fieldVesselTypeLength.init(); + fieldVesselTypeSpeed.init(); + fieldVesselTypeActivityRange.init(); + fieldVesselTypeMinCrewSize.init(); + fieldVesselTypeSpeed.init(); + fieldVesselTypeUnitFuelCostOfTravel.init(); } } protected void setListModel(){ @@ -102,7 +110,8 @@ <JLabel text="isisfish.vesselType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed'/> + <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' + onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed'/> </cell> </row> <row> @@ -110,7 +119,13 @@ <JLabel text="isisfish.vesselType.length" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}' onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/> + <NumberEditor id='fieldVesselTypeLength' constructorParams='this' + bean='{getBean()}' property='length' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{VesselTypeImpl.class}' _method='"Length"'/> + <!--JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}' + onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))' + decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/--> </cell> </row> <row> @@ -118,7 +133,13 @@ <JLabel text="isisfish.vesselType.speed" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}' onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/> + <NumberEditor id='fieldVesselTypeSpeed' constructorParams='this' + bean='{getBean()}' property='speed' useSign='true' + enabled='{isActif()}' decorator='boxed' + _bean='{VesselTypeImpl.class}' _method='"Speed"'/> + <!--JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}' + onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))' + decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/--> </cell> </row> <row> @@ -126,7 +147,9 @@ <JLabel text="isisfish.vesselType.maxDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' toolTipText="in hour" enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MaxTripDuration"'/> + <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' toolTipText="in hour" + enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))' + decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MaxTripDuration"'/> </cell> </row> <row> @@ -134,7 +157,13 @@ <JLabel text="isisfish.vesselType.activityRange" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}' onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/> + <NumberEditor id='fieldVesselTypeActivityRange' constructorParams='this' + bean='{getBean()}' property='activityRange' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/> + <!--JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}' + onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))' + decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/--> </cell> </row> <row> @@ -142,7 +171,13 @@ <JLabel text="isisfish.vesselType.miniCrew" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}' onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/> + <NumberEditor id='fieldVesselTypeMinCrewSize' constructorParams='this' + bean='{getBean()}' property='minCrewSize' useSign='true' + enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' + _method='"MinCrewSize"'/> + <!--JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}' + onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))' + decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/--> </cell> </row> <row> @@ -150,7 +185,13 @@ <JLabel text="isisfish.vesselType.fuelCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}' onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/> + <NumberEditor id='fieldVesselTypeUnitFuelCostOfTravel' constructorParams='this' + bean='{getBean()}' property='unitFuelCostOfTravel' + enabled='{isActif()}' decorator='boxed' useSign='true' + _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/> + <!--JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}' + onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' + enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/--> </cell> </row> <row> @@ -159,7 +200,8 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane> - <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"TripType"'/> + <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' + enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"TripType"'/> </JScrollPane> </cell> </row> @@ -169,7 +211,8 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' + onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -17,6 +17,8 @@ import java.io.FileWriter; import java.util.Iterator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.math.matrix.MatrixND; import org.codelutin.util.FileUtil; @@ -27,6 +29,9 @@ */ public class DataResult extends DataResultUI { // IfremerSimulation + /** Class logger. */ + private static Log log = LogFactory.getLog(DataResult.class); + protected MatrixND matrix; public DataResult() { @@ -105,7 +110,7 @@ writer.close(); } }catch(Exception eee){ - java.util.logging.Logger.getLogger("org.codelutin.resultat.DataResult.on_exportButton_clicked").severe(":104:Error during export"+eee); + log.error(":104:Error during export"+eee); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -29,8 +29,6 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.ButtonGroup; import javax.swing.JList; @@ -423,7 +421,7 @@ mapBean.removeAllResultatLayer(); mapBean.addResultatLayer(matInfo.getName(), layer); }catch(Exception eee){ - Logger.getLogger(getClass().getName() + ".addRendu").log(Level.WARNING, "Erreur lors de l'ajout du résultat à la carte. ", eee); + log.warn("Erreur lors de l'ajout du résultat à la carte. ", eee); JOptionPane.showMessageDialog(null, _("isisfish.error.add.card"), _("isisfish.common.alert"), JOptionPane.ERROR_MESSAGE); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -10,9 +10,6 @@ * @version */ -import java.beans.PropertyChangeEvent; -import java.util.logging.Level; -import java.util.logging.Logger; import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -22,7 +19,6 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; -import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,12 +26,11 @@ import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; -import java.beans.PropertyChangeListener; import java.beans.PropertyVetoException; import java.io.IOException; import java.text.ParseException; -import java.util.*; import java.util.List; +import jaxx.runtime.swing.ErrorDialogUI; public class ResultView extends ResultViewUI { @@ -55,9 +50,9 @@ try { initSimulation(); } catch (IOException ex) { - Logger.getLogger(ResultView.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } catch (ParseException ex) { - Logger.getLogger(ResultView.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -56,13 +56,13 @@ import fr.ifremer.isisfish.datastore.SensitivityStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; import fr.ifremer.isisfish.equation.Language; -import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import fr.ifremer.isisfish.vcs.VCSException; import freemarker.cache.TemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; +import jaxx.runtime.swing.ErrorDialogUI; class ScriptFileFilter implements FileFilter { protected FileFilter filter; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -29,6 +29,7 @@ import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputOneEquationUI; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; +import fr.ifremer.isisfish.ui.input.InputTabbedPaneListener; import fr.ifremer.isisfish.ui.input.MetierSeasonInfoSpeciesEditorUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI; import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI; @@ -37,8 +38,6 @@ import fr.ifremer.isisfish.ui.input.SpeciesStructuredUI; import fr.ifremer.isisfish.ui.widget.IntervalPanel; import java.lang.reflect.Method; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; @@ -50,7 +49,6 @@ import jaxx.runtime.JAXXInitialContext; import jaxx.runtime.swing.JAXXList; import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.MatrixEditor; import org.codelutin.math.matrix.gui.JAXXMatrixEditor; import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.input.RangeOfValuesUI; @@ -58,6 +56,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import jaxx.runtime.swing.editor.NumberEditor; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.math.matrix.gui.MatrixEditor; /** * @@ -65,6 +67,9 @@ */ public class EditorHelper { + /** Class logger. */ + private static Log log = LogFactory.getLog(InputTabbedPaneListener.class); + public static String getMethod(JComponent c){ return (String) c.getClientProperty("method"); } @@ -77,6 +82,12 @@ if (result instanceof JTextField) { ((JTextComponent) result).setText(String.valueOf(callMethod(e, fieldName))); + } else if (result instanceof NumberEditor){ + NumberEditor ui = (NumberEditor) c; + JTextField numEditor = new JTextField(); + numEditor.setText(String.valueOf(ui.getModel())); + result = numEditor; + } else if (result instanceof MatrixEditor){ MatrixEditor ui = (MatrixEditor) c; MatrixND m = (MatrixND)callMethod(e, fieldName); @@ -190,7 +201,7 @@ result = ui; } } catch (Exception ex) { - Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } return result; } @@ -225,7 +236,7 @@ continuousPanel.init(getNewBoundEditor(c, e), getNewBoundEditor(c, e)); } } catch (Exception ex) { - Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } return result; } @@ -275,7 +286,7 @@ continuousPanel.init(new JTextField(String.valueOf(domain.getMinBound())), new JTextField(String.valueOf(domain.getMaxBound()))); } } catch (Exception ex) { - Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } return result; } @@ -292,6 +303,11 @@ if (result instanceof JTextComponent) { ((JTextComponent) result).setText(String.valueOf(value)); + } else if (result instanceof NumberEditor){ + JTextField numEditor = new JTextField(); + numEditor.setText(String.valueOf(value)); + result = numEditor; + } else if (result instanceof JTable){ // ((JTable) result).setModel(((JTable)c).getModel()); @@ -414,7 +430,7 @@ result = ui; } } catch (Exception ex) { - Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } return result; } @@ -422,6 +438,8 @@ Object result = null; if (c instanceof JTextComponent) { result = ((JTextComponent)c).getText(); + } else if (c instanceof NumberEditor){ + result = ((NumberEditor)c).getModel(); } else if (c instanceof PopulationZonesEditorUI){ result = ((PopulationZonesEditorUI)c).getFieldPopulationMappingZoneReproZoneRecru().getMatrix(); } else if (c instanceof JTable){ @@ -496,6 +514,8 @@ if (c instanceof JTextComponent) { Object o = callMethod(e, fieldName); return canBeContinue(c, o); + } else if (c instanceof NumberEditor){ + return true; } else if (c instanceof InputOneEquationUI){ return true; } else if (c instanceof MatrixEditor){ @@ -526,7 +546,7 @@ Method m = e.getClass().getMethod("get" + fieldName, null); result = m.invoke(e, (Object[])null); } catch (Exception ex) { - Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } return result; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -32,9 +32,7 @@ <JLabel text='isisfish.factor.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> <cell fill='both' weightx='1' weighty='1'> - <!--JScrollPane--> - <JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - <!--/JScrollPane--> + <JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -19,11 +19,12 @@ package fr.ifremer.isisfish.ui.sensitivity; import fr.ifremer.isisfish.ui.input.InputContentUI; -import java.util.logging.Level; -import java.util.logging.Logger; +import fr.ifremer.isisfish.ui.input.InputTabbedPaneListener; import javax.swing.JTabbedPane; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @@ -31,6 +32,9 @@ */ public class SensitivityTabbedPaneListener implements ChangeListener{ + /** Class logger. */ + private static Log log = LogFactory.getLog(InputTabbedPaneListener.class); + protected int cacheSelectedIndex = -1; @Override @@ -57,7 +61,7 @@ } } } catch (Exception ex) { - Logger.getLogger(SensitivityTabbedPaneListener.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -81,8 +81,8 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; -import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; +import jaxx.runtime.swing.ErrorDialogUI; /** * SimulAction. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-05-07 17:03:19 UTC (rev 2200) @@ -6,16 +6,10 @@ package fr.ifremer.isisfish.ui.util; import java.io.InputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; import java.io.IOException; import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18n._; /** * @@ -40,12 +34,12 @@ data = new Properties(); data.load(stream); } catch (IOException ex) { - Logger.getLogger(UtilsUI.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } finally{ try { stream.close(); } catch (IOException ex) { - Logger.getLogger(UtilsUI.class.getName()).log(Level.SEVERE, null, ex); + log.error(ex); } } return data; Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/ErrorDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/ErrorDialogUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/ErrorDialogUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200) @@ -1,83 +0,0 @@ -<!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/** - * ErrorDialogUI.java - * - * @author letellier - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ ---> - -<JDialog title='isisfish.error.dialog.title'> - <script> -/** Le dialogue pour afficher les erreurs. */ -protected static ErrorDialogUI instance; - -public static void showError(Exception e) { - if (instance == null) { - instance = new ErrorDialogUI(); - } - instance.getErrorMessage().setText(e.getMessage()); - StringWriter w = new StringWriter(); - e.printStackTrace(new PrintWriter(w)); - instance.getErrorStack().setText(w.toString()); - instance.getErrorStack().setCaretPosition(0); - instance.pack(); - instance.setVisible(true); -} -public static void disposeUI() { - instance=null; -} - -JRootPane rootPane = getRootPane(); -rootPane.setDefaultButton(close); -rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close"); -rootPane.getActionMap().put("close", close.getAction()); - </script> - <Table> - <row fill='both'> - <cell> - <JPanel> - <JLabel text='isisfish.error.dialog.message'/> - </JPanel> - </cell> - </row> - <row fill='both'> - <cell> - <JLabel id='errorMessage'/> - </cell> - </row> - <row fill='both' weightx='1' weighty='1'> - <cell> - <JScrollPane width='600' height='200'> - <JTextArea id='errorStack' editable='false' font-size='9'/> - </JScrollPane> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JButton id='close' text='isisfish.welcome.menu.close' onActionPerformed='dispose()'/> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/resources/icons/building.png =================================================================== (Binary files differ) Deleted: isis-fish/trunk/src/main/resources/icons/building_add.png =================================================================== (Binary files differ) Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2009-05-07 16:51:57 UTC (rev 2199) +++ isis-fish/trunk/src/main/resources/log4j.properties 2009-05-07 17:03:19 UTC (rev 2200) @@ -6,8 +6,9 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.fr.ifremer.isisfish=INFO +log4j.logger.fr.ifremer.isisfish.ui=DEBUG log4j.logger.org.codelutin=INFO +log4j.logger.jaxx.runtime=DEBUG log4j.logger.analyseplans=INFO log4j.logger.exports=INFO log4j.logger.formules=INFO