Author: sletellier Date: 2009-01-12 15:01:10 +0000 (Mon, 12 Jan 2009) New Revision: 1729 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/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/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/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/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: Debug 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -69,11 +69,14 @@ } } }); - +public void setInputSaveVerifierBinding(){ + 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(), cell); + jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), getBean()); cellMap.setFisheryRegion(getRegion()); if (mapListener == null){ cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); @@ -83,8 +86,8 @@ setMapListener(); } - if (cell != null){ - cellMap.setSelectedCells(cell); + if (getBean() != null){ + cellMap.setSelectedCells(getBean()); } } protected void setMapListener(){ @@ -170,10 +173,10 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save' text='isisfish.common.save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel' text='isisfish.common.cancel'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -69,11 +69,17 @@ } }); +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} public void refresh(){ SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); setBean((SetOfVesselsImpl) setOfVessels); - jaxx.runtime.swing.Utils.fillList(fieldEffortDescriptionMetierList,getRegion().getMetier(), null); - setEffortDescriptionEffortDescriptionList(); + if (getBean() != null){ + jaxx.runtime.swing.Utils.fillList(fieldEffortDescriptionMetierList,getRegion().getMetier(), null); + setEffortDescriptionEffortDescriptionList(); + } } protected void setEffortDescriptionEffortDescriptionList(){ jaxx.runtime.swing.Utils.fillList(fieldEffortDescriptionEffortDescriptionList,getBean().getPossibleMetiers(), null); @@ -216,10 +222,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.3'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.3'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> <cell fill='horizontal' weightx='0.3'> <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -49,7 +49,10 @@ setButtonTitle("isisfish.input.continueCells"); setNextPath("$root/$cells"); -getVerifier().addSaveButton(save); +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save, false); + getVerifier().setCancelButton(cancel); +} public void refresh(){ setBean(null); FisheryRegion region = (FisheryRegion) getVerifier().getEntity(FisheryRegion.class); @@ -243,10 +246,10 @@ </row> <row> <cell fill='horizontal' weightx='0.3'> - <JButton id='save' text="isisfish.common.save" enabled='false' onActionPerformed='save()'/> + <JButton id='save' enabled='false' onActionPerformed='save()'/> </cell> <cell fill='horizontal' weightx='0.3'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> <cell fill='horizontal' weightx='0.3'> <JButton id='check' text="isisfish.common.check" onActionPerformed='check()'/> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -63,6 +63,12 @@ } } }); +public void setInputSaveVerifierBinding(){ + 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); @@ -102,7 +108,7 @@ <JLabel text="isisfish.gear.technicalParameter" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearParamName" text='{jaxx.runtime.Util.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getSelectedText())' enabled='{isActif()}'/> + <JTextField id="fieldGearParamName" text='{jaxx.runtime.Util.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -134,18 +140,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton javaBean='getVerifier().getNewButton("Gear")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton javaBean='getVerifier().getDeleteButton()'/> + <JButton id='remove'/> </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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -41,6 +41,7 @@ import fr.ifremer.isisfish.entities.Metier; setButtonTitle("isisfish.input.continueMetiers"); setNextPath("$root/$metiers"); +gearTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { getVerifier().addCurrentPanel(gearTabUI, selectivityUI); gearTabUI.refresh(); @@ -48,7 +49,7 @@ } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> - <JTabbedPane constraints='BorderLayout.CENTER' id="GearTab" name="Gear"> + <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab" name="Gear"> <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab> <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab> </JTabbedPane> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-01-12 15:01:10 UTC (rev 1729) @@ -48,6 +48,11 @@ import static fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.selectSimulation; import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import fr.ifremer.isisfish.util.CellPointcomparator; +import java.beans.PropertyChangeListener; +import java.beans.VetoableChangeListener; +import java.util.Date; +import java.util.logging.Level; +import java.util.logging.Logger; import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.lang.ClassUtils; import org.apache.commons.logging.Log; @@ -56,6 +61,7 @@ import org.codelutin.math.matrix.MatrixFactory; import org.codelutin.math.matrix.MatrixND; import org.codelutin.topia.TopiaContext; +import org.codelutin.topia.TopiaException; import org.codelutin.topia.persistence.TopiaDAO; import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.util.FileUtil; @@ -326,10 +332,10 @@ regionStorage = RegionStorage.getRegion(name); isisContext = regionStorage.getStorage().beginTransaction(); fisheryRegion = RegionStorage.getFisheryRegion(isisContext); + ui.setContextValue(regionStorage); + ui.setContextValue(isisContext); + ui.setContextValue(fisheryRegion); } - ui.setContextValue(regionStorage); - ui.setContextValue(isisContext); - ui.setContextValue(fisheryRegion); } catch (Exception eee) { log.error("Can't load region", eee); showMsgBox(eee); @@ -715,30 +721,36 @@ } // Population - - public Population createPopulation(Species species) { + public Species getSpeciesByTopiaId(TopiaContext context, String topiaId){ + Species result = null; + try { + SpeciesDAO dao = IsisFishDAOHelper.getSpeciesDAO(context); + result = dao.findByTopiaId(topiaId); + } catch (TopiaException ex) { + Logger.getLogger(InputAction.class.getName()).log(Level.SEVERE, null, ex); + } + return result; + } + public Population createPopulation(TopiaContext context, Species species) { if (log.isTraceEnabled()) { log.trace("create called"); } try { String name = "Population_new"; - - PopulationDAO dao = IsisFishDAOHelper.getPopulationDAO(species.getTopiaContext()); + + PopulationDAO dao = IsisFishDAOHelper.getPopulationDAO(context); Population pop = dao.create(); pop.setName(name); - + species.addPopulation(pop); pop.setSpecies(species); + species.update(); pop.update(); -// population = pop; -// population.update(); - species.update(); - species.getTopiaContext().commitTransaction(); + context.commitTransaction(); return pop; } catch (Exception eee) { log.error("Can't create Population", eee); showMsgBox(eee); -// return new OutputView("Error.xml", "error", eee.getMessage()); } return null; } 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -12,8 +12,8 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.entities.FisheryRegion; -public void refresh(){ -} +import org.codelutin.topia.persistence.TopiaEntity; +public void refresh(){} public InputAction getAction() { return getContextValue(InputAction.class); } @@ -29,6 +29,8 @@ protected void goTo(){ getParentContainer(InputUI.class).setTreeSelection(getNextPath()); } +public void setInputSaveVerifierBinding(){} +public void setBean(TopiaEntity t){}; ]]> </script> <JPanel id='body' constraints='BorderLayout.CENTER'/> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-01-12 15:01:10 UTC (rev 1729) @@ -96,8 +96,8 @@ try { currentUI = (InputContentUI) newUI; InputSaveVerifier verif = context.getContextValue(InputSaveVerifier.class); - verif.removeAllPanels(); verif.addCurrentPanel(currentUI); + currentUI.setInputSaveVerifierBinding(); currentUI.refresh(); currentNode = node; } catch (Exception e) { @@ -122,6 +122,9 @@ else if (responce == JOptionPane.CANCEL_OPTION){ exit = false; } + if (exit){ + verif.removeAllPanels(); + } return exit; } @@ -131,12 +134,12 @@ log.debug("find data for contextPath <" + node.getContextPath() + "> : " + (data == null ? null : data.getClass())); } InputSaveVerifier verif = context.getContextValue(InputSaveVerifier.class); - + verif.setRootPanel((InputUI)context); verif.removeAllEntity(); - verif.setRootPanel((InputUI)context); if (TopiaEntity.class.isInstance(data)){ verif.addCurrentEntity((TopiaEntity) data); } + verif.setPanelsActifs(); verif.setCurrentNode(node); } 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-12 15:01:10 UTC (rev 1729) @@ -13,13 +13,9 @@ 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.Map; import javax.swing.JButton; import javax.swing.JOptionPane; -import javax.swing.tree.TreePath; import jaxx.runtime.JAXXAction; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXInitialContext; @@ -39,11 +35,42 @@ * @author letellier */ public class InputSaveVerifier implements JAXXAction { - 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 JButton currentNewButton = null; + protected JButton currentDeleteButton = null; + protected JButton currentSaveButton = null; + protected JButton currentCancelButton = null; + + protected ActionListener saveListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + topiaSave(); + } + }; + protected ActionListener cancelListener = new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + topiaCancel(); + } + }; + protected ActionListener newListener = new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + topiaCreate(); + } + }; + protected ActionListener deleteListener = new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + topiaRemove(); + } + }; + + protected String type = null; + protected boolean editable = false; protected boolean changed = false; @@ -91,22 +118,21 @@ protected void topiaChanged(){ changed = true; setPanelsActifs(); - setEnabled(listSaveButton, true); - setEnabled(listCancelButton, true); - setEnabled(listNewButton.keySet(), false); - setEnabled(listDeleteButton, false); + setEnabled(currentSaveButton, true); + setEnabled(currentCancelButton, true); + setEnabled(currentNewButton, false); + setEnabled(currentDeleteButton, false); } protected void noModif(){ changed = false; setPanelsActifs(); - setEnabled(listSaveButton, false); - setEnabled(listCancelButton, false); - setEnabled(listNewButton.keySet(), true); - setEnabled(listDeleteButton, true); + setEnabled(currentSaveButton, false); + setEnabled(currentCancelButton, false); + setEnabled(currentNewButton, true); + setEnabled(currentDeleteButton, true); } - - protected void setEnabled(Collection<JButton> buttons, boolean enabled){ - for (JButton b : buttons){ + protected void setEnabled(JButton b, boolean enabled){ + if (b != null){ b.setEnabled(enabled); } } @@ -130,7 +156,9 @@ ArrayList<TopiaEntity> allWillBeRemoved = new ArrayList<TopiaEntity>(); for (TopiaEntity te : currentEntities){ allWillBeRemoved.add(te); - allWillBeRemoved.addAll(te.getComposite()); + if (te.getComposite() != null){ + allWillBeRemoved.addAll(te.getComposite()); + } } if (allWillBeRemoved.size() > 0) { String text = _( @@ -152,7 +180,6 @@ if (doDelete) { for (TopiaEntity te : allWillBeRemoved){ te.delete(); - System.out.println(te.getTopiaContext()); } isisContext.commitTransaction(); msg = _("isisfish.message.remove.finished"); @@ -165,14 +192,13 @@ } rootUI.setInfoText(msg); String path = currentNode.getParent().getContextPath(); - System.out.println(path); rootUI.setTreeModel(); rootUI.setTreeSelection(path); noModif(); } - protected void topiaCreate(String type){ + protected void topiaCreate(){ if (log.isTraceEnabled()) { log.trace("create called for " + type); @@ -195,7 +221,6 @@ if (!editable){ path = currentNode.getContextPath() + "/" + entity.getTopiaId(); } - System.out.println(path); rootUI.setTreeModel(); rootUI.setTreeSelection(path); @@ -259,14 +284,6 @@ } } } - 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(); @@ -283,12 +300,8 @@ } }); this.currentEntities.add(currentEntity); - System.out.println("currentEntity : "+ currentEntity); setPanelsActifs(); } - else{ - editable = false; - } } public void removeAllEntity(){ currentEntities.clear(); @@ -296,13 +309,11 @@ noModif(); setPanelsActifs(); } - public void addCurrentPanel(InputContentUI... currentPanels) { - if (currentPanels != null){ - for (InputContentUI ui : currentPanels){ - this.currentPanels.add(ui); - } - setPanelsActifs(); + public void addCurrentPanel(InputContentUI... panels) { + for (InputContentUI ui : panels){ + this.currentPanels.add(ui); } + setPanelsActifs(); } public void removeAllPanels(){ currentPanels.clear(); @@ -312,63 +323,51 @@ return editable; } - public JButton getCancelButton() { - JButton cancelButton = new JButton(_("isisfish.common.cancel")); - cancelButton.setEnabled(false); - cancelButton.addActionListener(new ActionListener() { + public void setSaveButton(JButton saveButton){ + setSaveButton(saveButton, true); + } - @Override - public void actionPerformed(ActionEvent e) { - topiaCancel(); - } - }); - listCancelButton.add(cancelButton); - return cancelButton; + public void setNewButton(JButton saveButton, String name){ + setNewButton(saveButton, name, true); } - public JButton getDeleteButton() { - JButton deleteButton = new JButton(_("isisfish.common.remove")); - deleteButton.addActionListener(new ActionListener() { + public void setSaveButton(JButton saveButton, Boolean listener){ + if (listener){ + saveButton.removeActionListener(saveListener); + saveButton.addActionListener(saveListener); + } + saveButton.setEnabled(changed); + saveButton.setText(_("isisfish.common.save")); + this.currentSaveButton = saveButton; + } - @Override - public void actionPerformed(ActionEvent e) { - topiaRemove(); - } - }); - listDeleteButton.add(deleteButton); - return deleteButton; + public void setCancelButton(JButton cancelButton){ + cancelButton.removeActionListener(cancelListener); + cancelButton.addActionListener(cancelListener); + cancelButton.setText(_("isisfish.common.cancel")); + cancelButton.setEnabled(changed); + this.currentCancelButton = cancelButton; } - 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 void setNewButton(JButton newButton, String t, Boolean listener){ + if (listener){ + newButton.removeActionListener(newListener); + newButton.addActionListener(newListener); + } + newButton.setText(_("isisfish.common.new")); + newButton.setEnabled(!changed); + this.type = t; + this.currentNewButton = 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 setDeleteButton(JButton deleteButton){ + deleteButton.removeActionListener(deleteListener); + deleteButton.addActionListener(deleteListener); + deleteButton.setEnabled(!changed); + deleteButton.setText(_("isisfish.common.remove")); + this.currentDeleteButton = deleteButton; } - 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/InputTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-01-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-01-12 15:01:10 UTC (rev 1729) @@ -16,22 +16,38 @@ * @author letellier */ public class InputTabbedPaneListener implements ChangeListener{ + protected int cacheSelectedIndex = -1; + @Override public void stateChanged(ChangeEvent e) { try { JTabbedPane pane = (JTabbedPane)e.getSource(); - int cacheSelectedIndex = pane.getSelectedIndex(); - InputContentUI ui = (InputContentUI) pane.getSelectedComponent(); - if (!closeUI(e, ui)) { + pane.removeChangeListener(this); + int selectedIndex = pane.getSelectedIndex(); + if (cacheSelectedIndex != -1){ pane.setSelectedIndex(cacheSelectedIndex); } + InputContentUI ui = (InputContentUI) pane.getSelectedComponent(); + if (closeUI(ui)) { + pane.setSelectedIndex(selectedIndex); + } + ui = (InputContentUI) pane.getSelectedComponent(); + ui.setInputSaveVerifierBinding(); + ui.refresh(); + cacheSelectedIndex = pane.getSelectedIndex(); + pane.addChangeListener(this); } catch (Exception ex) { Logger.getLogger(MetierUI.class.getName()).log(Level.SEVERE, null, ex); } } - protected boolean closeUI(ChangeEvent event, InputContentUI context) throws Exception { + /* + * Ask you to save if modification are made + * @param ui selected + * @return true to change tab + */ + protected boolean closeUI(InputContentUI context) throws Exception { boolean exit = true; // by default, we says that component was succesfull closed InputSaveVerifier verif = context.getContextValue(InputSaveVerifier.class); 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -237,19 +237,6 @@ </JScrollPane> </JPanel> </JPanel> - <JPanel id="inputPane" layout='{cardlayout}'> - <!--JLabel id='none' horizontalAlignment="0" text="isisfish.input.selectNodeTree" constraints='"none"'/> - <CellUI id='cellUI' constraints='"Cell"' constructorParams='getContextValue(InputAction.class)'/> - <ZoneUI id='zoneUI' constraints='"Zone"' constructorParams='getContextValue(InputAction.class)'/> - <PortUI id='portUI' constraints='"Port"' constructorParams='getContextValue(InputAction.class)'/> - <SpeciesUI id='speciesUI' constraints='"Species"' constructorParams='getContextValue(InputAction.class)'/> - <PopulationUI id='populationUI' constraints='"Population"' constructorParams='getContextValue(InputAction.class)'/> - <GearUI id='gearUI' constraints='"Gear"' constructorParams='getContextValue(InputAction.class)'/> - <MetierUI id='metierUI' constraints='"Metier"' constructorParams='getContextValue(InputAction.class)'/> - <TripTypeUI id='tripTypeUI' constraints='"TripType"' constructorParams='getContextValue(InputAction.class)'/> - <VesselTypeUI id='vesselTypeUI' constraints='"VesselType"' constructorParams='getContextValue(InputAction.class)'/> - <SetOfVesselsUI id='setOfVesselsUI' constraints='"SetOfVessels"' constructorParams='getContextValue(InputAction.class)'/> - <StrategyUI id='strategyUI' constraints='"Strategy"' constructorParams='getContextValue(InputAction.class)'/--> - </JPanel> + <JPanel id="inputPane" layout='{cardlayout}'/> </JSplitPane> </JPanel> \ No newline at end of file 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -38,125 +38,130 @@ <script><![CDATA[ - import com.l2fprod.common.swing.renderer.BooleanCellRenderer; - import java.util.logging.Level; - import java.util.logging.Logger; - import fr.ifremer.isisfish.entities.Equation; - import fr.ifremer.isisfish.entities.Formule; - import fr.ifremer.isisfish.entities.Metier; - import fr.ifremer.isisfish.entities.MetierImpl; - import fr.ifremer.isisfish.entities.MetierSeasonInfo; - import fr.ifremer.isisfish.entities.TargetSpecies; - import fr.ifremer.isisfish.ui.widget.editor.GenericCell; - import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import org.codelutin.topia.persistence.TopiaEntity; - import javax.swing.table.DefaultTableModel; - import fr.ifremer.isisfish.entities.Species; - import org.codelutin.topia.TopiaContext; - import javax.swing.table.TableCellEditor; +import com.l2fprod.common.swing.renderer.BooleanCellRenderer; +import java.util.logging.Level; +import java.util.logging.Logger; +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.entities.Formule; +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.entities.MetierImpl; +import fr.ifremer.isisfish.entities.MetierSeasonInfo; +import fr.ifremer.isisfish.entities.TargetSpecies; +import fr.ifremer.isisfish.ui.widget.editor.GenericCell; +import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; +import fr.ifremer.isisfish.ui.WelcomePanelUI; +import org.codelutin.topia.persistence.TopiaEntity; +import javax.swing.table.DefaultTableModel; +import fr.ifremer.isisfish.entities.Species; +import org.codelutin.topia.TopiaContext; +import javax.swing.table.TableCellEditor; + +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} + public void refresh() { getVerifier().addCurrentPanel(targetFactor); - public void refresh() { - Metier metier = (Metier)getVerifier().getEntity(Metier.class); - setBean((MetierImpl) metier); - if (getBean() != null){ - if (fieldMetierSeasonInfo.getSelectedIndex() <= 0){ - setSeasonModel(); - } - else { - setTableTargetSpeciesModel(); - } - if (fieldTargetSpecies.getSelectedIndex() <= 0){ - setTargetSpeciesModel(); - } - + Metier metier = (Metier)getVerifier().getEntity(Metier.class); + setBean((MetierImpl) metier); + if (getBean() != null){ + if (fieldMetierSeasonInfo.getSelectedIndex() <= 0){ + setSeasonModel(); + } + else { + setTableTargetSpeciesModel(); + } + if (fieldTargetSpecies.getSelectedIndex() <= 0){ + setTargetSpeciesModel(); + } + // 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(); - } - } - protected void setSeasonModel(){ + targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "TargetSpeciesTargetFactorEquation", fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class); + targetFactor.refresh(); + } + else{ DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); - java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo(); - if (metierSeasonInfo != null){ - seasonModel.addElement(new GenericCell(" ", null, null)); - for (MetierSeasonInfo m : metierSeasonInfo){ - seasonModel.addElement(new GenericCell(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, MetierSeasonInfo.class)); - } - } fieldMetierSeasonInfo.setModel(seasonModel); - } - protected void setTargetSpeciesModel(){ - DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel(); - java.util.List<Species> species = getRegion().getSpecies(); - if (species != null){ - fieldTargetSpeciesModel.addElement(new GenericCell(" ", null, null)); - for (Species s : species){ - fieldTargetSpeciesModel.addElement(new GenericCell(s.getName(), s, Species.class)); - } + setTargetSpeciesModel(); + } +} +protected void setSeasonModel(){ + DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); + java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo(); + if (metierSeasonInfo != null){ + seasonModel.addElement(new GenericCell(" ", null, null)); + for (MetierSeasonInfo m : metierSeasonInfo){ + seasonModel.addElement(new GenericCell(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, MetierSeasonInfo.class)); } - fieldTargetSpecies.setModel(fieldTargetSpeciesModel); - } - protected void setTableTargetSpeciesModel(){ - DefaultTableModel model = new DefaultTableModel(){ - @Override - public boolean isCellEditable(int row, int column) { - boolean result = false; - if (column > 0){ - result =true; - } - return result; + } + fieldMetierSeasonInfo.setModel(seasonModel); +} +protected void setTargetSpeciesModel(){ + DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel(); + java.util.List<Species> species = getRegion().getSpecies(); + if (species != null){ + fieldTargetSpeciesModel.addElement(new GenericCell(" ", null, null)); + for (Species s : species){ + fieldTargetSpeciesModel.addElement(new GenericCell(s.getName(), s, Species.class)); + } + } + fieldTargetSpecies.setModel(fieldTargetSpeciesModel); +} +protected void setTableTargetSpeciesModel(){ + DefaultTableModel model = new DefaultTableModel(){ + @Override + public boolean isCellEditable(int row, int column) { + boolean result = false; + if (column > 0){ + result =true; } - }; - Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); - if (season != null){ - Collection<TargetSpecies> targetSpecies = ((MetierSeasonInfo)season).getSpeciesTargetSpecies(); - if (targetSpecies != null){ - ArrayList <GenericCell> species = new ArrayList <GenericCell>(); - ArrayList <Equation> equations = new ArrayList <Equation>(); - ArrayList <Boolean> primaryCatch = new ArrayList <Boolean>(); - for (TargetSpecies t : targetSpecies){ - Species s = t.getSpecies(); - Equation e = t.getTargetFactorEquation(); - Boolean b = t.getPrimaryCatch(); - species.add(new GenericCell(s.getName(),s,Species.class)); - equations.add(e); - primaryCatch.add(b); - } - model.addColumn("Species", species.toArray()); - model.addColumn("Target factor", equations.toArray()); - model.addColumn("Main species for the metier", primaryCatch.toArray()); + return result; } - tableTargetSpecies.setModel(model); - EquationTableEditor cellEditor = new EquationTableEditor(); - tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor); + }; + Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); + if (season != null){ + Collection<TargetSpecies> targetSpecies = ((MetierSeasonInfo)season).getSpeciesTargetSpecies(); + if (targetSpecies != null){ + ArrayList <GenericCell> species = new ArrayList <GenericCell>(); + ArrayList <Equation> equations = new ArrayList <Equation>(); + ArrayList <Boolean> primaryCatch = new ArrayList <Boolean>(); + for (TargetSpecies t : targetSpecies){ + Species s = t.getSpecies(); + Equation e = t.getTargetFactorEquation(); + Boolean b = t.getPrimaryCatch(); + species.add(new GenericCell(s.getName(),s,Species.class)); + equations.add(e); + primaryCatch.add(b); + } + model.addColumn("Species", species.toArray()); + model.addColumn("Target factor", equations.toArray()); + model.addColumn("Main species for the metier", primaryCatch.toArray()); } + tableTargetSpecies.setModel(model); + EquationTableEditor cellEditor = new EquationTableEditor(); + tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor); } - protected void add(){ - Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); - Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); - if (season != null && species != null){ - getContextValue(InputAction.class).addTargetSpecies( - getBean(), - (MetierSeasonInfo)season, - (Species)species, - targetFactor.getEditor().getText(), - fieldPrimaryCatch.isSelected()); - refresh(); - } - } - protected void remove(){ +} +protected void add(){ + Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); + Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); + if (season != null && species != null){ + getContextValue(InputAction.class).addTargetSpecies( + getBean(), + (MetierSeasonInfo)season, + (Species)species, + targetFactor.getEditor().getText(), + fieldPrimaryCatch.isSelected()); refresh(); } - protected void metierSeasonChanged(){ - setTableTargetSpeciesModel(); - } +} +protected void remove(){ + refresh(); +} +protected void metierSeasonChanged(){ + setTableTargetSpeciesModel(); +} ]]></script> <Table id='body'> <row> @@ -167,7 +172,7 @@ <JLabel text="isisfish.metierSeasonInfoSpecies.selectSeason"/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldMetierSeasonInfo" onActionPerformed='metierSeasonChanged()'/> + <JComboBox id="fieldMetierSeasonInfo" onActionPerformed='metierSeasonChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -175,7 +180,7 @@ <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies"/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldTargetSpecies"/> + <JComboBox id="fieldTargetSpecies" enabled='{isActif()}'/> </cell> </row> <row> @@ -188,7 +193,7 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies"/> + <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies" enabled='{isActif()}'/> </cell> </row> </Table> @@ -199,27 +204,27 @@ <Table> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="buttonMetierSpeciesAddTargetSpecies" text="isisfish.common.add" onActionPerformed='add()'/> + <JButton id="buttonMetierSpeciesAddTargetSpecies" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTable id="tableTargetSpecies"/> + <JTable id="tableTargetSpecies" enabled='{isActif()}'/> </JScrollPane> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="buttonMetierSpeciesRemoveTargetSpecies" text="isisfish.common.remove" onActionPerformed='remove()'/> + <JButton id="buttonMetierSpeciesRemoveTargetSpecies" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -83,6 +83,13 @@ } } }); + +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "MetierSeasonInfo"); + getVerifier().setDeleteButton(remove); +} public void refresh() { Metier metier = (Metier)getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); @@ -262,18 +269,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton("MetierSeasonInfo")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='remove'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-01-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -48,6 +48,12 @@ 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() { try { Metier metier = (Metier)getVerifier().getEntity(Metier.class); @@ -127,18 +133,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton("Metier")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='remove'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -43,9 +43,9 @@ setButtonTitle("isisfish.input.continueTripTypes"); setNextPath("$root/$tripTypes"); - +metierTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { - getVerifier().addCurrentPanel(metierTabUI, metierSeasonSpeciesUI, metierSeasonInfoUI); + getVerifier().addCurrentPanel(metierTabUI, metierSeasonInfoUI, metierSeasonSpeciesUI); metierTabUI.refresh(); metierSeasonSpeciesUI.refresh(); metierSeasonInfoUI.setSeasonInit(true); 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -47,8 +47,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.table.DefaultTableModel; +import org.codelutin.topia.persistence.TopiaEntity; -getVerifier().addCurrentPanel(growthEquation, growthReverseEquation); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -59,20 +59,25 @@ 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); + //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text") } } }); - public void refresh(){ - Population population = (Population)getVerifier().getEntity(Population.class); - setBean((PopulationImpl) population); - getVerifier().setEditable(true); - getVerifier().setPanelsActifs(); + +public void setInputSaveVerifierBinding(){ + 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); @@ -83,49 +88,60 @@ setTableAgeLengthModel(); } } - protected void createClasses(){ - JFrame wizardFrame = new JFrame(); - wizardFrame.setLayout(new BorderLayout()); - WizardGroupCreationUI wizard = new WizardGroupCreationUI(getContextValue(InputAction.class), this); - wizardFrame.add(wizard, BorderLayout.CENTER); - wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title")); - wizardFrame.setVisible(true); - wizardFrame.pack(); - wizard.setAgeType(getBean().getSpecies().getAgeGroupType()); - if (wizard.isAgeType()) { - wizard.setCard("singleGroupAge"); - } else { - wizard.setCard("beginGroupLength"); - } - refresh(); +} +protected void createClasses(){ + JFrame wizardFrame = new JFrame(); + wizardFrame.setLayout(new BorderLayout()); + WizardGroupCreationUI wizard = new WizardGroupCreationUI(getContextValue(InputAction.class), this); + wizardFrame.add(wizard, BorderLayout.CENTER); + wizardFrame.setTitle(_("isisfish.wizardGroupCreation.title")); + wizardFrame.setVisible(true); + wizardFrame.pack(); + wizard.setAgeType(getBean().getSpecies().getAgeGroupType()); + if (wizard.isAgeType()) { + wizard.setCard("singleGroupAge"); + } else { + wizard.setCard("beginGroupLength"); } - protected void matureClassChanged(){ - Object selected = fieldPopulationBasicsMatureClass.getSelectedItem(); - if (selected != null){ - getBean().setMaturityGroup((PopulationGroup) selected); - } + refresh(); +} +protected void matureClassChanged(){ + Object selected = fieldPopulationBasicsMatureClass.getSelectedItem(); + if (selected != null){ + getBean().setMaturityGroup((PopulationGroup) selected); } - protected void setTableAgeLengthModel(){ - java.util.List<PopulationGroup> popGroup = getBean().getPopulationGroup(); - if (popGroup != null){ - DefaultTableModel model = new DefaultTableModel(2, popGroup.size() + 1); - model.setValueAt("Age", 0, 0); - model.setValueAt("Lengths", 1, 0); - int cnt = 1; - for (PopulationGroup pg : popGroup){ - model.setValueAt(pg.getAge(), 0, cnt); - model.setValueAt(pg.getLength(), 1, cnt); - cnt++; - } - tableAgeLength.setModel(model); +} +protected void setTableAgeLengthModel(){ + java.util.List<PopulationGroup> popGroup = getBean().getPopulationGroup(); + if (popGroup != null){ + DefaultTableModel model = new DefaultTableModel(2, popGroup.size() + 1); + model.setValueAt("Age", 0, 0); + model.setValueAt("Lengths", 1, 0); + int cnt = 1; + for (PopulationGroup pg : popGroup){ + model.setValueAt(pg.getAge(), 0, cnt); + model.setValueAt(pg.getLength(), 1, cnt); + cnt++; } + tableAgeLength.setModel(model); } - protected String getSizePopulationGroup(){ - if (getBean() != null){ - return String.valueOf(getBean().sizePopulationGroup()); - } - return ""; +} +protected String getSizePopulationGroup(){ + if (getBean() != null){ + return String.valueOf(getBean().sizePopulationGroup()); } + return ""; +} +protected void create(){ + Species species = getAction().getSpeciesByTopiaId(getVerifier().getIsisContext(), getVerifier().getCurrentNode().getParent().getNavigationPath()); + System.out.println(species); + TopiaEntity topia = getContextValue(InputAction.class).createPopulation(getVerifier().getIsisContext(), species); + + getParentContainer(InputUI.class).setTreeModel(); + getParentContainer(InputUI.class).setTreeSelection("$root/$species/"+ species.getTopiaId() +"/$populations/"+topia.getTopiaId()); + + setInfoText(_("isisfish.message.creation.finished")); +} ]]> </script> <Table id='body'> @@ -212,18 +228,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton("Population")'/> + <JButton id='create' onActionPerformed='create()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='remove'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-01-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -57,6 +57,11 @@ } } }); + +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); @@ -94,10 +99,10 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -43,6 +43,10 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); @@ -74,10 +78,10 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -67,6 +67,11 @@ } } }); + +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); @@ -148,10 +153,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -50,7 +50,7 @@ setPopInfo((PopulationSeasonInfoImpl)pi); } public void refresh(){ - Population population = (Population)getVerifier().getEntity(Population.class); + 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); 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -45,7 +45,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -59,7 +58,13 @@ } } }); + +public void setInputSaveVerifierBinding(){ + 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); setFieldPopulationMigrationSeasonChooserModel(); @@ -146,10 +151,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-01-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -59,6 +59,10 @@ } }); +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} public void refresh() { Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); @@ -120,10 +124,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -82,6 +82,13 @@ } } }); + +public void setInputSaveVerifierBinding(){ + 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); @@ -178,18 +185,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton("PopulationSeasonInfo")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='remove'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -48,9 +48,9 @@ setButtonTitle("isisfish.input.continueGears"); setNextPath("$root/$gears"); -getVerifier().addCurrentPanel(populationBasicsUI, populationGroupUI, populationEquationUI, populationZoneUI, populationSeasonsUI, populationCapturabilityUI, populationRecruitementUI, populationMigrationUI); - +populationTab.addChangeListener(new InputTabbedPaneListener()); public void refresh(){ + getVerifier().addCurrentPanel(populationBasicsUI, populationGroupUI, populationEquationUI, populationZoneUI, populationSeasonsUI, populationCapturabilityUI, populationRecruitementUI, populationMigrationUI); populationBasicsUI.refresh(); populationGroupUI.refresh(); populationEquationUI.refresh(); 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -60,6 +60,11 @@ } } }); + +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} public void refresh(){ Population population = (Population)getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); @@ -190,12 +195,12 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -74,6 +74,12 @@ } } }); +public void setInputSaveVerifierBinding(){ + 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); @@ -155,18 +161,18 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton("Port")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='remove'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -38,87 +38,93 @@ <script> <![CDATA[ - import fr.ifremer.isisfish.entities.Population; - import fr.ifremer.isisfish.entities.Gear; - import fr.ifremer.isisfish.entities.Species; - import fr.ifremer.isisfish.entities.Formule; - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; - import javax.swing.table.DefaultTableModel; - import fr.ifremer.isisfish.entities.Selectivity; - import fr.ifremer.isisfish.entities.GearImpl; - import fr.ifremer.isisfish.entities.Equation; - import java.util.logging.Level; - import java.util.logging.Logger; - import org.codelutin.topia.TopiaContext; - import org.codelutin.topia.persistence.TopiaEntity; - import fr.ifremer.isisfish.ui.widget.editor.GenericCell; - import fr.ifremer.isisfish.entities.Metier; - import fr.ifremer.isisfish.entities.MetierImpl; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.entities.Formule; +import fr.ifremer.isisfish.ui.WelcomePanelUI; +import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; +import javax.swing.table.DefaultTableModel; +import fr.ifremer.isisfish.entities.Selectivity; +import fr.ifremer.isisfish.entities.GearImpl; +import fr.ifremer.isisfish.entities.Equation; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.codelutin.topia.TopiaContext; +import org.codelutin.topia.persistence.TopiaEntity; +import fr.ifremer.isisfish.ui.widget.editor.GenericCell; +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.entities.MetierImpl; - public void refresh(){ - InputAction action = getAction(); - setBean(null); - Gear gear = (Gear)getVerifier().getEntity(Gear.class); - setBean((GearImpl) gear); +public void setInputSaveVerifierBinding(){ + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} +public void refresh(){ + getVerifier().addCurrentPanel(selectivityEquation); + InputAction action = getAction(); + setBean(null); + Gear gear = (Gear)getVerifier().getEntity(Gear.class); + setBean((GearImpl) gear); + if (getBean() != null){ 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(){ - @Override - public boolean isCellEditable(int row, int column) { - boolean result = false; - if (column > 0){ - result =true; - } - return result; + selectivityEquation.init(_("isisfish.selectivity.equation"), null, "SelectivityEquation", fr.ifremer.isisfish.equation.SelectivityEquation.class); + selectivityEquation.refresh(); +} +protected void setSelectivityTableModel(){ + DefaultTableModel model = new DefaultTableModel(){ + @Override + public boolean isCellEditable(int row, int column) { + boolean result = false; + if (column > 0){ + result =true; } - }; - Collection<Selectivity> selectivity = getBean().getPopulationSelectivity(); - java.util.List<Population> populations = new ArrayList<Population>(); - java.util.List<Equation> equations = new ArrayList<Equation>(); - if (selectivity != null){ - for (Selectivity s : selectivity){ - populations.add(s.getPopulation()); - equations.add(s.getEquation()); + return result; } + }; + Collection<Selectivity> selectivity = getBean().getPopulationSelectivity(); + java.util.List<Population> populations = new ArrayList<Population>(); + java.util.List<Equation> equations = new ArrayList<Equation>(); + if (selectivity != null){ + for (Selectivity s : selectivity){ + populations.add(s.getPopulation()); + equations.add(s.getEquation()); } - model.addColumn("Population", populations.toArray()); - model.addColumn("Equation", equations.toArray()); + } + model.addColumn("Population", populations.toArray()); + model.addColumn("Equation", equations.toArray()); - selectivityTable.setModel(model); - EquationTableEditor cellEditor = new EquationTableEditor(); - selectivityTable.getColumnModel().getColumn(1).setCellEditor(cellEditor); - } - protected DefaultComboBoxModel getSelectivityPopulationModel(){ - java.util.List<Species> species = getRegion().getSpecies(); - DefaultComboBoxModel selectivityPopulationModel = new DefaultComboBoxModel(); - if (species != null){ - selectivityPopulationModel.addElement(new GenericCell(" ", null, null)); - for (Species s : species){ - if (s.getPopulation() != null){ - for (Population p : s.getPopulation()){ - selectivityPopulationModel.addElement(new GenericCell(p.getName(), p, Population.class)); - } + selectivityTable.setModel(model); + EquationTableEditor cellEditor = new EquationTableEditor(); + selectivityTable.getColumnModel().getColumn(1).setCellEditor(cellEditor); +} +protected DefaultComboBoxModel getSelectivityPopulationModel(){ + java.util.List<Species> species = getRegion().getSpecies(); + DefaultComboBoxModel selectivityPopulationModel = new DefaultComboBoxModel(); + if (species != null){ + selectivityPopulationModel.addElement(new GenericCell(" ", null, null)); + for (Species s : species){ + if (s.getPopulation() != null){ + for (Population p : s.getPopulation()){ + selectivityPopulationModel.addElement(new GenericCell(p.getName(), p, Population.class)); } } } - return selectivityPopulationModel; } - protected void add(){ - 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(); - } + return selectivityPopulationModel; +} +protected void add(){ + 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(); +} ]]> </script> <Table id='body'> @@ -163,10 +169,10 @@ </row> <row> <cell fill='horizontal' weightx='1.0'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -48,7 +48,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -getVerifier().addCurrentPanel(technicalEfficiency); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -65,14 +64,24 @@ } } }); + +public void setInputSaveVerifierBinding(){ + 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); - jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort()); - jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType()); + 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"), (Formule)getBean().getTechnicalEfficiencyEquation(), "SoVTechnicalEfficiencyEquation", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class); + technicalEfficiency.refresh(); + } } ]]> </script> @@ -143,18 +152,18 @@ <Table> <row> <cell fill='horizontal' weightx='1.0'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='1.0'> - <JButton id='create' javaBean='getVerifier().getNewButton("SetOfVessels")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='remove'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -41,6 +41,7 @@ setButtonTitle("isisfish.input.continueStrategies"); setNextPath("$root/$strategies"); +setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { getVerifier().addCurrentPanel(setOfVesselsTabsUI, effortDescriptionUI); setOfVesselsTabsUI.refresh(); @@ -48,7 +49,7 @@ } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> - <JTabbedPane id="SetOfVesselsTab" name="SetOfVessels" constraints='BorderLayout.CENTER'> + <JTabbedPane id="setOfVesselsTab" name="SetOfVessels" constraints='BorderLayout.CENTER'> <tab title='{_("isisfish.setOfVessels.title")}'><SetOfVesselsTabsUI id='setOfVesselsTabsUI' constructorParams='this'/></tab> <tab title='{_("isisfish.effortDescription.title")}'><EffortDescriptionUI id='effortDescriptionUI' constructorParams='this'/></tab> </JTabbedPane> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -62,6 +62,12 @@ } } }); +public void setInputSaveVerifierBinding(){ + 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); @@ -134,18 +140,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton("Species")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='delete'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -36,8 +36,12 @@ <script><![CDATA[ import fr.ifremer.isisfish.types.Month; -getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, strategyApril, strategyMay, strategyJune, strategyJuly, strategyAugust, strategySeptember, strategyOctober, strategyNovember, strategyDecember); +public void setInputSaveVerifierBinding(){ + 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); @@ -118,10 +122,10 @@ <Table constraints='BorderLayout.SOUTH'> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -63,14 +63,22 @@ } } }); + +public void setInputSaveVerifierBinding(){ + 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); - getVerifier().addCurrentPanel(strategyInactivity); - strategyInactivity.init("", (Formule)getBean().getInactivityEquation(), "StrategyInactivityEquation", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class); - strategyInactivity.refresh(); - - setSetOfVesselsModel(); + if (getBean() != null){ + strategyInactivity.init("", (Formule)getBean().getInactivityEquation(), "StrategyInactivityEquation", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class); + strategyInactivity.refresh(); + setSetOfVesselsModel(); + } } protected void setSetOfVesselsModel(){ jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels()); @@ -135,18 +143,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton("Strategy")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='remove'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -37,6 +37,7 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ +strategyTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { getVerifier().addCurrentPanel(strategyTabUI, strategyMonthInfoUI); strategyTabUI.refresh(); @@ -44,7 +45,7 @@ } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> - <JTabbedPane id="StrategyTab" name="Strategy" constraints='BorderLayout.CENTER'> + <JTabbedPane id="strategyTab" name="Strategy" constraints='BorderLayout.CENTER'> <tab title='{_("isisfish.strategy.title")}'><StrategyTabUI id='strategyTabUI' constructorParams='this'/></tab> <tab title='{_("isisfish.strategyMonthInfo.title")}'><StrategyMonthInfoUI id='strategyMonthInfoUI' constructorParams='this'/></tab> </JTabbedPane> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -61,6 +61,12 @@ } } }); +public void setInputSaveVerifierBinding(){ + 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); @@ -113,18 +119,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton javaBean='getVerifier().getNewButton("TripType")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton javaBean='getVerifier().getDeleteButton()'/> + <JButton id='delete'/> </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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -65,6 +65,12 @@ } } }); +public void setInputSaveVerifierBinding(){ + 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); @@ -112,7 +118,7 @@ <JLabel text="isisfish.vesselType.maxDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' enabled='{isActif()}' onKeyReleased='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()) * 3600))'/> </cell> </row> <row> @@ -167,18 +173,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton("VesselType")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='delete'/> </cell> </row> </Table> 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-09 10:16:12 UTC (rev 1728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-01-12 15:01:10 UTC (rev 1729) @@ -69,6 +69,12 @@ } }); +public void setInputSaveVerifierBinding(){ + 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); @@ -158,18 +164,18 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' javaBean='getVerifier().getSaveButton()'/> + <JButton id='save'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' javaBean='getVerifier().getCancelButton()'/> + <JButton id='cancel'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' javaBean='getVerifier().getNewButton("Zone")'/> + <JButton id='create'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove' javaBean='getVerifier().getDeleteButton()'/> + <JButton id='remove'/> </cell> </row> </Table>