- Isis-fish-commits - mailman.cloud.codelutin.com

r1769 - isis-fish/trunk/src/main/resources/i18n
by sletellier＠users.labs.libre-entreprise.org 02 Feb '09

02 Feb '09

Author: sletellier Date: 2009-02-02 13:31:05 +0000 (Mon, 02 Feb 2009) New Revision: 1769 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Correction de traduction Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-02-02 13:30:13 UTC (rev 1768) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-02-02 13:31:05 UTC (rev 1769) @@ -445,7 +445,6 @@ isisfish.infoItem.sum.year=Somme de \u00E9l\u00E9ment par ann\u00E9e isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 isisfish.input.continueCells=Continuer vers les cells -isisfish.input.continueZones=Continuer vers les zones isisfish.input.continueGears=Continuer vers les gears isisfish.input.continueMetiers=Continuer vers les metiers isisfish.input.continuePopulations=Continuer vers les populations @@ -455,6 +454,7 @@ isisfish.input.continueStrategies=Continuer vers les strategies isisfish.input.continueTripTypes=Continuer vers les trip type isisfish.input.continueVesselTypes=Continuer vers les vessel type +isisfish.input.continueZones=Continuer vers les zones isisfish.input.menu.addRegion=Ajouter une r\u00E9gion isisfish.input.menu.commit=Sauvegarder les changements isisfish.input.menu.copyRegion=Copier r\u00E9gion

1 0

r1768 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by sletellier＠users.labs.libre-entreprise.org 02 Feb '09

02 Feb '09

Author: sletellier Date: 2009-02-02 13:30:13 +0000 (Mon, 02 Feb 2009) New Revision: 1768 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: Correction des multi-fenetres. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-01-30 13:12:32 UTC (rev 1767) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-02-02 13:30:13 UTC (rev 1768) @@ -40,13 +40,13 @@ public void setInfoText(String s){ statusBar.getLabelStatus().setText(s); } - public void close() { + public void close(JFrame f) { if (getVerifier().allIsSaved()){ - exit(); + exit(f); } } - protected void exit(){ - IsisFish.quit(); + protected void exit(JFrame f){ + f.dispose(); } protected WelcomeSaveVerifier getVerifier(){ return getContextValue(WelcomeSaveVerifier.class); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-01-30 13:12:32 UTC (rev 1767) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-02-02 13:30:13 UTC (rev 1768) @@ -50,14 +50,14 @@ import fr.ifremer.isisfish.ui.input.InputSaveVerifier; java.util.Map <JFrame, WelcomePanelUI> allFrameOpened; - - setContextValue(new WelcomeSaveVerifier()); + WelcomeSaveVerifier verifier = new WelcomeSaveVerifier(); + setContextValue(verifier); allFrameOpened = new java.util.HashMap <JFrame, WelcomePanelUI> (); welcomePanelUI.setContent(new WelcomeTabUI(new JAXXInitialContext().add(getVerifier()))); protected void openFrame(Container c, String title){ JFrame f = new JFrame(); f.setLayout(new BorderLayout()); - WelcomePanelUI welcome = new WelcomePanelUI(new JAXXInitialContext().add(getContextValue(WelcomeSaveVerifier.class)).add(this)); + WelcomePanelUI welcome = new WelcomePanelUI(new JAXXInitialContext().add(verifier).add(this)); welcome.setContent(c); f.add(welcome, BorderLayout.CENTER); f.setTitle(title); @@ -72,7 +72,8 @@ @Override public void windowClosing(WindowEvent e) { - allFrameOpened.get((JFrame) e.getSource()).close(); + JFrame f = (JFrame) e.getSource(); + allFrameOpened.get(f).close(f); } @Override @@ -98,7 +99,7 @@ f.setVisible(true); } public void close() { - if (getVerifier().allIsSaved()){ + if (verifier.allIsSaved()){ exit(); } } @@ -158,7 +159,7 @@ <JMenu text="isisfish.welcome.menu.frame"> <JMenuItem text="isisfish.welcome.menu.simulation" onActionPerformed='openFrame(new SimulUI(new SimulAction()), _("isisfish.simulation.title"))'/> <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='openFrame(new ResultView(), _("isisfish.result.title"))'/> - <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(getContextValue(WelcomeSaveVerifier.class)).add(new InputAction()).add(new InputSaveVerifier())), _("isisfish.input.title"))'/> + <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(verifier).add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.input.title"))'/> <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/>

1 0

r1767 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 30 Jan '09

30 Jan '09

Author: sletellier Date: 2009-01-30 13:12:32 +0000 (Fri, 30 Jan 2009) New Revision: 1767 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Log: Debug final Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-30 12:47:48 UTC (rev 1766) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-30 13:12:32 UTC (rev 1767) @@ -87,7 +87,14 @@ getVerifier().addCurrentEntity(getStrategyMonthInfo()); } if (getStrategyMonthInfo() != null){ + ActionListener[] listeners = fieldStrategyMonthInfoTripType.getActionListeners(); + for (ActionListener listener : listeners){ + fieldStrategyMonthInfoTripType.removeActionListener(listener); + } jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType()); + for (ActionListener listener : listeners){ + fieldStrategyMonthInfoTripType.addActionListener(listener); + } } } public void init(int m){

1 0

r1766 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/simulator/launcher resources/ssh
by chatellier＠users.labs.libre-entreprise.org 30 Jan '09

30 Jan '09

Author: chatellier Date: 2009-01-30 12:47:48 +0000 (Fri, 30 Jan 2009) New Revision: 1766 Removed: isis-fish/trunk/src/main/resources/ssh/launch-isis-pxe.seq Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Retrait du script de test sur pxe Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-01-30 12:28:41 UTC (rev 1765) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-01-30 12:47:48 UTC (rev 1766) @@ -468,7 +468,7 @@ File tempScript = File.createTempFile("launch-isis", ".seq"); tempScript.deleteOnExit(); // auto delete - String fileContent = getSimulationScriptLaunchContent("ssh/launch-isis-pxe.seq", simuationId, simulationZip); + String fileContent = getSimulationScriptLaunchContent("ssh/launch-isis.seq", simuationId, simulationZip); FileUtil.writeString(tempScript, fileContent); return tempScript; @@ -530,7 +530,7 @@ // command to : // - add script in qsub queue - String command = "./qsub \"" + scriptRemotePath + "\""; + String command = "qsub \"" + scriptRemotePath + "\""; int exit = SSHUtils.exec(session, command); Deleted: isis-fish/trunk/src/main/resources/ssh/launch-isis-pxe.seq =================================================================== --- isis-fish/trunk/src/main/resources/ssh/launch-isis-pxe.seq 2009-01-30 12:28:41 UTC (rev 1765) +++ isis-fish/trunk/src/main/resources/ssh/launch-isis-pxe.seq 2009-01-30 12:47:48 UTC (rev 1766) @@ -1,7 +0,0 @@ -#!/bin/bash - -cd /home/chatellier/isis-fish-3.2.0.3 -#source /usr/share/modules/init/csh -#module load java/1.6.0 - -java -jar isis-fish-3.2.0.3.jar --option launch.ui false --simulateWithSimulation "${simulationid}" "${simulationzip}"

1 0

r1765 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 30 Jan '09

30 Jan '09

Author: sletellier Date: 2009-01-30 12:28:41 +0000 (Fri, 30 Jan 2009) New Revision: 1765 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/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Log: Debug final 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-30 12:08:08 UTC (rev 1764) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-30 12:28:41 UTC (rev 1765) @@ -295,7 +295,6 @@ @Override public void propertyChange(PropertyChangeEvent evt) { topiaChanged(); - System.out.println(evt.getSource()); } }); this.currentEntities.add(currentEntity); 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-30 12:08:08 UTC (rev 1764) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-01-30 12:28:41 UTC (rev 1765) @@ -39,18 +39,18 @@ public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - strategyJanuary.init(Month.JANUARY); - strategyFebuary.init(Month.FEBRUARY); - strategyMarch.init(Month.MARCH); - strategyApril.init(Month.APRIL); - strategyMay.init(Month.MAY); - strategyJune.init(Month.JUNE); - strategyJuly.init(Month.JULY); - strategyAugust.init(Month.AUGUST); - strategySeptember.init(Month.SEPTEMBER); - strategyOctober.init(Month.OCTOBER); - strategyNovember.init(Month.NOVEMBER); - strategyDecember.init(Month.DECEMBER); + strategyJanuary.init(0); + strategyFebuary.init(1); + strategyMarch.init(2); + strategyApril.init(3); + strategyMay.init(4); + strategyJune.init(5); + strategyJuly.init(6); + strategyAugust.init(7); + strategySeptember.init(8); + strategyOctober.init(9); + strategyNovember.init(10); + strategyDecember.init(11); getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, strategyApril, strategyMay, strategyJune, strategyJuly, strategyAugust, strategySeptember, strategyOctober, strategyNovember, strategyDecember); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-30 12:08:08 UTC (rev 1764) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-30 12:28:41 UTC (rev 1765) @@ -49,7 +49,7 @@ import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -Month month = null; +int month = 0; PropertyChangeListener listener = null; addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -71,7 +71,9 @@ @Override public void propertyChange(PropertyChangeEvent evt) { if (fieldStrategyMonthInfoProportion.getMatrix() != null){ - getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); + if (fieldStrategyMonthInfoProportion.getMatrix() != null){ + getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); + } } } }); @@ -79,14 +81,16 @@ Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); setBean((StrategyImpl) strategy); if (getBean() != null){ - setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month)); +// setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month)); + Object[] monthInfos = getBean().getStrategyMonthInfo().toArray(); + setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]); getVerifier().addCurrentEntity(getStrategyMonthInfo()); } if (getStrategyMonthInfo() != null){ jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType()); } } -public void init(Month m){ +public void init(int m){ month = m; } ]]></script>

1 0

r1764 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 30 Jan '09

30 Jan '09

Author: sletellier Date: 2009-01-30 12:08:08 +0000 (Fri, 30 Jan 2009) New Revision: 1764 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/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/MetierSeasonInfoZoneUI.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/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Debug final - one bug left 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-30 09:34:10 UTC (rev 1763) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-30 12:08:08 UTC (rev 1764) @@ -34,6 +34,7 @@  <fr.ifremer.isisfish.entities.SetOfVesselsImpl id='bean' javaBean='null'/> + <fr.ifremer.isisfish.entities.EffortDescriptionImpl id='effortDescription' javaBean='null'/> <script><![CDATA[ @@ -119,7 +120,7 @@ <row> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="0" onMouseClicked='setEffortDescription((EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue())' enabled='{isActif()}'/> + <JList id="fieldEffortDescriptionEffortDescriptionList" selectionMode="0" onMouseClicked='setEffortDescription((EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue());getVerifier().addCurrentEntity(getEffortDescription())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> @@ -140,7 +141,7 @@ <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{jaxx.runtime.Util.getStringValue(getEffortDescription().getFishingOperationDuration())}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' 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-30 09:34:10 UTC (rev 1763) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-30 12:08:08 UTC (rev 1764) @@ -295,6 +295,7 @@ @Override public void propertyChange(PropertyChangeEvent evt) { topiaChanged(); + System.out.println(evt.getSource()); } }); this.currentEntities.add(currentEntity); 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-30 09:34:10 UTC (rev 1763) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-01-30 12:08:08 UTC (rev 1764) @@ -153,7 +153,18 @@ } } protected void remove(){ - refresh(); + Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); + if (season != null){ + MetierSeasonInfo m = (MetierSeasonInfo) season; + Object[] targetSpecies = m.getSpeciesTargetSpecies().toArray(); + + Object o = targetSpecies[tableTargetSpecies.getSelectedRow() + 1]; + if (o != null){ + TargetSpecies ts = (TargetSpecies)o; + getAction().removeTargetSpecies(m, ts); + refresh(); + } + } } protected void metierSeasonChanged(){ setTableTargetSpeciesModel(); 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-30 09:34:10 UTC (rev 1763) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-01-30 12:08:08 UTC (rev 1764) @@ -52,6 +52,7 @@ import fr.ifremer.isisfish.entities.MetierImpl; import jaxx.runtime.swing.Item; + protected Interval interval = null; protected IntervalPanel ip = new IntervalPanel(); displayMetierSeason.add(ip, BorderLayout.CENTER); ip.addPropertyChangeListener("first", new PropertyChangeListener() { @@ -110,49 +111,64 @@ Metier metier = getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); if (getBean() != null){ + // Model instanciation + interval = new Interval(); + interval.setMin(0); + interval.setMax(11); + interval.setFirst(0); + interval.setLast(2); + setCombo(); - if (getMetierSeasonInfo() != null){ - - // Model instanciation - Interval interval = new Interval(); - interval.setMin(0); - interval.setMax(11); - interval.setFirst(0); - interval.setLast(2); + setSeason(); + setMetierZone(); + + ip.setLabelRenderer(Month.MONTH); + ip.setModel(interval); + } + } + protected void setSeason(){ + if (getMetierSeasonInfo() != null){ - try { - log.debug("************** Interval ************"); - Month firstMonth = getMetierSeasonInfo().getFirstMonth(); - if (firstMonth != null) { - interval.setFirst(firstMonth.getMonthNumber()); - log.debug(" first : " + interval.getFirst()); - } else { - interval.setFirst(0); - } + try { + log.debug("************** Interval ************"); + Month firstMonth = getMetierSeasonInfo().getFirstMonth(); + if (firstMonth != null) { + interval.setFirst(firstMonth.getMonthNumber()); + log.debug(" first : " + interval.getFirst()); + } else { + interval.setFirst(0); + } - Month lastMonth = getMetierSeasonInfo().getLastMonth(); - if (lastMonth != null) { - interval.setLast(lastMonth.getMonthNumber()); - log.debug(" last : " + interval.getLast()); - } else { - interval.setLast(3); - } - } catch (Exception e) { - log.error("Unexpected origin.", e); - // Only trace the error and go on. + Month lastMonth = getMetierSeasonInfo().getLastMonth(); + if (lastMonth != null) { + interval.setLast(lastMonth.getMonthNumber()); + log.debug(" last : " + interval.getLast()); + } else { + interval.setLast(3); } - ip.setLabelRenderer(Month.MONTH); - ip.setModel(interval); - - metierZones.fillList(getRegion().getZone(), getMetierSeasonInfo().getZone()); + } catch (Exception e) { + log.error("Unexpected origin.", e); + // Only trace the error and go on. } - } - } + } + } + protected void setMetierZone(){ + if (getMetierSeasonInfo() != null){ + ListSelectionListener[] listeners = metierZones.getListSelectionListeners(); + for (ListSelectionListener listener : listeners){ + metierZones.removeListSelectionListener(listener); + } + metierZones.fillList(getRegion().getZone(), getMetierSeasonInfo().getZone()); + for (ListSelectionListener listener : listeners){ + metierZones.addListSelectionListener(listener); + } + } + } protected void setCombo(){ java.util.List<Item> items = new ArrayList<Item>(); - java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo(); - if (metierSeasonInfo != null){ - for (MetierSeasonInfo m : metierSeasonInfo){ + java.util.List<MetierSeasonInfo> metierSeasonInfoList = getBean().getMetierSeasonInfo(); + if (metierSeasonInfoList != null){ + for (MetierSeasonInfo m : metierSeasonInfoList){ items.add(new Item(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, false)); } } @@ -175,7 +191,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldMetierSeasonChoice" - onActionPerformed='refresh();setMetierSeasonInfo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());getVerifier().addCurrentEntity(getMetierSeasonInfo());setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null);' + onActionPerformed='setMetierSeasonInfo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());getVerifier().addCurrentEntity(getMetierSeasonInfo());setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null);setSeason();setMetierZone();' enabled='{isActif()}'/> </cell> </row> 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-30 09:34:10 UTC (rev 1763) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-01-30 12:08:08 UTC (rev 1764) @@ -124,7 +124,6 @@ interval.setMax(11); interval.setFirst(0); interval.setLast(2); - ip.setModel(interval); if(getPopulationSeasonInfo() != null){ try { log.debug("************** Interval ************"); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-30 09:34:10 UTC (rev 1763) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-30 12:08:08 UTC (rev 1764) @@ -80,6 +80,7 @@ setBean((StrategyImpl) strategy); if (getBean() != null){ setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month)); + getVerifier().addCurrentEntity(getStrategyMonthInfo()); } if (getStrategyMonthInfo() != null){ jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-01-30 09:34:10 UTC (rev 1763) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-01-30 12:08:08 UTC (rev 1764) @@ -78,7 +78,14 @@ } } protected void setSetOfVesselsModel(){ - jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels()); + ActionListener[] listeners = fieldStrategySetOfVessels.getActionListeners(); + for (ActionListener listener : listeners){ + fieldStrategySetOfVessels.removeActionListener(listener); + } + jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels()); + for (ActionListener listener : listeners){ + fieldStrategySetOfVessels.addActionListener(listener); + } } ]]></script> <Table id='body'> 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-30 09:34:10 UTC (rev 1763) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-01-30 12:08:08 UTC (rev 1764) @@ -95,7 +95,9 @@ refreshMap(); } protected void setZoneCells(){ - zoneCells.fillList(getRegion().getCell(), getBean() == null ? null : getBean().getCell()); + if (getBean() != null){ + zoneCells.fillList(getRegion().getCell(), getBean().getCell()); + } } protected void setMapListener(){ if (mapListener == null){

1 0

r1763 - isis-fish/trunk/src/main/resources/i18n
by sletellier＠users.labs.libre-entreprise.org 30 Jan '09

30 Jan '09

Author: sletellier Date: 2009-01-30 09:34:10 +0000 (Fri, 30 Jan 2009) New Revision: 1763 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Traduction Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-30 09:28:04 UTC (rev 1762) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-30 09:34:10 UTC (rev 1763) @@ -444,8 +444,7 @@ isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton isisfish.infoItem.sum.year=Sum elements per year isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 -isisfish.input.continueCell=Continue to cells -isisfish.input.continueCells= +isisfish.input.continueCells=Continue to cells isisfish.input.continueGears=Continue to gears isisfish.input.continueMetiers=Continue to metiers isisfish.input.continuePopulations=Continue to populations Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-30 09:28:04 UTC (rev 1762) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-30 09:34:10 UTC (rev 1763) @@ -444,8 +444,8 @@ isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton isisfish.infoItem.sum.year=Somme de \u00E9l\u00E9ment par ann\u00E9e isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 -isisfish.input.continueCell=Continuer vers les cells -isisfish.input.continueCells= +isisfish.input.continueCells=Continuer vers les cells +isisfish.input.continueZones=Continuer vers les zones isisfish.input.continueGears=Continuer vers les gears isisfish.input.continueMetiers=Continuer vers les metiers isisfish.input.continuePopulations=Continuer vers les populations

1 0

r1762 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input resources/i18n
by sletellier＠users.labs.libre-entreprise.org 30 Jan '09

30 Jan '09

Author: sletellier Date: 2009-01-30 09:28:04 +0000 (Fri, 30 Jan 2009) New Revision: 1762 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/FisheryRegionUI.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/MetierUI.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/PortUI.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/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/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Traduction 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-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -140,7 +140,7 @@ <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{jaxx.runtime.Util.getStringValue(getEffortDescription().getFishingOperationDuration())}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -47,7 +47,7 @@ protected OMToolSet toolSet = new OMToolSet(); -setButtonTitle("isisfish.input.continueCells"); +setButtonTitle(_("isisfish.input.continueCells")); setNextPath("$root/$cells"); public void refresh(){ getVerifier().setSaveButton(save, false); 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-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -39,11 +39,11 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.Metier; -setButtonTitle("isisfish.input.continueMetiers"); +setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); gearTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { - getVerifier().addCurrentPanel(gearTabUI, selectivityUI); + getVerifier().addCurrentPanel(selectivityUI ,gearTabUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> 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-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -41,7 +41,7 @@ import fr.ifremer.isisfish.entities.MetierImpl; import fr.ifremer.isisfish.entities.Metier; -setButtonTitle("isisfish.input.continueTripTypes"); +setButtonTitle(_("isisfish.input.continueTripTypes")); setNextPath("$root/$tripTypes"); metierTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { 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-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -46,11 +46,11 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -setButtonTitle("isisfish.input.continueGears"); +setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); populationTab.addChangeListener(new InputTabbedPaneListener()); public void refresh(){ - getVerifier().addCurrentPanel(populationBasicsUI, populationGroupUI, populationEquationUI, populationZoneUI, populationSeasonsUI, populationCapturabilityUI, populationRecruitementUI, populationMigrationUI); + getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); } ]]> </script> 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-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -58,7 +58,7 @@ protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; -setButtonTitle("isisfish.input.continueSpecies"); +setButtonTitle(_("isisfish.input.continueSpecies")); setNextPath("$root/$species"); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { 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-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -39,11 +39,11 @@ <script><![CDATA[ -setButtonTitle("isisfish.input.continueStrategies"); +setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { - getVerifier().addCurrentPanel(setOfVesselsTabsUI, effortDescriptionUI); + getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -44,7 +44,7 @@ import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.entities.SpeciesImpl; -setButtonTitle("isisfish.input.continuePopulations"); +setButtonTitle(_("isisfish.input.continuePopulations")); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -39,7 +39,7 @@ strategyTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { - getVerifier().addCurrentPanel(strategyTabUI, strategyMonthInfoUI); + getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -43,7 +43,7 @@ import fr.ifremer.isisfish.entities.TripTypeImpl; import fr.ifremer.isisfish.types.TimeUnit; -setButtonTitle("isisfish.input.continueVesselTypes"); +setButtonTitle(_("isisfish.input.continueVesselTypes")); setNextPath("$root/$vesselTypes"); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { 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-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-30 09:28:04 UTC (rev 1762) @@ -42,7 +42,7 @@ import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.types.TimeUnit; -setButtonTitle("isisfish.input.continueSetOfVessels"); +setButtonTitle(_("isisfish.input.continueSetOfVessels")); setNextPath("$root/$setOfVessels"); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-30 09:28:04 UTC (rev 1762) @@ -444,8 +444,18 @@ isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton isisfish.infoItem.sum.year=Sum elements per year isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 -isisfish.input.continuePorts=Continue to Ports -isisfish.input.continueZones=Continue to Zones +isisfish.input.continueCell=Continue to cells +isisfish.input.continueCells= +isisfish.input.continueGears=Continue to gears +isisfish.input.continueMetiers=Continue to metiers +isisfish.input.continuePopulations=Continue to populations +isisfish.input.continuePorts=Continue to ports +isisfish.input.continueSetOfVessels=Continue to set of vessels +isisfish.input.continueSpecies= +isisfish.input.continueStrategies=Continue to strategies +isisfish.input.continueTripTypes=Continue to trip type +isisfish.input.continueVesselTypes=Continue to vessel types +isisfish.input.continueZones=Continue to zones isisfish.input.menu.addRegion=Add region isisfish.input.menu.commit=Commit change isisfish.input.menu.copyRegion=Copy Region Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-29 17:57:45 UTC (rev 1761) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-30 09:28:04 UTC (rev 1762) @@ -444,8 +444,17 @@ isisfish.infoItem.sum=defaultToolTip-fr.ifremer.resultat.InfoItemDate.sumButton isisfish.infoItem.sum.year=Somme de \u00E9l\u00E9ment par ann\u00E9e isisfish.infoItem.table=defaultToolTip-fr.ifremer.resultat.InfoItem.table30 +isisfish.input.continueCell=Continuer vers les cells +isisfish.input.continueCells= +isisfish.input.continueGears=Continuer vers les gears +isisfish.input.continueMetiers=Continuer vers les metiers +isisfish.input.continuePopulations=Continuer vers les populations isisfish.input.continuePorts=Continuer vers les ports -isisfish.input.continueZones=Continuer vers les zones +isisfish.input.continueSetOfVessels=Continuer vers les set of vessels +isisfish.input.continueSpecies=Continuer vers les esp\u00E8ces +isisfish.input.continueStrategies=Continuer vers les strategies +isisfish.input.continueTripTypes=Continuer vers les trip type +isisfish.input.continueVesselTypes=Continuer vers les vessel type isisfish.input.menu.addRegion=Ajouter une r\u00E9gion isisfish.input.menu.commit=Sauvegarder les changements isisfish.input.menu.copyRegion=Copier r\u00E9gion

1 0

r1761 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/entities java/fr/ifremer/isisfish/ui/input resources/i18n
by sletellier＠users.labs.libre-entreprise.org 29 Jan '09

29 Jan '09

Author: sletellier Date: 2009-01-29 17:57:45 +0000 (Thu, 29 Jan 2009) New Revision: 1761 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.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/InputOneEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/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/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.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/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Debug final -1 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-01-29 17:57:45 UTC (rev 1761) @@ -155,8 +155,16 @@ } eq.setName(getName()); + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.change.equation"), eee); } @@ -176,8 +184,16 @@ } eq.setName(getName()); + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); } @@ -197,8 +213,16 @@ } eq.setName(getName()); + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); } @@ -218,8 +242,16 @@ } eq.setName(getName()); + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); } @@ -239,8 +271,16 @@ } eq.setName(getName()); + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-01-29 17:57:45 UTC (rev 1761) @@ -648,8 +648,16 @@ if (getPopulation() != null) { eq.setName(getPopulation().getName() + "(" + toString() + ")"); } + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); } @@ -672,8 +680,16 @@ if (getPopulation() != null) { eq.setName(getPopulation().getName() + "(" + toString() + ")"); } + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); } @@ -696,8 +712,16 @@ if (getPopulation() != null) { eq.setName(getPopulation().getName() + "(" + toString() + ")"); } + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2009-01-29 17:57:45 UTC (rev 1761) @@ -91,8 +91,16 @@ } eq.setName(getName()); + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.change.equation"), eee); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2009-01-29 17:57:45 UTC (rev 1761) @@ -145,8 +145,16 @@ } eq.setName(getName()); + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + eq.setContent(content); eq.update(); + + fireOnPostWrite("content", _oldValue, content); + } catch (TopiaException eee) { throw new IsisFishRuntimeException(_("isisfish.change.equation"), eee); } 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -117,7 +117,7 @@ <JComboBox id="fieldGearParamType" model='{new DefaultComboBoxModel(fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes())}' onActionPerformed='getBean().setParameterName(fieldGearParamName.getSelectedText())' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue().getValues()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getValues()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText()))' enabled='{isActif()}'/> </cell> </row> <row> 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-01-29 17:57:45 UTC (rev 1761) @@ -538,7 +538,7 @@ */ public Object saveAsModel(String category, String language, String content) { try { - String name = showInputDialog(""); + String name = showInputDialog("isisfish.message.saveModel.dialog"); if ("".equals(name)) { // showMsgBox("Error " +_("isisfish.error.invalid.equation.name")); } @@ -756,6 +756,67 @@ return null; } + public void createPopulationSeasonInfo(Population pop) { + log.debug("createSeasonInfo called"); + try { + PopulationSeasonInfoDAO dao = IsisFishDAOHelper.getPopulationSeasonInfoDAO(pop.getTopiaContext()); + PopulationSeasonInfo seasonInfo = dao.create(); + seasonInfo.setFirstMonth(Month.MONTH[0]); + seasonInfo.setLastMonth(Month.MONTH[3]); + pop.addPopulationSeasonInfo(seasonInfo); + seasonInfo.setPopulation(pop); + seasonInfo.update(); + pop.update(); +// isisContext.commitTransaction(); + } catch (Exception eee) { + log.error("Can't create PopulationSeasonInfo", eee); + showMsgBox(eee); + } + } + + public void removePopulationSeasonInfo(Population pop, PopulationSeasonInfo populationSeasonInfo) { + log.debug("removeSeasonInfo called"); + try { + pop.removePopulationSeasonInfo(populationSeasonInfo); + pop.update(); + pop.getTopiaContext().commitTransaction(); + } catch (Exception eee) { + log.error("Can't remove PopulationSeasonInfo", eee); + showMsgBox(eee); + } + } + + public void createMetierSeasonInfo(Metier metier){ + log.debug("createSeasonInfo called"); + try { + MetierSeasonInfoDAO metierSeasonInfoPS = IsisFishDAOHelper.getMetierSeasonInfoDAO(metier.getTopiaContext()); + MetierSeasonInfo metierSeasonInfo = metierSeasonInfoPS.create(); + metierSeasonInfo.setFirstMonth(Month.MONTH[0]); + metierSeasonInfo.setLastMonth(Month.MONTH[3]); + metier.addMetierSeasonInfo(metierSeasonInfo); + metierSeasonInfo.update(); + metier.update(); +// isisContext.commitTransaction(); + + }catch(Exception eee){ + log.error("Can't create MetierSeasonInfo", eee); + showMsgBox(eee); + } + } + + public void removeMetierSeasonInfo(Metier metier, MetierSeasonInfo info){ + log.debug("createSeasonInfo called"); + try { + metier.removeMetierSeasonInfo(info); + metier.update(); + metier.getTopiaContext().commitTransaction(); + + }catch(Exception eee){ + log.error("Can't create MetierSeasonInfo", eee); + showMsgBox(eee); + } + } + public Object createRecruitmentDistribution(Population pop) { if (log.isTraceEnabled()) { log.trace("createRecruitmentDistributionontext called: " + pop); 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -58,24 +58,32 @@ protected String methodSet; protected String name; protected Equation selectedEquation; +protected DocumentListener listener = null; -editor.getCurrentEditor().addDocumentListener(new DocumentListener() { +start(); +protected void start(){ + if (listener == null){ + listener = new DocumentListener() { - @Override - public void insertUpdate(DocumentEvent e) { - } + @Override + public void insertUpdate(DocumentEvent e) { + setEquation(); + } - @Override - public void removeUpdate(DocumentEvent e) { - } + @Override + public void removeUpdate(DocumentEvent e) { + setEquation(); + } - @Override - public void changedUpdate(DocumentEvent e) { - setEquation(); + @Override + public void changedUpdate(DocumentEvent e) { + } + }; } -}); - + editor.getCurrentEditor().addDocumentListener(listener); +} public void init(String lblText, TopiaEntity bean, String name, String methodGet, String methodSet, Class c){ + editor.getCurrentEditor().removeDocumentListener(listener); setLblText(lblText); this.bean = bean; this.methodGet = methodGet; @@ -86,6 +94,7 @@ setComboModel(); setFormule((Formule)combo.getSelectedItem()); setEditorText(); + editor.getCurrentEditor().addDocumentListener(listener); } protected Equation getEquation(){ Equation result = null; @@ -110,6 +119,7 @@ } } public void refresh(){ + editor.getCurrentEditor().removeDocumentListener(listener); try { editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java")); } catch (IOException ex) { @@ -120,7 +130,8 @@ setFormule((Formule)combo.getSelectedItem()); setEditorText(); } -} + editor.getCurrentEditor().addDocumentListener(listener); + } protected void setComboModel(){ java.util.List<Formule> formules = getAction().getFormules(getVerifier().getIsisContext(), name); if (formules != null){ 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-29 17:57:45 UTC (rev 1761) @@ -327,10 +327,6 @@ setSaveButton(saveButton, true); } - public void setNewButton(JButton saveButton, String name){ - setNewButton(saveButton, name, true); - } - public void setSaveButton(JButton saveButton, Boolean listener){ if (listener){ saveButton.removeActionListener(saveListener); @@ -341,12 +337,8 @@ this.currentSaveButton = saveButton; } - public void setCancelButton(JButton cancelButton){ - cancelButton.removeActionListener(cancelListener); - cancelButton.addActionListener(cancelListener); - cancelButton.setText(_("isisfish.common.cancel")); - cancelButton.setEnabled(changed); - this.currentCancelButton = cancelButton; + public void setNewButton(JButton saveButton, String name){ + setNewButton(saveButton, name, true); } public void setNewButton(JButton newButton, String t, Boolean listener){ @@ -360,9 +352,23 @@ this.currentNewButton = newButton; } + public void setCancelButton(JButton cancelButton){ + cancelButton.removeActionListener(cancelListener); + cancelButton.addActionListener(cancelListener); + cancelButton.setText(_("isisfish.common.cancel")); + cancelButton.setEnabled(changed); + this.currentCancelButton = cancelButton; + } + public void setDeleteButton(JButton deleteButton){ - deleteButton.removeActionListener(deleteListener); - deleteButton.addActionListener(deleteListener); + setDeleteButton(deleteButton, true); + } + + public void setDeleteButton(JButton deleteButton, boolean listener){ + if (listener){ + deleteButton.removeActionListener(deleteListener); + deleteButton.addActionListener(deleteListener); + } deleteButton.setEnabled(!changed); deleteButton.setText(_("isisfish.common.remove")); this.currentDeleteButton = deleteButton; 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-01-29 17:57:45 UTC (rev 1761) @@ -33,6 +33,7 @@ pane.setSelectedIndex(selectedIndex); } ui = (InputContentUI) pane.getSelectedComponent(); + ui.refresh(); cacheSelectedIndex = pane.getSelectedIndex(); pane.addChangeListener(this); } catch (Exception ex) { 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -36,47 +36,44 @@  <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/> + <fr.ifremer.isisfish.entities.MetierSeasonInfo id='metierSeasonInfo' javaBean='null'/> + + <Boolean id='metierSeasonInfoNotNull' javaBean='false'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.Season; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.ui.widget.Interval; import fr.ifremer.isisfish.entities.MetierSeasonInfo; - import fr.ifremer.isisfish.ui.widget.editor.GenericCell; + import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; import fr.ifremer.isisfish.ui.widget.IntervalPanel; import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.MetierImpl; - import org.codelutin.topia.persistence.TopiaEntity; - import fr.ifremer.isisfish.ui.WelcomePanelUI; + import jaxx.runtime.swing.Item; - protected boolean seasonInit = true; protected IntervalPanel ip = new IntervalPanel(); displayMetierSeason.add(ip, BorderLayout.CENTER); ip.addPropertyChangeListener("first", new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - Object selected = fieldMetierSeasonChoice.getSelectedItem(); - if (selected != null){ - Object value = ((GenericCell)selected).getValue(); // Data extraction - Season season = (Season) value; - Month first = season.getFirstMonth(); - first.setMonthNumber(ip.getModel().getFirst()); - season.setFirstMonth(first); - } + Season season = (Season) fieldMetierSeasonChoice.getSelectedItem(); + if (season != null){ + Month first = season.getFirstMonth(); + first.setMonthNumber(ip.getModel().getFirst()); + season.setFirstMonth(first); + } } }); + ip.addPropertyChangeListener("last", new PropertyChangeListener() { - ip.addPropertyChangeListener("last", new PropertyChangeListener() { - @Override public void propertyChange(PropertyChangeEvent evt) { - Object selected = fieldMetierSeasonChoice.getSelectedItem(); - if (selected != null){ - Object value = ((GenericCell)selected).getValue(); - // Data extraction - Season season = (Season) value; + // Data extraction + Season season = (Season) fieldMetierSeasonChoice.getSelectedItem(); + if (season != null){ Month last = season.getLastMonth(); last.setMonthNumber(ip.getModel().getLast()); season.setLastMonth(last); @@ -84,140 +81,89 @@ } }); + create.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + getContextValue(InputAction.class).createMetierSeasonInfo(getBean()); + setCombo(); + } + }); + + remove.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + getContextValue(InputAction.class).removeMetierSeasonInfo(getBean(), getMetierSeasonInfo()); + setCombo(); + } + }); + public void refresh() { + if (!isActif()){ + setMetierSeasonInfoNotNull(false); + } getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "MetierSeasonInfo"); - getVerifier().setDeleteButton(remove); + getVerifier().setNewButton(create, "MetierSeasonInfo", false); + getVerifier().setDeleteButton(remove, false); Metier metier = getVerifier().getEntity(Metier.class); setBean((MetierImpl) metier); - if (metier != null){ - if (seasonInit){ - DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); - java.util.List<MetierSeasonInfo> metierSeasonInfo = metier.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)); - } - } - fieldMetierSeasonChoice.setModel(seasonModel); - } - Object selected = fieldMetierSeasonChoice.getSelectedItem(); - if (selected != null){ - Object value = ((GenericCell)selected).getValue(); - if (value != null){ + if (getBean() != null){ + setCombo(); + if (getMetierSeasonInfo() != null){ + + // Model instanciation + Interval interval = new Interval(); + interval.setMin(0); + interval.setMax(11); + interval.setFirst(0); + interval.setLast(2); - // Data extraction - Season season = (Season) value; - - // Model instanciation - Interval interval = new Interval(); - interval.setMin(0); - interval.setMax(11); - interval.setFirst(0); - interval.setLast(2); - - try { - log.debug("************** Interval ************"); - Month firstMonth = season.getFirstMonth(); - if (firstMonth != null) { - interval.setFirst(firstMonth.getMonthNumber()); - log.debug(" first : " + interval.getFirst()); - } else { - interval.setFirst(0); - } - - Month lastMonth = season.getLastMonth(); - if (lastMonth != null) { - interval.setLast(lastMonth.getMonthNumber()); - log.debug(" last : " + interval.getLast()); - } else { - interval.setLast(3); - } - } catch (Exception e) { - log.error("Unexpected origin.", e); - // Only trace the error and go on. + try { + log.debug("************** Interval ************"); + Month firstMonth = getMetierSeasonInfo().getFirstMonth(); + if (firstMonth != null) { + interval.setFirst(firstMonth.getMonthNumber()); + log.debug(" first : " + interval.getFirst()); + } else { + interval.setFirst(0); } - ip.setLabelRenderer(Month.MONTH); - ip.setModel(interval); - } - - DefaultListModel zonesModel = new DefaultListModel(); - java.util.List<Zone> metierZone = getRegion().getZone(); - if (metierZone != null){ - for (Zone z : metierZone ){ - zonesModel.addElement(z); - // new GenericCell(z.getName(), z, Zone.class) + Month lastMonth = getMetierSeasonInfo().getLastMonth(); + if (lastMonth != null) { + interval.setLast(lastMonth.getMonthNumber()); + log.debug(" last : " + interval.getLast()); + } else { + interval.setLast(3); } + } catch (Exception e) { + log.error("Unexpected origin.", e); + // Only trace the error and go on. } - metierZones.setModel(zonesModel); - if (value != null){ - Collection<Zone> zones = ((MetierSeasonInfo)value).getZone(); - int [] selectedIndices = new int[zones.size()]; - int cnt = 0; - for (Zone z : zones){ - selectedIndices[cnt] = zonesModel.indexOf(z); - cnt++; - } - metierZones.setSelectedIndices(selectedIndices); - fieldMetierSeasonZoneComment.setText(((MetierSeasonInfo)value).getSeasonZoneComment()); - } + ip.setLabelRenderer(Month.MONTH); + ip.setModel(interval); + + metierZones.fillList(getRegion().getZone(), getMetierSeasonInfo().getZone()); } - else{ - // Model instanciation - Interval interval = new Interval(); - interval.setMin(0); - interval.setMax(11); - interval.setFirst(0); - interval.setLast(2); - ip.setLabelRenderer(Month.MONTH); - ip.setModel(interval); - fieldMetierSeasonZoneComment.setText(""); - DefaultListModel zonesModel = new DefaultListModel(); - java.util.List<Zone> metierZone = getRegion().getZone(); - if (metierZone != null){ - for (Zone z : metierZone ){ - zonesModel.addElement(z); - // new GenericCell(z.getName(), z, Zone.class) - } - } - metierZones.setModel(zonesModel); - } } } - protected void zonesChanged(){ - Object selected = fieldMetierSeasonChoice.getSelectedItem(); - if (selected != null){ - Object value = ((GenericCell)selected).getValue(); - if (value != null){ - // Data extraction - MetierSeasonInfo season = (MetierSeasonInfo) value; - for (Object o : metierZones.getSelectedValues()){ - season.addZone((Zone)o); - } + protected void setCombo(){ + java.util.List<Item> items = new ArrayList<Item>(); + java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo(); + if (metierSeasonInfo != null){ + for (MetierSeasonInfo m : metierSeasonInfo){ + items.add(new Item(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, false)); } } - } - protected void commentChanged(){ - Object selected = fieldMetierSeasonChoice.getSelectedItem(); - if (selected != null){ - Object value = ((GenericCell)selected).getValue(); - if (value != null){ - // Data extraction - MetierSeasonInfo season = (MetierSeasonInfo) value; - season.setSeasonZoneComment(fieldMetierSeasonZoneComment.getText()); - } + fieldMetierSeasonChoice.setItems(items); + } + protected void metierZonesChanged(){ + Object[] selected = metierZones.getSelectedValues(); + for (Object o : selected){ + getMetierSeasonInfo().addZone((Zone)o); } } - public void setSeasonInit(boolean b){ - seasonInit = b; - } - protected void metierSeasonChanged(){ - seasonInit = false; - refresh(); - } ]]></script> <Table id='body'> <row> @@ -228,34 +174,36 @@ <JLabel text="isisfish.metierSeasonInfoZone.selectSeason" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldMetierSeasonChoice" onActionPerformed='metierSeasonChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldMetierSeasonChoice" + onActionPerformed='refresh();setMetierSeasonInfo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());getVerifier().addCurrentEntity(getMetierSeasonInfo());setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null);' + enabled='{isActif()}'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.metierSeasonInfoZone.season" enabled='{isActif()}'/> + <JLabel text="isisfish.metierSeasonInfoZone.season" enabled='{isMetierSeasonInfoNotNull()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JPanel id='displayMetierSeason' layout='{new BorderLayout()}' enabled='{isActif()}'/> + <JPanel id='displayMetierSeason' layout='{new BorderLayout()}' enabled='{isMetierSeasonInfoNotNull()}'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.common.zone" enabled='{isActif()}'/> + <JLabel text="isisfish.common.zone" enabled='{isMetierSeasonInfoNotNull()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="metierZones" onValueChanged='zonesChanged()' enabled='{isActif()}'/> + <JList id="metierZones" onValueChanged='metierZonesChanged()' enabled='{isMetierSeasonInfoNotNull()}'/> </JScrollPane> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.metierSeasonInfoZone.comments" enabled='{isActif()}'/> + <JLabel text="isisfish.metierSeasonInfoZone.comments" enabled='{isMetierSeasonInfoNotNull()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierSeasonZoneComment" onKeyReleased='commentChanged()' enabled='{isActif()}'/> + <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.Util.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}'/> </JScrollPane> </cell> </row> 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -37,53 +37,27 @@ <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/> <script><![CDATA[ - import fr.ifremer.isisfish.entities.Gear; - import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.MetierImpl; - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import org.codelutin.topia.persistence.TopiaEntity; - import org.codelutin.topia.TopiaException; - import java.util.logging.Level; import java.util.logging.Logger; + import java.util.logging.Level; public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Metier"); getVerifier().setDeleteButton(remove); + Metier metier = getVerifier().getEntity(Metier.class); + setBean((MetierImpl) metier); try { - Metier metier = getVerifier().getEntity(Metier.class); - setBean((MetierImpl) metier); - DefaultComboBoxModel model = new DefaultComboBoxModel(getRegion().getGear().toArray()); - fieldMetierGear.setModel(model); - if (metier != null){ - fieldMetierName.setText(metier.getName()); - fieldMetierParam.setText(metier.getGearParameterValue()); - fieldMetierComment.setText(metier.getComment()); + if (getBean() != null){ + jaxx.runtime.swing.Utils.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear()); } - else{ - fieldMetierName.setText(""); - fieldMetierParam.setText(""); - fieldMetierComment.setText(""); - } } catch (Exception ex) { - Logger.getLogger(MetierTabUI.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(MetierTabUI.class.getName()).log(Level.SEVERE, null, ex); } } - protected void nameChanged(){ - getBean().setName(fieldMetierName.getText()); - } - protected void gearChanged(){ - getBean().setGear((Gear)fieldMetierGear.getSelectedItem()); - } - protected void paramChanged(){ - getBean().setGearParameterValue(fieldMetierParam.getText()); - } - protected void commentChanged(){ - getBean().setComment(fieldMetierComment.getText()); - } ]]></script> <Table id='bady'> <row> @@ -94,7 +68,7 @@ <JLabel text="isisfish.metier.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierName" onKeyReleased='nameChanged()' enabled='{isActif()}'/> + <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -102,7 +76,7 @@ <JLabel text="isisfish.common.gear" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldMetierGear" onActionPerformed='getBean().setGear((Gear)fieldMetierGear.getSelectedItem())' enabled='{isActif()}'/> </cell> </row> <row> @@ -110,7 +84,7 @@ <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierParam" onKeyReleased='paramChanged()' enabled='{isActif()}'/> + <JTextField id="fieldMetierParam" text='{jaxx.runtime.Util.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -119,7 +93,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierComment" onKeyReleased='commentChanged()' enabled='{isActif()}'/> + <JTextArea id="fieldMetierComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}'/> </JScrollPane> </cell> </row> 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -45,8 +45,7 @@ setNextPath("$root/$tripTypes"); metierTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { - getVerifier().addCurrentPanel(metierTabUI, metierSeasonInfoUI, metierSeasonSpeciesUI); - metierSeasonInfoUI.setSeasonInit(true); + getVerifier().addCurrentPanel(metierSeasonSpeciesUI, metierSeasonInfoUI, metierTabUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -80,7 +80,9 @@ 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()); + if (getBean().getPopulationGroup() != null){ + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup()); + } setTableAgeLengthModel(); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -82,7 +82,7 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -38,16 +38,19 @@ <fr.ifremer.isisfish.entities.PopulationGroupImpl id='populationGroup' javaBean='null'/> + <Boolean id='popGroupNotNull' javaBean='false'/> + <script><![CDATA[ - import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationGroupImpl; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; import org.codelutin.math.matrix.gui.MatrixPanelListener; import org.codelutin.math.matrix.gui.MatrixPanelEvent; +import org.codelutin.math.matrix.AbstractMatrixND; +import org.codelutin.math.matrix.MatrixND; -addPropertyChangeListener("bean", new PropertyChangeListener() { +addPropertyChangeListener("populationGroup", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { // remove previous binding on getBean() @@ -59,7 +62,7 @@ fieldPopulationGroupMinLength.setText(""); fieldPopulationGroupMaxLength.setText(""); fieldPopulationGroupComment.setText(""); -// fieldPopulationGroupNaturalDeathRate.setMatrix(null); + fieldPopulationGroupNaturalDeathRate.setMatrix(null); } if (evt.getNewValue() != null) { // add binding on getBean() @@ -69,13 +72,13 @@ }); public void refresh(){ + if (!isActif()){ + setPopGroupNotNull(false); + } getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - if (getPopulationGroup() != null){ - getVerifier().addCurrentEntity(getPopulationGroup()); - } if (getBean() != null){ jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null); } @@ -88,66 +91,67 @@ <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPopulationGroup.getSelectedItem())' enabled='{isActif()}'/> + <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPopulationGroup.getSelectedItem());getVerifier().addCurrentEntity(getPopulationGroup());setPopGroupNotNull(getPopulationGroup() != null);' enabled='{isActif()}'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.populationGroup.meanWeigth" enabled='{isActif()}'/> + <JLabel text="isisfish.populationGroup.meanWeigth" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.populationGroup.price" enabled='{isActif()}'/> + <JLabel text="isisfish.populationGroup.price" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' editable='{false}' enabled='{isPopGroupNotNull()}'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isActif()}'/> + <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.populationGroup.reproductionRate" enabled='{isActif()}'/> + <JLabel text="isisfish.populationGroup.reproductionRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isPopGroupNotNull()}'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.populationGroup.age" enabled='{isActif()}'/> + <JLabel text="isisfish.populationGroup.age" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' enabled='{isPopGroupNotNull()}'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.populationGroup.length" enabled='{isActif()}'/> + <JLabel text="isisfish.populationGroup.length" enabled='{isPopGroupNotNull()}'/> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isPopGroupNotNull()}'/> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isPopGroupNotNull()}'/> </cell> </row> <row> <cell fill='horizontal' anchor='east'> - <JLabel text="isisfish.populationGroup.comments" enabled='{isActif()}'/> + <JLabel text="isisfish.populationGroup.comments" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.Util.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.Util.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -80,7 +80,9 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { - popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix()); + if (popInfo != null){ + popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix()); + } } }); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -79,7 +79,9 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { - popInfo.setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); + if (popInfo != null){ + popInfo.setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); + } } }); if (popInfo != null){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -81,7 +81,9 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { - popInfo.setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); + if (popInfo != null){ + popInfo.setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); + } } }); if (popInfo != null){ 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -38,6 +38,8 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='populationSeasonInfo' javaBean='null'/> + <Boolean id='popSeasonInfoNotNull' javaBean='false'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; @@ -53,9 +55,11 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - Month first = getPopulationSeasonInfo().getFirstMonth(); - first.setMonthNumber(ip.getModel().getFirst()); - getPopulationSeasonInfo().setFirstMonth(first); + if (getPopulationSeasonInfo() != null){ + Month first = getPopulationSeasonInfo().getFirstMonth(); + first.setMonthNumber(ip.getModel().getFirst()); + getPopulationSeasonInfo().setFirstMonth(first); + } } }); @@ -63,9 +67,11 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - Month last = getPopulationSeasonInfo().getLastMonth(); - last.setMonthNumber(ip.getModel().getLast()); - getPopulationSeasonInfo().setLastMonth(last); + if (getPopulationSeasonInfo() != null){ + Month last = getPopulationSeasonInfo().getLastMonth(); + last.setMonthNumber(ip.getModel().getLast()); + getPopulationSeasonInfo().setLastMonth(last); + } } }); @@ -83,16 +89,34 @@ } }); +create.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + getContextValue(InputAction.class).createPopulationSeasonInfo(getBean()); + setCombo(); + } +}); + +remove.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + getContextValue(InputAction.class).removePopulationSeasonInfo(getBean(), getPopulationSeasonInfo()); + setCombo(); + } +}); + public void refresh(){ + if (!isActif()){ + setPopSeasonInfoNotNull(false); + } getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "PopulationSeasonInfo"); - getVerifier().setDeleteButton(remove); + getVerifier().setNewButton(create, "PopulationSeasonInfo", false); + getVerifier().setDeleteButton(remove, false); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - if (getBean() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null); - } // Model instanciation Interval interval = new Interval(); @@ -128,6 +152,16 @@ ip.setLabelRenderer(Month.MONTH); ip.setModel(interval); } +protected void setCombo(){ + if (getBean() != null){ + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null); + } +} +protected void seasonGroupChanged(){ + if (getPopulationSeasonInfo() == null){ + getPopulationSeasonInfo().setGroupChange(fieldPopulationSeasonGroupChange.isSelected()); + } +} ]]> </script> <Table id='body'> @@ -139,15 +173,17 @@ <JLabel text="isisfish.populationSeasons.selectSeason" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldPopulationSeasonInfoChooser" onActionPerformed='setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem())' enabled='{isActif()}'/> + <JComboBox id="fieldPopulationSeasonInfoChooser" + onActionPerformed='setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem());getVerifier().addCurrentEntity(getPopulationSeasonInfo());setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null);' + enabled='{isActif()}'/> </cell> </row> <row> <cell anchor='east'> - <JLabel text="isisfish.common.season" enabled='{isActif()}'/> + <JLabel text="isisfish.common.season" enabled='{isPopSeasonInfoNotNull()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JPanel id='fieldPopulationSeasonInterval' layout='{new BorderLayout()}' enabled='{isActif()}'/> + <JPanel id='fieldPopulationSeasonInterval' layout='{new BorderLayout()}' enabled='{isPopSeasonInfoNotNull()}'/> </cell> </row> <row> @@ -156,24 +192,24 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JCheckBox id="fieldPopulationSeasonGroupChange" text="isisfish.populationSeasons.changeGroup" selected='{getPopulationSeasonInfo().getGroupChange()}' - onActionPerformed='getPopulationSeasonInfo().setGroupChange(fieldPopulationSeasonGroupChange.isSelected())' enabled='{isActif()}'/> + onActionPerformed='seasonGroupChanged()' enabled='{isPopSeasonInfoNotNull()}'/> </cell> </row> <row> <cell anchor='east'> - <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isActif()}'/> + <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}'/> </cell> <cell fill='both' weightx='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}'/> </cell> </row> <row> <cell anchor='east'> - <JLabel text="isisfish.populationSeasons.comments" enabled='{isActif()}'/> + <JLabel text="isisfish.populationSeasons.comments" enabled='{isPopSeasonInfoNotNull()}'/> </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.Util.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.Util.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -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"), bean, "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class); + technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), getBean(), "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class); getVerifier().addCurrentPanel(technicalEfficiency); } } 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -73,7 +73,7 @@ VesselType vesselType = getVerifier().getEntity(VesselType.class); setBean((VesselTypeImpl) vesselType); if (getBean() != null){ - vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType()); + vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType() == null ? null : getBean().getTripType()); } } protected void tripTypeChanged(){ 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-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-01-29 17:57:45 UTC (rev 1761) @@ -83,7 +83,7 @@ if (log.isDebugEnabled()) { log.debug("zone nb cells : "+ ( zone==null ? 0 : zone.getCell().size() ) ); } - zoneCells.fillList(getRegion().getCell(), getBean() == null ? java.util.Collections.EMPTY_LIST : getBean().getCell()); + setZoneCells(); zoneMap.setFisheryRegion(getRegion()); if (mapListener == null){ zoneMap.setActiveMouseMode(new SelectMouseMode(false)); @@ -94,17 +94,17 @@ } refreshMap(); } +protected void setZoneCells(){ + zoneCells.fillList(getRegion().getCell(), getBean() == null ? null : getBean().getCell()); +} protected void setMapListener(){ if (mapListener == null){ mapListener = new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean onMouseClicked() { - if (!isActif()) { - //TODO don't known what does mean that return... - return false; - } java.util.List<Cell> selectedCell = zoneMap.getSelectedCells(); getBean().setCell(selectedCell); + setZoneCells(); return true; } }; Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-29 17:57:45 UTC (rev 1761) @@ -558,6 +558,7 @@ isisfish.message.removing.region=Removing region %1$s ... isisfish.message.result.verif.region=R\u00E9sultat de la v\u00E9rification de la r\u00E9gion isisfish.message.save.finished=Save finished +isisfish.message.saveModel.dialog=Model name to save isisfish.message.saveModel.finished=Save model finished isisfish.message.setting.cache.aspects=Setting Cache aspects isisfish.message.setting.trace.aspects=Setting Trace aspects Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-28 10:35:22 UTC (rev 1760) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-29 17:57:45 UTC (rev 1761) @@ -558,6 +558,7 @@ isisfish.message.removing.region=Suppression de lar\u00E9gion %1$s ... isisfish.message.result.verif.region=R\u00E9sultat de la v\u00E9rification de la r\u00E9gion isisfish.message.save.finished=Sauvegarde termin\u00E9e +isisfish.message.saveModel.dialog=Nom du model \u00E0 sauvegarder isisfish.message.saveModel.finished=Sauvegarde du mod\u00E8le termin\u00E9e isisfish.message.setting.cache.aspects=Mise en place des aspects Cache isisfish.message.setting.trace.aspects=Mise en place des aspects Trace

1 0

r1760 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/simulator src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 28 Jan '09

28 Jan '09

Author: chatellier Date: 2009-01-28 10:35:22 +0000 (Wed, 28 Jan 2009) New Revision: 1760 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Update XML-RPC to 3.1 Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-01-27 15:21:13 UTC (rev 1759) +++ isis-fish/trunk/changelog.txt 2009-01-28 10:35:22 UTC (rev 1760) @@ -1,5 +1,6 @@ isis-fish (3.2.0.x) xxx + * Update XML-RPC launcher to xmlprc 3 * Add ssh simulation launcher * Add Jaxx UI for all interfaces * Remove SwixAT UI Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-01-27 15:21:13 UTC (rev 1759) +++ isis-fish/trunk/pom.xml 2009-01-28 10:35:22 UTC (rev 1760) @@ -145,20 +145,28 @@ <scope>compile</scope> </dependency> +  <dependency> - <groupId>xmlrpc</groupId> - <artifactId>xmlrpc</artifactId> - <version>2.0</version> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>3.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-server</artifactId> + <version>3.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> <scope>runtime</scope> </dependency> - +  <dependency> <groupId>org.beanshell</groupId> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-01-27 15:21:13 UTC (rev 1759) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-01-28 10:35:22 UTC (rev 1760) @@ -1,48 +1,46 @@ -/* - * *##% Copyright (C) 2002-2005 Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% - */ +/* *##% + * Copyright (C) 2007, 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ -/******************************************************************************* - * SimulatorServer.java - * - * Created: Thu Aug 22 2002 - * - * @author <poussin at codelutin.com> Copyright Code Lutin - * - * @version $Revision$ - * - * Mise a jour: $Date$ par : $Author$ - */ - package fr.ifremer.isisfish.simulator; import static org.codelutin.i18n.I18n._; import java.io.File; +import java.io.IOException; import java.util.Hashtable; +import java.util.Map; import java.util.Vector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.xmlrpc.AuthenticatedXmlRpcHandler; -import org.apache.xmlrpc.WebServer; -import org.apache.xmlrpc.XmlRpc; +import org.apache.xmlrpc.XmlRpcException; +import org.apache.xmlrpc.XmlRpcHandler; +import org.apache.xmlrpc.XmlRpcRequest; +import org.apache.xmlrpc.XmlRpcRequestConfig; +import org.apache.xmlrpc.common.XmlRpcHttpRequestConfig; +import org.apache.xmlrpc.server.XmlRpcHandlerMapping; +import org.apache.xmlrpc.server.XmlRpcNoSuchHandlerException; +import org.apache.xmlrpc.server.XmlRpcServer; +import org.apache.xmlrpc.webserver.WebServer; import org.codelutin.util.FileUtil; +import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; @@ -52,54 +50,99 @@ * de simulation. Il est ensuite possible de lui demander ou en est rendu * une simulation. * - * @author poussin + * Created: Thu Aug 22 2002 + * + * @author <poussin at codelutin.com> Copyright Code Lutin + * + * @version $Revision$ + * + * Mise a jour: $Date$ par : $Author$ */ -public class SimulatorServer implements AuthenticatedXmlRpcHandler { // SimulatorServer +public class SimulatorServer implements XmlRpcHandler, XmlRpcHandlerMapping { // SimulatorServer /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SimulatorServer.class); + private static Log log = LogFactory.getLog(SimulatorServer.class); - // TODO dans SimulationControlServer ajouter une date de lancement de - // simulation. Si cette date est par exemple > 7 j on supprime - // automatiquement de simulationControls. Et on fait - // ce petit traitement a chaque connexion au serveur. - Hashtable simulationControls = new Hashtable(); + /** + * TODO dans SimulationControl ajouter une date de lancement de + * simulation. Si cette date est par exemple > 7 j on supprime + * automatiquement de simulationControls. Et on fait + * ce petit traitement a chaque connexion au serveur. + */ + protected Hashtable<String, SimulationControl> simulationControls = new Hashtable<String, SimulationControl>(); - public SimulatorServer() { + /* + * @see org.apache.xmlrpc.server.XmlRpcHandlerMapping#getHandler(java.lang.String) + */ + @Override + public XmlRpcHandler getHandler(String handler) + throws XmlRpcNoSuchHandlerException, XmlRpcException { + if (log.isDebugEnabled()) { + log.debug("Request handler : " + handler); + } + + return this; } - /** - * Method execute - * - * @param method les 2 noms de methodes possibles sont <b>simulate</b> pour - * commencer une nouvelle simulation, et <b>checkPoint</b> pour - * demander ou en est la simulation que l'utilisateur a demande. - * @param params si la methode est <b>simulate</b>, il faut donnee l'id, - * les parameters, le code ecmascript, les regles de gestions, les - * objets de la base a utilse. Si la methode est <b>checkPoint</b> - * il faut redonner le meme id que pour le lancement de la - * simulation. - * @param user le login a utiliser pour pouvoir faire une simulation - * @param password le mot de passe - * @return si la methode est <b>simulate</b> retourne un objet - * {@link SimulationStorage} Simulation sous forme XML. Si la - * methode est <b>checkPoint</b> retourne le nombre de mois simule. + /* + * @see org.apache.xmlrpc.XmlRpcHandler#execute(org.apache.xmlrpc.XmlRpcRequest) */ - public Object execute(String method, Vector params, String user, - String password) throws Exception { - log.info("L'utilisateur " + user + " demande " + method); + @Override + public Object execute(XmlRpcRequest request) throws XmlRpcException { - // TODO: verifier que l'utilisateur a le droit de faire des simulations + /* + * Parametres: + * method les 2 noms de methodes possibles sont <b>simulate</b> pour + * commencer une nouvelle simulation, et <b>checkPoint</b> pour + * demander ou en est la simulation que l'utilisateur a demande. + * param params si la methode est <b>simulate</b>, il faut donnee l'id, + * et le zip de la simulation. Si la methode est <b>checkPoint</b> + * il faut redonner le meme id que pour le lancement de la + * simulation. + * user le login a utiliser pour pouvoir faire une simulation + * password le mot de passe + * si la methode est <b>simulate</b> retourne un objet + * {@link Simulation} Simulation sous forme XML. Si la + * methode est <b>checkPoint</b> retourne le nombre de mois simule. + */ - if ("simulate".equals(method)) { - return new SimulatorServer().simulate(params); - } else if ("checkPoint".equals(method)) { - return checkPoint(params); - } else { - throw new NoSuchMethodException("Erreur: la methode " + method - + " n'existe pas"); + String user = null; + String password = null; + + // get basic connection info + XmlRpcRequestConfig config = request.getConfig(); + if (config instanceof XmlRpcHttpRequestConfig) { + XmlRpcHttpRequestConfig httpConfig = (XmlRpcHttpRequestConfig) config; + user = httpConfig.getBasicUserName(); + password = httpConfig.getBasicPassword(); } + + // TODO check authenticated users + + // get params + Vector params = new Vector(); + for (int index = 0; index < request.getParameterCount(); ++index) { + params.add(request.getParameter(index)); + } + + // launch requested method + String method = request.getMethodName(); + Object result = null; + try { + if ("simulate".equals(method)) { + result = new SimulatorServer().simulate(params); + } else if ("checkPoint".equals(method)) { + result = checkPoint(params); + } else { + throw new NoSuchMethodException("Erreur: la methode " + method + + " n'existe pas"); + } + } catch (Exception e) { + throw new XmlRpcException("Error during xmlrpc call", e); + } + + return result; } /** @@ -117,30 +160,33 @@ */ protected Object simulate(Vector params) throws Exception { // on creer une nouvelle simulation - if (params.size() < 6) + if (params.size() < 2) { throw new IllegalArgumentException("Mauvais nombre d'argument"); + } String id = (String) params.get(0); File zip = FileUtil.byteToFile((byte[]) params.get(1)); - + SimulationControl control = new SimulationControl(id); SimulationStorage simulation = null; - + simulationControls.put(id, control); try { SimulatorLauncher launcher = new InProcessSimulatorLauncher(); simulation = launcher.simulate(null, control, zip); zip = simulation.createZip(); - byte [] result = FileUtil.fileToByte(zip); - + byte[] result = FileUtil.fileToByte(zip); + return result; } catch (Exception eee) { log.warn(_("isisfish.error.during.simulation"), eee); throw eee; } finally { simulationControls.remove(id); - simulation.delete(false); + if (simulation != null) { + simulation.delete(false); + } } } @@ -148,44 +194,47 @@ * synchronized two SimulationControl (local and remote) * * @param params - * @return ? + * @return * @throws Exception */ synchronized protected Object checkPoint(Vector params) throws Exception { // on retourne a l'utilisateur on en est la simulation - if (params.size() < 1) + if (params.size() < 1) { throw new IllegalArgumentException("Mauvais nombre d'argument"); + } - Hashtable<String, Object> args = (Hashtable<String, Object>)params.get(0); - + Hashtable<String, Object> args = new Hashtable<String, Object>(); + args.putAll((Map<String, Object>) params.get(0)); + String id = (String) args.get("id"); SimulationControl callback = (SimulationControl) simulationControls .get(id); - if (callback == null) + if (callback == null) { throw new SimulatorServerBadIdException("Erreur: " + id + " n'est pas un identifiant de simulation"); + } callback.updateFromHashtable(args); - + return callback.getUpdateHashtable(); } -// synchronized protected Object stop(Vector params) throws Exception { -// if (params.size() < 1) -// throw new IllegalArgumentException("Mauvais nombre d'argument"); -// -// String id = (String) params.get(0); -// SimulationControl callback = (SimulationControl) simulationControls -// .get(id); -// if (callback == null) -// throw new SimulationException("Erreur: " + id -// + " n'est pas un identifiant de simulation"); -// -// callback.stopSimulation(); -// -// return ""; -// } + // synchronized protected Object stop(Vector params) throws Exception { + // if (params.size() < 1) + // throw new IllegalArgumentException("Mauvais nombre d'argument"); + // + // String id = (String) params.get(0); + // SimulationControl callback = (SimulationControl) simulationControls + // .get(id); + // if (callback == null) + // throw new SimulationException("Erreur: " + id + // + " n'est pas un identifiant de simulation"); + // + // callback.stopSimulation(); + // + // return ""; + // } /** * Method main permet de lancer un serveur de simulation sur une machine. @@ -193,8 +242,17 @@ * @param args */ public static void main(String[] args) { - System.err.println("Usage: SimulatorServer [port]"); + try { + IsisFish.init(); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't ini IsisFish", e); + } + } + + System.out.println("Usage: SimulatorServer [port]"); + int p = 9090; if (args.length > 0) { @@ -205,18 +263,23 @@ } } - XmlRpc.setKeepAlive(true); + // FIXME KeepAlive in xmlrpc 3.x ? + //XmlRpc.setKeepAlive(true); try { WebServer webserver = new WebServer(p); + XmlRpcServer xmlRpcServer = webserver.getXmlRpcServer(); - webserver.addHandler("$default", new SimulatorServer()); + //xmlRpcServer.addHandler("$default", new SimulatorServer()); // 2.x + xmlRpcServer.setHandlerMapping(new SimulatorServer()); // 3.x - System.err.println("started web server on port " + p); - webserver.start(); - } catch (Exception x) { - System.err.println("Error creating web server: " + x); + System.out.println("Started web server on port " + p); + + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Error creating web server", e); + } } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-01-27 15:21:13 UTC (rev 1759) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-01-28 10:35:22 UTC (rev 1760) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,19 +21,23 @@ import static org.codelutin.i18n.I18n._; -import fr.ifremer.isisfish.IsisConfig; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.simulator.SimulationControl; import java.io.File; +import java.net.URL; import java.rmi.RemoteException; import java.util.Hashtable; import java.util.Vector; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.client.XmlRpcClient; +import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; +import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory; import org.codelutin.util.FileUtil; +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.simulator.SimulationControl; + /** * * @author poussin @@ -45,18 +49,24 @@ public class IsisFishServerSimulationLauncher implements SimulatorLauncher { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(IsisFishServerSimulationLauncher.class); + private static Log log = LogFactory + .getLog(IsisFishServerSimulationLauncher.class); - public SimulationStorage simulate(SimulationService simulationService, SimulationControl control, File simulationZip) throws RemoteException { + public SimulationStorage simulate(SimulationService simulationService, + SimulationControl control, File simulationZip) + throws RemoteException { String simulationId = control.getId(); SimulationStorage simulation = null; try { - simulation = SimulationStorage.importAndRenameZip( - simulationZip, simulationId); + simulation = SimulationStorage.importAndRenameZip(simulationZip, + simulationId); simulation = remoteSimulate(control, simulation); } catch (Exception eee) { log.error(_("Can't do simulation %s", simulationId), eee); - simulation.getInformation().setException(eee); + // FIXME simulation allways null here + if(simulation != null) { + simulation.getInformation().setException(eee); + } } // on retourne directement le simulation storage passe en argument @@ -70,21 +80,21 @@ return 1; } - /** - * execute la simulation en remote - * - * @param control le controleur de simulation, peut-etre null si on ne - * souhaite pas controler la simulation - * @param simulation la simulation a faire - * - * @return le storage après simulation - * @throws Exception pour toute erreur - */ + /** + * execute la simulation en remote + * + * @param control le controleur de simulation, peut-etre null si on ne + * souhaite pas controler la simulation + * @param simulation la simulation a faire + * + * @return le storage après simulation + * @throws Exception pour toute erreur + */ public SimulationStorage remoteSimulate(SimulationControl control, SimulationStorage simulation) throws Exception { // export en zip du storage File zip = simulation.createZip(); - + if (control != null) { // creation du thread de surveillance de la simulation distante // qui sert a mettre a jour les valeurs de control @@ -97,13 +107,22 @@ Vector<Object> a = new Vector<Object>(); //fixme : on peut avori control à null ? a.add(control.getId()); - a.add(FileUtil.fileToByte(zip)); + a.add(FileUtil.fileToByte(zip)); // lancement de la simulation - XmlRpcClient c = new XmlRpcClient(IsisFish.config.getSimulatorServer()); - c.setBasicAuthentication(IsisFish.config.getSimulatorUsername(), - IsisFish.config.getSimulatorPassword()); - byte[] callResult = (byte[])c.execute("simulate", a); + //XmlRpcClient c = new XmlRpcClient(IsisFish.config.getSimulatorServer()); + //c.setBasicAuthentication(IsisFish.config.getSimulatorUsername(), + // IsisFish.config.getSimulatorPassword()); + + XmlRpcClientConfigImpl xmlrpcconfig = new XmlRpcClientConfigImpl(); + xmlrpcconfig.setServerURL(new URL(IsisFish.config.getSimulatorServer())); + xmlrpcconfig.setBasicUserName(IsisFish.config.getSimulatorUsername()); + xmlrpcconfig.setBasicPassword(IsisFish.config.getSimulatorPassword()); + XmlRpcClient client = new XmlRpcClient(); + client.setTransportFactory(new XmlRpcCommonsTransportFactory(client)); + client.setConfig(xmlrpcconfig); + + byte[] callResult = (byte[]) client.execute("simulate", a); // ecriture du resultat dans un fichier File tmpzip = FileUtil.byteToFile(callResult); @@ -164,16 +183,27 @@ public void updateControl(SimulationControl control) throws Exception { // essai l'ancienne etait en dur: "http://localhost:9090" - IsisConfig config = IsisFish.config; - XmlRpcClient c = new XmlRpcClient(config.getSimulatorServer()); - c.setBasicAuthentication(config.getSimulatorUsername(), config.getSimulatorPassword()); + + XmlRpcClientConfigImpl xmlrpcconfig = new XmlRpcClientConfigImpl(); + xmlrpcconfig.setServerURL(new URL(IsisFish.config.getSimulatorServer())); + xmlrpcconfig.setBasicUserName(IsisFish.config.getSimulatorUsername()); + xmlrpcconfig.setBasicPassword(IsisFish.config.getSimulatorPassword()); + XmlRpcClient client = new XmlRpcClient(); + client.setTransportFactory(new XmlRpcCommonsTransportFactory(client)); + client.setConfig(xmlrpcconfig); Vector a = new Vector(); a.add(control.getUpdateHashtable()); - Hashtable<String, Object> result = (Hashtable<String, Object>) c.execute("checkPoint", a); + Hashtable<String, Object> result = (Hashtable<String, Object>) client + .execute("checkPoint", a); // on remet de le temps normal, vu que la connexion a reussi control.updateFromHashtable(result); } } // SimulationCheckpointRemoteThread + + @Override + public String toString() { + return _("Remote IsisFish server"); + } } Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-27 15:21:13 UTC (rev 1759) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-01-28 10:35:22 UTC (rev 1760) @@ -44,7 +44,9 @@ Process\ template\ error= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ already\ inited= +Remote\ IsisFish\ server= Remote\ control\ file\ doen't\ exists\ %s= +Remote\ control\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= Show\ help= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s= Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-27 15:21:13 UTC (rev 1759) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-01-28 10:35:22 UTC (rev 1760) @@ -44,7 +44,9 @@ Process\ template\ error= Region\ %s\ allready\ exist\ in\ repository.\ Can't\ import= Region\ %s\ already\ inited=La r\u00E9gion %s a d\u00E9j\u00E0 \u00E9t\u00E9 initialis\u00E9e +Remote\ IsisFish\ server= Remote\ control\ file\ doen't\ exists\ %s= +Remote\ control\ file\ doesn't\ exists\ %s= Rename\ data\ directory\ to\ %s= Show\ help= SimulationExecutor\ started\ with\ %s\ thread\ for\ %s=

1 0