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

r2338 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 8, 2009

June 8, 2009

Author: chatellier Date: 2009-06-08 15:34:02 +0000 (Mon, 08 Jun 2009) New Revision: 2338 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/VesselTypeUI.jaxx Log: Make refresh() to work. Remove number editor. 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-06-08 15:32:04 UTC (rev 2337) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-06-08 15:34:02 UTC (rev 2338) @@ -29,6 +29,7 @@ setButtonTitle(_("isisfish.input.continueVesselTypes")); setNextPath("$root/$vesselTypes"); + addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -49,6 +50,10 @@ @Override public void refresh() { TripType tripType = (TripType)getVerifier().getEntity(TripType.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((TripTypeImpl) tripType); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-06-08 15:32:04 UTC (rev 2337) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-06-08 15:34:02 UTC (rev 2338) @@ -36,21 +36,17 @@ 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"); fieldVesselTypeName.setText(""); - fieldVesselTypeLength.setModelText(""); - fieldVesselTypeSpeed.setModelText(""); + fieldVesselTypeLength.setText(""); + fieldVesselTypeSpeed.setText(""); fieldVesselTypeMaxTripDuration.setText(""); - fieldVesselTypeActivityRange.setModelText(""); - fieldVesselTypeMinCrewSize.setModelText(""); - fieldVesselTypeSpeed.setModelText(""); - fieldVesselTypeUnitFuelCostOfTravel.setModelText(""); + fieldVesselTypeActivityRange.setText(""); + fieldVesselTypeMinCrewSize.setText(""); + fieldVesselTypeSpeed.setText(""); + fieldVesselTypeUnitFuelCostOfTravel.setText(""); fieldVesselTypeComment.setText(""); } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); } } }); @@ -58,16 +54,23 @@ @Override public void refresh() { VesselType vesselType = getVerifier().getEntity(VesselType.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((VesselTypeImpl) vesselType); + if (getBean() != null) { setListModel(); + + /* NumberEditor is not working fieldVesselTypeLength.init(); fieldVesselTypeLength.init(); fieldVesselTypeSpeed.init(); fieldVesselTypeActivityRange.init(); fieldVesselTypeMinCrewSize.init(); fieldVesselTypeSpeed.init(); - fieldVesselTypeUnitFuelCostOfTravel.init(); + fieldVesselTypeUnitFuelCostOfTravel.init(); */ } } @@ -113,13 +116,13 @@ <JLabel text="isisfish.vesselType.length" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldVesselTypeLength' constructorParams='this' +  + <JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}' onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))' - decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/--> + decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/> </cell> </row> <row> @@ -127,13 +130,13 @@ <JLabel text="isisfish.vesselType.speed" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldVesselTypeSpeed' constructorParams='this' +  + <JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}' onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))' - decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/--> + decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/> </cell> </row> <row> @@ -151,13 +154,13 @@ <JLabel text="isisfish.vesselType.activityRange" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldVesselTypeActivityRange' constructorParams='this' +  + <JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}' onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))' - decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/--> + decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/> </cell> </row> <row> @@ -165,13 +168,13 @@ <JLabel text="isisfish.vesselType.miniCrew" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldVesselTypeMinCrewSize' constructorParams='this' +  + <JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}' onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))' - decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/--> + decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/> </cell> </row> <row> @@ -179,13 +182,13 @@ <JLabel text="isisfish.vesselType.fuelCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldVesselTypeUnitFuelCostOfTravel' constructorParams='this' +  + <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}' onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/> </cell> </row> <row>

1 0

r2337 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org June 8, 2009

June 8, 2009

Author: chatellier Date: 2009-06-08 15:32:04 +0000 (Mon, 08 Jun 2009) New Revision: 2337 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Traduction de Cancel finished Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-08 12:47:41 UTC (rev 2336) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-08 15:32:04 UTC (rev 2337) @@ -559,7 +559,7 @@ isisfish.message.add.objets.simulation=Ajout des nouveaux objets cr\u00E9\u00E9s durant la simulation isisfish.message.backup.database.finished=backup database termin\u00E9 isisfish.message.backup.database.progress=backup database en cours -isisfish.message.cancel.finished=Cancel finished +isisfish.message.cancel.finished=Annulation termin\u00E9e isisfish.message.check.finished=v\u00E9rification termin\u00E9e isisfish.message.check.region= isisfish.message.checking.cell=

1 0

r2336 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor
by chatellier＠users.labs.libre-entreprise.org June 8, 2009

June 8, 2009

Author: chatellier Date: 2009-06-08 12:47:41 +0000 (Mon, 08 Jun 2009) New Revision: 2336 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/GenericCell.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java Log: Make GenericCell and Param editor deprecated. Too hard to maintain, table should have their how models. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2009-06-08 12:45:33 UTC (rev 2335) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2009-06-08 12:47:41 UTC (rev 2336) @@ -37,7 +37,7 @@ import java.util.Iterator; /** - * EquationTableEditor. + * Equation table cell editor. * * Created: 23 mars 2004 * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/GenericCell.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/GenericCell.java 2009-06-08 12:45:33 UTC (rev 2335) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/GenericCell.java 2009-06-08 12:47:41 UTC (rev 2336) @@ -27,13 +27,15 @@ * * Mise a jour: $Date: 2008-11-28 10:25:59 +0100 (ven 28 nov 2008) $ * par : $Author: chatellier $ + * + * @deprecated since 3.2.0.5, Use specific model instead */ public class GenericCell { private String name; private Object value; - private Class type; + private Class<?> type; - public GenericCell(String n, Object c, Class t) { + public GenericCell(String n, Object c, Class<?> t) { name = n; value = c; type = t; @@ -52,7 +54,7 @@ return name; } - public Class getType() { + public Class<?> getType() { return type; } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java 2009-06-08 12:45:33 UTC (rev 2335) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java 2009-06-08 12:47:41 UTC (rev 2336) @@ -63,6 +63,8 @@ * * Last update: $Date$ * by : $Author$ + * + * @deprecated since 3.2.0.5, Use specific model instead */ public class ParameterColumnEditor extends JComponent implements TableCellEditor {

1 0

r2335 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 8, 2009

June 8, 2009

Author: chatellier Date: 2009-06-08 12:45:33 +0000 (Mon, 08 Jun 2009) New Revision: 2335 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx Log: Fix space Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-06-08 08:47:41 UTC (rev 2334) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-06-08 12:45:33 UTC (rev 2335) @@ -224,7 +224,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id="fieldCurrentRegion" model='{getFieldCurrentRegionModel()}' onItemStateChanged='regionChange(event)' /> + <JComboBox id="fieldCurrentRegion" model='{getFieldCurrentRegionModel()}' onItemStateChanged='regionChange(event)' /> </cell> </row> </Table>

1 0

r2334 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 8, 2009

June 8, 2009

Author: chatellier Date: 2009-06-08 08:47:41 +0000 (Mon, 08 Jun 2009) New Revision: 2334 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx Log: Pack ti getStringValue() for null values 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-06-08 08:23:01 UTC (rev 2333) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-06-08 08:47:41 UTC (rev 2334) @@ -98,8 +98,9 @@ <cell fill='horizontal' anchor='east'> <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/> </cell> +  <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierParam" text='{getBean().getGearParameterValue()}' + <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> @@ -107,9 +108,10 @@ <cell fill='horizontal' anchor='east'> <JLabel text="isisfish.metier.comments" enabled='{isActif()}'/> </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='{getBean().getComment()}' + <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell>

1 0

r2333 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 8, 2009

June 8, 2009

Author: chatellier Date: 2009-06-08 08:23:01 +0000 (Mon, 08 Jun 2009) New Revision: 2333 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx Log: Make rangeofvalues refresh working Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2009-06-05 16:29:51 UTC (rev 2332) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2009-06-08 08:23:01 UTC (rev 2333) @@ -1,3 +1,22 @@ + <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -11,13 +30,10 @@ 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");fieldPopulationBasicsName.setText(""); fieldGearParamPossibleValue.setText(""); } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } } }); @@ -27,17 +43,21 @@ @Override public void refresh() { Gear gear = getVerifier().getEntity(Gear.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((GearImpl) gear); - java.util.List<Object> values = new ArrayList<Object>(); - for (String value : fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes()) { - values.add(value); - } + if (getBean() != null) { - if (values != null) { - init = true; - jaxx.runtime.SwingUtil.fillComboBox(fieldGearParamType, values, getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getType(), true); - init = false; + java.util.List<Object> values = new ArrayList<Object>(); + for (String value : RangeOfValues.getPossibleTypes()) { + values.add(value); } + + init = true; + jaxx.runtime.SwingUtil.fillComboBox(fieldGearParamType, values, getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getType(), true); + init = false; } } @@ -46,7 +66,7 @@ } -protected void paramChanged() { +protected void gearParamChanged() { if (fieldGearParamType.getSelectedItem() != null) { if (!init) { getBean().setPossibleValue(new RangeOfValues(fieldGearParamType.getSelectedItem().toString().concat("[" + fieldGearParamPossibleValue.getText() + "]"))); @@ -57,10 +77,10 @@ <Table id='body'> <row> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldGearParamType" onActionPerformed='paramChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldGearParamType" onActionPerformed='gearParamChanged()' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='paramChanged()' enabled='{isActif()}'/> + <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue().getValues()}' onKeyReleased='gearParamChanged()' enabled='{isActif()}'/> </cell> </row> </Table>

1 0

r2332 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 5, 2009

June 5, 2009

Author: chatellier Date: 2009-06-05 16:29:51 +0000 (Fri, 05 Jun 2009) New Revision: 2332 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/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx Log: Remove number editor, fix cancel refresh Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-06-05 14:59:30 UTC (rev 2331) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-06-05 16:29:51 UTC (rev 2332) @@ -31,8 +31,6 @@ 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; addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -40,17 +38,18 @@ 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.setModelText(""); + + fieldEffortDescriptionFishingOperation.setText(""); fieldEffortDescriptionFishingOperationDuration.setText(""); - fieldEffortDescriptionGearsNumberPerOperation.setModelText(""); - fieldEffortDescriptionCrewSize.setModelText(""); - fieldEffortDescriptionUnitCostOfFishing.setModelText(""); - fieldEffortDescriptionFixedCrewSalary.setModelText(""); - fieldEffortDescriptionCrewFoodCost.setModelText(""); - fieldEffortDescriptionCrewShareRate.setModelText(""); - fieldEffortDescriptionRepairAndMaintenanceGearCost.setModelText(""); - fieldEffortDescriptionLandingCosts.setModelText(""); - fieldEffortDescriptionOtherRunningCost.setModelText(""); + fieldEffortDescriptionGearsNumberPerOperation.setText(""); + fieldEffortDescriptionCrewSize.setText(""); + fieldEffortDescriptionUnitCostOfFishing.setText(""); + fieldEffortDescriptionFixedCrewSalary.setText(""); + fieldEffortDescriptionCrewFoodCost.setText(""); + fieldEffortDescriptionCrewShareRate.setText(""); + fieldEffortDescriptionRepairAndMaintenanceGearCost.setText(""); + fieldEffortDescriptionLandingCosts.setText(""); + fieldEffortDescriptionOtherRunningCost.setText(""); } if (evt.getNewValue() != null) { // add binding on getBean() @@ -64,7 +63,7 @@ SetOfVessels setOfVessels = getVerifier().getEntity(SetOfVessels.class); setBean((SetOfVesselsImpl) setOfVessels); if (getBean() != null){ - if (getRegion().getMetier() != null){ + if (getRegion().getMetier() != null) { fieldEffortDescriptionMetierList.fillList(getRegion().getMetier(), (Object)null); } setEffortDescriptionEffortDescriptionList(); @@ -96,7 +95,7 @@ } protected void remove(){ Object value = fieldEffortDescriptionEffortDescriptionList.getSelectedValue(); - if (value != null){ + if (value != null) { EffortDescription e = (EffortDescription)value; getContextValue(InputAction.class).removeEffortDescription(getBean(), e); setEffortDescriptionEffortDescriptionList(); @@ -106,7 +105,9 @@ EffortDescriptionImpl selectedEffort = (EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue(); setEffortDescription(selectedEffort); getVerifier().addCurrentEntity(getEffortDescription()); - if (getEffortDescription() != null){ + + /* NumberEditor is not working + if (getEffortDescription() != null) { fieldEffortDescriptionFishingOperation.init(); fieldEffortDescriptionGearsNumberPerOperation.init(); fieldEffortDescriptionCrewSize.init(); @@ -117,7 +118,7 @@ fieldEffortDescriptionRepairAndMaintenanceGearCost.init(); fieldEffortDescriptionLandingCosts.init(); fieldEffortDescriptionOtherRunningCost.init(); - } + }*/ } ]]> </script> @@ -153,13 +154,13 @@ <JLabel text="isisfish.effortDescription.fishingOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionFishingOperation' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onFocusLost='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/> </cell> </row> <row> @@ -178,13 +179,13 @@ <JLabel text="isisfish.effortDescription.gearsNumberPerOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionGearsNumberPerOperation' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onFocusLost='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/> </cell> </row> <row> @@ -192,13 +193,13 @@ <JLabel text="isisfish.effortDescription.crewSize" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionCrewSize' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onFocusLost='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/> </cell> </row> <row> @@ -206,13 +207,13 @@ <JLabel text="isisfish.effortDescription.unitCostOfFishing" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionUnitCostOfFishing' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onFocusLost='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/> </cell> </row> <row> @@ -220,13 +221,13 @@ <JLabel text="isisfish.effortDescription.fixedCrewSalary" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionFixedCrewSalary' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onFocusLost='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/> </cell> </row> <row> @@ -234,13 +235,13 @@ <JLabel text="isisfish.effortDescription.crewFoodCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionCrewFoodCost' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onFocusLost='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/> </cell> </row> <row> @@ -248,13 +249,13 @@ <JLabel text="isisfish.effortDescription.crewShareRate" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionCrewShareRate' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onFocusLost='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/> </cell> </row> <row> @@ -262,13 +263,13 @@ <JLabel text="isisfish.effortDescription.repairAndMaintenanceGearCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionRepairAndMaintenanceGearCost' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onFocusLost='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/> </cell> </row> <row> @@ -276,13 +277,13 @@ <JLabel text="isisfish.effortDescription.landingCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionLandingCosts' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onFocusLost='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/> </cell> </row> <row> @@ -290,13 +291,13 @@ <JLabel text="isisfish.effortDescription.otherRunningCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldEffortDescriptionOtherRunningCost' constructorParams='this' +  + <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onFocusLost='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/> </cell> </row> <row> 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-06-05 14:59:30 UTC (rev 2331) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-06-05 16:29:51 UTC (rev 2332) @@ -35,31 +35,26 @@ import fr.ifremer.isisfish.entities.SetOfVesselsImpl; boolean init = false; -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");fieldPopulationBasicsName.setText(""); - } - if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - } - } -}); @Override public void refresh() { SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((SetOfVesselsImpl) setOfVessels); + if (getBean() != null) { init = true; jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort(), true); jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true); init=false; getVerifier().addCurrentPanel(technicalEfficiency); - fieldSetOfVesselsNumberOfVessels.init(); - fieldSetOfVesselsFixedCosts.init(); + + // NumberEditor is not working + //fieldSetOfVesselsNumberOfVessels.init(); + //fieldSetOfVesselsFixedCosts.init(); } } @@ -71,12 +66,12 @@ getVerifier().setDeleteButton(remove); } -protected void portChanged(){ +protected void portChanged() { if (!init) { getBean().setPort((Port)fieldSetOfVesselsPort.getSelectedItem()); } } -protected void vesselTypeChanged(){ +protected void vesselTypeChanged() { if (!init) { getBean().setVesselType((VesselType)fieldSetOfVesselsVesselType.getSelectedItem()); } @@ -116,13 +111,13 @@ <JLabel text="isisfish.setOfVessels.numberOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldSetOfVesselsNumberOfVessels' constructorParams='this' +  + <JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}' onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/> </cell> </row> <row> @@ -130,20 +125,20 @@ <JLabel text="isisfish.setOfVessels.fixedCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldSetOfVesselsFixedCosts' constructorParams='this' +  + <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> <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> <InputOneEquationUI id='technicalEfficiency' constructorParams='this' lblText='{_("isisfish.setOfVessels.technicalEfficiency")}' - bean='{getBean()}' nameEquation='TechnicalEfficiency' methodGet='TechnicalEfficiencyEquation' methodSet='EquationTechnicalEfficiency' + bean='{getBean()}' nameEquation='TechnicalEfficiency' methodGet='TechnicalEfficiencyEquation' methodSet='EquationTechnicalEfficiency' clazz='{fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"TechnicalEfficiencyEquation"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-05 14:59:30 UTC (rev 2331) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-05 16:29:51 UTC (rev 2332) @@ -23,7 +23,6 @@ <script><![CDATA[ setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); -//getVerifier().addCurrentPanel(this); @Override public void refresh() { @@ -32,7 +31,7 @@ // (depends on sensitivity can't be done on constructor) installChangeListener(setOfVesselsTab); - getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI); + getVerifier().addCurrentPanel(setOfVesselsTabsUI, effortDescriptionUI); } @Override

1 0

r2331 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 5, 2009

June 5, 2009

Author: chatellier Date: 2009-06-05 14:59:30 +0000 (Fri, 05 Jun 2009) New Revision: 2331 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/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.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/PopulationSeasonsUI.jaxx Log: Format comment, remove number editor, fix strange binding content. 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-06-05 14:58:03 UTC (rev 2330) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-05 14:59:30 UTC (rev 2331) @@ -316,7 +316,7 @@ * Save all non saved entities. * * Change registred button states. - * Commi opened topia context. + * Commit opened topia context. */ protected void topiaSave() { try { 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-06-05 14:58:03 UTC (rev 2330) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-06-05 14:59:30 UTC (rev 2331) @@ -56,8 +56,6 @@ @Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); if (getBean() != null){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-06-05 14:58:03 UTC (rev 2330) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-06-05 14:59:30 UTC (rev 2331) @@ -30,20 +30,6 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -// TODO why it's commented -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");fieldPopulationBasicsName.setText(""); - } - if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text") - } - } -}); - public void init(PopulationSeasonInfo pi) { setPopInfo((PopulationSeasonInfoImpl)pi); } @@ -66,7 +52,7 @@ <cell fill='both' weightx='1.0' weighty='0.3'> <InputOneEquationUI id='migrationEquation' constructorParams='this' lblText='{_("isisfish.common.migration")}' - bean='{getPopInfo()}' nameEquation='Migration' methodGet='MigrationEquation' methodSet='MigrationEquationAsString' + bean='{getPopInfo()}' nameEquation='Migration' methodGet='MigrationEquation' methodSet='MigrationEquationAsString' clazz='{fr.ifremer.isisfish.equation.MigrationEquation.class}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/> </cell> @@ -75,7 +61,7 @@ <cell fill='both' weightx='1.0' weighty='0.3'> <InputOneEquationUI id='emigrationEquation' constructorParams='this' lblText='{_("isisfish.common.emigration")}' - bean='{getPopInfo()}' nameEquation='Emigration' methodGet='EmigrationEquation' methodSet='EmigrationEquationAsString' + bean='{getPopInfo()}' nameEquation='Emigration' methodGet='EmigrationEquation' methodSet='EmigrationEquationAsString' clazz='{fr.ifremer.isisfish.equation.EmigrationEquation.class}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/> </cell> @@ -84,7 +70,7 @@ <cell fill='both' weightx='1.0' weighty='0.3'> <InputOneEquationUI id='immigrationEquation' constructorParams='this' lblText='{_("isisfish.common.immigration")}' - bean='{getPopInfo()}' nameEquation='Immigration' methodGet='ImmigrationEquation' methodSet='ImmigrationEquationAsString' + bean='{getPopInfo()}' nameEquation='Immigration' methodGet='ImmigrationEquation' methodSet='ImmigrationEquationAsString' clazz='{fr.ifremer.isisfish.equation.ImmigrationEquation.class}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-06-05 14:58:03 UTC (rev 2330) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-06-05 14:59:30 UTC (rev 2331) @@ -119,7 +119,8 @@ </row> <row> <cell columns='2' anchor='west'> - <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed'/> + <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo().getUseEquationMigration()}' + text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -128,13 +129,16 @@ <PopulationMigrationEquationUI id='populationMigrationEquationUI' constraints='"fieldUseEquation"' constructorParams='this'/> <JTabbedPane id="fieldUseMatrix" constraints='"fieldUseMatrix"'> <tab title='{_("isisfish.populationMigrationMigration.title")}'> - <PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/> + <PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed' + _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/> </tab> <tab title='{_("isisfish.populationMigrationImmigration.title")}'> - <PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/> + <PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed' + _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/> </tab> <tab title='{_("isisfish.populationMigrationEmigration.title")}'> - <PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/> + <PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' + _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/> </tab> </JTabbedPane> </JPanel> @@ -146,7 +150,9 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldPopulationMigrationComment" text='{getBean().getMigrationComment()}' + onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' + enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </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-06-05 14:58:03 UTC (rev 2330) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-06-05 14:59:30 UTC (rev 2331) @@ -37,7 +37,7 @@ 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.setModelText(""); + fieldPopulationMonthGapBetweenReproRecrutement.setText(""); fieldPopulationRecruitmentComment.setText(""); } if (evt.getNewValue() != null) { @@ -67,7 +67,9 @@ if (getBean() != null && getBean().getRecruitmentDistribution() != null) { fieldPopulationRecruitmentDistribution.setMatrix(getBean().getRecruitmentDistribution().copy()); - fieldPopulationMonthGapBetweenReproRecrutement.init(); + + // chatellier : number editor is not working + //fieldPopulationMonthGapBetweenReproRecrutement.init(); } fieldPopulationRecruitmentDistribution.addMatrixListener(listener); } @@ -97,13 +99,13 @@ <JLabel text="isisfish.populationRecruitment.monthgapgetweenreprorecruitment" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldPopulationMonthGapBetweenReproRecrutement' constructorParams='this' +  + <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}' onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/> </cell> </row> <row> @@ -130,7 +132,9 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextArea id="fieldPopulationRecruitmentComment" text='{getBean().getRecruitmentComment()}' + onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' + enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </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-06-05 14:58:03 UTC (rev 2330) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-06-05 14:59:30 UTC (rev 2331) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - --> +--> <fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-06-05 14:58:03 UTC (rev 2330) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-06-05 14:59:30 UTC (rev 2331) @@ -287,7 +287,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.2'> <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' - matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution()}' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution().copy()}' enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ReproductionDistribution"'/> @@ -299,7 +299,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.1'> <JScrollPane> - <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> + <JTextArea id="fieldPopulationSeasonComment" text='{getBean().getSeasonsComment()}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> </JScrollPane> </cell> </row>

1 0

r2330 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input resources/i18n
by chatellier＠users.labs.libre-entreprise.org June 5, 2009

June 5, 2009

Author: chatellier Date: 2009-06-05 14:58:03 +0000 (Fri, 05 Jun 2009) New Revision: 2330 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Correction des traductions FR Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-06-05 14:57:13 UTC (rev 2329) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-06-05 14:58:03 UTC (rev 2330) @@ -509,7 +509,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JLabel text='isisfish.wizardGroupCreation.groupNumberHelp'/> + <JLabel text='isisfish.wizardGroupCreation.numberGroupHelp'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-05 14:57:13 UTC (rev 2329) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-05 14:58:03 UTC (rev 2330) @@ -1074,7 +1074,6 @@ isisfish.wizardGroupCreation.firstLength=First length isisfish.wizardGroupCreation.firstLengthHelp=First length \= minimal length of first group isisfish.wizardGroupCreation.gapBetweenGroupsHelp=gap between to group is 1 year. -isisfish.wizardGroupCreation.groupNumberHelp=number of Group \= number of group wanted isisfish.wizardGroupCreation.groupWidth=Group width isisfish.wizardGroupCreation.groupWidthHelp=Group width \= width of group isisfish.wizardGroupCreation.lastAge=Last age @@ -1082,6 +1081,7 @@ isisfish.wizardGroupCreation.maxGroupsLength=Maximal groups length isisfish.wizardGroupCreation.maxGroupsLengthHelp=A semicolon ';' must separe maximal length of each group isisfish.wizardGroupCreation.numberGroup=Number of group +isisfish.wizardGroupCreation.numberGroupHelp=number of Group \= number of group wanted isisfish.wizardGroupCreation.numberGroups=Number of groups isisfish.wizardGroupCreation.populationCharacteristics=Input the population characteristics isisfish.wizardGroupCreation.selectGroupLengthType=Select group length type Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-05 14:57:13 UTC (rev 2329) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-05 14:58:03 UTC (rev 2330) @@ -1066,24 +1066,24 @@ isisfish.welcome.menu.synchro=Synchronisation Serveur isisfish.welcome.title=Simulation Ifremer isisfish.wizardGroupCreation.allGroupsSameSize=Tous les groupes ont la m\u00EAme taille -isisfish.wizardGroupCreation.allValues=Input all the values +isisfish.wizardGroupCreation.allValues=Entrer toutes les valeurs isisfish.wizardGroupCreation.computedGrowthCurve=Calcul\u00E9 par une courbe de croissance isisfish.wizardGroupCreation.firstAge=Premier age -isisfish.wizardGroupCreation.firstAgeHelp=First age \= minimal age +isisfish.wizardGroupCreation.firstAgeHelp=Premier age \= age minimal isisfish.wizardGroupCreation.firstGroup=Premier groupe isisfish.wizardGroupCreation.firstLength=Premi\u00E8re taille -isisfish.wizardGroupCreation.firstLengthHelp=First length \= minimal length of first group -isisfish.wizardGroupCreation.gapBetweenGroupsHelp=gap between to group is 1 year. -isisfish.wizardGroupCreation.groupNumberHelp=number of Group \= number of group wanted +isisfish.wizardGroupCreation.firstLengthHelp=Premi\u00E8re taille \= taille minimale du premier groupe +isisfish.wizardGroupCreation.gapBetweenGroupsHelp=L'interval entre chaque groupe est de 1 an isisfish.wizardGroupCreation.groupWidth=Longueur du groupe -isisfish.wizardGroupCreation.groupWidthHelp=Group width \= width of group +isisfish.wizardGroupCreation.groupWidthHelp=Longueur du groupe \= Longueur du groupe isisfish.wizardGroupCreation.lastAge=Dernier age -isisfish.wizardGroupCreation.lastAgeHelp=Last age \= maximal age +isisfish.wizardGroupCreation.lastAgeHelp=Dernier age \= Age maximal isisfish.wizardGroupCreation.maxGroupsLength=Taille maximale de groupes -isisfish.wizardGroupCreation.maxGroupsLengthHelp=A semicolon ';' must separe maximal length of each group -isisfish.wizardGroupCreation.numberGroup=Nombre de groupes +isisfish.wizardGroupCreation.maxGroupsLengthHelp=Un point-virgule ';' doit s\u00E9parer les tailles maximales de chaque groupe +isisfish.wizardGroupCreation.numberGroup=Nombre de groupe +isisfish.wizardGroupCreation.numberGroupHelp=Nombre de groupe \= Nombre de groupe voulu isisfish.wizardGroupCreation.numberGroups=Nombre de groupes -isisfish.wizardGroupCreation.populationCharacteristics=Input the population characteristics +isisfish.wizardGroupCreation.populationCharacteristics=Entrez les caract\u00E9ristiques de la population isisfish.wizardGroupCreation.selectGroupLengthType=Choisir la longueur du groupe isisfish.wizardGroupCreation.timeStep=Pas de temps (en mois) isisfish.wizardGroupCreation.title=Cr\u00E9ation du groupe

1 0

r2329 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 5, 2009

June 5, 2009

Author: chatellier Date: 2009-06-05 14:57:13 +0000 (Fri, 05 Jun 2009) New Revision: 2329 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx Log: Remove NumberEditor (again) Cancel is working 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-06-05 13:33:16 UTC (rev 2328) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-06-05 14:57:13 UTC (rev 2329) @@ -24,18 +24,16 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.FisheryRegionImpl; import com.bbn.openmap.gui.OMToolSet; -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(); - toolSet.setupListeners(cellMap); toolMap.add((Component)toolSet); + setButtonTitle(_("isisfish.input.continueCells")); setNextPath("$root/$cells"); + addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -51,17 +49,22 @@ @Override public void refresh() { + FisheryRegion region = getVerifier().getEntity(FisheryRegion.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect setBean(null); - FisheryRegion region = getVerifier().getEntity(FisheryRegion.class); setBean((FisheryRegionImpl)region); - if (region != null){ + + if (getBean() != null) { setFieldMapfilesModel(getBean()); + /* numberEditor is not working fieldLatMin.init(); fieldLatMax.init(); fieldLongMin.init(); fieldLongMax.init(); fieldCellLengthLatitude.init(); - fieldCellLengthLongitude.init(); + fieldCellLengthLongitude.init();*/ } } @@ -71,44 +74,44 @@ getVerifier().setCancelButton(cancel); } -protected void setFieldMapfilesModel(FisheryRegion region){ +protected void setFieldMapfilesModel(FisheryRegion region) { DefaultListModel model = new DefaultListModel(); java.util.List<String> mapList = region.getMapFileList(); - if (mapList != null){ + if (mapList != null) { int cnt = 0; - for (String map : mapList){ + for (String map : mapList) { model.add(cnt, map); cnt++; } } fieldMapfiles.setModel(model); } -protected void mapFieldChanged(){ +protected void mapFieldChanged() { Object[] values = fieldMapfiles.getSelectedValues(); java.util.List<String> valuesList = new ArrayList<String>(); - if (values != null){ + if (values != null) { for (Object o : values){ valuesList.add((String)o); } } getBean().setMapFileList(valuesList); } -protected void addMap(){ +protected void addMap() { getContextValue(InputAction.class).addMap(getBean()); } -protected void delMap(){ +protected void delMap() { getContextValue(InputAction.class).removeMap(getBean(), fieldMapfiles.getSelectedValues()); } -protected void cellFillChanged(){ +protected void cellFillChanged() { } -protected void cellFile(){ +protected void cellFile() { getContextValue(InputAction.class).loadCellFile(fieldCellFile.getText()); } -protected void check(){ +protected void check() { getContextValue(InputAction.class).checkFisheryRegion(getBean()); setInfoText(_("isisfish.message.check.region")); } -protected void save(){ +protected void save() { setInfoText(_("isisfish.message.checking.cell")); getContextValue(InputAction.class).saveFisheryRegion(getBean()); getVerifier().setEditable(false); @@ -117,9 +120,7 @@ setInfoText(_("isisfish.message.save.finished")); refresh(); } - ]]> - </script> - + ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <JSplitPane id="FisheryRegionTab" name="FisheryRegion" constraints='BorderLayout.CENTER' oneTouchExpandable="true" dividerLocation="200" orientation="HORIZONTAL"> @@ -146,9 +147,11 @@ <JLabel text="isisfish.fisheryRegion.latitude.min"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldLatMin' constructorParams='this' +  + <JTextField id="fieldLatMin" text='{getBean().getMinLatitude()}' decorator='boxed' + onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> </cell> </row> <row> @@ -156,9 +159,11 @@ <JLabel text="isisfish.fisheryRegion.latitude.max"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldLatMax' constructorParams='this' +  + <JTextField id="fieldLatMax" text='{getBean().getMaxLatitude()}' decorator='boxed' + onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> </cell> </row> <row> @@ -166,9 +171,11 @@ <JLabel text="isisfish.fisheryRegion.longitude.min"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldLongMin' constructorParams='this' +  + <JTextField id="fieldLongMin" text='{getBean().getMinLongitude()}' decorator='boxed' + onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> </cell> </row> <row> @@ -176,9 +183,11 @@ <JLabel text="isisfish.fisheryRegion.longitude.max"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldLongMax' constructorParams='this' +  + <JTextField id="fieldLongMax" text='{getBean().getMaxLongitude()}' decorator='boxed' + onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> </cell> </row> <row> @@ -191,9 +200,11 @@ <JLabel text="isisfish.fisheryRegion.latitude"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldCellLengthLatitude' constructorParams='this' +  + <JTextField id="fieldCellLengthLatitude" text='{getBean().getCellLengthLatitude()}' decorator='boxed' + onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> </cell> </row> <row> @@ -201,9 +212,11 @@ <JLabel text="isisfish.fisheryRegion.longitude"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldCellLengthLongitude' constructorParams='this' +  + <JTextField id="fieldCellLengthLongitude" text='{getBean().getCellLengthLongitude()}' decorator='boxed' + onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> </cell> </row> <row> @@ -275,10 +288,12 @@ <JButton id='check' text="isisfish.common.check" onActionPerformed='check()' decorator='boxed'/> </cell> </row> - </Table> + </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> - <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' selectionMode="0" javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER' decorator='boxed'/> + <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' + constraints='BorderLayout.NORTH' decorator='boxed'/> + <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' selectionMode="0" javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' + fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER' decorator='boxed'/> </JPanel> </JSplitPane> </JPanel>

1 0