Author: sletellier Date: 2009-01-16 17:52:40 +0000 (Fri, 16 Jan 2009) New Revision: 1742 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/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/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.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/InputTabbedPaneListener.java 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/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/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: Save on Tab changed 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -69,11 +69,9 @@ } } }); -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} -public void refresh() { Cell cell = (Cell)getVerifier().getEntity(Cell.class); setBean((CellImpl) cell); jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), getBean()); 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -69,11 +69,9 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} -public void refresh(){ SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); setBean((SetOfVesselsImpl) setOfVessels); if (getBean() != null){ 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -49,11 +49,9 @@ setButtonTitle("isisfish.input.continueCells"); setNextPath("$root/$cells"); -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save, false); getVerifier().setCancelButton(cancel); -} -public void refresh(){ setBean(null); FisheryRegion region = (FisheryRegion) getVerifier().getEntity(FisheryRegion.class); setBean((FisheryRegionImpl)region); 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -63,13 +63,11 @@ } } }); -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Gear"); getVerifier().setDeleteButton(remove); -} -public void refresh() { Gear gear = (Gear)getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); } 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -44,8 +44,6 @@ gearTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { getVerifier().addCurrentPanel(gearTabUI, selectivityUI); - gearTabUI.refresh(); - selectivityUI.refresh(); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-01-16 17:52:40 UTC (rev 1742) @@ -51,6 +51,7 @@ import java.beans.PropertyChangeListener; import java.beans.VetoableChangeListener; import java.util.Date; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import org.apache.commons.beanutils.MethodUtils; 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -29,7 +29,6 @@ protected void goTo(){ getParentContainer(InputUI.class).setTreeSelection(getNextPath()); } -public void setInputSaveVerifierBinding(){} public void setBean(TopiaEntity t){}; ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-01-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-01-16 17:52:40 UTC (rev 1742) @@ -95,10 +95,7 @@ // apply refresh method (should a contract for all this ui with a method refresh...) try { currentUI = (InputContentUI) newUI; - InputSaveVerifier verif = context.getContextValue(InputSaveVerifier.class); - verif.addCurrentPanel(currentUI); - currentUI.setInputSaveVerifierBinding(); - currentUI.refresh(); + context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); currentNode = node; } catch (Exception e) { log.debug(e.getMessage(), e); @@ -139,7 +136,7 @@ if (TopiaEntity.class.isInstance(data)){ verif.addCurrentEntity((TopiaEntity) data); } - verif.setPanelsActifs(); + verif.refreshAll(); verif.setCurrentNode(node); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-01-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -33,102 +33,117 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> + <!-- bean property --> + <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> + + <String id='lblText' javaBean='null'/> + <script><![CDATA[ import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.entities.Formule; +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.entities.EquationImpl; import java.util.logging.Level; import java.util.logging.Logger; +import java.lang.reflect.Method; +import org.apache.commons.beanutils.MethodUtils; +import org.codelutin.topia.persistence.TopiaEntity; +import fr.ifremer.isisfish.entities.EquationDAO; +import fr.ifremer.isisfish.IsisFishDAOHelper; -protected Class clazz = null; -protected String nameEquation = null; -protected String lblText; -protected Formule f; +protected Class clazz; +protected TopiaEntity bean; +protected String method; protected String name; -protected Class c; +protected Equation selectedEquation; -public void init(String lblText, Formule f, String name, Class c){ - this.lblText = lblText; - this.f = f; + +public void init(String lblText, TopiaEntity bean, String method, String name, Class c){ + setLblText(lblText); + this.bean = bean; + this.method = method; this.name = name; - this.c = c; + this.clazz = c; + selectedEquation = getEquation(); } -public void refresh(){ - lbl.setText(lblText); - clazz = c; +protected Equation getEquation(){ + Equation result = null; try { - editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); - } catch (IOException ex) { + if (bean != null){ + Method m = bean.getClass().getMethod("get" + method, null); + result = (Equation) m.invoke(bean, (Object[])null); + } + } catch (Exception ex) { Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex); } - setComboModel(f, name); + return result; } -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; +protected void setEquation(Formule f){ + try { + EquationDAO dao = IsisFishDAOHelper.getEquationDAO(bean.getTopiaContext()); + Equation e = dao.create("name", f.getName()); + e.setCategory(f.getCategory()); + e.setContent(f.getContent()); + e.setJavaInterface(clazz); + e.setLanguage("java"); + e.update(); + e.getTopiaContext().commitTransaction(); + if (bean != null) { + Method m = bean.getClass().getMethod("set" + method, Equation.class); + m.invoke(bean, e); } + } catch (Exception ex) { + Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex); } - 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()); +public void refresh(){ + try { + editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); + } catch (IOException ex) { + Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex); } - f = selected; + setComboModel(); + setFormule((Formule)combo.getSelectedItem()); + setEditorText(); } -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(); - } +protected void setComboModel(){ + java.util.List<Formule> formules = getAction().getFormules(getVerifier().getIsisContext(), name); + if (formules != null){ + jaxx.runtime.swing.Utils.fillComboBox(combo,formules, selectedEquation, "getName"); } - return result; } protected void saveModel(){ - Formule e = getFormule(); + Formule e = (Formule)combo.getSelectedItem(); if (e != null){ getContextValue(InputAction.class).saveAsModel(e.getCategory(), "Java", e.getContent()); } else{ getContextValue(InputAction.class).saveAsModel(name, "Java", editor.getText()); - setComboModel(f, name); + setComboModel(); } - refresh(); setInfoText(_("isisfish.message.saveModel.finished")); } protected void openEditor(){ - Formule e = getFormule(); + Formule e = (Formule)combo.getSelectedItem(); 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); + getContextValue(InputAction.class).openEditor(name, "new", clazz, editor.getText(), editor); } } +protected void setEditorText(){ + editor.setText(getFormule().getContent()); +} ]]> </script> <Table id='body'> <row> <cell fill='horizontal' anchor='east'> - <JLabel id='lbl'/> + <JLabel id='lbl' text='{getLblText()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="combo" onActionPerformed='comboChanged()' enabled='{isActif()}'/> + <JComboBox id="combo" onActionPerformed='setFormule((Formule)combo.getSelectedItem());setEquation(getFormule());setEditorText();' enabled='{isActif()}'/> </cell> </row> <row> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-16 17:52:40 UTC (rev 1742) @@ -288,6 +288,7 @@ for (InputContentUI panel : currentPanels){ panel.refresh(); } + setPanelsActifs(); } public void addCurrentEntity(TopiaEntity currentEntity) { if (currentEntity != null){ @@ -312,6 +313,7 @@ public void addCurrentPanel(InputContentUI... panels) { for (InputContentUI ui : panels){ this.currentPanels.add(ui); + ui.refresh(); } setPanelsActifs(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-01-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-01-16 17:52:40 UTC (rev 1742) @@ -33,8 +33,6 @@ pane.setSelectedIndex(selectedIndex); } ui = (InputContentUI) pane.getSelectedComponent(); - ui.setInputSaveVerifierBinding(); - ui.refresh(); cacheSelectedIndex = pane.getSelectedIndex(); pane.addChangeListener(this); } catch (Exception ex) { 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -56,13 +56,9 @@ import org.codelutin.topia.TopiaContext; import javax.swing.table.TableCellEditor; - -public void setInputSaveVerifierBinding(){ + public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} - public void refresh() { - getVerifier().addCurrentPanel(targetFactor); Metier metier = (Metier)getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); if (getBean() != null){ @@ -77,8 +73,8 @@ } // TODO : Equation selectionne - targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "TargetSpeciesTargetFactorEquation", fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class); - targetFactor.refresh(); + targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "", "TargetSpeciesTargetFactorEquation", fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class); + getVerifier().addCurrentPanel(targetFactor); } else{ DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -84,13 +84,11 @@ } }); -public void setInputSaveVerifierBinding(){ - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "MetierSeasonInfo"); - getVerifier().setDeleteButton(remove); -} public void refresh() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "MetierSeasonInfo"); + getVerifier().setDeleteButton(remove); Metier metier = (Metier)getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); if (metier != null){ 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -48,13 +48,11 @@ import java.util.logging.Level; import java.util.logging.Logger; -public void setInputSaveVerifierBinding(){ - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "Metier"); - getVerifier().setDeleteButton(remove); -} public void refresh() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "Metier"); + getVerifier().setDeleteButton(remove); try { Metier metier = (Metier)getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -46,10 +46,7 @@ metierTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { getVerifier().addCurrentPanel(metierTabUI, metierSeasonInfoUI, metierSeasonSpeciesUI); - metierTabUI.refresh(); - metierSeasonSpeciesUI.refresh(); metierSeasonInfoUI.setSeasonInit(true); - metierSeasonInfoUI.refresh(); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -67,24 +67,20 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Population", false); getVerifier().setDeleteButton(remove); -} -public void refresh(){ - getVerifier().addCurrentPanel(growthEquation, growthReverseEquation); Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); if (getBean() != null){ // 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(); + growthEquation.init(_("isisfish.populationBasics.growth"), getBean(), "Growth", "PopulationGrowth", fr.ifremer.isisfish.equation.PopulationGrowth.class); + growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), getBean(), "GrowthReverse", "PopulationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class); + getVerifier().addCurrentPanel(growthEquation, growthReverseEquation); if (getBean() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass,getBean().getPopulationGroup(), getBean().getMaturityGroup()); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup()); setTableAgeLengthModel(); } } 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -58,11 +58,9 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} -public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); fieldPopulationCapturability.addMatrixListener(new MatrixPanelListener() { 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -43,20 +43,15 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} -public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); + naturalDeathRate.init(_("isisfish.populationEquation.naturalDeathRate"), getBean(), "NaturalDeathRate", "PopulationNaturalDeathRate", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class); + meanWeight.init(_("isisfish.populationEquation.meanWeight"), getBean(), "MeanWeight", "PopulationMeanWeight", fr.ifremer.isisfish.equation.PopulationMeanWeight.class); + price.init(_("isisfish.populationEquation.price"), getBean(), "Price", "PopulationPrice", fr.ifremer.isisfish.equation.PopulationPrice.class); 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); - naturalDeathRate.refresh(); - meanWeight.refresh(); - price.refresh(); } ]]> </script> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -68,11 +68,9 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} -public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -52,13 +52,10 @@ public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); + migrationEquation.init(_("isisfish.common.migration"), getPopInfo(), "MigrationEquation", "Migration", fr.ifremer.isisfish.equation.MigrationEquation.class); + emigrationEquation.init(_("isisfish.common.emigration"), getPopInfo(), "EmigrationEquation", "Emigration", fr.ifremer.isisfish.equation.EmigrationEquation.class); + immigrationEquation.init(_("isisfish.common.immigration"), getPopInfo(), "ImmigrationEquation", "Immigration", fr.ifremer.isisfish.equation.ImmigrationEquation.class); 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); - migrationEquation.refresh(); - emigrationEquation.refresh(); - immigrationEquation.refresh(); } ]]> </script> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -59,11 +59,9 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} -public void refresh(){ getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI); Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); @@ -76,10 +74,6 @@ populationMigrationMigrationUI.init(selected); populationMigrationImmigrationUI.init(selected); populationMigrationEmigrationUI.init(selected); - populationMigrationEquationUI.refresh(); - populationMigrationMigrationUI.refresh(); - populationMigrationImmigrationUI.refresh(); - populationMigrationEmigrationUI.refresh(); } } protected void setFieldPopulationMigrationSeasonChooserModel(){ 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -59,17 +59,14 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} -public void refresh() { Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); + reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "ReproductionEquation", "PopulationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class); getVerifier().addCurrentPanel(reproductionEquation); - reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), (Formule)getBean().getReproductionEquation(), "PopulationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class); - reproductionEquation.refresh(); } ]]> </script> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -83,13 +83,11 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "PopulationSeasonInfo"); getVerifier().setDeleteButton(remove); -} -public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null); 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -51,14 +51,6 @@ populationTab.addChangeListener(new InputTabbedPaneListener()); public void refresh(){ getVerifier().addCurrentPanel(populationBasicsUI, populationGroupUI, populationEquationUI, populationZoneUI, populationSeasonsUI, populationCapturabilityUI, populationRecruitementUI, populationMigrationUI); - populationBasicsUI.refresh(); - populationGroupUI.refresh(); - populationEquationUI.refresh(); - populationZoneUI.refresh(); - populationSeasonsUI.refresh(); - populationCapturabilityUI.refresh(); - populationRecruitementUI.refresh(); - populationMigrationUI.refresh(); } ]]> </script> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -61,94 +61,92 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} - public void refresh(){ - Population population = (Population)getVerifier().getEntity(Population.class); - setBean((PopulationImpl) population); - setPopulationZonesPresenceModel(); - setFieldPopulationZonesReproductionModel(); - setFieldPopulationZonesRecruitmentModel(); - setFieldPopulationMappingZoneReproZoneRecru(); - fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(new MatrixPanelListener() { + Population population = (Population)getVerifier().getEntity(Population.class); + setBean((PopulationImpl) population); + setPopulationZonesPresenceModel(); + setFieldPopulationZonesReproductionModel(); + setFieldPopulationZonesRecruitmentModel(); + setFieldPopulationMappingZoneReproZoneRecru(); + fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - fieldPopulationMappingZoneReproZoneRecruChanged(); - } - }); - } - protected void fieldPopulationMappingZoneReproZoneRecruChanged(){ - getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix()); - } - protected void setFieldPopulationMappingZoneReproZoneRecru(){ - if (getBean().getMappingZoneReproZoneRecru() != null){ - fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().getMappingZoneReproZoneRecru().copy()); + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + fieldPopulationMappingZoneReproZoneRecruChanged(); } + }); +} +protected void fieldPopulationMappingZoneReproZoneRecruChanged(){ + getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix()); +} +protected void setFieldPopulationMappingZoneReproZoneRecru(){ + if (getBean().getMappingZoneReproZoneRecru() != null){ + fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().getMappingZoneReproZoneRecru().copy()); } - protected void setPopulationZonesPresenceModel(){ - setModel(getBean().getPopulationZone(), populationZonesPresence); - } - protected void setFieldPopulationZonesReproductionModel(){ - setModel(getBean().getReproductionZone(), fieldPopulationZonesReproduction); - } - protected void setFieldPopulationZonesRecruitmentModel(){ - setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment); - } - protected void setModel(java.util.List<Zone> selected, JAXXList componant){ - DefaultListModel model = new DefaultListModel(); - java.util.List<Zone> zones = getRegion().getZone(); - java.util.List<GenericCell> selectedZones = new ArrayList<GenericCell>(); - if (zones != null){ - for (Zone z : zones){ - GenericCell cell = new GenericCell(z.getName(), z, Zone.class); - model.addElement(cell); - if (selected != null){ - if (selected.contains(z)){ - selectedZones.add(cell); - } +} +protected void setPopulationZonesPresenceModel(){ + setModel(getBean().getPopulationZone(), populationZonesPresence); +} +protected void setFieldPopulationZonesReproductionModel(){ + setModel(getBean().getReproductionZone(), fieldPopulationZonesReproduction); +} +protected void setFieldPopulationZonesRecruitmentModel(){ + setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment); +} +protected void setModel(java.util.List<Zone> selected, JAXXList componant){ + DefaultListModel model = new DefaultListModel(); + java.util.List<Zone> zones = getRegion().getZone(); + java.util.List<GenericCell> selectedZones = new ArrayList<GenericCell>(); + if (zones != null){ + for (Zone z : zones){ + GenericCell cell = new GenericCell(z.getName(), z, Zone.class); + model.addElement(cell); + if (selected != null){ + if (selected.contains(z)){ + selectedZones.add(cell); } } } - componant.setModel(model); - if (selectedZones.size() > 0){ - java.util.List <Integer> indicesList = new ArrayList<Integer>(); - for (GenericCell c : selectedZones){ - indicesList.add(model.indexOf(c)); - } - int[] indices = new int[indicesList.size()]; - int cnt = 0; - for (Integer i : indicesList){ - indices[cnt]=i; - cnt ++; - } - componant.setSelectedIndices(indices); + } + componant.setModel(model); + if (selectedZones.size() > 0){ + java.util.List <Integer> indicesList = new ArrayList<Integer>(); + for (GenericCell c : selectedZones){ + indicesList.add(model.indexOf(c)); } + int[] indices = new int[indicesList.size()]; + int cnt = 0; + for (Integer i : indicesList){ + indices[cnt]=i; + cnt ++; + } + componant.setSelectedIndices(indices); } - protected void presenceChanged(){ - getBean().setPopulationZone(getSelectedValue(populationZonesPresence)); - } - protected void reproductionChanged(){ - getBean().setReproductionZone(getSelectedValue(fieldPopulationZonesReproduction)); - } - protected void recruitementChanged(){ - getBean().setRecruitmentZone(getSelectedValue(fieldPopulationZonesRecruitment)); - } - protected java.util.List<Zone> getSelectedValue(JAXXList componant){ - Object[] selected = componant.getSelectedValues(); - java.util.List<Zone> selectedZone = new ArrayList<Zone>(); - if (selected != null){ - for (Object i : selected){ - GenericCell cell = (GenericCell)i; - if (cell.getValue() != null){ - selectedZone.add((Zone)cell.getValue()); - } +} +protected void presenceChanged(){ + getBean().setPopulationZone(getSelectedValue(populationZonesPresence)); +} +protected void reproductionChanged(){ + getBean().setReproductionZone(getSelectedValue(fieldPopulationZonesReproduction)); +} +protected void recruitementChanged(){ + getBean().setRecruitmentZone(getSelectedValue(fieldPopulationZonesRecruitment)); +} +protected java.util.List<Zone> getSelectedValue(JAXXList componant){ + Object[] selected = componant.getSelectedValues(); + java.util.List<Zone> selectedZone = new ArrayList<Zone>(); + if (selected != null){ + for (Object i : selected){ + GenericCell cell = (GenericCell)i; + if (cell.getValue() != null){ + selectedZone.add((Zone)cell.getValue()); } } - return selectedZone; } + return selectedZone; +} ]]> </script> <Table id='body'> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -74,48 +74,46 @@ } } }); -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Port"); getVerifier().setDeleteButton(remove); -} - 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); - portMap.setActiveMouseMode(new SelectMouseMode()); - toolSet.setupListeners(portMap); - toolMap.add((Component)toolSet); - setMapListener(); - } - refreshMap(); + 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); + portMap.setActiveMouseMode(new SelectMouseMode()); + toolSet.setupListeners(portMap); + toolMap.add((Component)toolSet); + setMapListener(); } - protected void refreshMap(){ - java.util.List<Cell> cells = new ArrayList<Cell>(); - cells.add((Cell)portCell.getSelectedValue()); - portMap.setSelectedCells(cells); - } - protected void setMapListener(){ - if (mapListener == null){ - mapListener = new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { + refreshMap(); +} +protected void refreshMap(){ + java.util.List<Cell> cells = new ArrayList<Cell>(); + cells.add((Cell)portCell.getSelectedValue()); + portMap.setSelectedCells(cells); +} +protected void setMapListener(){ + if (mapListener == null){ + mapListener = new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { - @Override - public boolean onMouseClicked() { - for (Cell c : portMap.getSelectedCells()){ - if (getBean() != null){ - getBean().setCell(c); - } + @Override + public boolean onMouseClicked() { + for (Cell c : portMap.getSelectedCells()){ + if (getBean() != null){ + getBean().setCell(c); } - refresh(); - return true; } - }; - } + refresh(); + return true; + } + }; } +} ]]> </script> <Table id='body'> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -56,12 +56,9 @@ import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.MetierImpl; -public void setInputSaveVerifierBinding(){ +public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} -public void refresh(){ - getVerifier().addCurrentPanel(selectivityEquation); InputAction action = getAction(); setBean(null); Gear gear = (Gear)getVerifier().getEntity(Gear.class); @@ -72,8 +69,8 @@ } // TODO : Equation selection - selectivityEquation.init(_("isisfish.selectivity.equation"), null, "SelectivityEquation", fr.ifremer.isisfish.equation.SelectivityEquation.class); - selectivityEquation.refresh(); + selectivityEquation.init(_("isisfish.selectivity.equation"), null, "", "SelectivityEquation", fr.ifremer.isisfish.equation.SelectivityEquation.class); + getVerifier().addCurrentPanel(selectivityEquation); } protected void setSelectivityTableModel(){ DefaultTableModel model = new DefaultTableModel(){ 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -65,22 +65,19 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "SetOfVessels"); getVerifier().setDeleteButton(remove); -} -public void refresh() { - getVerifier().addCurrentPanel(technicalEfficiency); SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); setBean((SetOfVesselsImpl) setOfVessels); if (getBean() != null){ 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(); + technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), getBean(), "TechnicalEfficiencyEquation", "SoVTechnicalEfficiencyEquation", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class); + getVerifier().addCurrentPanel(technicalEfficiency); } } ]]> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -44,8 +44,6 @@ setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { getVerifier().addCurrentPanel(setOfVesselsTabsUI, effortDescriptionUI); - setOfVesselsTabsUI.refresh(); - effortDescriptionUI.refresh(); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -62,13 +62,11 @@ } } }); -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Species"); getVerifier().setDeleteButton(delete); -} -public void refresh() { Species species = (Species)getVerifier().getEntity(Species.class); setBean((SpeciesImpl) species); setNextPath("$root/$species/" + getBean().getTopiaId() + "/$populations"); 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -36,12 +36,9 @@ <script><![CDATA[ import fr.ifremer.isisfish.types.Month; -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); -} -public void refresh() { - getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, strategyApril, strategyMay, strategyJune, strategyJuly, strategyAugust, strategySeptember, strategyOctober, strategyNovember, strategyDecember); strategyJanuary.init(Month.JANUARY); strategyFebuary.init(Month.FEBRUARY); strategyMarch.init(Month.MARCH); @@ -54,18 +51,7 @@ strategyOctober.init(Month.OCTOBER); strategyNovember.init(Month.NOVEMBER); strategyDecember.init(Month.DECEMBER); - strategyJanuary.refresh(); - strategyFebuary.refresh(); - strategyMarch.refresh(); - strategyApril.refresh(); - strategyMay.refresh(); - strategyJune.refresh(); - strategyJuly.refresh(); - strategyAugust.refresh(); - strategySeptember.refresh(); - strategyOctober.refresh(); - strategyNovember.refresh(); - strategyDecember.refresh(); + getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, strategyApril, strategyMay, strategyJune, strategyJuly, strategyAugust, strategySeptember, strategyOctober, strategyNovember, strategyDecember); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -76,7 +76,7 @@ } }); public void refresh() { - Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); + Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); setBean((StrategyImpl) strategy); setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month)); jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType()); 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -64,19 +64,16 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Strategy"); getVerifier().setDeleteButton(remove); -} -public void refresh() { - getVerifier().addCurrentPanel(strategyInactivity); Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); setBean((StrategyImpl) strategy); if (getBean() != null){ - strategyInactivity.init("", (Formule)getBean().getInactivityEquation(), "StrategyInactivityEquation", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class); - strategyInactivity.refresh(); + strategyInactivity.init("", getBean(), "InactivityEquation", "StrategyInactivityEquation", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class); + getVerifier().addCurrentPanel(strategyInactivity); setSetOfVesselsModel(); } } 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -40,8 +40,6 @@ strategyTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { getVerifier().addCurrentPanel(strategyTabUI, strategyMonthInfoUI); - strategyTabUI.refresh(); - strategyMonthInfoUI.refresh(); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -61,13 +61,12 @@ } } }); -public void setInputSaveVerifierBinding(){ + +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "TripType"); getVerifier().setDeleteButton(delete); -} -public void refresh() { TripType tripType = (TripType)getVerifier().getEntity(TripType.class); setBean((TripTypeImpl) tripType); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -65,13 +65,11 @@ } } }); -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "VesselType"); getVerifier().setDeleteButton(delete); -} -public void refresh() { VesselType vesselType = (VesselType)getVerifier().getEntity(VesselType.class); setBean((VesselTypeImpl) vesselType); jaxx.runtime.swing.Utils.fillList(vesselTypeTripType, getRegion().getTripType(), getBean().getTripType()); 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-14 15:45:53 UTC (rev 1741) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-01-16 17:52:40 UTC (rev 1742) @@ -69,13 +69,11 @@ } }); -public void setInputSaveVerifierBinding(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Zone"); getVerifier().setDeleteButton(remove); -} -public void refresh() { setBean(null); Zone zone = (Zone)getVerifier().getEntity(Zone.class); setBean((ZoneImpl) zone);