[Isis-fish-commits] r1589 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input simulator

Author: sletellier Date: 2008-11-18 11:57:27 +0000 (Tue, 18 Nov 2008) New Revision: 1589 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.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/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/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.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/PopulationMigrationEquationUI.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/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.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/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.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/StrategyMonthInfoUI.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/input/ZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Debug vol1 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -75,6 +75,7 @@ cellMapPanel.add(toolMap, BorderLayout.NORTH); cellMapPanel.add(cellMap, BorderLayout.CENTER); cellMap.setSelectedCells(cell); + valueChanged(false); } } protected void save(){ @@ -82,12 +83,10 @@ getParentContainer(InputUI.class).setTreeSelection(topia, Cell.class); setInfoText(_("isisfish.message.save.finished")); refresh(); - valueChanged(false); } protected void cancel(){ getContextValue(InputAction.class).cancel("Cell"); setInfoText(_("isisfish.message.cancel.finished")); - valueChanged(false); refresh(); } protected void goToZone(){ @@ -107,19 +106,21 @@ getContextValue(InputAction.class).setValue(c, Cell.class); getParentContainer(InputUI.class).setTreeSelection(c, Cell.class); refresh(); + valueChanged(true); } protected void nameChanged(){ getContextValue(InputAction.class).getCell().setName(fieldCellName.getText()); + refresh(); valueChanged(true); - refresh(); } protected void cellLandChanged(){ getContextValue(InputAction.class).getCell().setLand(fieldCellLand.isSelected()); + refresh(); valueChanged(true); - refresh(); } protected void commentChanged(){ getContextValue(InputAction.class).getCell().setComment(fieldCellComment.getText()); + refresh(); valueChanged(true); } ]]> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -106,6 +106,7 @@ protected void valueChanged(boolean b){ changed=b; save.setEnabled(b); + cancel.setEnabled(b); } protected void add(){ fr.ifremer.isisfish.entities.SetOfVessels setOfVessels = getContextValue(InputAction.class).getSetOfVessels(); @@ -115,6 +116,7 @@ Metier m = (Metier)((GenericCell)value).getValue(); getContextValue(InputAction.class).addEffortDescription(setOfVessels, m); setEffortDescriptionEffortDescriptionListModel(getContextValue(InputAction.class).getSetOfVessels()); + valueChanged(true); } } refresh(); @@ -124,8 +126,7 @@ if (setOfVessels != null){ Object value = fieldEffortDescriptionEffortDescriptionList.getSelectedValue(); if (value != null){ - - EffortDescription e = (EffortDescription)((GenericCell)value).getValue(); + EffortDescription e = (EffortDescription)((GenericCell)value).getValue(); getContextValue(InputAction.class).removeEffortDescription(setOfVessels, e); valueChanged(false); setEffortDescriptionEffortDescriptionListModel(getContextValue(InputAction.class).getSetOfVessels()); @@ -146,66 +147,87 @@ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText())); + valueChanged(true); + refresh(); } } protected void fishingOperationDurationChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText()))); + valueChanged(true); + refresh(); } } protected void gearsNumberPerOperationChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText())); + valueChanged(true); + refresh(); } } protected void descriptionCrewSizeChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText())); + valueChanged(true); + refresh(); } } protected void costOfFishingChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText())); + valueChanged(true); + refresh(); } } protected void fixedCrewSalaryChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText())); + valueChanged(true); + refresh(); } } protected void crewFoodCostChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText())); + valueChanged(true); + refresh(); } } protected void crewShareRateChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText())); + valueChanged(true); + refresh(); } } protected void repairAndMaintenanceGearCostChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText())); + valueChanged(true); + refresh(); } } protected void langdingCostsChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText())); + refresh(); } } protected void otherRunningCostChanged(){ EffortDescription possibleMetier = getEffortDescription(); if (possibleMetier != null){ possibleMetier.setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText())); + valueChanged(true); + refresh(); } } ]]> @@ -213,13 +235,7 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JList id="fieldEffortDescriptionMetierList" selectionMode="0"> -<!-- Fixme : ListModel and ListSelectionEvents -renderer="name" -<ListModel origin="$FisheryRegion/metier"/> -<ListSelectionEvents onValueChanged="refreshViewPattern('buttonEffortDescriptionAdd.*')"/> ---> - </JList> + <JList id="fieldEffortDescriptionMetierList" selectionMode="0"/> </JScrollPane> </cell> </row> @@ -229,22 +245,12 @@ <row> <cell fill='horizontal' weightx='1.0'> <JButton id="buttonEffortDescriptionAdd" text="isisfish.common.add" onActionPerformed='add()'/> -<!-- -actionCommand="input.InputEffortDescription.addEffortDescription($SetOfVessels, $fieldEffortDescriptionMetierList/selectedValue)" -origin="not(getPossibleMetiers($SetOfVessels, $fieldEffortDescriptionMetierList/selectedValue))" ---> </cell> </row> <row> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="0" onValueChanged='refresh()'/> - <!-- Fixme : ListModel and ListSelectionEvents -origin="$EffortDescription" -renderer="possibleMetiers/name" -<ListModel origin="$SetOfVessels/possibleMetiers"/> -<ListSelectionEvents onValueChanged="input.Input.selectEntity('EffortDescription', $fieldEffortDescriptionEffortDescriptionList/selectedValue)"/> ---> </JScrollPane> </cell> </row> @@ -258,12 +264,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionFishingOperation" onKeyTyped='fishingOperationChanged()'/> -<!-- Fixme : DocumentEvents -origin="$EffortDescription/fishingOperation" -<DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionFishingOperation/text"/> -</DocumentEvents> ---> </cell> </row> <row> @@ -272,10 +272,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionFishingOperationDuration" onKeyTyped='fishingOperationDurationChanged()'/> -<!-- Fixme : DocumentEvents -origin="$EffortDescription/fishingOperationDuration/hour" tooltips="in hour" -<DocumentEvents onModified="Update(3600 * $fieldEffortDescriptionFishingOperationDuration/text, $EffortDescription/fishingOperationDuration)"/> ---> </cell> </row> <row> @@ -284,12 +280,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" onKeyTyped='gearsNumberPerOperationChanged()'/> -<!-- Fixme : DocumentEvents - origin="$EffortDescription/gearsNumberPerOperation" - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionGearsNumberPerOperation/text"/> - </DocumentEvents> ---> </cell> </row> <row> @@ -298,12 +288,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionCrewSize" onKeyTyped='descriptionCrewSizeChanged()'/> -<!-- Fixme : DocumentEvents - origin="$EffortDescription/crewSize" - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionCrewSize/text"/> - </DocumentEvents> ---> </cell> </row> <row> @@ -312,12 +296,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionUnitCostOfFishing" onKeyTyped='costOfFishingChanged()'/> -<!-- Fixme : DocumentEvents - origin="$EffortDescription/unitCostOfFishing" - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionUnitCostOfFishing/text"/> - </DocumentEvents> ---> </cell> </row> <row> @@ -326,12 +304,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionFixedCrewSalary" onKeyTyped='fixedCrewSalaryChanged()'/> -<!-- Fixme : DocumentEvents - origin="$EffortDescription/fixedCrewSalary" - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionFixedCrewSalary/text"/> - </DocumentEvents> ---> </cell> </row> <row> @@ -340,12 +312,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionCrewFoodCost" onKeyTyped='crewFoodCostChanged()'/> -<!-- Fixme : DocumentEvents - origin="$EffortDescription/crewFoodCost" - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionCrewFoodCost/text"/> - </DocumentEvents> ---> </cell> </row> <row> @@ -354,12 +320,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionCrewShareRate" onKeyTyped='crewShareRateChanged()'/> -<!-- Fixme : DocumentEvents - origin="$EffortDescription/crewShareRate" - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionCrewShareRate/text"/> - </DocumentEvents> ---> </cell> </row> <row> @@ -368,12 +328,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" onKeyTyped='repairAndMaintenanceGearCostChanged()'/> -<!-- Fixme : DocumentEvents - origin="$EffortDescription/repairAndMaintenanceGearCost" - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionRepairAndMaintenanceGearCost/text"/> - </DocumentEvents> ---> </cell> </row> <row> @@ -382,12 +336,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionLandingCosts" onKeyTyped='langdingCostsChanged()'/> -<!-- Fixme : DocumentEvents - origin="$EffortDescription/landingCosts" - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionLandingCosts/text"/> - </DocumentEvents> ---> </cell> </row> <row> @@ -396,12 +344,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldEffortDescriptionOtherRunningCost" onKeyTyped='otherRunningCostChanged()'/> -<!-- Fixme : DocumentEvents - origin="$EffortDescription/otherRunningCost" - <DocumentEvents onModified="UpdateOrigin"> - <UpdateOrigin source="$fieldEffortDescriptionOtherRunningCost/text"/> - </DocumentEvents> ---> </cell> </row> <row> @@ -409,25 +351,13 @@ <Table> <row> <cell fill='horizontal' weightx='0.3'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.save("EffortDescription", $EffortDescription);refreshView($inputEffortDescription)' ---> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.3'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.cancel("EffortDescription", $EffortDescription);refreshView($inputEffortDescription)' ---> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> <cell fill='horizontal' weightx='0.3'> <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- -origin="$EffortDescription" -actionCommand="input.InputEffortDescription.remove($SetOfVessels, $EffortDescription)" ---> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -87,7 +87,7 @@ } protected void valueChanged(boolean b){ changed=b; - create.setEnabled(b); + cancel.setEnabled(b); save.setEnabled(b); } protected void nameChanged(){ @@ -130,10 +130,6 @@ </cell> <cell columns="2" fill='horizontal' weightx='1.0'> <JTextField id="fieldGearName" onKeyTyped='nameChanged()'/> -<!-- Fixme : DocumentEvents -origin="$Gear/name" -<DocumentEvents onModified="Update($fieldGearName/text)"/> ---> </cell> </row> <row> @@ -142,10 +138,6 @@ </cell> <cell columns="2" fill='horizontal' weightx='1.0'> <JTextField id="fieldGearEffortUnit" onKeyTyped='effortUnitChanged()'/> -<!-- Fixme : DocumentEvents -origin="$Gear/effortUnit" -<DocumentEvents onModified="Update($fieldGearEffortUnit/text)"/> ---> </cell> </row> <row> @@ -154,10 +146,6 @@ </cell> <cell columns="2" fill='horizontal' weightx='1.0'> <JTextField id="fieldGearStandardisationFactor" onKeyTyped='standardisationFactorChanged()'/> -<!-- Fixme : DocumentEvents -origin="$Gear/standardisationFactor" -<DocumentEvents onModified="Update($fieldGearStandardisationFactor/text)"/> ---> </cell> </row> <row> @@ -166,10 +154,6 @@ </cell> <cell columns="2" fill='horizontal' weightx='1.0'> <JTextField id="fieldGearParamName" onKeyTyped='paramNameChanged()'/> -<!-- Fixme : DocumentEvents -origin="$Gear/parameterName"> -<DocumentEvents onModified="Update($fieldGearParamName/text)"/> ---> </cell> </row> <row> @@ -178,19 +162,9 @@ </cell> <cell fill='horizontal' weightx='0.5'> <JComboBox id="fieldGearParamType" onActionPerformed='paramTypeChanged()'/> - <!-- Fixme : ComboBoxModel -firstNull="true" -origin="$Gear/possibleValue/type" -actionCommand="update(concat($fieldGearParamType/selectedItem, '[', $fieldGearParamPossibleValue/text, ']'), $Gear/possibleValue)" -<ComboBoxModel origin="fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes()"/> ---> </cell> <cell fill='horizontal' weightx='0.5'> <JTextField id="fieldGearParamPossibleValue" onKeyTyped='paramPossibleValueChanged()'/> - <!-- Fixme : DocumentEvents -origin="$Gear/possibleValue/values" -<DocumentEvents onModified="Update(concat($fieldGearParamType/selectedItem, '[', $fieldGearParamPossibleValue/text, ']'), $Gear/possibleValue)"/> ---> </cell> </row> <row> @@ -199,12 +173,7 @@ </cell> <cell columns="2" fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldGearComment" onKeyTyped='commentChanged()'> -<!-- Fixme : DocumentEvents -origin="$Gear/comment" -<DocumentEvents onModified="Update($fieldGearComment/text)"/> ---> - </JTextArea> + <JTextArea id="fieldGearComment" onKeyTyped='commentChanged()'/> </JScrollPane> </cell> </row> @@ -216,34 +185,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id="create" text="isisfish.common.new" onActionPerformed='create()'/> - <!-- -origin="$FisheryRegion" -actionCommand='input.Input.create("Gear")' ---> + <JButton id="save" enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id="save" text="isisfish.common.save" onActionPerformed='save()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.save("Gear", $Gear);refreshView($inputGear)' ---> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.cancel("Gear", $Gear);refreshView($inputGear)' ---> + <JButton id="create" text="isisfish.common.new" onActionPerformed='create()'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- -origin="$Gear" -actionCommand="input.Input.remove($Gear)" ---> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -206,12 +206,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldMetierSeasonInfo" onActionPerformed='metierSeasonChanged()'/> -<!-- Fixme : ComboBoxModel -firstNull="true" -origin="$MetierSeasonInfo" renderer="concat(firstMonth, '-', lastMonth)" -actionCommand="input.Input.selectEntity('MetierSeasonInfo', $fieldMetierSeasonInfo/selectedItem)" -<ComboBoxModel origin="getMetierSeasonInfo($Metier)"/> ---> </cell> </row> <row> @@ -220,10 +214,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldTargetSpecies"/> -<!-- Fixme : ComboBoxModel -firstNull="true" renderer="name" -<ComboBoxModel origin="$FisheryRegion/species"/> ---> </cell> </row> <row> @@ -232,11 +222,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldTargetFactorEquation" onActionPerformed='equationChanged()'/> -<!-- Fixme : ComboBoxModel -renderer="name" firstNull="true" -actionCommand="update($fieldTargetFactorEquation/selectedItem/content, $fieldTargetFactorScript/text)" -<ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "TargetFactor")'/> ---> </cell> </row> <row> @@ -245,17 +230,11 @@ <row> <cell fill='horizontal'> <JButton id='saveModel' text="isisfish.common.saveModel" onActionPerformed='saveAsModel()'/> -<!-- -actionCommand='input.Input.saveAsModel("TargetFactor", "Java", $fieldTargetFactorScript/text);refreshView($fieldTargetFactorEquation)' ---> </cell> </row> <row> <cell fill='horizontal'> <JButton id='openEditor' text="isisfish.common.openEditor" onActionPerformed='openEditor()'/> -<!-- -actionCommand='input.Input.openEditor("TargetFactor","new","fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation",$fieldTargetFactorScript/text,$fieldTargetFactorScript)' ---> </cell> </row> <row> @@ -268,11 +247,6 @@ <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> <org.codelutin.widget.editor.Editor id='fieldTargetFactorScript' askIfNotSaved="false"/> -<!-- -<editor id="fieldTargetFactorScript" askIfNotSaved="false" -origin="org.codelutin.util.FileUtil.getTempFile('', '.java')"> -</editor> ---> </JScrollPane> </cell> </row> @@ -293,51 +267,26 @@ <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JButton id="buttonMetierSpeciesAddTargetSpecies" text="isisfish.common.add" onActionPerformed='add()'/> -<!-- -actionCommand="input.InputMetier.addTargetSpecies($fieldMetierSeasonInfo/selectedItem, $fieldTargetSpecies/selectedItem, $fieldTargetFactorScript/text, $fieldPrimaryCatch/selected)" ---> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTable id="tableTargetSpecies"> -<!-- - <tableModel origin="getSpeciesTargetSpecies($MetierSeasonInfo)"> - <column title="Species" property="species" renderer="name"/> - <column title="Target factor" property="targetFactorEquation" renderer="name" editable="true"> - <tableColumnEditor><EquationTableEditor/></tableColumnEditor> - </column> - <column title="Main species for the metier" property="primaryCatch" - type="boolean" editable="true"/> - </tableModel> ---> - </JTable> + <JTable id="tableTargetSpecies"/> </JScrollPane> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JButton id="buttonMetierSpeciesRemoveTargetSpecies" text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- -actionCommand="input.InputMetier.removeTargetSpecies(getSpeciesTargetSpecies($MetierSeasonInfo)[$tableTargetSpecies/selectedRow + 1])" ---> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> <JButton id='save' text="isisfish.common.save" onActionPerformed='save()' enabled='false'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.save("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoSpecies)' ---> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()' enabled='false'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.cancel("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoSpecies)' ---> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -121,10 +121,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldMetierName" onKeyTyped='nameChanged()'/> -<!-- Fixme : DocumentEvents - origin="$Metier/name" -<DocumentEvents onModified="Update($fieldMetierName/text)"/> ---> </cell> </row> <row> @@ -133,11 +129,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()'/> -<!-- Fixme : ComboBoxModel -origin="$Metier/gear" renderer="name" firstNull="true" -actionCommand="update($fieldMetierGear/selectedItem, $Metier/gear)" -<ComboBoxModel origin="$FisheryRegion/gear"/> ---> </cell> </row> <row> @@ -146,10 +137,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldMetierParam" onKeyTyped='paramChanged()'/> -<!-- Fixme : DocumentEvents -origin="$Metier/gearParameterValue" -<DocumentEvents onModified="Update($fieldMetierParam/text)"/> ---> </cell> </row> <row> @@ -159,10 +146,6 @@ <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> <JTextArea id="fieldMetierComment" onKeyTyped='commentChanged()'/> -<!-- Fixme : DocumentEvents - origin="$Metier/comment" -<DocumentEvents onModified="Update($fieldMetierComment/text)"/> ---> </JScrollPane> </cell> </row> @@ -174,34 +157,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id="create" text="isisfish.common.new" onActionPerformed='create()'/> -<!-- -origin="$FisheryRegion" -actionCommand='input.Input.create("Metier")' ---> + <JButton id="save" enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id="save" text="isisfish.common.save" onActionPerformed='save()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.save("Metier", $Metier);refreshView($inputMetier)' ---> + <JButton id="cancel" enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id="cancel" text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.cancel("Metier", $Metier);refreshView($inputMetier)' ---> + <JButton id="create" text="isisfish.common.new" onActionPerformed='create()'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- -origin="$Metier" -actionCommand="input.Input.remove($Metier)" ---> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -56,6 +56,7 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { pop.setCapturability(fieldPopulationCapturability.getMatrix()); + refresh(); valueChanged(true); } }); @@ -76,8 +77,8 @@ protected void cancel(){ getContextValue(InputAction.class).cancel("Metier"); setInfoText(_("isisfish.message.cancel.finished")); + refresh(); valueChanged(false); - refresh(); } protected void setInfoText(String txt){ WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); @@ -125,14 +126,14 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> <!-- origin="$EntityModified" actionCommand='input.Input.save("Population", $Population);refreshView($inputCapturability)' --> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> <!-- origin="$EntityModified" actionCommand='input.Input.cancel("Population", $Population);refreshView($inputCapturability)' Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -50,6 +50,7 @@ naturalDeathRate.refresh(_("isisfish.populationEquation.naturalDeathRate"), (Formule)pop.getNaturalDeathRate(), "NaturalDeathRate", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class); meanWeight.refresh(_("isisfish.populationEquation.meanWeight"), (Formule)pop.getMeanWeight(), "MeanWeight", fr.ifremer.isisfish.equation.PopulationMeanWeight.class); price.refresh(_("isisfish.populationEquation.price"), (Formule)pop.getPrice(), "Price", fr.ifremer.isisfish.equation.PopulationPrice.class); + valueChanged(false); } } protected void save(){ @@ -93,19 +94,10 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - - <JButton id='cancel' text="isisfish.common.cancel" enabled='false' onActionPerformed='cancel()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationEquation)' ---> + <JButton id='cancel' text="isisfish.common.cancel" enabled='false' onActionPerformed='cancel()'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='save' text="isisfish.common.save" enabled='false' onActionPerformed='save()'/> -<!-- -origin="$EntityModified" -actionCommand='input.Input.save("Population", $Population);refreshView($inputPopulationEquation)' ---> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -125,12 +125,6 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='populationGroupChanged()'/> -<!-- Fixme : ComboBoxModel - id="fieldPopulationGroupPopulationGroup" renderer="concat(population/name, ' - ', id)" - origin="$PopulationGroup" firstNull="true" - actionCommand="input.Input.selectEntity('PopulationGroup', $fieldPopulationGroupPopulationGroup/selectedItem)" - <ComboBoxModel origin="$Population/populationGroup"/> ---> </cell> </row> <row> @@ -139,9 +133,6 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationGroupMeanWeight"/> -<!-- - origin="$PopulationGroup/meanWeight" editable="false" ---> </cell> </row> <row> @@ -150,9 +141,6 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationGroupPrice"/> -<!-- - origin="$PopulationGroup/price" editable="false" ---> </cell> </row> <row> @@ -161,11 +149,6 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate'/> -<!-- Fixme : matrixPanel - <matrixPanel constraints='"fieldPopulationGroupNaturalDeathRate"' - id="fieldPopulationGroupNaturalDeathRate" - origin="reduce(getSubMatrixOnSemantic($Population/naturalDeathRateMatrix, '0', util:array($PopulationGroup)))" /> ---> </cell> </row> <row> @@ -174,10 +157,6 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationGroupReproductionRate" onKeyTyped='reproductionRateChanged()'/> -<!-- -origin="$PopulationGroup/reproductionRate" -<DocumentEvents onModified="Update($fieldPopulationGroupReproductionRate/text)"/> ---> </cell> </row> <row> @@ -186,10 +165,6 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationGroupAge"/> -<!-- Fixme : DocumentEvents -origin="$PopulationGroup/age" -<DocumentEvents onModified="Update($fieldPopulationGroupAge/text)"/> ---> </cell> </row> <row> @@ -209,12 +184,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationGroupComment" onKeyTyped='groupCommentChanged()'> -<!-- Fixme : DocumentEvents -origin="$PopulationGroup/comment" - <DocumentEvents onModified="Update($fieldPopulationGroupComment/text)"/> ---> - </JTextArea> + <JTextArea id="fieldPopulationGroupComment" onKeyTyped='groupCommentChanged()'/> </JScrollPane> </cell> </row> @@ -223,18 +193,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.save("PopulationGroup", $PopulationGroup);refreshView($inputPopulationGroup)' ---> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.cancel("PopulationGroup", $PopulationGroup);refreshView($inputPopulationGroup)' ---> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -94,6 +94,7 @@ (PopulationGroup) fieldPopulationMigrationEmigrationGroupChooser.getSelectedItem(), (Zone) fieldPopulationMigrationEmigrationDepartureZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationEmigrationCoefficient.getText())); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); refresh(popInfo); } protected void remove(){ 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -30,123 +30,41 @@ * by : $Author: sletellier $ */ --> -<JPanel name="isisfish.populationMigrationEquation.title"> +<Table name="isisfish.populationMigrationEquation.title"> <script><![CDATA[ import fr.ifremer.isisfish.entities.PopulationSeasonInfo; + import fr.ifremer.isisfish.entities.Population; + import fr.ifremer.isisfish.entities.Formule; + + protected Population pop = null; public PopulationMigrationEquationUI (InputAction action){ delegateContext = new jaxx.runtime.DefaultJAXXContext(this); setContextValue(action); } public void refresh(PopulationSeasonInfo popInfo){ + pop = getContextValue(InputAction.class).getPopulation(); + if (pop != null){ + migrationEquation.refresh(_("isisfish.common.migration"), (Formule)popInfo.getMigrationEquation(), "Migration", fr.ifremer.isisfish.equation.MigrationEquation.class); + emigrationEquation.refresh(_("isisfish.common.emigration"), (Formule)popInfo.getEmigrationEquation(), "Emigration", fr.ifremer.isisfish.equation.EmigrationEquation.class); + immigrationEquation.refresh(_("isisfish.common.immigration"), (Formule)popInfo.getImmigrationEquation(), "Immigration", fr.ifremer.isisfish.equation.ImmigrationEquation.class); + } } ]]> </script> - <!-- - | Migration - + --> - <JLabel text="isisfish.common.migration"/> - <JComboBox id="fieldPopulationMigrationEquationMigration"> -<!-- Fixme : ComboBoxModel - origin="$PopulationInfoSaison/migrationEquation" - renderer="name" firstNull="true" - actionCommand="update($fieldPopulationMigrationEquationMigration/selectedItem/content, $fieldScriptPopulationMigrationEquationMigration/text)" - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Migration")'/> ---> - </JComboBox> - - <JButton text="isisfish.common.saveModel"/> - -<!-- -actionCommand='input.Input.saveEquationAsModel($PopulationInfoSaison/migrationEquation);refreshView($fieldPopulationMigrationEquationMigration)' ---> - - <JButton text="isisfish.common.openEditor"/> -<!-- -actionCommand='input.Input.openEditor($PopulationSeasonInfo/migrationEquation/category,$PopulationSeasonInfo/migrationEquation/name,$PopulationSeasonInfo/migrationEquation/javaInterface,$PopulationSeasonInfo/migrationEquation/content,$fieldScriptPopulationMigrationEquationMigration)' ---> - - <JScrollPane> -<!-- Fixme : editor, DocumentEvents - <editor askIfNotSaved="false" id="fieldScriptPopulationMigrationEquationMigration" - origin="org.codelutin.util.FileUtil.getTempFile($PopulationSeasonInfo/migrationEquation/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setMigrationEquationAsString($PopulationSeasonInfo, $fieldScriptPopulationMigrationEquationMigration/text)"/> - </DocumentEvents> - </editor> ---> - </JScrollPane> - - <!-- - | Emigration - + --> - <JLabel text="isisfish.common.emigration"/> - <JComboBox id="fieldPopulationMigrationEquationEmigration"> -<!-- Fixme : ComboBoxModel -origin="$PopulationInfoSaison/emigrationEquation" -renderer="name" firstNull="true" -actionCommand="update($fieldPopulationMigrationEquationEmigration/selectedItem/content, $fieldScriptPopulationMigrationEquationEmigration/text)" -<ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Emigration")'/> ---> - </JComboBox> - - <JButton text="isisfish.common.saveModel"/> -<!-- - - actionCommand='input.Input.saveEquationAsModel($PopulationInfoSaison/emigrationEquation);refreshView($fieldPopulationMigrationEquationEmigration)' ---> - - <JButton text="isisfish.common.openEditor"/> -<!-- -actionCommand='input.Input.openEditor($PopulationSeasonInfo/emigrationEquation/category,$PopulationSeasonInfo/emigrationEquation/name,$PopulationSeasonInfo/emigrationEquation/javaInterface,$PopulationSeasonInfo/emigrationEquation/content,$fieldScriptPopulationMigrationEquationEmigration)' ---> - - <JScrollPane> -<!-- Fixme : editor, DocumentEvents - <editor askIfNotSaved="false" id="fieldScriptPopulationMigrationEquationEmigration" - origin="org.codelutin.util.FileUtil.getTempFile($PopulationSeasonInfo/emigrationEquation/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEmigrationEquationAsString($PopulationSeasonInfo, $fieldScriptPopulationMigrationEquationEmigration/text)"/> - </DocumentEvents> - </editor> ---> - </JScrollPane> - - <!-- - | Immigration - + --> - <JLabel text="isisfish.common.immigration"/> - <JComboBox id="fieldPopulationMigrationEquationImmigration"> -<!--Fixme : ComboBoxModel -origin="$PopulationInfoSaison/immigrationEquation" -renderer="name" firstNull="true" -actionCommand="update($fieldPopulationMigrationEquationImmigration/selectedItem/content, $fieldScriptPopulationMigrationEquationImmigration/text)" - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Immigration")'/> ---> - </JComboBox> - - <JButton text="isisfish.common.saveModel"/> -<!-- - - actionCommand='input.Input.saveEquationAsModel($PopulationInfoSaison/immigrationEquation);refreshView($fieldPopulationMigrationEquationImmigration)' ---> - - <JButton text="isisfish.common.openEditor"/> -<!-- - actionCommand='input.Input.openEditor($PopulationSeasonInfo/immigrationEquation/category,$PopulationSeasonInfo/immigrationEquation/name,$PopulationSeasonInfo/immigrationEquation/javaInterface,$PopulationSeasonInfo/immigrationEquation/content,$fieldScriptPopulationMigrationEquationImmigration)' ---> - <JScrollPane> -<!-- Fixme : editor, DocumentEvents - <editor askIfNotSaved="false" id="fieldScriptPopulationMigrationEquationImmigration" - origin="org.codelutin.util.FileUtil.getTempFile($PopulationSeasonInfo/immigrationEquation/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setImmigrationEquationAsString($PopulationSeasonInfo, $fieldScriptPopulationMigrationEquationImmigration/text)"/> - </DocumentEvents> - </editor> ---> - </JScrollPane> - -</JPanel> + <row> + <cell fill='both' weightx='1.0' weighty='0.3'> + <PopulationOneEquationUI id='migrationEquation' constructorParams='getContextValue(InputAction.class)'/> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0' weighty='0.3'> + <PopulationOneEquationUI id='emigrationEquation' constructorParams='getContextValue(InputAction.class)'/> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0' weighty='0.3'> + <PopulationOneEquationUI id='immigrationEquation' constructorParams='getContextValue(InputAction.class)'/> + </cell> + </row> +</Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -89,6 +89,7 @@ (PopulationGroup) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), (Zone) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationImmigrationCoefficient.getText())); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); refresh(popInfo); } protected void remove(){ @@ -132,29 +133,16 @@ <row columns='4'> <cell fill='horizontal' weightx='1.0'> <JButton id="buttonPopulationMigrationImmigrationAdd" text="isisfish.common.add" onActionPerformed='add()'/> -<!-- -actionCommand="input.InputPopulation.addImmigration($fieldPopulationMigrationImmigrationGroupChooser/selectedItem, $fieldPopulationMigrationImmigrationArrivalZoneChooser/selectedItem, $fieldPopulationMigrationImmigrationCoefficient/text)" ---> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable'/> -<!-- Fixme : MatrixPanel - -<MatrixPanel constraints="PopulationMigrationImmigrationTable" id="PopulationMigrationImmigrationTable" - origin="copy($PopulationSeasonInfo/immigrationMatrix)" linearModel="true"> - <MatrixPanelEvents onMatrixChanged="Update(copy($PopulationMigrationImmigrationTable/matrix), $PopulationSeasonInfo/immigrationMatrix)"/> - </MatrixPanel> ---> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> <JButton id="buttonPopulationImmigrationMigrationRemove" text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- - actionCommand="input.InputPopulation.removeImmigration($PopulationMigrationImmigrationTable)" ---> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -98,6 +98,7 @@ (Zone) fieldPopulationMigrationMigrationDepartureZoneChooser.getSelectedItem(), (Zone) fieldPopulationMigrationMigrationArrivalZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationMigrationCoefficient.getText())); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); refresh(popInfo); } protected void remove(){ @@ -144,30 +145,16 @@ <row columns='4'> <cell fill='horizontal' weightx='1.0'> <JButton id="buttonPopulationMigrationMigrationAdd" text="isisfish.common.add" onActionPerformed='add()'/> -<!-- - actionCommand="input.InputPopulation.addMigration($fieldPopulationMigrationMigrationGroupChooser/selectedItem, $fieldPopulationMigrationMigrationDepartureZoneChooser/selectedItem, $fieldPopulationMigrationMigrationArrivalZoneChooser/selectedItem, $fieldPopulationMigrationMigrationCoefficient/text)" ---> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable'/> -<!-- Fixme : MatrixPanel - - - <MatrixPanel constraints="PopulationMigrationMigrationTable" id="PopulationMigrationMigrationTable" - origin="copy($PopulationSeasonInfo/migrationMatrix)" linearModel="true"> - <MatrixPanelEvents onMatrixChanged="Update(copy($PopulationMigrationMigrationTable/matrix), $PopulationSeasonInfo/migrationMatrix)"/> - </MatrixPanel> ---> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> <JButton id="buttonPopulationMigrationMigrationRemove" text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- -actionCommand="input.InputPopulation.removeMigration($PopulationMigrationMigrationTable)" ---> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -115,7 +115,7 @@ WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); root.setInfoText(txt); } - protected void valueChanged(boolean b){ + public void valueChanged(boolean b){ changed=b; cancel.setEnabled(b); save.setEnabled(b); @@ -128,21 +128,11 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldPopulationMigrationSeasonChooser" onActionPerformed='seasonChooserChanged()'/> -<!-- - firstNull="true" - origin="getPopulationSeasonInfo($Population)" - actionCommand="input.Input.selectEntityAndRefresh('PopulationSeasonInfo', $fieldPopulationMigrationSeasonChooser/selectedItem, '(fieldUseEquationMigration|hideablePanel)')" ---> </cell> </row> <row> <cell columns='2' anchor='west'> - <JCheckBox id="fieldUseEquationMigration" text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()'> -<!-- Fixme : ItemEvents -origin="$PopulationSeasonInfo/useEquationMigration" - <ItemEvents onStateChanged="Update($fieldUseEquationMigration/selected, $PopulationSeasonInfo/useEquationMigration, refreshView($hideablePanel))"/> ---> - </JCheckBox> + <JCheckBox id="fieldUseEquationMigration" text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()'/> </cell> </row> <row> @@ -155,21 +145,6 @@ <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='getContextValue(InputAction.class)'/></tab> </JTabbedPane> </JPanel> -<!-- - <hidablePanel constraints="fieldUseEquation" layout="BorderLayout" - origin="getUseEquationMigration($PopulationSeasonInfo)"> - <xpanel xml="input/PopulationMigrationEquation.xml"/> - </hidablePanel> - - <hidablePanel constraints='"fieldUseMatrix"' layout="BorderLayout" - origin="not(getUseEquationMigration($PopulationSeasonInfo))"> - <tabbedpane id="PopulationMigrationTabbed" constraints="PopulationMigrationTabbed"> - <xpanel xml="input/PopulationMigrationMigration.xml"/> - <xpanel xml="input/PopulationMigrationImmigration.xml"/> - <xpanel xml="input/PopulationMigrationEmigration.xml"/> - </tabbedpane> - </hidablePanel> ---> </cell> </row> <row> @@ -178,12 +153,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldPopulationMigrationComment" onKeyTyped='commentChanged()'> -<!-- Fixme : DocumentEvents - origin="$Population/migrationComment" - <DocumentEvents onModified="Update($fieldPopulationMigrationComment/text)"/> ---> - </JTextArea> + <JTextArea id="fieldPopulationMigrationComment" onKeyTyped='commentChanged()'/> </JScrollPane> </cell> </row> @@ -192,18 +162,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- -origin="$EntityModified" -actionCommand="input.Input.save('PopulationSeasonInfo', $PopulationSeasonInfo);refreshView($inputMigration)" ---> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- -origin="$EntityModified" -actionCommand="input.Input.cancel('PopulationSeasonInfo', $PopulationSeasonInfo);refreshView($inputMigration)" ---> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -95,7 +95,12 @@ } protected void valueChanged(boolean b){ changed = b; - getParentContainer(PopulationEquationUI.class).valueChanged(true); + if (getParentContainer(PopulationEquationUI.class) != null){ + getParentContainer(PopulationEquationUI.class).valueChanged(b); + } + else{ + getParentContainer(PopulationMigrationUI.class).valueChanged(b); + } } protected void saveModel(){ Equation e = getEquation(); @@ -117,11 +122,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="combo" onActionPerformed='comboChanged()'/> -<!-- Fixme : ComboBoxModel -origin="$Population/naturalDeathRate" renderer="name" firstNull="true" -actionCommand="update($fieldPopulationNaturalDeathRate/selectedItem/content, $fieldScriptPopulationNaturalDeathRate/text)" - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "NaturalDeathRate")'/> ---> </cell> </row> <row> @@ -130,33 +130,16 @@ <row> <cell fill='horizontal'> <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()'/> -<!-- - actionCommand='input.Input.saveEquationAsModel($Population/naturalDeathRate);refreshView($fieldPopulationNaturalDeathRate)' ---> </cell> </row> <row> <cell fill='horizontal'> <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()'/> -<!-- - actionCommand='input.Input.openEditor($Population/naturalDeathRate/category,$Population/naturalDeathRate/name,$Population/naturalDeathRate/javaInterface,$Population/naturalDeathRate/content,$fieldScriptPopulationNaturalDeathRate)' ---> </cell> </row> <row> <cell fill='horizontal' weighty='1.0'> - <JPanel/> -<!-- Fixme : editor - <editor constraints='"fieldScriptPopulationNaturalDeathRate"' askIfNotSaved="false" - id="fieldScriptPopulationNaturalDeathRate" - origin="org.codelutin.util.FileUtil.getTempFile($Population/naturalDeathRate/content, '.java')"> - <DocumentEvents onModified="Update"> - <UpdateOrigin - target="setEquationNaturalDeathRate($Population, $fieldScriptPopulationNaturalDeathRate/text)"/> - </DocumentEvents> - </editor> ---> - + <JPanel/> </cell> </row> </Table> @@ -167,12 +150,4 @@ </JScrollPane> </cell> </row> - <!--row> - <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.populationEquation.meanWeight"/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldPopulationMeanWeight"/> - </cell> - </row--> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -261,14 +261,14 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> <!-- origin="$EntityModified" actionCommand='input.Input.save("Population", $Population);refreshView($inputPopulationRecruitment)' --> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> <!-- origin="$EntityModified" actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationRecruitment)' 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -183,12 +183,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldPopulationSeasonInfoChooser" onActionPerformed='infoChooserChanged()'/> -<!-- Fixme : ComboBoxModel - firstNull="true" origin="$PopulationSeasonInfo" -renderer="concat(firstMonth, '-', lastMonth)" -actionCommand="input.Input.selectEntity('PopulationSeasonInfo', $fieldPopulationSeasonInfoChooser/selectedItem)" - <ComboBoxModel origin="getPopulationSeasonInfo($Population)"/> ---> </cell> </row> <row> @@ -197,19 +191,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JPanel id='fieldPopulationSeasonInterval' layout='{new BorderLayout()}'/> -<!-- Fixme : SeasonIntervalPanel, hidablePanel - <SeasonIntervalPanel constraints="fieldPopulationSeasonInterval" - id="fieldPopulationSeasonInterval" origin="$PopulationSeasonInfo"> - <PropertyChangeEvents onChange="Update" propertyName="first"> - <UpdateOrigin source="$fieldPopulationSeasonInterval/model/first" - target="$PopulationSeasonInfo/firstMonth"/> - </PropertyChangeEvents> - <PropertyChangeEvents onChange="Update" propertyName="last"> - <UpdateOrigin source="$fieldPopulationSeasonInterval/model/last" - target="$PopulationSeasonInfo/lastMonth"/> - </PropertyChangeEvents> - </SeasonIntervalPanel> ---> </cell> </row> <row> @@ -218,9 +199,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JCheckBox id="fieldPopulationSeasonGroupChange" text="isisfish.populationSeasons.changeGroup" onActionPerformed='groupChangedChanged()'/> -<!-- -<ItemEvents onStateChanged="Update($fieldPopulationSeasonGroupChange/selected)"/> ---> </cell> </row> <row> @@ -229,14 +207,6 @@ </cell> <cell fill='both' weightx='1.0'> <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution'/> -<!-- - <MatrixPanel id="fieldPopulationSeasonReproductionDistribution" - origin="copy($PopulationSeasonInfo/reproductionDistribution)"> - <MatrixPanelEvents - onMatrixChanged="Update(copy($fieldPopulationSeasonReproductionDistribution/matrix), $PopulationSeasonInfo/reproductionDistribution)"/> - </MatrixPanel> - </hidablePanel> ---> </cell> </row> <row> @@ -246,10 +216,6 @@ <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> <JTextArea id="fieldPopulationSeasonComment" onKeyTyped='commentChanged()'> -<!-- Fixme : DocumentEvents - origin="$Population/seasonsComment" -<DocumentEvents onModified="Update($fieldPopulationSeasonComment/text)"/> ---> </JTextArea> </JScrollPane> </cell> @@ -262,34 +228,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> -<!-- - origin="$FisheryRegion" - actionCommand='input.InputPopulation.createSeasonInfo($Population)' - --> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.save("PopulationSeasonInfo", $PopulationSeasonInfo);refreshView($inputPopulationSeasonInfo);refreshView($inputCapturability)' ---> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.cancel("PopulationSeasonInfo", $PopulationSeasonInfo);refreshView($inputPopulationSeasonInfo);refreshView($inputCapturability)' ---> + <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- - origin="$PopulationSeasonInfo" - actionCommand="input.InputPopulation.removeSeasonInfo($Population, $PopulationSeasonInfo)" ---> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -121,7 +121,7 @@ } protected void valueChanged(boolean b){ changed=b; - create.setEnabled(b); + cancel.setEnabled(b); save.setEnabled(b); } protected void nameChanged(){ @@ -183,15 +183,15 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> + <JButton id='create' enabled='false' text="isisfish.common.new" onActionPerformed='create()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> + <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()'/> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -147,7 +147,7 @@ } protected void valueChanged(boolean b){ changed=b; - create.setEnabled(b); + cancel.setEnabled(b); save.setEnabled(b); } protected void nameChanged(){ @@ -330,15 +330,15 @@ <Table> <row> <cell fill='horizontal' weightx='1.0'> - <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> <row> <cell fill='horizontal' weightx='1.0'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> + <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> </cell> <cell fill='horizontal' weightx='1.0'> <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()'/> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -91,7 +91,7 @@ } protected void valueChanged(boolean b){ changed=b; - create.setEnabled(b); + cancel.setEnabled(b); save.setEnabled(b); } protected void setInfoText(String txt){ @@ -202,10 +202,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -37,7 +37,8 @@ import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.ui.WelcomePanelUI; import org.codelutin.topia.persistence.TopiaEntity; - + + protected boolean changed = false; public StrategyMonthInfoUI (InputAction action){ delegateContext = new jaxx.runtime.DefaultJAXXContext(this); setContextValue(action); @@ -71,6 +72,11 @@ WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); root.setInfoText(txt); } + public void valueChanged(boolean b){ + save.setEnabled(b); + cancel.setEnabled(b); + changed = b; + } ]]></script> <Table constraints='BorderLayout.CENTER'> <row> @@ -125,18 +131,10 @@ <Table constraints='BorderLayout.SOUTH'> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.save("Strategy", $Strategy);refreshView($inputStrategyMonthInfo)' ---> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.cancel("Strategy", $Strategy);refreshView($inputStrategyMonthInfo)' ---> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -41,7 +41,7 @@ import fr.ifremer.isisfish.ui.widget.editor.GenericCell; protected StrategyMonthInfo strategyMonthInfo = null; - + protected boolean changed = false; public StrategyOneMonthInfoUI (InputAction action){ delegateContext = new jaxx.runtime.DefaultJAXXContext(this); setContextValue(action); @@ -54,6 +54,7 @@ numberOfTrips.setText(strategyMonthInfo.getNumberOfTrips() + ""); fieldStrategyMonthInfoMinInactivityDays.setText(strategyMonthInfo.getMinInactivityDays() + ""); setFieldStrategyMonthInfoProportionModel(); + valueChanged(false); } } protected void setFieldStrategyMonthInfoTripTypeModel(){ @@ -77,31 +78,32 @@ protected void setFieldStrategyMonthInfoProportionModel(){ if (strategyMonthInfo != null){ fieldStrategyMonthInfoProportion.setMatrix(strategyMonthInfo.getProportionMetier()); - strategyMonthInfo.setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); -// fieldStrategyMonthInfoProportion.getModel().addTableModelListener(new TableModelListener() { -// @Override -// public void tableChanged(TableModelEvent e) { -// } -// }); + strategyMonthInfo.addPropertyChangeListener(new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + strategyMonthInfo.setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); + valueChanged(true); + } + }); } - - // <MatrixPanel constraints='"fieldStrategyMonthInfoProportion"' - // id="fieldStrategyMonthInfoProportion2" - // linearModel="true" linearModelShowDefault="true" - // origin="copy($StrategyMonthInfo2/proportionMetier)"> - // <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion2/matrix), $StrategyMonthInfo2/proportionMetier)"/> - // </MatrixPanel> } protected void tripTypeChanged(){ Object selected = fieldStrategyMonthInfoTripType.getSelectedItem(); if (selected != null){ TripType tripTypeSelected = (TripType)((GenericCell)selected).getValue(); strategyMonthInfo.setTripType(tripTypeSelected); + valueChanged(true); } } protected void minInactivityDayChanged(){ strategyMonthInfo.setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText())); + valueChanged(true); } + protected void valueChanged(boolean b){ + getParentContainer(StrategyMonthInfoUI.class).valueChanged(b); + changed = b; + } ]]></script> <row> <cell columns='2' fill='horizontal' weightx='1.0' anchor='west'> @@ -110,13 +112,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='tripTypeChanged()'> -<!--Fixme : JComboBoxModel - origin="$StrategyMonthInfo2/tripType" firstNull="true" - actionCommand="update($fieldStrategyMonthInfoTripType2/selectedItem, $StrategyMonthInfo2/tripType)" - <JComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> ---> - </JComboBox> + <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='tripTypeChanged()'/> </cell> </row> <row> @@ -125,10 +121,6 @@ </cell> <cell fill='horizontal' weightx='0.5' anchor='west'> <JLabel id='numberOfTrips'/> -<!-- - text='{strategyMonthInfo.getNumberOfTrips().toString()}' - origin="$StrategyMonthInfo2/numberOfTrips" ---> </cell> </row> <row> @@ -136,12 +128,7 @@ <JLabel text="isisfish.strategyMonthInfo.minInactivityDays"/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldStrategyMonthInfoMinInactivityDays" onKeyTyped='minInactivityDayChanged()'> -<!-- Fixme : DocumentEvents - origin="$StrategyMonthInfo2/minInactivityDays" - <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays2/text)"/> ---> - </JTextField> + <JTextField id="fieldStrategyMonthInfoMinInactivityDays" onKeyTyped='minInactivityDayChanged()'/> </cell> </row> <row> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -156,7 +156,7 @@ } protected void valueChanged(boolean b){ changed=b; - create.setEnabled(b); + cancel.setEnabled(b); save.setEnabled(b); } ]]></script> @@ -169,10 +169,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldStrategyName" onKeyTyped='nameChanged()'/> -<!-- Fixme : DocumentEvents - origin="$Strategy/name" -<DocumentEvents onModified="Update($fieldStrategyName/text)"/> ---> </cell> </row> <row> @@ -181,11 +177,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldStrategySetOfVessels" onActionPerformed='setOfVesselsChanged()'/> -<!-- Fixme : ComboBoxModel -origin="$Strategy/setOfVessels" renderer="name" firstNull="true" - actionCommand="update($fieldStrategySetOfVessels/selectedItem, $Strategy/setOfVessels)" -<ComboBoxModel origin="$FisheryRegion/setOfVessels"/> ---> </cell> </row> <row> @@ -194,10 +185,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldStrategyProportionSetOfVessels" onKeyTyped='proportionSetOfVesselsChanged()'/> -<!-- Fixme : DocumentEvents -origin="$Strategy/proportionSetOfVessels" -<DocumentEvents onModified="Update($fieldStrategyProportionSetOfVessels/text)"/> ---> </cell> </row> <row> @@ -206,10 +193,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JCheckBox id="fieldUseEquationInactivity" onActionPerformed='useInactivityChanged()'/> -<!-- Fixme : ItemEvents - origin="$Strategy/inactivityEquationUsed" text="isisfish.strategy.inactivityEquationUsed" -<ItemEvents onStateChanged="Update($fieldUseEquationInactivity/selected, $Strategy/inactivityEquationUsed, refreshView($hideablePanelInactivityEquation))"/> ---> </cell> </row> <row> @@ -218,10 +201,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldStrategyInactivity" onActionPerformed='inactivityChanged()'/> -<!-- - actionCommand="Update($fieldStrategyInactivity/selectedItem/content, $fieldScriptStrategyInactivity/text)"> - <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Inactivity")'/> ---> </cell> </row> <row> @@ -230,17 +209,11 @@ <row> <cell fill='horizontal'> <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()'/> -<!-- - actionCommand='input.Input.saveEquationAsModel($Strategy/inactivityEquation);refreshView($fieldStrategyInactivity)'/> ---> </cell> </row> <row> <cell fill='horizontal'> <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()'/> -<!-- -actionCommand='input.Input.openEditor($Strategy/inactivityEquation/category,$Strategy/inactivityEquation/name,$Strategy/inactivityEquation/javaInterface,$Strategy/inactivityEquation/content,$fieldScriptStrategyInactivity)'/> ---> </cell> </row> <row> @@ -252,18 +225,6 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false"/> -<!-- - <editor constraints='"fieldScriptStrategyInactivity"' askIfNotSaved="false" - id="fieldScriptStrategyInactivity" - origin="org.codelutin.util.FileUtil.getTempFile($Strategy/inactivityEquation/content, '.java')"> - <Document </row> - </Table> - </cell>Events onModified="Update"> - <UpdateOrigin - target="setEquationInactivity($Strategy, $fieldScriptStrategyInactivity/text)"/> - </DocumentEvents> - </editor> ---> </cell> </row> <row> @@ -272,12 +233,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldStrategyComment" onKeyTyped='commentChanged()'> -<!-- Fixme : DocumentEvents - origin="$Strategy/comment" -<DocumentEvents onModified="Update($fieldStrategyComment/text)"/> ---> - </JTextArea> + <JTextArea id="fieldStrategyComment" onKeyTyped='commentChanged()'/> </JScrollPane> </cell> </row> @@ -289,34 +245,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> -<!-- - origin="$FisheryRegion" - actionCommand='input.Input.create("Strategy")' ---> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.save("Strategy", $Strategy);refreshView($inputStrategy)' ---> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- - origin="$EntityModified" - actionCommand='input.Input.cancel("Strategy", $Strategy);refreshView($inputStrategy)' ---> + <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- - origin="$Strategy" - actionCommand="input.Input.remove($Strategy)" ---> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -60,7 +60,7 @@ } protected void valueChanged(boolean b){ changed=b; - create.setEnabled(b); + cancel.setEnabled(b); save.setEnabled(b); } protected void nameChanged(){ @@ -156,10 +156,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -100,7 +100,7 @@ } protected void valueChanged(boolean b){ changed=b; - create.setEnabled(b); + cancel.setEnabled(b); save.setEnabled(b); } protected void goToSetOfVessels(){ @@ -149,10 +149,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldVesselTypeName" onKeyTyped='nameChanged()'/> -<!-- Fixme : DocumentEvents -origin="$VesselType/name" -<DocumentEvents onModified="Update($fieldVesselTypeName/text)"/> ---> </cell> </row> <row> @@ -161,10 +157,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldVesselTypeLength" onKeyTyped='lenghtChanged()'/> -<!-- Fixme : DocumentEvents -origin="$VesselType/length" -<DocumentEvents onModified="Update($fieldVesselTypeLength/text)"/> ---> </cell> </row> <row> @@ -173,10 +165,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldVesselTypeSpeed" onKeyTyped='speedChanged()'/> -<!-- Fixme : DocumentEvents - origin="$VesselType/speed" -<DocumentEvents onModified="Update($fieldVesselTypeSpeed/text)"/> ---> </cell> </row> <row> @@ -185,10 +173,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldVesselTypeMaxTripDuration" onKeyTyped='tripDurationChanged()'/> -<!-- Fixeme : DocumentEvents -origin="$VesselType/maxTripDuration/hour" tooltips="in hour" -<DocumentEvents onModified="Update(3600 * $fieldVesselTypeMaxTripDuration/text, $VesselType/maxTripDuration)"/> ---> </cell> </row> <row> @@ -197,10 +181,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldVesselTypeActivityRange" onKeyTyped='activityRangeChanged()'/> - <!-- Fixme : DocumentEvents -origin="$VesselType/activityRange" -<DocumentEvents onModified="Update($fieldVesselTypeActivityRange/text)"/> ---> </cell> </row> <row> @@ -209,10 +189,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldVesselTypeMinCrewSize" onKeyTyped='minCrewChanged()'/> -<!-- Fixme : DocumentEvents -origin="$VesselType/minCrewSize" -<DocumentEvents onModified="Update($fieldVesselTypeMinCrewSize/text)"/> ---> </cell> </row> <row> @@ -221,10 +197,6 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" onKeyTyped='unitFuelCostChanged()'/> -<!-- Fixme : DocumentEvents -origin="$VesselType/unitFuelCostOfTravel" -<DocumentEvents onModified="Update($fieldVesselTypeUnitFuelCostOfTravel/text)"/> ---> </cell> </row> <row> @@ -233,13 +205,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane> - <JList id="vesselTypeTripType" onValueChanged='tripTypeChanged()'> -<!-- Fixme : ListModel - origin="getTripType($VesselType)" renderer="name" -<ListModel origin="$FisheryRegion/tripType"/> -<MouseEvents onClicked="Update($vesselTypeTripType/selectedValues, $VesselType/tripType)"/> ---> - </JList> + <JList id="vesselTypeTripType" onValueChanged='tripTypeChanged()'/> </JScrollPane> </cell> </row> @@ -249,12 +215,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldVesselTypeComment" onKeyTyped='commentChanged()'> -<!-- Fixme : DocumentEvents - origin="$VesselType/comment - <DocumentEvents onModified="Update($fieldVesselTypeComment/text)"/> ---> - </JTextArea> + <JTextArea id="fieldVesselTypeComment" onKeyTyped='commentChanged()'/> </JScrollPane> </cell> </row> @@ -266,46 +227,24 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> -<!-- - origin="$FisheryRegion" -actionCommand='input.Input.create("VesselType")' ---> + <JButton id='save' enabled='false' text="isisfish.common.save" onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" onActionPerformed='save()'/> -<!-- - origin="$EntityModified" -actionCommand='input.Input.save("VesselType", $VesselType);refreshView($inputVesselType)' ---> + <JButton id='cancel' enabled='false' text="isisfish.common.cancel" onActionPerformed='cancel()'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text="isisfish.common.cancel" onActionPerformed='cancel()'/> -<!-- - origin="$EntityModified" -actionCommand='input.Input.cancel("VesselType", $VesselType);refreshView($inputVesselType)' ---> + <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()'/> -<!-- - origin="$VesselType" -actionCommand="input.Input.remove($VesselType)" ---> </cell> </row> </Table> </cell> </row> </Table> -<!-- - <xpanel xml="input/VesselType.xml" id="inputVesselType" name="VesselType"/> ---> <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueSetOfVessels" onActionPerformed='goToSetOfVessels()'/> -<!-- - actionCommand="UIHelper.setTreeSelection('SetOfVessels')" ---> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -178,6 +178,7 @@ } getContextValue(InputAction.class).getZone().setCell(cells); valueChanged(true); + refreshMap(); refresh(); } protected void nameChange(){ @@ -187,7 +188,7 @@ } protected void valueChanged(boolean b){ changed=b; - create.setEnabled(b); + cancel.setEnabled(b); save.setEnabled(b); } ]]> @@ -205,7 +206,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldZoneName" onFocusLost='nameChange()'/> + <JTextField id="fieldZoneName" onKeyTyped='nameChange()'/> </cell> </row> <row> @@ -216,7 +217,7 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="zoneCells" onMouseClicked='refreshMap()' onFocusLost='zoneCellsChange()'/> + <JList id="zoneCells" onMouseClicked='zoneCellsChange()'/> </JScrollPane> </cell> </row> @@ -228,24 +229,24 @@ <row> <cell columns='2' fill='both' weighty='0.3' weightx='1.0'> <JScrollPane> - <JTextArea id="fieldZoneComment" onFocusLost='commentChange()'/> + <JTextArea id="fieldZoneComment" onKeyTyped='commentChange()'/> </JScrollPane> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' text="isisfish.common.new" enabled='false' onActionPerformed='create()'/> + <JButton id='save' text="isisfish.common.save" enabled='false' onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text="isisfish.common.save" enabled='false' onActionPerformed='save()'/> + <JButton id='cancel' text="isisfish.common.cancel" enabled='false' onActionPerformed='cancel()'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton text="isisfish.common.cancel" onActionPerformed='cancel()'/> + <JButton id='create' text="isisfish.common.new" onActionPerformed='create()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton text="isisfish.common.remove" onActionPerformed='remove()'/> + <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-11-18 11:57:27 UTC (rev 1589) @@ -236,7 +236,8 @@ } protected void selectFilter(){ try { - getContextValue(SimulAction.class).setOldSimulatorNames(fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(getContextValue(SimulAction.class).getSimulatorNames())); + getContextValue(SimulAction.class).setOldSimulatorNames(fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(getContextValue(SimulAction.class).getOldSimulationItem())); + refresh(); } catch (ParseException ex) { Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, null, ex); } catch (IOException ex) { @@ -253,7 +254,9 @@ } return result; } - + protected void resetFilter(){ + getContextValue(SimulAction.class).resetOldSimulatorNames(); + } ]]> </script> <row> @@ -272,7 +275,7 @@ <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()'/> </cell> <cell> - <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter"/> + <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()'/> </cell> </row> </Table> 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 2008-11-17 14:58:51 UTC (rev 1588) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2008-11-18 11:57:27 UTC (rev 1589) @@ -382,14 +382,18 @@ return null; } public List<String> getFilteredOldSimulatorNames() { - + if (oldSimulNames == null){ + oldSimulNames = getOldSimulationItem(); + } return oldSimulNames; } public void setOldSimulatorNames(List<String> sn){ oldSimulNames = sn; } - + public void resetOldSimulatorNames(){ + oldSimulNames = getOldSimulationItem(); + } /*