Author: sletellier Date: 2009-01-26 10:39:35 +0000 (Mon, 26 Jan 2009) New Revision: 1755 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/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/MetierSeasonInfoSpeciesUI.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/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/PopulationRecruitmentUI.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/StrategyTabUI.jaxx Log: Update Tony's fillList() 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -75,12 +75,12 @@ SetOfVessels setOfVessels = getVerifier().getEntity(SetOfVessels.class); setBean((SetOfVesselsImpl) setOfVessels); if (getBean() != null){ - fieldEffortDescriptionMetierList.fillList(getRegion().getMetier(), null); + fieldEffortDescriptionMetierList.fillList(getRegion().getMetier(), (Object)null); setEffortDescriptionEffortDescriptionList(); } } protected void setEffortDescriptionEffortDescriptionList(){ - fieldEffortDescriptionEffortDescriptionList.fillList(getBean().getPossibleMetiers(), null); + fieldEffortDescriptionEffortDescriptionList.fillList(getBean().getPossibleMetiers(), (Object)null); } protected void add(){ Object value = fieldEffortDescriptionMetierList.getSelectedValue(); 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -54,47 +54,59 @@ protected Class clazz; protected TopiaEntity bean; -protected String method; +protected String methodGet; +protected String methodSet; protected String name; protected Equation selectedEquation; +editor.getCurrentEditor().addDocumentListener(new DocumentListener() { -public void init(String lblText, TopiaEntity bean, String method, String name, Class c){ + @Override + public void insertUpdate(DocumentEvent e) { + } + + @Override + public void removeUpdate(DocumentEvent e) { + } + + @Override + public void changedUpdate(DocumentEvent e) { + setEquation(); + } +}); + +public void init(String lblText, TopiaEntity bean, String name, String methodGet, String methodSet, Class c){ setLblText(lblText); this.bean = bean; - this.method = method; + this.methodGet = methodGet; + this.methodSet = methodSet; this.name = name; this.clazz = c; selectedEquation = getEquation(); + setComboModel(); + setFormule((Formule)combo.getSelectedItem()); + setEditorText(); } protected Equation getEquation(){ Equation result = null; try { - if (bean != null){ - Method m = bean.getClass().getMethod("get" + method, null); + if (bean != null && methodGet != null){ + Method m = bean.getClass().getMethod("get" + methodGet, null); result = (Equation) m.invoke(bean, (Object[])null); } } catch (Exception ex) { - Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex); + System.out.println(ex); } return result; } -protected void setEquation(Formule f){ +protected void setEquation(){ 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); + if (bean != null && methodSet != null) { + Method m = bean.getClass().getMethod("set" + methodSet, String.class); + m.invoke(bean, editor.getText()); } } catch (Exception ex) { - Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex); + System.out.println(ex); } } public void refresh(){ @@ -103,33 +115,26 @@ } catch (IOException ex) { Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex); } - setComboModel(); - setFormule((Formule)combo.getSelectedItem()); - setEditorText(); + if (name != null){ + setComboModel(); + setFormule((Formule)combo.getSelectedItem()); + setEditorText(); + } } protected void setComboModel(){ java.util.List<Formule> formules = getAction().getFormules(getVerifier().getIsisContext(), name); if (formules != null){ - if (selectedEquation != null){ - java.util.List<Item> items = new ArrayList<Item>(); - for (Formule f : formules) { - System.out.println(selectedEquation.getClass().getName()); - boolean selected = f.equals(selectedEquation); - items.add(new Item(f.getName(), f.getName(), f, selected)); - } - combo.setItems(items); + java.util.List<Item> items = new ArrayList<Item>(); + for (Formule f : formules) { + boolean selected = f.equals(selectedEquation); + items.add(new Item(f.getName(), f.getName(), f, selected)); } + combo.setItems(items); } } protected void saveModel(){ - 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(); - } + getContextValue(InputAction.class).saveAsModel(name, "Java", editor.getText()); + setComboModel(); setInfoText(_("isisfish.message.saveModel.finished")); } protected void openEditor(){ @@ -154,7 +159,7 @@ <JLabel id='lbl' text='{getLblText()}' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="combo" onActionPerformed='setFormule((Formule)combo.getSelectedItem());setEquation(getFormule());setEditorText();' enabled='{isActif()}'/> + <JComboBox id="combo" onActionPerformed='setFormule((Formule)combo.getSelectedItem());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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-26 10:39:35 UTC (rev 1755) @@ -300,10 +300,6 @@ this.currentEntities.add(currentEntity); setPanelsActifs(); } - else{ - editable = false; - setPanelsActifs(); - } } public void removeAllEntity(){ currentEntities.clear(); @@ -313,6 +309,7 @@ } public void addCurrentPanel(InputContentUI... panels) { for (InputContentUI ui : panels){ + editable = !currentEntities.isEmpty(); this.currentPanels.add(ui); ui.refresh(); ui.setActif(editable); 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -74,7 +74,7 @@ } // TODO : Equation selectionne - targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "TargetFactor", "TargetSpeciesTargetFactorEquation", fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class); + targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "TargetFactor", null, null, fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class); } else{ DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -73,12 +73,12 @@ getVerifier().setNewButton(create, "Population", false); getVerifier().setDeleteButton(remove); Population population = getVerifier().getEntity(Population.class); + getVerifier().addCurrentPanel(growthEquation, growthReverseEquation); setBean((PopulationImpl) population); if (getBean() != null){ // TODO : Selection equation - 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); + growthEquation.init(_("isisfish.populationBasics.growth"), getBean(), "Growth", "Growth", "EquationGrowth", fr.ifremer.isisfish.equation.PopulationGrowth.class); + growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), getBean(), "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class); if (getBean() != null){ jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup()); setTableAgeLengthModel(); 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -48,9 +48,9 @@ getVerifier().setCancelButton(cancel); 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); + naturalDeathRate.init(_("isisfish.populationEquation.naturalDeathRate"), getBean(), "NaturalDeathRate", "NaturalDeathRate", "EquationNaturalDeathRate", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class); + meanWeight.init(_("isisfish.populationEquation.meanWeight"), getBean(), "MeanWeight", "MeanWeight", "EquationMeanWeight", fr.ifremer.isisfish.equation.PopulationMeanWeight.class); + price.init(_("isisfish.populationEquation.price"), getBean(), "Price", "Price", "EquationPrice", fr.ifremer.isisfish.equation.PopulationPrice.class); getVerifier().addCurrentPanel(naturalDeathRate, meanWeight, price); } ]]> 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -73,7 +73,9 @@ getVerifier().setCancelButton(cancel); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - getVerifier().addCurrentEntity(getPopulationGroup()); + if (getPopulationGroup() != null){ + getVerifier().addCurrentEntity(getPopulationGroup()); + } if (getBean() != null){ 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -52,9 +52,9 @@ public void refresh(){ 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); + migrationEquation.init(_("isisfish.common.migration"), getPopInfo(), "Migration", "MigrationEquation", "MigrationEquationAsString", fr.ifremer.isisfish.equation.MigrationEquation.class); + emigrationEquation.init(_("isisfish.common.emigration"), getPopInfo(), "Emigration", "EmigrationEquation", "EmigrationEquationAsString", fr.ifremer.isisfish.equation.EmigrationEquation.class); + immigrationEquation.init(_("isisfish.common.immigration"), getPopInfo(), "Immigration", "ImmigrationEquation", "ImmigrationEquationAsString", fr.ifremer.isisfish.equation.ImmigrationEquation.class); getVerifier().addCurrentPanel(migrationEquation, emigrationEquation, immigrationEquation); } ]]> 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -65,7 +65,7 @@ Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "ReproductionEquation", "PopulationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class); + reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class); getVerifier().addCurrentPanel(reproductionEquation); } ]]> 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -89,10 +89,10 @@ toolMap.add((Component)toolSet); setMapListener(); } - refreshMap(); if (getBean() != null){ portCell.fillList(getRegion().getCell(), getBean().getCell()); } + refreshMap(); } protected void refreshMap(){ java.util.List<Cell> cells = new ArrayList<Cell>(); 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -69,7 +69,7 @@ } // TODO : Equation selection - selectivityEquation.init(_("isisfish.selectivity.equation"), null, "", "SelectivityEquation", fr.ifremer.isisfish.equation.SelectivityEquation.class); + selectivityEquation.init(_("isisfish.selectivity.equation"), null, "Selectivity", null, null, fr.ifremer.isisfish.equation.SelectivityEquation.class); getVerifier().addCurrentPanel(selectivityEquation); } protected void setSelectivityTableModel(){ 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -76,7 +76,7 @@ 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"), getBean(), "TechnicalEfficiencyEquation", "SoVTechnicalEfficiencyEquation", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class); + technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), bean, "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class); getVerifier().addCurrentPanel(technicalEfficiency); } } 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-23 17:37:09 UTC (rev 1754) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-01-26 10:39:35 UTC (rev 1755) @@ -72,7 +72,7 @@ Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); setBean((StrategyImpl) strategy); if (getBean() != null){ - strategyInactivity.init("", getBean(), "InactivityEquation", "StrategyInactivityEquation", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class); + strategyInactivity.init("isisfish.strategy.inactivity", getBean(), "Inactivity", "InactivityEquation", "EquationInactivity", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class); getVerifier().addCurrentPanel(strategyInactivity); setSetOfVesselsModel(); }