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

r1775 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org Feb. 3, 2009

Feb. 3, 2009

Author: chatellier Date: 2009-02-03 10:39:29 +0000 (Tue, 03 Feb 2009) New Revision: 1775 Modified: isis-fish/trunk/src/main/resources/log4j.properties Log: Remove this categories Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2009-02-02 18:01:33 UTC (rev 1774) +++ isis-fish/trunk/src/main/resources/log4j.properties 2009-02-03 10:39:29 UTC (rev 1775) @@ -13,6 +13,4 @@ log4j.logger.formules=INFO log4j.logger.rules=INFO log4j.logger.scripts=INFO -log4j.logger.simulators=INFO -log4j.logger.fr.ifremer.isisfish.ui.input.InputNavigationTreeSelectionAdapter=DEBUG -log4j.logger.fr.ifremer.isisfish.ui.input.ZoneUI=DEBUG \ No newline at end of file +log4j.logger.simulators=INFO \ No newline at end of file

1 0

r1774 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org Feb. 2, 2009

Feb. 2, 2009

Author: sletellier Date: 2009-02-02 18:01:33 +0000 (Mon, 02 Feb 2009) New Revision: 1774 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Ajout d'un JScrollPane Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-02 16:18:21 UTC (rev 1773) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-02 18:01:33 UTC (rev 1774) @@ -60,9 +60,6 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; SimulationServiceListener simulationListener; - setContextValue(new MatrixPanelEditor()); - simulParamsNumbers.add(getContextValue(MatrixPanelEditor.class), BorderLayout.CENTER); - simulationListener = new SimulationServiceListener() { @Override public void simulationStart(SimulationService simService, SimulationJob job) { @@ -211,7 +208,7 @@ protected void populationSelected(){ if (listSimulParamsPopulations.getSelectedIndex() != -1){ getContextValue(SimulAction.class).setPopulations(listSimulParamsPopulations.getSelectedValues()); - getContextValue(MatrixPanelEditor.class).setMatrix(getContextValue(SimulAction.class).getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.getSelectedValue())); + simulParamsNumbers.setMatrix(getContextValue(SimulAction.class).getSimulationParameter().getNumberOf((Population) listSimulParamsPopulations.getSelectedValue())); } } protected void strategySelected(){ @@ -238,8 +235,7 @@ Map<String, Class> values; if (listSimulParamsMesuresList.getSelectedIndex() != -1){ values = getContextValue(SimulAction.class).getRuleParameterName(listSimulParamsMesuresList.getSelectedValue().toString()); - int row = 0; - model = new DefaultTableModel(values.size(), 2){ + model = new DefaultTableModel(){ @Override public boolean isCellEditable(int row, int column) { boolean result = false; @@ -249,14 +245,17 @@ return result; } }; + java.util.List<Object> properties = new ArrayList<Object>(); + java.util.List<GenericCell> cells = new ArrayList<GenericCell>(); for (Iterator<String> it = values.keySet().iterator(); it.hasNext();) { String name = it.next(); - Object properties = getContextValue(SimulAction.class).getRuleParameterValue(name, listSimulParamsMesuresList.getSelectedValue().toString()); + Object propertie = getContextValue(SimulAction.class).getRuleParameterValue(name, listSimulParamsMesuresList.getSelectedValue().toString()); GenericCell value = new GenericCell(name, values.get(name), null); - model.setValueAt(value, row, 0); - model.setValueAt(properties, row, 1); - row++; + properties.add(propertie); + cells.add(value); } + model.addColumn("Name", cells.toArray()); + model.addColumn("Value", properties.toArray()); } simulParamsRules.setModel(model); ParameterColumnEditor cellEditor = new ParameterColumnEditor(); @@ -525,10 +524,12 @@ <cell columns="4" fill="both" weightx="1.0" weighty="0.6"> <JTabbedPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> <tab title='{_("isisfish.params.populationNumbers")}'> - <JPanel id="simulParamsNumbers" name="isisfish.params.populationNumbers" layout='{new BorderLayout()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id="simulParamsNumbers" name="isisfish.params.populationNumbers"/> </tab> <tab title='{_("isisfish.params.ruleParameters")}'> - <JTable id="simulParamsRules" name="isisfish.params.ruleParameters"/> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTable id="simulParamsRules" name="isisfish.params.ruleParameters"/> + </JScrollPane> </tab> </JTabbedPane> </cell>

1 0

r1773 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: result simulator
by sletellier＠users.labs.libre-entreprise.org Feb. 2, 2009

Feb. 2, 2009

Author: sletellier Date: 2009-02-02 16:18:21 +0000 (Mon, 02 Feb 2009) New Revision: 1773 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: La liste des simulations se rafraichie corectement. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-02-02 15:12:24 UTC (rev 1772) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-02-02 16:18:21 UTC (rev 1773) @@ -10,6 +10,7 @@ * @version */ +import java.beans.PropertyChangeEvent; import java.util.logging.Level; import java.util.logging.Logger; import static org.codelutin.i18n.I18n._; @@ -29,6 +30,7 @@ import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; +import java.beans.PropertyChangeListener; import java.beans.PropertyVetoException; import java.io.IOException; import java.text.ParseException; @@ -42,11 +44,8 @@ private FilterModel<SimulationProperties, String> filterModel; private DefaultComboBoxModel model; - public ResultView (){ - super(); + SimulationServiceListener listener = new SimulationServiceListener() { - SimulationService.getService().addSimulationServiceListener(new SimulationServiceListener() { - @Override public void simulationStart(SimulationService simService, SimulationJob job) { } @@ -65,9 +64,12 @@ @Override public void clearJobDone(SimulationService simService) { } - }); + }; + + public ResultView (){ + super(); + SimulationService.getService().addSimulationServiceListener(listener); init(); - try { initSimulation(); } catch (Exception e) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-02 15:12:24 UTC (rev 1772) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-02 16:18:21 UTC (rev 1773) @@ -70,20 +70,21 @@ @Override public void simulationStop(SimulationService simService, SimulationJob job) { - fieldSimulParamsSelect.setModel(getSimulParamsSelectModel()); + fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(true)); } @Override public void clearJobDone(SimulationService simService) { } } - SimulationService.getService().addSimulationServiceListener(simulationListener); public ParamsUI(SimulAction action){ setContextValue(action); } public void refresh(){ + SimulationService.getService().removeSimulationServiceListener(simulationListener); + SimulationService.getService().addSimulationServiceListener(simulationListener); if (getContextValue(SimulAction.class).getSimulationStorage() != null){ fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName()); } @@ -281,8 +282,11 @@ Logger.getLogger(ParamsUI.class.getName()).log(Level.SEVERE, null, ex); } } - private ComboBoxModel getSimulParamsSelectModel() { - java.util.List<String> items = getContextValue(SimulAction.class).getFilteredOldSimulatorNames(); + protected ComboBoxModel getSimulParamsSelectModel() { + return getSimulParamsSelectModel(false); + } + protected ComboBoxModel getSimulParamsSelectModel(boolean force) { + java.util.List<String> items = getContextValue(SimulAction.class).getFilteredOldSimulatorNames(force); DefaultComboBoxModel result = new DefaultComboBoxModel(); if (items != null){ for (String s : items){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-02 15:12:24 UTC (rev 1772) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-02 16:18:21 UTC (rev 1773) @@ -441,7 +441,10 @@ return null; } public List<String> getFilteredOldSimulatorNames() { - if (oldSimulNames == null){ + return getFilteredOldSimulatorNames(false); + } + public List<String> getFilteredOldSimulatorNames(boolean force) { + if (oldSimulNames == null || force){ oldSimulNames = getOldSimulationItem(); } return oldSimulNames;

1 0

r1772 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org Feb. 2, 2009

Feb. 2, 2009

Author: sletellier Date: 2009-02-02 15:12:24 +0000 (Mon, 02 Feb 2009) New Revision: 1772 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Log: Matrix dans le bon sens 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-02-02 14:49:51 UTC (rev 1771) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-02-02 15:12:24 UTC (rev 1772) @@ -130,7 +130,7 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" matrix='{getStrategyMonthInfo().getProportionMetier()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}'/> </cell> </row> </Table>

1 0

r1771 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org Feb. 2, 2009

Feb. 2, 2009

Author: sletellier Date: 2009-02-02 14:49:51 +0000 (Mon, 02 Feb 2009) New Revision: 1771 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Correction de la saisie des r?\195?\169sultas. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-02 14:49:03 UTC (rev 1770) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-02-02 14:49:51 UTC (rev 1771) @@ -507,8 +507,10 @@ for (Object o : resultNames) { resultNamesString.add(o.toString()); } + param.setResultEnabled(resultNamesString); IsisFish.config.setDefaultResultNames(resultNamesString); } + public List<String> getDefaultResultNames(){ return IsisFish.config.getDefaultResultNamesAsList(); }

1 0

r1770 - isis-fish/trunk/src/main/resources/i18n
by sletellier＠users.labs.libre-entreprise.org Feb. 2, 2009

Feb. 2, 2009

Author: sletellier Date: 2009-02-02 14:49:03 +0000 (Mon, 02 Feb 2009) New Revision: 1770 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:31:05 UTC (rev 1769) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-02-02 14:49:03 UTC (rev 1770) @@ -445,15 +445,15 @@ 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.continueGears=Continuer vers les gears +isisfish.input.continueGears=Continuer vers les materiaux isisfish.input.continueMetiers=Continuer vers les metiers isisfish.input.continuePopulations=Continuer vers les populations isisfish.input.continuePorts=Continuer vers les ports -isisfish.input.continueSetOfVessels=Continuer vers les set of vessels +isisfish.input.continueSetOfVessels=Continuer vers les ensembles de navires 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.continueTripTypes=Continuer vers les types de trajets +isisfish.input.continueVesselTypes=Continuer vers les types de navires isisfish.input.continueZones=Continuer vers les zones isisfish.input.menu.addRegion=Ajouter une r\u00E9gion isisfish.input.menu.commit=Sauvegarder les changements

1 0

r1769 - isis-fish/trunk/src/main/resources/i18n
by sletellier＠users.labs.libre-entreprise.org Feb. 2, 2009

Feb. 2, 2009

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 Feb. 2, 2009

Feb. 2, 2009

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