Author: sletellier Date: 2009-01-09 10:15:37 +0000 (Fri, 09 Jan 2009) New Revision: 1726 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 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/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.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/MetierSeasonInfoZoneUI.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/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/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/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/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.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/SelectivityUI.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 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/StrategyUI.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 Log: Ajout de saveVerfier et utilisation des binding JAXX Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-01-09 10:15:37 UTC (rev 1726) @@ -0,0 +1,38 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package fr.ifremer.isisfish.ui; + +import fr.ifremer.isisfish.ui.input.InputSaveVerifier; +import javax.swing.JOptionPane; + +/** + * + * @author letellier + */ +public class WelcomeSaveVerifier { + protected InputSaveVerifier inputVerifier = null; + + public void setInputVerifier(InputSaveVerifier inputVerifier) { + this.inputVerifier = inputVerifier; + } + + public InputSaveVerifier getInputVerifier() { + return inputVerifier; + } + + public boolean allIsSaved(){ + boolean exit = true; + int responce = inputVerifier.checkEdit(); + //boolean exit = checkEdit(event, component); + if (responce == JOptionPane.OK_OPTION){ + } + else if (responce == JOptionPane.CANCEL_OPTION){ + exit = false; + } + return exit; + } + +} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -49,7 +49,7 @@ <fr.ifremer.isisfish.ui.result.ResultView/> </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/book.gif"))}'> - <fr.ifremer.isisfish.ui.input.InputUI constructorParams='new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier())'/> + <fr.ifremer.isisfish.ui.input.InputUI constructorParams='new JAXXInitialContext().add(getContextValue(WelcomeSaveVerifier.class)).add(new InputAction()).add(new InputSaveVerifier())'/> </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/bookPage.gif"))}'> <fr.ifremer.isisfish.ui.script.ScriptUI/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -41,29 +41,38 @@ import fr.ifremer.isisfish.ui.script.ScriptUI; import fr.ifremer.isisfish.ui.simulator.SimulUI; import fr.ifremer.isisfish.ui.simulator.QueueUI; + import jaxx.runtime.DefaultJAXXContext; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisConfig; import javax.swing.JFrame; import org.codelutin.widget.AboutFrame; import jaxx.runtime.JAXXInitialContext; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; - - welcomePanelUI.setContent(new WelcomeTabUI()); - this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + + setContextValue(new WelcomeSaveVerifier()); + welcomePanelUI.setContent(new WelcomeTabUI(new JAXXInitialContext().add(getVerifier()))); protected void openFrame(Container c, String title){ JFrame f = new JFrame(); f.setLayout(new BorderLayout()); - WelcomePanelUI welcome = new WelcomePanelUI(); + WelcomePanelUI welcome = new WelcomePanelUI(this); welcome.setContent(c); f.add(welcome, BorderLayout.CENTER); f.setTitle(title); f.setSize(new Dimension(800, 600)); f.setVisible(true); } - protected void close() { + public void close() { + if (getVerifier().allIsSaved()){ + exit(); + } + } + protected void exit(){ this.dispose(); IsisFish.quit(); } + protected WelcomeSaveVerifier getVerifier(){ + return getContextValue(WelcomeSaveVerifier.class); + } protected void monitorUI() { new ApplicationMonitorUI(); } @@ -113,7 +122,7 @@ <JMenu text="isisfish.welcome.menu.frame"> <JMenuItem text="isisfish.welcome.menu.simulation" onActionPerformed='openFrame(new SimulUI(new SimulAction()), _("isisfish.simulation.title"))'/> <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='openFrame(new ResultView(), _("isisfish.result.title"))'/> - <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier())), _("isisfish.input.title"))'/> + <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(this).add(new InputAction()).add(new InputSaveVerifier())), _("isisfish.input.title"))'/> <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> @@ -131,5 +140,5 @@ <JMenuItem text="isisfish.welcome.menu.about" onActionPerformed='about()'/> </JMenu> </JMenuBar> - <WelcomePanelUI id="welcomePanelUI"/> + <WelcomePanelUI id="welcomePanelUI" constructorParams='new DefaultJAXXContext(this)'/> </JFrame> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -50,7 +50,6 @@ protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; -setType("Cell"); setButtonTitle("isisfish.input.continueZones"); setNextPath("$root/$zones"); addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -130,7 +129,7 @@ <JLabel text="isisfish.cell.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellName" text='{jaxx.runtime.Util.getStringValue(getBean().getName())}' onKeyReleased='setChanged(true)' onFocusLost='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldCellName" text='{jaxx.runtime.Util.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> </cell> </row> <row> 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -45,9 +45,6 @@ import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.types.TimeUnit; -setType("SetOfVessels"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -131,7 +128,7 @@ <JLabel text="isisfish.effortDescription.fishingOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperation" text='getEffortDescription().getFishingOperation()' onKeyTyped='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onKeyReleased='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -139,7 +136,7 @@ <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='getEffortDescription().getFishingOperationDuration()' onKeyTyped='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/> </cell> </row> <row> @@ -147,7 +144,7 @@ <JLabel text="isisfish.effortDescription.gearsNumberPerOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='getEffortDescription().getGearsNumberPerOperation()' onKeyTyped='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onKeyReleased='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -155,7 +152,7 @@ <JLabel text="isisfish.effortDescription.crewSize" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewSize" text='getEffortDescription().getCrewSize()' onKeyTyped='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onKeyReleased='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -163,7 +160,7 @@ <JLabel text="isisfish.effortDescription.unitCostOfFishing" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='getEffortDescription().getUnitCostOfFishing()' onKeyTyped='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onKeyReleased='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -171,7 +168,7 @@ <JLabel text="isisfish.effortDescription.fixedCrewSalary" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='getEffortDescription().getFixedCrewSalary()' onKeyTyped='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onKeyReleased='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -179,7 +176,7 @@ <JLabel text="isisfish.effortDescription.crewFoodCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewFoodCost" text='getEffortDescription().getCrewFoodCost()' onKeyTyped='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onKeyReleased='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -187,7 +184,7 @@ <JLabel text="isisfish.effortDescription.crewShareRate" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewShareRate" text='getEffortDescription().getCrewShareRate()' onKeyTyped='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onKeyReleased='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -195,7 +192,7 @@ <JLabel text="isisfish.effortDescription.repairAndMaintenanceGearCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='getEffortDescription().getRepairAndMaintenanceGearCost()' onKeyTyped='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onKeyReleased='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -203,7 +200,7 @@ <JLabel text="isisfish.effortDescription.landingCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionLandingCosts" text='getEffortDescription().getLandingCosts()' onKeyTyped='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onKeyReleased='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -211,7 +208,7 @@ <JLabel text="isisfish.effortDescription.otherRunningCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionOtherRunningCost" text='getEffortDescription().getOtherRunningCost()' onKeyTyped='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onKeyReleased='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -47,73 +47,68 @@ protected OMToolSet toolSet = new OMToolSet(); - public void refresh(){ - setBean(null); - FisheryRegion region = (FisheryRegion) getVerifier().getEntity(FisheryRegion.class); - setBean((FisheryRegionImpl)region); - if (region != null){ - setFieldMapfilesModel(getBean()); - cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); - cellMap.setActiveMouseMode(new SelectMouseMode()); - cellMap.setFisheryRegion(getBean()); - toolSet.setupListeners(cellMap); - toolMap.add((Component)toolSet); - } +setButtonTitle("isisfish.input.continueCells"); +setNextPath("$root/$cells"); +getVerifier().addSaveButton(save); +public void refresh(){ + setBean(null); + FisheryRegion region = (FisheryRegion) getVerifier().getEntity(FisheryRegion.class); + setBean((FisheryRegionImpl)region); + if (region != null){ + setFieldMapfilesModel(getBean()); + cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + cellMap.setActiveMouseMode(new SelectMouseMode()); + cellMap.setFisheryRegion(getBean()); + toolSet.setupListeners(cellMap); + toolMap.add((Component)toolSet); + } +} +protected void setFieldMapfilesModel(FisheryRegion region){ + DefaultListModel model = new DefaultListModel(); + java.util.List<String> mapList = region.getMapFileList(); + if (mapList != null){ + int cnt = 0; + for (String map : mapList){ + model.add(cnt, map); + cnt++; } - protected void setFieldMapfilesModel(FisheryRegion region){ - DefaultListModel model = new DefaultListModel(); - java.util.List<String> mapList = region.getMapFileList(); - if (mapList != null){ - int cnt = 0; - for (String map : mapList){ - model.add(cnt, map); - cnt++; - } - } - fieldMapfiles.setModel(model); + } + fieldMapfiles.setModel(model); +} +protected void mapFieldChanged(){ + Object[] values = fieldMapfiles.getSelectedValues(); + java.util.List<String> valuesList = new ArrayList<String>(); + if (values != null){ + for (Object o : values){ + valuesList.add((String)o); } - protected void mapFieldChanged(){ - Object[] values = fieldMapfiles.getSelectedValues(); - java.util.List<String> valuesList = new ArrayList<String>(); - if (values != null){ - for (Object o : values){ - valuesList.add((String)o); - } - } - getBean().setMapFileList(valuesList); - } - protected void addMap(){ - getContextValue(InputAction.class).addMap(getBean()); - } - protected void delMap(){ - getContextValue(InputAction.class).removeMap(getBean(), fieldMapfiles.getSelectedValues()); - } - protected void cellFillChanged(){ - } - protected void cellFile(){ - getContextValue(InputAction.class).loadCellFile(fieldCellFile.getText()); - } -// protected void save(){ -// setMsg(_("isisfish.message.checking.cell")); -// getContextValue(InputAction.class).saveFisheryRegion("FisheryRegion"); -// valueChanged(false); -// getParentContainer(InputUI.class).setTreeModel(); -// getParentContainer(InputUI.class).setFieldCurrentRegionModel(); -// setMsg(_("isisfish.message.save.finished")); -// refresh(); -// } -// protected void cancel(){ -// getContextValue(InputAction.class).cancel(); -// valueChanged(false); -// refresh(); -// } - protected void check(){ - getContextValue(InputAction.class).checkFisheryRegion(getBean()); - setInfoText(_("isisfish.message.check.region")); - } -// protected void goToCell(){ -// getParentContainer(InputUI.class).setTreeSelection("$root/$cells"); -// } + } + getBean().setMapFileList(valuesList); +} +protected void addMap(){ + getContextValue(InputAction.class).addMap(getBean()); +} +protected void delMap(){ + getContextValue(InputAction.class).removeMap(getBean(), fieldMapfiles.getSelectedValues()); +} +protected void cellFillChanged(){ +} +protected void cellFile(){ + getContextValue(InputAction.class).loadCellFile(fieldCellFile.getText()); +} +protected void check(){ + getContextValue(InputAction.class).checkFisheryRegion(getBean()); + setInfoText(_("isisfish.message.check.region")); +} +protected void save(){ + setInfoText(_("isisfish.message.checking.cell")); + getContextValue(InputAction.class).saveFisheryRegion(getBean(), "FisheryRegion"); + getVerifier().setEditable(false); + getParentContainer(InputUI.class).setTreeModel(); + getParentContainer(InputUI.class).setFieldCurrentRegionModel(); + setInfoText(_("isisfish.message.save.finished")); + refresh(); +} ]]> </script> @@ -248,7 +243,7 @@ </row> <row> <cell fill='horizontal' weightx='0.3'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save' text="isisfish.common.save" enabled='false' onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.3'> <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -37,64 +37,36 @@ <script><![CDATA[ - import fr.ifremer.isisfish.entities.Gear; - import fr.ifremer.isisfish.entities.GearImpl; - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import org.codelutin.topia.persistence.TopiaEntity; - import org.codelutin.topia.TopiaException; - import jaxx.runtime.swing.navigation.NavigationTreeModel; - import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.GearImpl; +import fr.ifremer.isisfish.ui.WelcomePanelUI; +import org.codelutin.topia.persistence.TopiaEntity; +import org.codelutin.topia.TopiaException; +import jaxx.runtime.swing.navigation.NavigationTreeModel; +import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; - public void refresh() { - Gear gear = (Gear)getVerifier().getEntity(Gear.class); - setBean((GearImpl) gear); - if (gear != null){ - fieldGearName.setText(gear.getName()); - fieldGearEffortUnit.setText(gear.getEffortUnit()); - fieldGearStandardisationFactor.setText(gear.getStandardisationFactor() + ""); - fieldGearParamName.setText(gear.getParameterName()); - DefaultComboBoxModel model = new DefaultComboBoxModel(fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes()); - fieldGearParamType.setModel(model); - if (gear.getPossibleValue() != null){ - fieldGearParamPossibleValue.setText(gear.getPossibleValue().getValues()); - } - fieldGearComment.setText(gear.getComment()); - } - else{ +addPropertyChangeListener("bean", new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getOldValue() != null || evt.getNewValue() == null) { + // remove previous binding on getBean() + //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); fieldGearName.setText(""); fieldGearEffortUnit.setText(""); fieldGearStandardisationFactor.setText(""); fieldGearParamName.setText(""); - DefaultComboBoxModel model = new DefaultComboBoxModel(fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes()); - fieldGearParamType.setModel(model); fieldGearParamPossibleValue.setText(""); fieldGearComment.setText(""); } - } - protected void nameChanged(){ - getBean().setName(fieldGearName.getText()); - } - protected void effortUnitChanged(){ - getBean().setEffortUnit(fieldGearEffortUnit.getText()); - } - protected void standardisationFactorChanged(){ - getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText())); - } - protected void paramNameChanged(){ - getBean().setParameterName(fieldGearParamName.getSelectedText()); - } - protected void paramTypeChanged(){ -// TODO -// getContextValue(InputAction.class).getGear().setParameterName(fieldGearParamName.getSelectedText()); - } - protected void paramPossibleValueChanged(){ - if (fieldGearParamPossibleValue.getText() != ""){ - getBean().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText())); + if (evt.getNewValue() != null) { + // add binding on getBean() + //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); } } - protected void commentChanged(){ - getBean().setComment(fieldGearComment.getText()); - } +}); +public void refresh() { + Gear gear = (Gear)getVerifier().getEntity(Gear.class); + setBean((GearImpl) gear); +} ]]> </script> <Table id='body'> @@ -106,7 +78,7 @@ <JLabel text="isisfish.gear.name" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearName" onKeyTyped='nameChanged()' enabled='{isActif()}'/> + <JTextField id="fieldGearName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldGearName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -114,7 +86,7 @@ <JLabel text="isisfish.gear.effortUnit" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearEffortUnit" onKeyTyped='effortUnitChanged()' enabled='{isActif()}'/> + <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.Util.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -122,7 +94,7 @@ <JLabel text="isisfish.gear.standardisationFactor" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearStandardisationFactor" onKeyTyped='standardisationFactorChanged()' enabled='{isActif()}'/> + <JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -130,7 +102,7 @@ <JLabel text="isisfish.gear.technicalParameter" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearParamName" onKeyTyped='paramNameChanged()' enabled='{isActif()}'/> + <JTextField id="fieldGearParamName" text='{jaxx.runtime.Util.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getSelectedText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -138,10 +110,10 @@ <JLabel text="isisfish.gear.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldGearParamType" onActionPerformed='paramTypeChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldGearParamType" model='{new DefaultComboBoxModel(fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes())}' onActionPerformed='getBean().setParameterName(fieldGearParamName.getSelectedText())' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldGearParamPossibleValue" onKeyTyped='paramPossibleValueChanged()' enabled='{isActif()}'/> + <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue().getValues()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -150,7 +122,7 @@ </cell> <cell columns="2" fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldGearComment" onKeyTyped='commentChanged()' enabled='{isActif()}'/> + <JTextArea id="fieldGearComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -162,18 +134,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton javaBean='getVerifier().getSaveButton()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton javaBean='getVerifier().getCancelButton()'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton javaBean='getVerifier().getNewButton("Gear")'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove' javaBean='getVerifier().getDeleteButton()'/> + <JButton javaBean='getVerifier().getDeleteButton()'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -38,37 +38,19 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ - import fr.ifremer.isisfish.entities.Metier; - init(); - public void refresh() { - gearTabUI.refresh(); - selectivityUI.refresh(); - } - protected void init(){ - this.addPropertyChangeListener("actif", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - gearTabUI.setActif((Boolean)evt.getNewValue()); - selectivityUI.setActif((Boolean)evt.getNewValue()); - } - }); - this.addPropertyChangeListener("changed", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - gearTabUI.setChanged((Boolean)evt.getNewValue()); - selectivityUI.setChanged((Boolean)evt.getNewValue()); - } - }); - } - protected void goToMetier(){ - getParentContainer(InputUI.class).setTreeSelection("$root/$metiers"); - } +import fr.ifremer.isisfish.entities.Metier; +setButtonTitle("isisfish.input.continueMetiers"); +setNextPath("$root/$metiers"); +public void refresh() { + getVerifier().addCurrentPanel(gearTabUI, selectivityUI); + gearTabUI.refresh(); + selectivityUI.refresh(); +} ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <JTabbedPane constraints='BorderLayout.CENTER' id="GearTab" name="Gear"> - <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI"/></tab> - <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI"/></tab> + <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab> + <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab> </JTabbedPane> </JPanel> - <!--JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueMetiers" onActionPerformed='goToMetier()'/--> </fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-01-09 10:15:37 UTC (rev 1726) @@ -922,7 +922,7 @@ // FIXME todo loadCellFile } - public Object saveFisheryRegion(FisheryRegion fisheryRegion, String type) { + public void saveFisheryRegion(FisheryRegion fisheryRegion, String type) { if (log.isTraceEnabled()) { log.trace("save called"); } @@ -995,7 +995,6 @@ log.error(_("isisfish.error.save.region"), eee); showMsgBox(eee); } - return null; } public Object checkFisheryRegion(FisheryRegion fisheryRegion) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -2,27 +2,6 @@ <!-- ui state when editing --> <Boolean id='actif' javaBean='false'/> - - <!-- ui state when editing and modified --> - <Boolean id='changed' javaBean='false'/> - - <!-- ui state when a bean is selected in list --> - <Boolean id='selected' javaBean='false'/> - - <!-- New button enabled --> - <Boolean id='newEnabled' javaBean='false'/> - - <!-- Cancel button enabled --> - <Boolean id='cancelEnabled' javaBean='false'/> - - <!-- Save button enabled --> - <Boolean id='saveEnabled' javaBean='false'/> - - <!-- Delete button enabled --> - <Boolean id='deleteEnabled' javaBean='false'/> - - <!-- Next button enabled --> - <Boolean id='buttonEnabled' javaBean='true'/> <!-- Next button title --> <java.lang.String id='buttonTitle' javaBean='""'/> @@ -30,9 +9,6 @@ <!-- Next button title --> <java.lang.String id='nextPath' javaBean='null'/> - <!-- Next button title --> - <java.lang.String id='type' javaBean='null'/> - <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.entities.FisheryRegion; @@ -56,5 +32,5 @@ ]]> </script> <JPanel id='body' constraints='BorderLayout.CENTER'/> - <JButton id='next' text='{getButtonTitle()}' constraints='BorderLayout.SOUTH' enabled='{isButtonEnabled()}' visible='{getNextPath() != null}' onActionPerformed='goTo()'/> + <JButton id='next' text='{getButtonTitle()}' constraints='BorderLayout.SOUTH' visible='{getNextPath() != null}' onActionPerformed='goTo()'/> </JPanel> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx (from rev 1724, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -0,0 +1,160 @@ +<!-- +/* *##% + * Copyright (C) 2005 + * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +/* * + * IsisFish.java + * + * Created: 1 aout 2005 18:37:25 CEST + * + * @author Benjamin POUSSIN <poussin at codelutin.com> + * @version $Revision: 1312 $ + * + * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ + * by : $Author: sletellier $ + */ + --> + +<fr.ifremer.isisfish.ui.input.InputContentUI> + + <script><![CDATA[ +import fr.ifremer.isisfish.ui.widget.editor.GenericCell; +import fr.ifremer.isisfish.entities.Formule; +import java.util.logging.Level; +import java.util.logging.Logger; + +protected Class clazz = null; +protected String nameEquation = null; +protected String lblText; +protected Formule f; +protected String name; +protected Class c; + +public void init(String lblText, Formule f, String name, Class c){ + this.lblText = lblText; + this.f = f; + this.name = name; + this.c = c; +} +public void refresh(){ + lbl.setText(lblText); + clazz = c; + try { + editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); + } catch (IOException ex) { + Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex); + } + setComboModel(f, name); +} +protected void setComboModel(Formule f, String name){ + DefaultComboBoxModel model = new DefaultComboBoxModel(); + GenericCell cellSelected = null; + for (Formule formule : getAction().getFormules(getVerifier().getIsisContext(),name)){ + GenericCell cell = new GenericCell(formule.getName(), formule, Formule.class); + model.addElement(cell); + if (formule.equals(f)){ + cellSelected = cell; + } + } + combo.setModel(model); + if (cellSelected != null){ + combo.setSelectedItem(cellSelected); + Formule selected = getFormule(); + if (selected != null){ + editor.setText(selected.getContent()); + } + } +} +protected void comboChanged(){ + Formule selected = getFormule(); + if (selected != null){ + editor.setText(selected.getContent()); + } +} +protected Formule getFormule(){ + Formule result = null; + Object selected = combo.getSelectedItem(); + if (selected != null){ + GenericCell cell = (GenericCell) selected; + if (cell.getValue() != null){ + result = (Formule)cell.getValue(); + } + } + return result; +} +protected void saveModel(){ + Formule e = getFormule(); + if (e != null){ + getContextValue(InputAction.class).saveAsModel(e.getCategory(), "Java", e.getContent()); + } + else{ + getContextValue(InputAction.class).saveAsModel(name, "Java", editor.getText()); + setComboModel(f, name); + } + refresh(); + setInfoText(_("isisfish.message.saveModel.finished")); +} +protected void openEditor(){ + Formule e = getFormule(); + if (e != null){ + getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(), clazz, e.getContent(), editor); + } + else{ + getContextValue(InputAction.class).openEditor(name,"new",c, editor.getText(), editor); + } +} + ]]> + </script> + <Table id='body'> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel id='lbl'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="combo" onActionPerformed='comboChanged()' enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()' enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()' enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell fill='horizontal' weighty='1.0'> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActif()}'/> + </JScrollPane> + </cell> + </row> + </Table> +</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx ___________________________________________________________________ Name: svn:mergeinfo + 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-09 10:15:37 UTC (rev 1726) @@ -7,16 +7,16 @@ import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; +import java.util.Map; import javax.swing.JButton; import javax.swing.JOptionPane; import javax.swing.tree.TreePath; @@ -39,10 +39,11 @@ * @author letellier */ public class InputSaveVerifier implements JAXXAction { - protected JButton newButton = null; - protected JButton deleteButton = null; - protected JButton saveButton = null; - protected JButton cancelButton = null; + protected Map<JButton, String> listNewButton = new HashMap<JButton, String>(); + protected List<JButton> listDeleteButton = new ArrayList<JButton>(); + protected List<JButton> listSaveButton = new ArrayList<JButton>(); + protected List<JButton> listCancelButton = new ArrayList<JButton>(); + protected boolean editable = false; protected boolean changed = false; @@ -58,39 +59,6 @@ protected InputUI rootUI; public InputSaveVerifier(){ - newButton = new JButton(_("isisfish.common.new")); - newButton.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - topiaCreate(); - } - }); - deleteButton = new JButton(_("isisfish.common.remove")); - deleteButton.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - topiaRemove(); - } - }); - saveButton = new JButton(_("isisfish.common.save")); - saveButton.addActionListener(new ActionListener(){ - - @Override - public void actionPerformed(ActionEvent e) { - topiaSave(); - } - - }); - cancelButton = new JButton(_("isisfish.common.cancel")); - cancelButton.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - topiaCancel(); - } - }); } @Override public JAXXInitialContext init(JAXXContext parentContent, Object... datas) { @@ -123,20 +91,26 @@ protected void topiaChanged(){ changed = true; setPanelsActifs(); - saveButton.setEnabled(true); - cancelButton.setEnabled(true); - newButton.setEnabled(false); - deleteButton.setEnabled(false); + setEnabled(listSaveButton, true); + setEnabled(listCancelButton, true); + setEnabled(listNewButton.keySet(), false); + setEnabled(listDeleteButton, false); } protected void noModif(){ changed = false; setPanelsActifs(); - saveButton.setEnabled(false); - cancelButton.setEnabled(false); - newButton.setEnabled(true); - deleteButton.setEnabled(true); + setEnabled(listSaveButton, false); + setEnabled(listCancelButton, false); + setEnabled(listNewButton.keySet(), true); + setEnabled(listDeleteButton, true); } + protected void setEnabled(Collection<JButton> buttons, boolean enabled){ + for (JButton b : buttons){ + b.setEnabled(enabled); + } + } + /** * Delete one entity and commit the change, try to selected intelligently * other node in tree. @@ -155,6 +129,7 @@ boolean doDelete; ArrayList<TopiaEntity> allWillBeRemoved = new ArrayList<TopiaEntity>(); for (TopiaEntity te : currentEntities){ + allWillBeRemoved.add(te); allWillBeRemoved.addAll(te.getComposite()); } if (allWillBeRemoved.size() > 0) { @@ -177,6 +152,7 @@ if (doDelete) { for (TopiaEntity te : allWillBeRemoved){ te.delete(); + System.out.println(te.getTopiaContext()); } isisContext.commitTransaction(); msg = _("isisfish.message.remove.finished"); @@ -188,15 +164,15 @@ ErrorDialogUI.showError(eee); } rootUI.setInfoText(msg); - TreePath treeParentPath = rootUI.getNavigation().getSelectionPath().getParentPath(); + String path = currentNode.getParent().getContextPath(); + System.out.println(path); rootUI.setTreeModel(); - rootUI.setTreeSelection(treeParentPath.toString()); + rootUI.setTreeSelection(path); noModif(); } - protected void topiaCreate(){ - String type = currentPanels.get(0).getType(); + protected void topiaCreate(String type){ if (log.isTraceEnabled()) { log.trace("create called for " + type); @@ -215,10 +191,14 @@ entity.update(); isisContext.commitTransaction(); + String path = currentNode.getParent().getContextPath() + "/" + entity.getTopiaId(); + if (!editable){ + path = currentNode.getContextPath() + "/" + entity.getTopiaId(); + } + System.out.println(path); + rootUI.setTreeModel(); - String parentPath = currentNode.getParent().getContextPath() + entity.getTopiaId(); - System.out.println(parentPath); - rootUI.setTreeSelection(parentPath); + rootUI.setTreeSelection(path); rootUI.setInfoText(_("isisfish.message.creation.finished")); @@ -279,6 +259,14 @@ } } } + protected void setPanelsActifs(boolean b){ + if (!currentPanels.isEmpty()){ + for (InputContentUI panel : currentPanels){ + System.out.println("panel : "+ panel); + panel.setActif(b); + } + } + } protected void refreshAll(){ for (InputContentUI panel : currentPanels){ panel.refresh(); @@ -295,6 +283,8 @@ } }); this.currentEntities.add(currentEntity); + System.out.println("currentEntity : "+ currentEntity); + setPanelsActifs(); } else{ editable = false; @@ -304,10 +294,13 @@ currentEntities.clear(); editable = false; noModif(); + setPanelsActifs(); } - public void addCurrentPanel(InputContentUI currentPanel) { - if (currentPanel != null){ - this.currentPanels.add(currentPanel); + public void addCurrentPanel(InputContentUI... currentPanels) { + if (currentPanels != null){ + for (InputContentUI ui : currentPanels){ + this.currentPanels.add(ui); + } setPanelsActifs(); } } @@ -320,21 +313,62 @@ } public JButton getCancelButton() { + JButton cancelButton = new JButton(_("isisfish.common.cancel")); + cancelButton.setEnabled(false); + cancelButton.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + topiaCancel(); + } + }); + listCancelButton.add(cancelButton); return cancelButton; } public JButton getDeleteButton() { + JButton deleteButton = new JButton(_("isisfish.common.remove")); + deleteButton.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + topiaRemove(); + } + }); + listDeleteButton.add(deleteButton); return deleteButton; } - public JButton getNewButton() { + public JButton getNewButton(String type) { + JButton newButton = new JButton(_("isisfish.common.new")); + newButton.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + topiaCreate(listNewButton.get(e.getSource())); + } + }); + listNewButton.put(newButton, type); return newButton; } public JButton getSaveButton() { + JButton saveButton = new JButton(_("isisfish.common.save")); + saveButton.setEnabled(false); + saveButton.addActionListener(new ActionListener(){ + + @Override + public void actionPerformed(ActionEvent e) { + topiaSave(); + } + + }); + listSaveButton.add(saveButton); return saveButton; } - + public void addSaveButton(JButton saveButton){ + listSaveButton.add(saveButton); + } public TopiaContext getIsisContext() { return isisContext; } 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -38,6 +38,7 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.Common; +import fr.ifremer.isisfish.ui.WelcomeSaveVerifier; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.ui.WelcomePanelUI; import javax.swing.tree.DefaultMutableTreeNode; @@ -75,6 +76,7 @@ import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.datastore.RegionStorage; +getContextValue(WelcomeSaveVerifier.class).setInputVerifier(getVerifier()); protected FisheryRegion getRegion(){ return getContextValue(FisheryRegion.class); } @@ -216,7 +218,7 @@ <Table constraints='BorderLayout.NORTH'> <row> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldNewRegion" onKeyTyped='newChanged()'/> + <JTextField id="fieldNewRegion" onKeyReleased='newChanged()'/> </cell> <cell fill='horizontal'> <JButton id="JButtonNewRegion" text="isisfish.input.newRegion" onActionPerformed='newRegion()' enabled='false'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -56,6 +56,7 @@ import org.codelutin.topia.TopiaContext; import javax.swing.table.TableCellEditor; + getVerifier().addCurrentPanel(targetFactor); public void refresh() { Metier metier = (Metier)getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); @@ -69,21 +70,15 @@ if (fieldTargetSpecies.getSelectedIndex() <= 0){ setTargetSpeciesModel(); } - if (fieldTargetFactorEquation.getSelectedIndex() <= 0){ - setTargetFactorEquationModel(); - } - try { - fieldTargetFactorScript.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(SelectivityUI.class.getName()).log(Level.SEVERE, null, ex); - } - + +// TODO : Equation selectionne + targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "TargetSpeciesTargetFactorEquation", fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class); + targetFactor.refresh(); } else{ DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); fieldMetierSeasonInfo.setModel(seasonModel); setTargetSpeciesModel(); - setTargetFactorEquationModel(); } } protected void setSeasonModel(){ @@ -108,17 +103,6 @@ } fieldTargetSpecies.setModel(fieldTargetSpeciesModel); } - protected void setTargetFactorEquationModel(){ - java.util.List<Formule> formules = fr.ifremer.isisfish.datastore.FormuleStorage.getFormules(getContextValue(TopiaContext.class), "TargetFactor"); - DefaultComboBoxModel fieldTargetFactorEquationModel = new DefaultComboBoxModel(); - if (formules != null){ - fieldTargetFactorEquationModel.addElement(new GenericCell(" ", null, null)); - for (Formule f : formules){ - fieldTargetFactorEquationModel.addElement(new GenericCell(f.getName(), f, Formule.class)); - } - } - fieldTargetFactorEquation.setModel(fieldTargetFactorEquationModel); - } protected void setTableTargetSpeciesModel(){ DefaultTableModel model = new DefaultTableModel(){ @Override @@ -154,19 +138,6 @@ tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor); } } - protected void equationChanged(){ - GenericCell g = (GenericCell)fieldTargetFactorEquation.getSelectedItem(); - if (g.getValue() != null){ - fieldTargetFactorScript.setText(((Formule)g.getValue()).getContent()); - } - else{ - try { - fieldTargetFactorScript.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(MetierSeasonInfoSpeciesUI.class.getName()).log(Level.SEVERE, null, ex); - } - } - } protected void add(){ Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); @@ -175,7 +146,7 @@ getBean(), (MetierSeasonInfo)season, (Species)species, - fieldTargetFactorScript.getText(), + targetFactor.getEditor().getText(), fieldPrimaryCatch.isSelected()); refresh(); } @@ -183,14 +154,6 @@ protected void remove(){ refresh(); } - protected void openEditor(){ - getContextValue(InputAction.class).openEditor("TargetSpeciesTargetFactorEquation","new",fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class, fieldTargetFactorScript.getText(), fieldTargetFactorScript); - } - protected void saveAsModel(){ - getContextValue(InputAction.class).saveAsModel("TargetSpeciesTargetFactorEquation", "Java", fieldTargetFactorScript.getText()); - setTargetFactorEquationModel(); - setInfoText(_("isisfish.message.saveModel.finished")); - } protected void metierSeasonChanged(){ setTableTargetSpeciesModel(); } @@ -216,40 +179,11 @@ </cell> </row> <row> - <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.metierSeasonInfoSpecies.targetFactor"/> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <InputOneEquationUI id='targetFactor' constructorParams='this'/> </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldTargetFactorEquation" onActionPerformed='equationChanged()'/> - </cell> </row> <row> - <cell fill='both' weighty='1.0'> - <Table> - <row> - <cell fill='horizontal'> - <JButton id='saveModel' text="isisfish.common.saveModel" onActionPerformed='saveAsModel()'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton id='openEditor' text="isisfish.common.openEditor" onActionPerformed='openEditor()'/> - </cell> - </row> - <row> - <cell fill='both' weighty='1.0'> - <JPanel/> - </cell> - </row> - </Table> - </cell> - <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"/> - </JScrollPane> - </cell> - </row> - <row> <cell fill='horizontal'> <JPanel/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -250,7 +250,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierSeasonZoneComment" onKeyTyped='commentChanged()' enabled='{isActif()}'/> + <JTextArea id="fieldMetierSeasonZoneComment" onKeyReleased='commentChanged()' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -270,7 +270,7 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("MetierSeasonInfo")'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -90,7 +90,7 @@ <JLabel text="isisfish.metier.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierName" onKeyTyped='nameChanged()' enabled='{isActif()}'/> + <JTextField id="fieldMetierName" onKeyReleased='nameChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -106,7 +106,7 @@ <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierParam" onKeyTyped='paramChanged()' enabled='{isActif()}'/> + <JTextField id="fieldMetierParam" onKeyReleased='paramChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -115,7 +115,7 @@ </cell> <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()' enabled='{isActif()}'/> + <JTextArea id="fieldMetierComment" onKeyReleased='commentChanged()' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -135,7 +135,7 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("Metier")'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='remove' javaBean='getVerifier().getDeleteButton()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -36,47 +36,21 @@ +--> <fr.ifremer.isisfish.ui.input.InputContentUI> - <!-- bean property --> - <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/> +<script><![CDATA[ +import fr.ifremer.isisfish.entities.TripType; +import fr.ifremer.isisfish.entities.MetierImpl; +import fr.ifremer.isisfish.entities.Metier; - <script><![CDATA[ - import fr.ifremer.isisfish.entities.TripType; - import fr.ifremer.isisfish.entities.MetierImpl; - import fr.ifremer.isisfish.entities.Metier; +setButtonTitle("isisfish.input.continueTripTypes"); +setNextPath("$root/$tripTypes"); - init(); - public void refresh() { - setBean(null); - Metier metier = (Metier)getVerifier().getEntity(Metier.class); - setBean((MetierImpl) metier); - metierTabUI.refresh(); - metierSeasonSpeciesUI.refresh(); - - metierSeasonInfoUI.setSeasonInit(true); - metierSeasonInfoUI.refresh(); - } - protected void init(){ - metierTab.addChangeListener(new InputTabbedPaneListener()); - this.addPropertyChangeListener("actif", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - metierTabUI.setActif((Boolean)evt.getNewValue()); - metierSeasonSpeciesUI.setActif((Boolean)evt.getNewValue()); - metierSeasonInfoUI.setActif((Boolean)evt.getNewValue()); - } - }); - this.addPropertyChangeListener("changed", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - metierTabUI.setChanged((Boolean)evt.getNewValue()); - metierSeasonSpeciesUI.setChanged((Boolean)evt.getNewValue()); - metierSeasonInfoUI.setChanged((Boolean)evt.getNewValue()); - } - }); - } - protected void goToTripType(){ - getParentContainer(InputUI.class).setTreeSelection("$root/$tripTypes"); - } +public void refresh() { + getVerifier().addCurrentPanel(metierTabUI, metierSeasonSpeciesUI, metierSeasonInfoUI); + metierTabUI.refresh(); + metierSeasonSpeciesUI.refresh(); + metierSeasonInfoUI.setSeasonInit(true); + metierSeasonInfoUI.refresh(); +} ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <JTabbedPane id="metierTab" name="Metier" constraints='BorderLayout.CENTER' > @@ -84,6 +58,5 @@ <tab title='{_("isisfish.metierSeasonInfoZone.title")}'><MetierSeasonInfoZoneUI id="metierSeasonInfoUI" constructorParams='this'/></tab> <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'/></tab> </JTabbedPane> - <!--JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueTripTypes" onActionPerformed='goToTripType()'/--> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -48,50 +48,41 @@ import java.util.logging.Logger; import javax.swing.table.DefaultTableModel; -setType("Population"); -setButtonTitle(""); -setNextPath(null); +getVerifier().addCurrentPanel(growthEquation, growthReverseEquation); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { // remove previous binding on getBean() //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); + fieldPopulationBasicsName.setText(""); fieldPopulationBasicsGeographicID.setText(""); fieldPopulationBasicsNbClasses.setText(""); fieldPopulationBasicsComment.setText(""); fieldPopulationBasicsMatureClass.setSelectedItem(null); + getVerifier().setPanelsActifs(false); } if (evt.getNewValue() != null) { // add binding on getBean() //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + getVerifier().setPanelsActifs(true); } } }); public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - editorReverse.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(PopulationBasicsUI.class.getName()).log(Level.SEVERE, null, ex); - } - setFieldPopulationBasicsGrowthModel(); - setfieldPopulationBasicsGrowthReverseModel(); - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsGrowthReverse,getAction().getFormules(getBean().getTopiaContext(), "GrowthReverse"), null); + getVerifier().setEditable(true); + getVerifier().setPanelsActifs(); +// TODO : Selection equation + growthEquation.init(_("isisfish.populationBasics.growth"), getBean().getGrowth(), "PopulationGrowth", fr.ifremer.isisfish.equation.PopulationGrowth.class); + growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), getBean().getGrowthReverse(), "PopulationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class); + growthEquation.refresh(); + growthReverseEquation.refresh(); if (getBean() != null){ jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass,getBean().getPopulationGroup(), getBean().getMaturityGroup()); -// growthReverseChanged(); -// basicsGrowthChanged(); setTableAgeLengthModel(); } } - protected void setFieldPopulationBasicsGrowthModel(){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsGrowth,getAction().getFormules(getBean().getTopiaContext(), "Growth"), null); - } - protected void setfieldPopulationBasicsGrowthReverseModel(){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsGrowthReverse,getAction().getFormules(getBean().getTopiaContext(), "GrowthReverse"), null); - } protected void createClasses(){ JFrame wizardFrame = new JFrame(); wizardFrame.setLayout(new BorderLayout()); @@ -114,34 +105,6 @@ getBean().setMaturityGroup((PopulationGroup) selected); } } - protected void basicsGrowthChanged(){ - Equation f = (Equation) fieldPopulationBasicsGrowth.getSelectedItem(); - if (f != null){ - editor.setText(f.getContent()); - } - } - protected void saveGrowthModel(){ - getContextValue(InputAction.class).saveAsModel("PopulationGrowth", "Java", editor.getText()); - setFieldPopulationBasicsGrowthModel(); - setInfoText(_("isisfish.message.saveModel.finished")); - } - protected void openGrowthEditor(){ - getContextValue(InputAction.class).openEditor("PopulationGrowth","new",fr.ifremer.isisfish.equation.PopulationGrowth.class, editor.getText(), editor); - } - protected void growthReverseChanged(){ - Equation f = (Equation)fieldPopulationBasicsGrowthReverse.getSelectedItem(); - if (f != null){ - editorReverse.setText(f.getContent()); - } - } - protected void saveGrowthReverseModel(){ - getContextValue(InputAction.class).saveAsModel("PopulationGrowthReverse", "Java", editor.getText()); - setfieldPopulationBasicsGrowthReverseModel(); - setInfoText(_("isisfish.message.saveModel.finished")); - } - protected void openGrowthReverseEditor(){ - getContextValue(InputAction.class).openEditor("PopulationGrowthReverse","new",fr.ifremer.isisfish.equation.PopulationGrowthReverse.class, editorReverse.getText(), editorReverse); - } protected void setTableAgeLengthModel(){ java.util.List<PopulationGroup> popGroup = getBean().getPopulationGroup(); if (popGroup != null){ @@ -157,6 +120,12 @@ tableAgeLength.setModel(model); } } + protected String getSizePopulationGroup(){ + if (getBean() != null){ + return String.valueOf(getBean().sizePopulationGroup()); + } + return ""; + } ]]> </script> <Table id='body'> @@ -171,7 +140,7 @@ <JLabel text="isisfish.populationBasics.name" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationBasicsName" text='getBean().getName()' onKeyTyped='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -179,7 +148,7 @@ <JLabel text="isisfish.populationBasics.geographicID" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationBasicsGeographicID" text='getBean().getGeographicId()' onKeyTyped='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}'/> + <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.Util.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -187,7 +156,7 @@ <JLabel text="isisfish.populationBasics.numberGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldPopulationBasicsNbClasses" text='getBean().sizePopulationGroup()' editable="false" enabled='{isActif()}'/> + <JTextField id="fieldPopulationBasicsNbClasses" text='{getSizePopulationGroup()}' editable="false" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createClasses()' enabled='{isActif()}'/> @@ -210,80 +179,22 @@ </cell> </row> <row> - <cell anchor='east'> - <JLabel text="isisfish.populationBasics.growth" enabled='{isActif()}'/> + <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> + <InputOneEquationUI id='growthEquation' constructorParams='this'/> </cell> - <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id="fieldPopulationBasicsGrowth" onActionPerformed='basicsGrowthChanged()' enabled='{isActif()}'/> - </cell> </row> <row> - <cell fill='both'> - <Table> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.saveModel" onActionPerformed='saveGrowthModel()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.openEditor" onActionPerformed='openGrowthEditor()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='both' weighty='1.0'> - <JPanel/> - </cell> - </row> - </Table> + <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> + <InputOneEquationUI id='growthReverseEquation' constructorParams='this'/> </cell> - <cell columns='2' fill='both' weightx='1.0' weighty='0.4'> - <JScrollPane> - <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActif()}'/> - </JScrollPane> - </cell> </row> <row> <cell anchor='east'> - <JLabel text="isisfish.populationBasics.growthReverse" enabled='{isActif()}'/> - </cell> - <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id="fieldPopulationBasicsGrowthReverse" onActionPerformed='growthReverseChanged()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='both'> - <Table> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.saveModel" onActionPerformed='saveGrowthReverseModel()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.openEditor" onActionPerformed='openGrowthReverseEditor()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='both' weighty='1.0'> - <JPanel/> - </cell> - </row> - </Table> - </cell> - <cell columns='2' fill='both' weightx='1.0' weighty='0.4'> - <JScrollPane> - <org.codelutin.widget.editor.Editor id='editorReverse' askIfNotSaved="false" enabled='{isActif()}'/> - </JScrollPane> - </cell> - </row> - <row> - <cell anchor='east'> <JLabel text="isisfish.population.comments" enabled='{isActif()}'/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.2'> <JScrollPane> - <JTextArea id="fieldPopulationBasicsComment" text='getBean().getComment()' onKeyTyped='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -309,7 +220,7 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("Population")'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -43,9 +43,6 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -setType("Population"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -91,7 +88,7 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationCapturabilityComment" text='getBean().getCapturabilityComment()' onKeyTyped='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.Util.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> 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 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -43,12 +43,10 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -setType("Population"); -setButtonTitle(""); -setNextPath(null); public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); + getVerifier().addCurrentPanel(naturalDeathRate, meanWeight, price); naturalDeathRate.init(_("isisfish.populationEquation.naturalDeathRate"), (Formule)getBean().getNaturalDeathRate(), "PopulationNaturalDeathRate", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class); meanWeight.init(_("isisfish.populationEquation.meanWeight"), (Formule)getBean().getMeanWeight(), "PopulationMeanWeight", fr.ifremer.isisfish.equation.PopulationMeanWeight.class); price.init(_("isisfish.populationEquation.price"), (Formule)getBean().getPrice(), "PopulationPrice", fr.ifremer.isisfish.equation.PopulationPrice.class); @@ -60,18 +58,18 @@ </script> <Table id='body'> <row> - <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> - <PopulationOneEquationUI id='naturalDeathRate' constructorParams='this'/> + <cell columns='2' fill='both' weightx='0.5' weighty='0.3'> + <InputOneEquationUI id='naturalDeathRate' constructorParams='this'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> - <PopulationOneEquationUI id='meanWeight' constructorParams='this'/> + <InputOneEquationUI id='meanWeight' constructorParams='this'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> - <PopulationOneEquationUI id='price' constructorParams='this'/> + <InputOneEquationUI id='price' constructorParams='this'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -47,9 +47,6 @@ import org.codelutin.math.matrix.gui.MatrixPanelListener; import org.codelutin.math.matrix.gui.MatrixPanelEvent; -setType("Population"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -91,7 +88,7 @@ <JLabel text="isisfish.populationGroup.meanWeigth" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupMeanWeight" text='getPopulationGroup().getMeanWeight()' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' enabled='{isActif()}'/> </cell> </row> <row> @@ -99,7 +96,7 @@ <JLabel text="isisfish.populationGroup.price" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupPrice" text='getPopulationGroup().getPrice()' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' enabled='{isActif()}'/> </cell> </row> <row> @@ -114,7 +111,7 @@ <JLabel text="isisfish.populationGroup.reproductionRate" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupReproductionRate" text='getPopulationGroup().getReproductionRate()' onKeyTyped='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -122,7 +119,7 @@ <JLabel text="isisfish.populationGroup.age" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupAge" text='getPopulationGroup().getAge()' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' enabled='{isActif()}'/> </cell> </row> <row> @@ -130,10 +127,10 @@ <JLabel text="isisfish.populationGroup.length" enabled='{isActif()}'/> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMinLength" text='getPopulationGroup().getMinLength()' onKeyTyped='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isActif()}'/> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMaxLength" text='getPopulationGroup().getMaxLength()' onKeyTyped='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -142,7 +139,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationGroupComment" text='getPopulationGroup().getComment()' onKeyTyped='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.Util.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -54,10 +54,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -setType("Population"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -46,16 +46,13 @@ import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.entities.Formule; -setType("Population"); -setButtonTitle(""); -setNextPath(null); - public void init(PopulationSeasonInfo pi){ setPopInfo((PopulationSeasonInfoImpl)pi); } public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); + getVerifier().addCurrentPanel(migrationEquation, emigrationEquation, immigrationEquation); migrationEquation.init(_("isisfish.common.migration"), (Formule)getPopInfo().getMigrationEquation(), "Migration", fr.ifremer.isisfish.equation.MigrationEquation.class); emigrationEquation.init(_("isisfish.common.emigration"), (Formule)getPopInfo().getEmigrationEquation(), "Emigration", fr.ifremer.isisfish.equation.EmigrationEquation.class); immigrationEquation.init(_("isisfish.common.immigration"), (Formule)getPopInfo().getImmigrationEquation(), "Immigration", fr.ifremer.isisfish.equation.ImmigrationEquation.class); @@ -68,17 +65,17 @@ <Table id='body'> <row> <cell fill='both' weightx='1.0' weighty='0.3'> - <PopulationOneEquationUI id='migrationEquation' constructorParams='this'/> + <InputOneEquationUI id='migrationEquation' constructorParams='this'/> </cell> </row> <row> <cell fill='both' weightx='1.0' weighty='0.3'> - <PopulationOneEquationUI id='emigrationEquation' constructorParams='this'/> + <InputOneEquationUI id='emigrationEquation' constructorParams='this'/> </cell> </row> <row> <cell fill='both' weightx='1.0' weighty='0.3'> - <PopulationOneEquationUI id='immigrationEquation' constructorParams='this'/> + <InputOneEquationUI id='immigrationEquation' constructorParams='this'/> </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 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -53,9 +53,6 @@ protected PopulationSeasonInfo popInfo = null; -setType("Population"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -53,9 +53,6 @@ protected PopulationSeasonInfo popInfo = null; protected PopulationSeasonInfo pi; -setType("Population"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -45,9 +45,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -setType("Population"); -setButtonTitle(""); -setNextPath(null); +getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -139,7 +137,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldPopulationMigrationComment" text='getBean().getMigrationComment()' onKeyTyped='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.Util.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> Deleted: 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 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -1,196 +0,0 @@ -<!-- -/* *##% - * Copyright (C) 2005 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * IsisFish.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ - --> - -<fr.ifremer.isisfish.ui.input.InputContentUI> - - <!-- bean property --> - <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> - - <script><![CDATA[ -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationImpl; -import fr.ifremer.isisfish.entities.Equation; -import java.util.logging.Level; -import java.util.logging.Logger; - -protected Class clazz = null; -protected String nameEquation = null; -protected String lblText; -protected Formule f; -protected String name; -protected Class c; - -setType("Population"); -setButtonTitle(""); -setNextPath(null); -addPropertyChangeListener("bean", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); -// fieldPopulationMonthGapBetweenReproRecrutement.setText(""); -// fieldPopulationRecruitmentComment.setText(""); - } - if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - } - } -}); - -public void init(String lblText, Formule f, String name, Class c){ - this.lblText = lblText; - this.f = f; - this.name = name; - this.c = c; -} -public void refresh(){ - Population population = (Population)getVerifier().getEntity(Population.class); - setBean((PopulationImpl) population); - lbl.setText(lblText); - clazz = c; - try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(PopulationOneEquationUI.class.getName()).log(Level.SEVERE, null, ex); - } - setComboModel(f, name); -} -protected void setComboModel(Formule f, String name){ - DefaultComboBoxModel model = new DefaultComboBoxModel(); - GenericCell cellSelected = null; - for (Formule formule : getAction().getFormules(getBean().getTopiaContext(),name)){ - GenericCell cell = new GenericCell(formule.getName(), formule, Formule.class); - model.addElement(cell); - if (formule.equals(f)){ - cellSelected = cell; - } - } - combo.setModel(model); - if (cellSelected != null){ - combo.setSelectedItem(cellSelected); - Equation selected = getEquation(); - if (selected != null){ - editor.setText(selected.getContent()); - } - } -} -protected void comboChanged(){ - Equation selected = getEquation(); - if (selected != null){ - editor.setText(selected.getContent()); - } - valueChanged(true); -} -protected Equation getEquation(){ - Equation result = null; - Object selected = combo.getSelectedItem(); - if (selected != null){ - GenericCell cell = (GenericCell) selected; - if (cell.getValue() != null){ - result = (Equation)cell.getValue(); - } - } - return result; -} -protected void valueChanged(boolean b){ - changed = b; - if (getParentContainer(PopulationEquationUI.class) != null){ -// getParentContainer(PopulationEquationUI.class).valueChanged(b); - } - else{ -// getParentContainer(PopulationMigrationUI.class).valueChanged(b); - } -} -protected void saveModel(){ - Equation e = getEquation(); - if (e != null){ - getContextValue(InputAction.class).saveAsModel(e.getCategory(), e.getLanguage(), e.getContent()); - } - else{ - getContextValue(InputAction.class).saveAsModel(name, "Java", editor.getText()); - setComboModel(f, name); - } - refresh(); -// setInfoText(_("isisfish.message.saveModel.finished")); -} -protected void openEditor(){ - Equation e = getEquation(); - if (e != null){ - getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(), clazz, e.getContent(), editor); - } - else{ - getContextValue(InputAction.class).openEditor(name,"new",c, editor.getText(), editor); - } -} - ]]> - </script> - <Table id='body'> - <row> - <cell fill='horizontal' anchor='east'> - <JLabel id='lbl'/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="combo" onActionPerformed='comboChanged()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='both' weighty='1.0'> - <Table> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='horizontal' weighty='1.0'> - <JPanel/> - </cell> - </row> - </Table> - </cell> - <cell fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane> - <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false" onKeyTyped='valueChanged(true)' enabled='{isActif()}'/> - </JScrollPane> - </cell> - </row> - </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -44,9 +44,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -setType("Population"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -65,30 +62,11 @@ public void refresh() { Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - setFieldPopulationReproductionEquationModel(); - try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(PopulationRecruitmentUI.class.getName()).log(Level.SEVERE, null, ex); - } + + getVerifier().addCurrentPanel(reproductionEquation); + reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), (Formule)getBean().getReproductionEquation(), "PopulationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class); + reproductionEquation.refresh(); } -protected void setFieldPopulationReproductionEquationModel() { - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationReproductionEquation,getAction().getFormules(getBean().getTopiaContext(), "Reproduction"), getBean().getReproductionEquation()); -} -protected void equationChanged(){ - Formule e = (Formule)fieldPopulationReproductionEquation.getSelectedItem(); - if (e != null){ - editor.setText(e.getContent()); - } -} -protected void saveModel(){ - getAction().saveAsModel("PopulationReproductionEquation", "Java", editor.getText()); - setFieldPopulationReproductionEquationModel(); - setInfoText(_("isisfish.message.saveModel.finished")); -} -protected void openEditor(){ - getAction().openEditor("PopulationReproductionEquation","new", fr.ifremer.isisfish.equation.PopulationGrowth.class, editor.getText(), editor); -} ]]> </script> <Table id='body'> @@ -96,45 +74,16 @@ <cell fill='both' weightx='1.0' weighty='1.0'> <Table> <row> - <cell anchor='east'> - <JLabel text="isisfish.populationRecruitment.reproductionEquation" enabled='{isActif()}'/> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <InputOneEquationUI id='reproductionEquation' constructorParams='this'/> </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldPopulationReproductionEquation" onActionPerformed='equationChanged()' enabled='{isActif()}'/> - </cell> </row> <row> - <cell fill='both' weighty='1.0'> - <Table> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='both' weighty='1.0'> - <JPanel/> - </cell> - </row> - </Table> - </cell> - <cell fill='both' weightx='1.0' weighty='0.5'> - <JScrollPane> - <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActif()}'/> - </JScrollPane> - </cell> - </row> - <row> <cell anchor='east'> <JLabel text="Month Gap BetweenRepro Recruitment" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='getBean().getMonthGapBetweenReproRecrutement()' onKeyTyped='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}' onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -159,7 +108,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationRecruitmentComment" text='getBean().getRecruitmentComment()' onKeyTyped='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.Util.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -171,10 +120,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save' javaBean='getVerifier().getSaveButton()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> </cell> </row> </Table> 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -69,9 +69,6 @@ } }); -setType("Population"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -97,27 +94,29 @@ interval.setFirst(0); interval.setLast(2); ip.setModel(interval); - try { - log.debug("************** Interval ************"); - Month firstMonth = getPopulationSeasonInfo().getFirstMonth(); + if(getPopulationSeasonInfo() != null){ + try { + log.debug("************** Interval ************"); + Month firstMonth = getPopulationSeasonInfo().getFirstMonth(); - if (firstMonth != null) { - interval.setFirst(firstMonth.getMonthNumber()); - log.debug(" first : " + interval.getFirst()); - } else { - interval.setFirst(0); - } + if (firstMonth != null) { + interval.setFirst(firstMonth.getMonthNumber()); + log.debug(" first : " + interval.getFirst()); + } else { + interval.setFirst(0); + } - Month lastMonth = getPopulationSeasonInfo().getLastMonth(); - if (lastMonth != null) { - interval.setLast(lastMonth.getMonthNumber()); - log.debug(" last : " + interval.getLast()); - } else { - interval.setLast(3); + Month lastMonth = getPopulationSeasonInfo().getLastMonth(); + if (lastMonth != null) { + interval.setLast(lastMonth.getMonthNumber()); + log.debug(" last : " + interval.getLast()); + } else { + interval.setLast(3); + } + } catch (Exception e) { + log.error("Unexpected origin.", e); + // Only trace the error and go on. } - } catch (Exception e) { - log.error("Unexpected origin.", e); - // Only trace the error and go on. } ip.setLabelRenderer(Month.MONTH); ip.setModel(interval); @@ -167,7 +166,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationSeasonComment" text='getBean().getSeasonsComment()' onKeyTyped='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.Util.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -187,7 +186,7 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("PopulationSeasonInfo")'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -46,9 +46,9 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -setType("Population"); setButtonTitle("isisfish.input.continueGears"); setNextPath("$root/$gears"); +getVerifier().addCurrentPanel(populationBasicsUI, populationGroupUI, populationEquationUI, populationZoneUI, populationSeasonsUI, populationCapturabilityUI, populationRecruitementUI, populationMigrationUI); public void refresh(){ populationBasicsUI.refresh(); @@ -59,22 +59,7 @@ populationCapturabilityUI.refresh(); populationRecruitementUI.refresh(); populationMigrationUI.refresh(); -// setSpecies(); } -// protected void setSpecies(){ -// String[] paths = getContextValue(InputAction.class).getPath().split("/"); -// String topiaId = null; -// for (String path : paths){ -// if (!path.matches("^\\$.+$")){ -// if (path.matches("^fr\\.ifremer\\.isisfish\\.entities\\.Species\\#.+$")){ -// topiaId = path; -// } -// } -// } -// if (topiaId != null){ -// getContextValue(InputAction.class).setSpecies(topiaId); -// } -// } ]]> </script> <JPanel id='body' layout='{new BorderLayout()}'> @@ -104,6 +89,5 @@ <PopulationMigrationUI id='populationMigrationUI' constructorParams='this'/> </tab> </JTabbedPane> - <!--JButton text="isisfish.input.continueGears" constraints='BorderLayout.SOUTH' onActionPerformed='goToGear()'/--> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -48,9 +48,6 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -setType("Population"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { 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 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -42,52 +42,42 @@ <script><![CDATA[ - import fr.ifremer.isisfish.entities.Species; - import fr.ifremer.isisfish.entities.Port; - import fr.ifremer.isisfish.entities.PortImpl; - import fr.ifremer.isisfish.entities.Cell; - import fr.ifremer.isisfish.map.IsisMapBean; - import fr.ifremer.isisfish.map.OpenMapToolPanel; - import com.bbn.openmap.gui.OMToolSet; - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import fr.ifremer.isisfish.map.CellSelectionLayer; - import com.bbn.openmap.event.SelectMouseMode; - import org.codelutin.topia.persistence.TopiaEntity; - import org.codelutin.topia.TopiaException; +import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.entities.Port; +import fr.ifremer.isisfish.entities.PortImpl; +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.map.IsisMapBean; +import fr.ifremer.isisfish.map.OpenMapToolPanel; +import com.bbn.openmap.gui.OMToolSet; +import fr.ifremer.isisfish.ui.WelcomePanelUI; +import fr.ifremer.isisfish.map.CellSelectionLayer; +import com.bbn.openmap.event.SelectMouseMode; +import org.codelutin.topia.persistence.TopiaEntity; +import org.codelutin.topia.TopiaException; - protected OMToolSet toolSet = new OMToolSet(); - protected OpenMapEvents mapListener = null; +protected OMToolSet toolSet = new OMToolSet(); +protected OpenMapEvents mapListener = null; - public void refresh() { - Port port = (Port)getVerifier().getEntity(Port.class); - setBean((PortImpl) port); - if (getBean() != null){ - fieldPortName.setText(getBean().getName()); - - DefaultListModel portCellModel = new DefaultListModel(); - java.util.List<Cell> cells = getRegion().getCell(); - for (Cell c : cells){ - portCellModel.addElement(c); - } - portCell.setModel(portCellModel); - portCell.setSelectedValue(getBean().getCell()); - - fieldPortComment.setText(getBean().getComment()); - } - else{ +setButtonTitle("isisfish.input.continueSpecies"); +setNextPath("$root/$species"); +addPropertyChangeListener("bean", new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getOldValue() != null || evt.getNewValue() == null) { + // remove previous binding on getBean() + //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldPortName.setText(""); - - DefaultListModel portCellModel = new DefaultListModel(); - java.util.List<Cell> cells = getRegion().getCell(); - for (Cell c : cells){ - portCellModel.addElement(c); - } - portCell.setModel(portCellModel); - fieldPortComment.setText(""); - - } + if (evt.getNewValue() != null) { + // add binding on getBean() + //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } + } +}); + public void refresh() { + Port port = (Port)getVerifier().getEntity(Port.class); + setBean((PortImpl) port); + jaxx.runtime.swing.Utils.fillList(portCell, getRegion().getCell(), getBean().getCell()); portMap.setFisheryRegion(getRegion()); if(mapListener == null){ portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); @@ -120,15 +110,6 @@ }; } } - protected void nameChanged(){ - getBean().setName(fieldPortName.getText()); - } - protected void portCellChanged(){ - getBean().setCell((Cell)portCell.getSelectedValue()); - } - protected void commentChanged(){ - getBean().setComment(fieldPortComment.getText()); - } ]]> </script> <Table id='body'> @@ -144,7 +125,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0' > - <JTextField id="fieldPortName" onKeyTyped='nameChanged()' enabled='{isActif()}'/> + <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -156,7 +137,7 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="portCell" selectionMode="0" onMouseClicked='portCellChanged()' enabled='{isActif()}'/> + <JList id="portCell" selectionMode="0" onMouseClicked='getBean().setCell((Cell)portCell.getSelectedValue())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -168,7 +149,7 @@ <row> <cell columns='2' fill='both' weighty='0.3' weightx='1.0' > <JScrollPane> - <JTextArea id="fieldPortComment" onKeyTyped='commentChanged()' enabled='{isActif()}'/> + <JTextArea id="fieldPortComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -182,7 +163,7 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("Port")'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='remove' javaBean='getVerifier().getDeleteButton()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -61,20 +61,13 @@ setBean(null); Gear gear = (Gear)getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); - fieldSelectivityPopulation.setModel(getSelectivityPopulationModel()); - fieldSelectivityEquation.setModel(getSelectivityEquationModel()); - if (getBean() != null){ - setSelectivityTableModel(); - } - else{ - DefaultTableModel model = new DefaultTableModel(); - selectivityTable.setModel(model); - } - try { - fieldSelectivityScript.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(SelectivityUI.class.getName()).log(Level.SEVERE, null, ex); - } + fieldSelectivityPopulation.setModel(getSelectivityPopulationModel()); + setSelectivityTableModel(); + + getVerifier().addCurrentPanel(selectivityEquation); +// TODO : Equation selection + selectivityEquation.init(_("isisfish.selectivity.equation"), null, "SelectivityEquation", fr.ifremer.isisfish.equation.SelectivityEquation.class); + selectivityEquation.refresh(); } protected void setSelectivityTableModel(){ DefaultTableModel model = new DefaultTableModel(){ @@ -118,47 +111,14 @@ } return selectivityPopulationModel; } - protected DefaultComboBoxModel getSelectivityEquationModel(){ - java.util.List<Formule> formules = fr.ifremer.isisfish.datastore.FormuleStorage.getFormules(getContextValue(TopiaContext.class), "Selectivity"); - DefaultComboBoxModel selectivityEquationModel = new DefaultComboBoxModel(); - if (formules != null){ - selectivityEquationModel.addElement(new GenericCell(" ", null, null)); - for (Formule f : formules){ - GenericCell g = new GenericCell(f.getName(), f, Formule.class); - selectivityEquationModel.addElement(g); - } - } - return selectivityEquationModel; - } - protected void saveAsModel(){ - getAction().saveAsModel("SelectivityEquation", "Java", fieldSelectivityScript.getText()); - fieldSelectivityEquation.setModel(getSelectivityEquationModel()); - setInfoText(_("isisfish.message.saveModel.finished")); - } - protected void openEditor(){ - getAction().openEditor("SelectivityEquation", "new", fr.ifremer.isisfish.equation.SelectivityEquation.class, fieldSelectivityScript.getText(), fieldSelectivityScript); - } protected void add(){ - getAction().addSelectivity((Population) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue(), fieldSelectivityScript.getText(), getBean()); + getAction().addSelectivity((Population) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue(), selectivityEquation.getEditor().getText(), getBean()); refresh(); } protected void remove(){ getAction().removeSelectivity(getBean(), (Selectivity) getBean().getPopulationSelectivity((Population) selectivityTable.getValueAt(selectivityTable.getSelectedRow(), 0))); refresh(); } - protected void equationChanged(){ - GenericCell g = (GenericCell)fieldSelectivityEquation.getSelectedItem(); - if (g.getValue() != null){ - fieldSelectivityScript.setText(((Formule)(g).getValue()).getContent()); - } - else { - try { - fieldSelectivityScript.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(SelectivityUI.class.getName()).log(Level.SEVERE, null, ex); - } - } - } ]]> </script> <Table id='body'> @@ -174,39 +134,10 @@ </cell> </row> <row> - <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.selectivity.equation" enabled='{isActif()}'/> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <InputOneEquationUI id='selectivityEquation' constructorParams='this'/> </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSelectivityEquation" onActionPerformed='equationChanged()' enabled='{isActif()}'/> - </cell> </row> - <row> - <cell fill='both' weighty='1.0'> - <Table> - <row> - <cell fill='horizontal'> - <JButton id='saveModel' text="isisfish.common.saveModel" onActionPerformed='saveAsModel()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton id='openEditor' text="isisfish.common.openEditor" onActionPerformed='openEditor()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='both' weighty='1.0'> - <JPanel/> - </cell> - </row> - </Table> - </cell> - <cell fill='both' weightx='1.0' weighty='1.0'> - <JScrollPane> - <org.codelutin.widget.editor.Editor id='fieldSelectivityScript' askIfNotSaved="false" enabled='{isActif()}'/> - </JScrollPane> - </cell> - </row> </Table> </cell> </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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -48,9 +48,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -setType("SetOfVessels"); -setButtonTitle(""); -setNextPath(null); +getVerifier().addCurrentPanel(technicalEfficiency); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -67,38 +65,15 @@ } } }); - public void refresh() { - SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); - setBean((SetOfVesselsImpl) setOfVessels); - jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort()); - jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType()); - jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsTechnicalEfficiency,getAction().getFormules(getBean().getTopiaContext(),"TechnicalEfficiency"), getBean().getTechnicalEfficiencyEquation()); - try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(SelectivityUI.class.getName()).log(Level.SEVERE, null, ex); - } - } - protected void technicalEfficiencyChanged(){ - if (fieldSetOfVesselsTechnicalEfficiency.getSelectedItem() != null){ - editor.setText(((Formule)fieldSetOfVesselsTechnicalEfficiency.getSelectedItem()).getContent()); - getBean().setTechnicalEfficiencyEquation((Equation)fieldSetOfVesselsTechnicalEfficiency.getSelectedItem()); - } - else{ - try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(MetierSeasonInfoSpeciesUI.class.getName()).log(Level.SEVERE, null, ex); - } - } - } - protected void saveAsModel(){ - getContextValue(InputAction.class).saveAsModel("SoVTechnicalEfficiencyEquation", "Java", editor.getText()); - setInfoText(_("isisfish.message.saveModel.finished")); - } - protected void openEditor(){ - getContextValue(InputAction.class).openEditor("SoVTechnicalEfficiencyEquation","new",fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class, editor.getText(), editor); - } +public void refresh() { + SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); + setBean((SetOfVesselsImpl) setOfVessels); + jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort()); + jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType()); + + technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), (Formule)getBean().getTechnicalEfficiencyEquation(), "SoVTechnicalEfficiencyEquation", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class); + technicalEfficiency.refresh(); +} ]]> </script> <Table id='body'> @@ -110,7 +85,7 @@ <JLabel text="isisfish.setOfVessels.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsName" text='getBean().getName()' onKeyTyped='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSetOfVesselsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -134,7 +109,7 @@ <JLabel text="isisfish.setOfVessels.numberOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsNumberOfVessels" text='getBean().getNumberOfVessels()' onKeyTyped='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}' onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -142,50 +117,21 @@ <JLabel text="isisfish.setOfVessels.fixedCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsFixedCosts" text='getBean().getFixedCosts()' onKeyTyped='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}' onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' enabled='{isActif()}'/> </cell> </row> <row> - <cell anchor='east'> - <JLabel text="isisfish.setOfVessels.technicalEfficiency" enabled='{isActif()}'/> + <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> + <InputOneEquationUI id='technicalEfficiency' constructorParams='this'/> </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSetOfVesselsTechnicalEfficiency" onActionPerformed='technicalEfficiencyChanged()' enabled='{isActif()}'/> - </cell> </row> <row> - <cell fill='both' weighty='0.7'> - <Table> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.saveModel" onActionPerformed='saveAsModel()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='both' weightx='1.0' weighty='1.0'> - <JPanel/> - </cell> - </row> - </Table> - </cell> - <cell fill='both' weightx='1.0' weighty='0.7'> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActif()}'/> - </JScrollPane> - </cell> - </row> - <row> <cell anchor='east'> <JLabel text="isisfish.setOfVessels.comments" enabled='{isActif()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldSetOfVesselsComment" text='getBean().getComment()' onKeyTyped='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -205,7 +151,7 @@ </row> <row> <cell fill='horizontal' weightx='1.0'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("SetOfVessels")'/> </cell> <cell fill='horizontal' weightx='1.0'> <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -39,10 +39,10 @@ <script><![CDATA[ -setType("SetOfVessels"); setButtonTitle("isisfish.input.continueStrategies"); setNextPath("$root/$strategies"); public void refresh() { + getVerifier().addCurrentPanel(setOfVesselsTabsUI, effortDescriptionUI); setOfVesselsTabsUI.refresh(); effortDescriptionUI.refresh(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -44,9 +44,7 @@ import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.entities.SpeciesImpl; -setType("Species"); setButtonTitle("isisfish.input.continuePopulations"); -setNextPath("$root/$species/" + getBean().getTopiaId() + "/$population"); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -55,7 +53,7 @@ fieldSpeciesName.setText(""); fieldSpeciesScientificName.setText(""); fieldSpeciesCodeRubbin.setText(""); - fieldSpeciesCEE.setText(""); + fieldSpeciesCEE.setText(0 + ""); fieldSpeciesComment.setText(""); } if (evt.getNewValue() != null) { @@ -67,6 +65,7 @@ public void refresh() { Species species = (Species)getVerifier().getEntity(Species.class); setBean((SpeciesImpl) species); + setNextPath("$root/$species/" + getBean().getTopiaId() + "/$populations"); } ]]> </script> @@ -79,7 +78,7 @@ <JLabel text="isisfish.species.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesName" text='getBean().getName()' onKeyTyped='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -87,7 +86,7 @@ <JLabel text="isisfish.species.scientificName" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesScientificName" text='getBean().getScientificName()' onKeyTyped='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.Util.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -95,7 +94,7 @@ <JLabel text="isisfish.species.rubbinCode" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCodeRubbin" text='getBean().getCodeRubbin()' onKeyTyped='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.Util.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -103,7 +102,7 @@ <JLabel text="isisfish.species.cee" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCEE" text='getBean().getCodeCEE()' onKeyTyped='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}' onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -123,7 +122,7 @@ </cell> <cell fill='both' columns='2' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldSpeciesComment" text='getBean().getComment()' onKeyTyped='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -143,7 +142,7 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("Species")'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> 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 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -36,9 +36,7 @@ <script><![CDATA[ import fr.ifremer.isisfish.types.Month; -setType("Population"); -setButtonTitle(""); -setNextPath(null); +getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, strategyApril, strategyMay, strategyJune, strategyJuly, strategyAugust, strategySeptember, strategyOctober, strategyNovember, strategyDecember); public void refresh() { strategyJanuary.init(Month.JANUARY); strategyFebuary.init(Month.FEBRUARY); @@ -66,7 +64,7 @@ strategyDecember.refresh(); } ]]></script> - <JPanel id='body'> + <JPanel id='body' layout='{new BorderLayout()}'> <Table constraints='BorderLayout.CENTER'> <row> <cell fill='both' weightx='0.25' weighty='0.3'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -52,9 +52,6 @@ Month month = null; PropertyChangeListener listener = null; -setType("Strategy"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -104,7 +101,7 @@ <JLabel text="isisfish.strategyMonthInfo.numberOfTrips" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5' anchor='west'> - <JLabel id='numberOfTrips' text='getStrategyMonthInfo().getNumberOfTrips()' enabled='{isActif()}'/> + <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}'/> </cell> </row> <row> @@ -112,7 +109,7 @@ <JLabel text="isisfish.strategyMonthInfo.minInactivityDays" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='getStrategyMonthInfo().getMinInactivityDays()' onKeyTyped='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' enabled='{isActif()}'/> </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 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -48,9 +48,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -setType("Strategy"); -setButtonTitle(""); -setNextPath(null); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -69,27 +66,15 @@ public void refresh() { Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); setBean((StrategyImpl) strategy); + getVerifier().addCurrentPanel(strategyInactivity); + strategyInactivity.init("", (Formule)getBean().getInactivityEquation(), "StrategyInactivityEquation", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class); + strategyInactivity.refresh(); + setSetOfVesselsModel(); - setInactivityModel(); - try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { - Logger.getLogger(StrategyTabUI.class.getName()).log(Level.SEVERE, null, ex); - } } -protected void setInactivityModel(){ - jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyInactivity,getAction().getFormules(getBean().getTopiaContext(), "Inactivity"), null); -} protected void setSetOfVesselsModel(){ jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels()); } -protected void saveModel(){ -// GenericCell g = (GenericCell)fieldStrategyInactivity.getSelectedItem(); -// getContextValue(InputAction.class).saveEquationAsModel((Equation)g.getValue()); - getAction().saveAsModel("StrategyInactivityEquation", "Java", editor.getText()); - setInactivityModel(); - setInfoText(_("isisfish.message.saveModel.finished")); -} ]]></script> <Table id='body'> <row> @@ -100,7 +85,7 @@ <JLabel text="isisfish.strategy.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldStrategyName" text='getBean().getName()' onKeyTyped='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldStrategyName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -116,7 +101,7 @@ <JLabel text="isisfish.strategy.proportionSetOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldStrategyProportionSetOfVessels" text='getBean().getProportionSetOfVessels()' onKeyTyped='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldStrategyProportionSetOfVessels" text='{getBean().getProportionSetOfVessels()}' onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -128,44 +113,17 @@ </cell> </row> <row> - <cell anchor='west'> - <JLabel text="isisfish.strategy.inactivity" enabled='{isActif()}'/> + <cell columns="2" fill='both' weightx='1.0'> + <InputOneEquationUI id="strategyInactivity" constructorParams='this'/> </cell> - <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldStrategyInactivity" onActionPerformed='editor.setText(((Formule)fieldStrategyInactivity.getSelectedItem()).getContent())' enabled='{isActif()}'/> - </cell> </row> <row> - <cell fill='both' weighty='0.7'> - <Table> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton text="isisfish.common.openEditor" onActionPerformed='getAction().openEditor("StrategyInactivityEquation","new",fr.ifremer.isisfish.equation.StrategyInactivityEquation.class, editor.getText(), editor)' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell fill='both' weighty='1.0'> - <JPanel/> - </cell> - </row> - </Table> - </cell> - <cell fill='both' weightx='1.0' weighty='0.7'> - <org.codelutin.widget.editor.Editor id='editor' askIfNotSaved="false" enabled='{isActif()}'/> - </cell> - </row> - <row> <cell anchor='west'> <JLabel text="isisfish.strategy.comments" enabled='{isActif()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldStrategyComment" text='getBean().getComment()' onKeyTyped='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -185,7 +143,7 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("Strategy")'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -36,10 +36,12 @@ +--> <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ - public void refresh() { - strategyTabUI.refresh(); - strategyMonthInfoUI.refresh(); - } + +public void refresh() { + getVerifier().addCurrentPanel(strategyTabUI, strategyMonthInfoUI); + strategyTabUI.refresh(); + strategyMonthInfoUI.refresh(); +} ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <JTabbedPane id="StrategyTab" name="Strategy" constraints='BorderLayout.CENTER'> 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -43,9 +43,8 @@ import fr.ifremer.isisfish.entities.TripTypeImpl; import fr.ifremer.isisfish.types.TimeUnit; -setType("TripType"); -setButtonTitle("isisfish.input.continueZones"); -setNextPath("$root/$zones"); +setButtonTitle("isisfish.input.continueVesselTypes"); +setNextPath("$root/$vesselTypes"); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -77,7 +76,7 @@ <JLabel text="isisfish.tripType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeName" text='getBean().getName()' onKeyTyped='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -85,7 +84,7 @@ <JLabel text="isisfish.tripType.duration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeDuration" text='getBean().getTripDuration().getHour()' onKeyTyped='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' enabled='{isActif()}'/> + <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' enabled='{isActif()}'/> </cell> </row> <row> @@ -93,7 +92,7 @@ <JLabel text="isisfish.tripType.minTime" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='getBean().getMinTimeBetweenTrip().getHour()' onKeyTyped='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' enabled='{isActif()}'/> + <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{getBean().getMinTimeBetweenTrip().getHour()}' onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' enabled='{isActif()}'/> </cell> </row> <row> @@ -102,7 +101,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldTripTypeComment" text='getBean().getComment()' onKeyTyped='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -114,18 +113,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton javaBean='getVerifier().getSaveButton()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton javaBean='getVerifier().getCancelButton()'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton javaBean='getVerifier().getNewButton("TripType")'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> + <JButton javaBean='getVerifier().getDeleteButton()'/> </cell> </row> </Table> 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-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -40,12 +40,10 @@ import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.VesselTypeImpl; import fr.ifremer.isisfish.entities.TripType; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.types.TimeUnit; -setType("VesselType"); -setButtonTitle("isisfish.input.continueZones"); -setNextPath("$root/$zones"); +setButtonTitle("isisfish.input.continueSetOfVessels"); +setNextPath("$root/$setOfVessels"); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -76,7 +74,7 @@ Object[] values = vesselTypeTripType.getSelectedValues(); Collection<TripType> tripTypes = new LinkedList<TripType>(); for (Object o : values){ - tripTypes.add((TripType)((GenericCell)o).getValue()); + tripTypes.add((TripType)o); } getBean().setTripType(tripTypes); } @@ -90,7 +88,7 @@ <JLabel text="isisfish.vesselType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeName" text='getBean().getName()' enabled='{isActif()}' onKeyTyped='getBean().setName(fieldVesselTypeName.getText())'/> + <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())'/> </cell> </row> <row> @@ -98,7 +96,7 @@ <JLabel text="isisfish.vesselType.length" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeLength" text='getBean().getLength()' enabled='{isActif()}' onKeyTyped='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))'/> + <JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}' onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))'/> </cell> </row> <row> @@ -106,7 +104,7 @@ <JLabel text="isisfish.vesselType.speed" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeSpeed" text='getBean().getSpeed()' enabled='{isActif()}' onKeyTyped='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))'/> + <JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}' onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))'/> </cell> </row> <row> @@ -114,7 +112,7 @@ <JLabel text="isisfish.vesselType.maxDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMaxTripDuration" text='getBean().getMaxTripDuration().getHour()' enabled='{isActif()}' onKeyTyped='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText())))'/> + <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText())))'/> </cell> </row> <row> @@ -122,7 +120,7 @@ <JLabel text="isisfish.vesselType.activityRange" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeActivityRange" text='getBean().getActivityRange()' enabled='{isActif()}' onKeyTyped='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))'/> + <JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}' onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))'/> </cell> </row> <row> @@ -130,7 +128,7 @@ <JLabel text="isisfish.vesselType.miniCrew" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMinCrewSize" text='getBean().getMinCrewSize()' enabled='{isActif()}' onKeyTyped='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))'/> + <JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}' onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))'/> </cell> </row> <row> @@ -138,7 +136,7 @@ <JLabel text="isisfish.vesselType.fuelCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='getBean().getUnitFuelCostOfTravel()' onKeyTyped='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}' onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' enabled='{isActif()}'/> </cell> </row> <row> @@ -157,7 +155,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldVesselTypeComment" text='getBean().getComment()' onKeyTyped='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -177,7 +175,7 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("VesselType")'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-01-02 17:22:09 UTC (rev 1725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-01-09 10:15:37 UTC (rev 1726) @@ -52,7 +52,6 @@ protected OMToolSet toolSet = new OMToolSet(); protected MapMouseListener mapListener = null; -setType("Zone"); setButtonTitle("isisfish.input.continuePorts"); setNextPath("$root/$ports"); addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -71,6 +70,7 @@ }); public void refresh() { + setBean(null); Zone zone = (Zone)getVerifier().getEntity(Zone.class); setBean((ZoneImpl) zone); jaxx.runtime.swing.Utils.fillList(zoneCells, getRegion().getCell(), getBean().getCell()); @@ -81,8 +81,8 @@ toolSet.setupListeners(zoneMap); toolMap.add((Component)toolSet); setMapListener(); + refreshMap(); } - refreshMap(); } protected void setMapListener(){ if (mapListener == null){ @@ -126,7 +126,7 @@ <JTextField id="fieldZoneName" text='{jaxx.runtime.Util.getStringValue(getBean().getName())}' enabled='{isActif()}' - onKeyTyped='getBean().setName(fieldZoneName.getText())'/> + onKeyReleased='getBean().setName(fieldZoneName.getText())'/> </cell> </row> <row> @@ -152,7 +152,7 @@ <JTextArea id="fieldZoneComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' enabled='{isActif()}' - onKeyTyped='getBean().setComment(fieldZoneComment.getText())'/> + onKeyReleased='getBean().setComment(fieldZoneComment.getText())'/> </JScrollPane> </cell> </row> @@ -166,7 +166,7 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton()'/> + <JButton id='create' javaBean='getVerifier().getNewButton("Zone")'/> </cell> <cell fill='horizontal' weightx='0.5'> <JButton id='remove' javaBean='getVerifier().getDeleteButton()'/>