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

r2149 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico
by chatellier＠users.labs.libre-entreprise.org 28 Apr '09

28 Apr '09

Author: chatellier Date: 2009-04-28 10:26:19 +0000 (Tue, 28 Apr 2009) New Revision: 2149 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java Log: Lit le design plan en uft-8 (meme si c'est par defaut comme ca) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-04-28 10:25:11 UTC (rev 2148) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-04-28 10:26:19 UTC (rev 2149) @@ -91,6 +91,7 @@ // don't use reader.read(String); // don't work on windows beacause of : in path // Document doc = reader.read(xmlFile); + reader.setEncoding("utf-8"); Document doc = reader.read(xmlFile); Element root = doc.getRootElement(); designPlan = DomXMLParser.parseDesignPlan(root);

1 0

r2148 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 28 Apr '09

28 Apr '09

Author: chatellier Date: 2009-04-28 10:25:11 +0000 (Tue, 28 Apr 2009) New Revision: 2148 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Sauvegarde le designplan en utf-8 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-04-28 09:18:49 UTC (rev 2147) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-04-28 10:25:11 UTC (rev 2148) @@ -925,7 +925,7 @@ // Sauvegarde du design plan en XML if (!StringUtils.isEmpty(xmlDesignPlan)) { File simulationDesignPlanFile = SimulationStorage.getMexicoDesignPlan(tmpDirectory); - FileUtil.writeString(simulationDesignPlanFile, xmlDesignPlan); + FileUtil.writeString(simulationDesignPlanFile, xmlDesignPlan, "utf-8"); } FileUtil.copy(new File(SimulatorStorage.getSimulatorDirectory(),

1 0

r2147 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/mexico main/java/fr/ifremer/isisfish/ui/simulator test/java/fr/ifremer/isisfish/mexico
by chatellier＠users.labs.libre-entreprise.org 28 Apr '09

28 Apr '09

Author: chatellier Date: 2009-04-28 09:18:49 +0000 (Tue, 28 Apr 2009) New Revision: 2147 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Log: Utilise un FIle pour le parser xml. Pour lui un path string qui comporte un :, c'est pas pareil Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-04-24 16:06:42 UTC (rev 2146) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-04-28 09:18:49 UTC (rev 2147) @@ -18,6 +18,7 @@ package fr.ifremer.isisfish.mexico; +import java.io.File; import java.io.IOException; import org.dom4j.Document; @@ -82,11 +83,14 @@ * @return DesignPlan * @throws IOException */ - public static DesignPlan getDesignPlanFromXML(String xmlFile) + public static DesignPlan getDesignPlanFromXML(File xmlFile) throws IOException { DesignPlan designPlan = null; try { SAXReader reader = new SAXReader(); + // don't use reader.read(String); + // don't work on windows beacause of : in path + // Document doc = reader.read(xmlFile); Document doc = reader.read(xmlFile); Element root = doc.getRootElement(); designPlan = DomXMLParser.parseDesignPlan(root); 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-04-24 16:06:42 UTC (rev 2146) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-28 09:18:49 UTC (rev 2147) @@ -308,10 +308,10 @@ // Chargement des facteurs File f = simulStorage.getMexicoDesignPlan(SimulationStorage.getSimulationDirectory(simulName)); if (f != null && f.canRead()) { - if (log.isDebugEnabled()) { - log.debug("Import design plan from : " + f.getPath()); + if (log.isInfoEnabled()) { + log.info("Import design plan from : " + f.getAbsolutePath()); } - designPlan = MexicoHelper.getDesignPlanFromXML(f.getPath()); + designPlan = MexicoHelper.getDesignPlanFromXML(f); factors.clear(); for (Factor factor : designPlan.getFactors()) { if (log.isDebugEnabled()) { Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-04-24 16:06:42 UTC (rev 2146) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-04-28 09:18:49 UTC (rev 2147) @@ -162,10 +162,10 @@ */ @Test public void testGetDesignPlanFromXML() throws IOException { + + File testFile = new File("src/test/resources/mexico/mexicohelper_designplan.xml"); + DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile); - DesignPlan plan = MexicoHelper - .getDesignPlanFromXML("src/test/resources/mexico/mexicohelper_designplan.xml"); - Assert.assertEquals(5, plan.getFactors().size()); String xml = MexicoHelper.getDesignPlanAsXML(plan); @@ -187,7 +187,8 @@ log.debug("xml 1 = " + xml1); // export - DesignPlan plan = MexicoHelper.getDesignPlanFromXML("src/test/resources/mexico/mexicohelper_designplan.xml"); + File testFile = new File("src/test/resources/mexico/mexicohelper_designplan.xml"); + DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile); String xml2 = MexicoHelper.getDesignPlanAsXML(plan); log.debug("xml 2 = " + xml2);

1 0

r2146 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 24 Apr '09

24 Apr '09

Author: chatellier Date: 2009-04-24 16:06:42 +0000 (Fri, 24 Apr 2009) New Revision: 2146 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx Log: Fix jaxx compilation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-04-24 15:57:15 UTC (rev 2145) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-04-24 16:06:42 UTC (rev 2146) @@ -109,7 +109,7 @@ Object o = node.getUserObject(); if (Factor.class.isInstance(o)) { Factor f = (Factor)o; - FactorWizard wizard = new FactorWizard(this); + FactorWizardUI wizard = new FactorWizardUI(this); JComponent c = getSimulAction().getFactorComponent(f); if (c != null) { wizard.initExisting(c, f);

1 0

r2145 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 24 Apr '09

24 Apr '09

Author: chatellier Date: 2009-04-24 15:57:15 +0000 (Fri, 24 Apr 2009) New Revision: 2145 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainer.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx Log: Refactoring (pour faire du code propre). Les UI, ont leur nom suffix?\195?\169es par 'UI'. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/pom.xml 2009-04-24 15:57:15 UTC (rev 2145) @@ -451,9 +451,9 @@ <entry> <basedir>${maven.gen.dir}/java/</basedir> <specificGoal>parserJava</specificGoal> -  + </includes> </entry> </entries> </configuration> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -42,7 +42,7 @@ import java.lang.reflect.Method; import org.apache.commons.beanutils.MethodUtils; import fr.ifremer.isisfish.ui.util.UtilsUI; -import fr.ifremer.isisfish.ui.sensitivity.FactorWizard; +import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; import jaxx.runtime.JAXXInitialContext; @@ -112,7 +112,7 @@ bean = getVerifier().getEntity(classBean, beanID); } if (bean != null){ - FactorWizard wizard = new FactorWizard(this); + FactorWizardUI wizard = new FactorWizardUI(this); wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); wizard.pack(); Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainer.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainer.jaxx 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainer.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -1,41 +0,0 @@ - -<JPanel id='continuousPanelContainer' layout='{new BorderLayout()}'> - - <Boolean id='continuePossible' javaBean='true'/> - - <Boolean id='continueSelected' javaBean='false'/> - - <JPanel id='content' constraints='BorderLayout.CENTER'/> - -</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx (from rev 2134, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainer.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -0,0 +1,28 @@ + +<JPanel id='continuousPanelContainer' layout='{new BorderLayout()}'> + + <Boolean id='continuePossible' javaBean='true'/> + + <Boolean id='continueSelected' javaBean='false'/> + + <JPanel id='content' constraints='BorderLayout.CENTER'/> + +</JPanel> \ No newline at end of file Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -1,94 +0,0 @@ - -<ContinuousPanelContainer> - <script><![CDATA[ - -protected JTextField continueMax = null; -protected JTextField continueMin = null; - -addPropertyChangeListener("continuePossible", new PropertyChangeListener(){ - - @Override - public void propertyChange(PropertyChangeEvent evt) { - continueMax.setVisible((Boolean)evt.getNewValue()); - continueMin.setVisible((Boolean)evt.getNewValue()); - } - -}); - -addPropertyChangeListener("continueSelected", new PropertyChangeListener(){ - - @Override - public void propertyChange(PropertyChangeEvent evt) { - continueMax.setEnabled((Boolean)evt.getNewValue()); - continueMin.setEnabled((Boolean)evt.getNewValue()); - } - -}); - -public void init(JTextField cMin, JTextField cMax){ - continueMax = cMax; - continueMin = cMin; - continueMax.setEnabled(isContinueSelected()); - continueMin.setEnabled(isContinueSelected()); - continueMax.setVisible(isContinuePossible()); - continueMin.setVisible(isContinuePossible()); - - continueMaxPanel.add(continueMax, BorderLayout.CENTER); - continueMinPanel.add(continueMin, BorderLayout.CENTER); -} -public String getMin(){ - return continueMin.getText(); -} -public String getMax(){ - return continueMax.getText(); -} - ]]> - </script> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.factor.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JPanel id='continueMinPanel' layout='{new BorderLayout()}'/> - </cell> - <cell fill='horizontal'> - <JLabel text='isisfish.factor.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JPanel id='continueMaxPanel' layout='{new BorderLayout()}'/> - </cell> - </row> - </Table> -</ContinuousPanelContainer> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx (from rev 2134, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -0,0 +1,81 @@ + +<ContinuousPanelContainerUI> + <script><![CDATA[ + +protected JTextField continueMax = null; +protected JTextField continueMin = null; + +addPropertyChangeListener("continuePossible", new PropertyChangeListener(){ + + @Override + public void propertyChange(PropertyChangeEvent evt) { + continueMax.setVisible((Boolean)evt.getNewValue()); + continueMin.setVisible((Boolean)evt.getNewValue()); + } + +}); + +addPropertyChangeListener("continueSelected", new PropertyChangeListener(){ + + @Override + public void propertyChange(PropertyChangeEvent evt) { + continueMax.setEnabled((Boolean)evt.getNewValue()); + continueMin.setEnabled((Boolean)evt.getNewValue()); + } + +}); + +public void init(JTextField cMin, JTextField cMax){ + continueMax = cMax; + continueMin = cMin; + continueMax.setEnabled(isContinueSelected()); + continueMin.setEnabled(isContinueSelected()); + continueMax.setVisible(isContinuePossible()); + continueMin.setVisible(isContinuePossible()); + + continueMaxPanel.add(continueMax, BorderLayout.CENTER); + continueMinPanel.add(continueMin, BorderLayout.CENTER); +} +public String getMin(){ + return continueMin.getText(); +} +public String getMax(){ + return continueMax.getText(); +} + ]]> + </script> + <Table id='content' constraints='BorderLayout.CENTER'> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.factor.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JPanel id='continueMinPanel' layout='{new BorderLayout()}'/> + </cell> + <cell fill='horizontal'> + <JLabel text='isisfish.factor.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JPanel id='continueMaxPanel' layout='{new BorderLayout()}'/> + </cell> + </row> + </Table> +</ContinuousPanelContainerUI> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-04-24 15:57:15 UTC (rev 2145) @@ -199,14 +199,14 @@ } return result; } - public static ContinuousPanelContainer getContinuousPanel(JComponent c, TopiaEntity e){ - ContinuousPanelContainer result = null; + public static ContinuousPanelContainerUI getContinuousPanel(JComponent c, TopiaEntity e){ + ContinuousPanelContainerUI result = null; try { String fieldName = getMethod(c); - DefaultContinuousPanel continuousPanel = null; + DefaultContinuousPanelUI continuousPanel = null; if (c instanceof InputOneEquationUI){ InputOneEquationUI origine = (InputOneEquationUI) c; - EquationContinuousPanel ui = new EquationContinuousPanel(new JAXXInitialContext().add(new InputAction())); + EquationContinuousPanelUI ui = new EquationContinuousPanelUI(new JAXXInitialContext().add(new InputAction())); ui.setSelectedEquation(origine.getSelectedEquation()); ui.setLblText(origine.getLblText()); ui.setNameEquation(origine.getNameEquation()); @@ -216,14 +216,14 @@ ui.setBean(e); result = ui; } else if (c instanceof MatrixEditor){ - MatrixContinuousPanel matrixPanel = new MatrixContinuousPanel(); + MatrixContinuousPanelUI matrixPanel = new MatrixContinuousPanelUI(); MatrixND m = (MatrixND)callMethod(e, fieldName); if (m != null){ matrixPanel.setMatrix(m.clone()); } result = matrixPanel; } else { - continuousPanel = new DefaultContinuousPanel(); + continuousPanel = new DefaultContinuousPanelUI(); result = continuousPanel; } if (continuousPanel != null){ @@ -242,13 +242,13 @@ } return new JTextField(); } - public static ContinuousPanelContainer getContinuousPanelWithValue(JComponent c, ContinuousDomain domain, Factor f) { - ContinuousPanelContainer result = null; + public static ContinuousPanelContainerUI getContinuousPanelWithValue(JComponent c, ContinuousDomain domain, Factor f) { + ContinuousPanelContainerUI result = null; try { - DefaultContinuousPanel continuousPanel = null; + DefaultContinuousPanelUI continuousPanel = null; if (c instanceof InputOneEquationUI){ InputOneEquationUI origine = (InputOneEquationUI) c; - EquationContinuousPanel ui = new EquationContinuousPanel(new JAXXInitialContext().add(new InputAction())); + EquationContinuousPanelUI ui = new EquationContinuousPanelUI(new JAXXInitialContext().add(new InputAction())); ui.setLblText(origine.getLblText()); ui.setNameEquation(origine.getNameEquation()); ui.getEditor().getEditor().setText((String)f.getValue()); @@ -263,7 +263,7 @@ result = ui; } else if (c instanceof MatrixEditor){ - MatrixContinuousPanel panel = new MatrixContinuousPanel(); + MatrixContinuousPanelUI panel = new MatrixContinuousPanelUI(); MatrixContinuousDomain matrixDomain = (MatrixContinuousDomain)domain; MatrixND m = matrixDomain.getMatrix(); if (m != null){ @@ -273,7 +273,7 @@ panel.getCoef().setText("" + matrixDomain.getCoefficient()); result = panel; } else { - continuousPanel = new DefaultContinuousPanel(); + continuousPanel = new DefaultContinuousPanelUI(); result = continuousPanel; } if (continuousPanel != null){ @@ -537,8 +537,8 @@ } // RangeOfValue - public static ContinuousPanelContainer getContinuousRangeOfValuePanel(JComponent cOrigine, TopiaEntity bean){ - DefaultContinuousPanel continuousPanel = new DefaultContinuousPanel(); + public static ContinuousPanelContainerUI getContinuousRangeOfValuePanel(JComponent cOrigine, TopiaEntity bean){ + DefaultContinuousPanelUI continuousPanel = new DefaultContinuousPanelUI(); RangeOfValuesUI ui = (RangeOfValuesUI)cOrigine; String value = ui.getFieldGearParamPossibleValue().getText(); String min = "0"; Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -1,267 +0,0 @@ - -<ContinuousPanelContainer> - -  - <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> - <String id='lblText' javaBean='null'/> - <org.codelutin.topia.persistence.TopiaEntity id='bean' javaBean='null'/> - <Class id='clazz' javaBean='null'/> - <String id='methodGet' javaBean='null'/> - <String id='methodSet' javaBean='null'/> - <String id='nameEquation' javaBean='null'/> - <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/> - - <script><![CDATA[ -import javax.swing.table.AbstractTableModel; -import javax.swing.table.DefaultTableModel; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableModel; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; - -protected String[] columnNames = {"Name", "Value", "Coef (in %)", "Operator", "Action"}; -protected java.util.List<EquationContinuousDomain> datas = new ArrayList<EquationContinuousDomain>(); -protected java.util.List<JComboBox> operateurs = new ArrayList<JComboBox>(); -protected java.util.List<JButton> actions = new ArrayList<JButton>(); - -public java.util.List<EquationContinuousDomain> getDomains(){ - return datas; -} -public void setDomains(java.util.List<EquationContinuousDomain> domains){ - datas.clear(); - for (EquationContinuousDomain d : domains){ - addDomain(d); - } -} -public void addDomain(EquationContinuousDomain domain){ - newButton(); - datas.add(domain); -} -protected AbstractTableModel getTableModel(){ - AbstractTableModel model = new AbstractTableModel() { - - @Override - public int getRowCount() { - return datas.size(); - } - - @Override - public int getColumnCount() { - return columnNames.length; - } - - @Override - public boolean isCellEditable(int rowIndex, int columnIndex) { - return true; - } - @Override - public Object getValueAt(int rowIndex, int columnIndex) { - if (columnIndex == 0){ - return datas.get(rowIndex).getVariableName(); - } else if (columnIndex == 1){ - return datas.get(rowIndex).getReferenceValue(); - } else if (columnIndex == 2){ - return datas.get(rowIndex).getCoefficient() == null ? 100 : datas.get(rowIndex).getCoefficient() * 100; - } else if (columnIndex == 3){ - return datas.get(rowIndex).getOperator(); - } else if (columnIndex == 4){ - return _("isisfish.factor.validDiscretNumber"); - } - return null; - } - - @Override - public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - if (String.class.isInstance(aValue)){ - if (!((String)aValue).equals("")){ - if (columnIndex == 0){ - datas.get(rowIndex).setVariableName((String)aValue); - } else if (columnIndex == 1){ - datas.get(rowIndex).setReferenceValue(Double.parseDouble((String)aValue)); - } else if (columnIndex == 2){ - datas.get(rowIndex).setCoefficient(Double.parseDouble((String)aValue) / 100); - } else if (columnIndex == 3){ - datas.get(rowIndex).setOperator((String)aValue); - } - } - } - } - - @Override - public String getColumnName(int col) { - return columnNames[col].toString(); - } - - }; - return model; -} -protected JComboBox getOperateur(){ - JComboBox result = new JComboBox(); - result.addItem("+"); - result.addItem("-"); - result.addItem("*"); - result.addItem("/"); - operateurs.add(result); - result.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - JComboBox source = (JComboBox)e.getSource(); - int i = operateurs.indexOf(source); - if (datas.size() <= i){ - datas.get(i).setOperator((String)source.getSelectedItem()); - } - } - }); - return result; -} -protected void newButton(){ - JButton result = new JButton(); - result.setText(_("isisfish.factor.validDiscretNumber")); - actions.add(result); - result.addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - JButton source = (JButton)e.getSource(); - int i = actions.indexOf(source); - valid(i); - } - }); -} -protected JButton getActionButton(int i){ - return actions.get(i); -} -protected void valid(int i) { - String variableName = datas.get(i).getVariableName(); - String[] lines = editor.getEditor().getText().split("\n"); - String result = ""; - for (String line : lines) { - Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*)([\\d\\.]+).*\\;$"); - Matcher matcher = p.matcher(line); - if (matcher.find()) { - String fullVariableName = bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName; - line = matcher.group(1) + "context.getValueAndCompute(\"" + fullVariableName + "\", " + matcher.group(2) + ");"; - } - result += line + "\n"; - } - editor.getEditor().setText(result); -} -protected void setTable(){ - params.setModel(getTableModel()); - params.getColumnModel().getColumn(3).setCellEditor(new DefaultCellEditor(getOperateur())); - params.getColumnModel().getColumn(4).setCellEditor(new TableCellEditor() { - - @Override - public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - return getActionButton(row); - } - - @Override - public Object getCellEditorValue() { - return null; - } - - @Override - public boolean isCellEditable(EventObject anEvent) { - return true; - } - - @Override - public boolean shouldSelectCell(EventObject anEvent) { - return true; - } - - @Override - public boolean stopCellEditing() { - return true; - } - - @Override - public void cancelCellEditing() { - } - - @Override - public void addCellEditorListener(CellEditorListener l) { - } - - @Override - public void removeCellEditorListener(CellEditorListener l) { - } - }); -} -protected void add(){ - datas.add(new EquationContinuousDomain()); - newButton(); - setTable(); -} -protected void remove(){ - int i = params.getSelectedRow(); - if (i != -1){ - datas.remove(i); - operateurs.remove(i); - actions.remove(i); - setTable(); - } -} - ]]> - </script> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <JScrollPane> - <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' enabled='{isContinueSelected()}'/> - </JScrollPane> - </cell> - </row> - <row> - <cell fill='horizontal' weightx='0.5'> - <JButton id='add' text='isisfish.common.add' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='add()'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JButton id='remove' text='isisfish.common.remove' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='remove()'/> - </cell> - </row> - <row> - <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' formule='{getFormule()}' lblText='{getLblText()}' - constructorParams='this' bean='{getBean()}' clazz='{getClazz()}' methodGet='{getMethodGet()}' actif='{isContinueSelected()}' - methodSet='{getMethodSet()}' nameEquation='{getNameEquation()}' selectedEquation='{getSelectedEquation()}' - visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - </row> - </Table> -</ContinuousPanelContainer> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx (from rev 2134, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -0,0 +1,254 @@ + +<ContinuousPanelContainerUI> + +  + <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> + <String id='lblText' javaBean='null'/> + <org.codelutin.topia.persistence.TopiaEntity id='bean' javaBean='null'/> + <Class id='clazz' javaBean='null'/> + <String id='methodGet' javaBean='null'/> + <String id='methodSet' javaBean='null'/> + <String id='nameEquation' javaBean='null'/> + <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/> + + <script><![CDATA[ +import javax.swing.table.AbstractTableModel; +import javax.swing.table.DefaultTableModel; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableModel; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.commons.lang.StringUtils; + +protected String[] columnNames = {"Name", "Value", "Coef (in %)", "Operator", "Action"}; +protected java.util.List<EquationContinuousDomain> datas = new ArrayList<EquationContinuousDomain>(); +protected java.util.List<JComboBox> operateurs = new ArrayList<JComboBox>(); +protected java.util.List<JButton> actions = new ArrayList<JButton>(); + +public java.util.List<EquationContinuousDomain> getDomains(){ + return datas; +} +public void setDomains(java.util.List<EquationContinuousDomain> domains){ + datas.clear(); + for (EquationContinuousDomain d : domains){ + addDomain(d); + } +} +public void addDomain(EquationContinuousDomain domain){ + newButton(); + datas.add(domain); +} +protected AbstractTableModel getTableModel(){ + AbstractTableModel model = new AbstractTableModel() { + + @Override + public int getRowCount() { + return datas.size(); + } + + @Override + public int getColumnCount() { + return columnNames.length; + } + + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + return true; + } + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + if (columnIndex == 0){ + return datas.get(rowIndex).getVariableName(); + } else if (columnIndex == 1){ + return datas.get(rowIndex).getReferenceValue(); + } else if (columnIndex == 2){ + return datas.get(rowIndex).getCoefficient() == null ? 100 : datas.get(rowIndex).getCoefficient() * 100; + } else if (columnIndex == 3){ + return datas.get(rowIndex).getOperator(); + } else if (columnIndex == 4){ + return _("isisfish.factor.validDiscretNumber"); + } + return null; + } + + @Override + public void setValueAt(Object aValue, int rowIndex, int columnIndex) { + if (String.class.isInstance(aValue)){ + if (!((String)aValue).equals("")){ + if (columnIndex == 0){ + datas.get(rowIndex).setVariableName((String)aValue); + } else if (columnIndex == 1){ + datas.get(rowIndex).setReferenceValue(Double.parseDouble((String)aValue)); + } else if (columnIndex == 2){ + datas.get(rowIndex).setCoefficient(Double.parseDouble((String)aValue) / 100); + } else if (columnIndex == 3){ + datas.get(rowIndex).setOperator((String)aValue); + } + } + } + } + + @Override + public String getColumnName(int col) { + return columnNames[col].toString(); + } + + }; + return model; +} +protected JComboBox getOperateur(){ + JComboBox result = new JComboBox(); + result.addItem("+"); + result.addItem("-"); + result.addItem("*"); + result.addItem("/"); + operateurs.add(result); + result.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + JComboBox source = (JComboBox)e.getSource(); + int i = operateurs.indexOf(source); + if (datas.size() <= i){ + datas.get(i).setOperator((String)source.getSelectedItem()); + } + } + }); + return result; +} +protected void newButton(){ + JButton result = new JButton(); + result.setText(_("isisfish.factor.validDiscretNumber")); + actions.add(result); + result.addActionListener(new ActionListener() { + + @Override + public void actionPerformed(ActionEvent e) { + JButton source = (JButton)e.getSource(); + int i = actions.indexOf(source); + valid(i); + } + }); +} +protected JButton getActionButton(int i){ + return actions.get(i); +} +protected void valid(int i) { + String variableName = datas.get(i).getVariableName(); + String[] lines = editor.getEditor().getText().split("\n"); + String result = ""; + for (String line : lines) { + Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*)([\\d\\.]+).*\\;$"); + Matcher matcher = p.matcher(line); + if (matcher.find()) { + String fullVariableName = bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName; + line = matcher.group(1) + "context.getValueAndCompute(\"" + fullVariableName + "\", " + matcher.group(2) + ");"; + } + result += line + "\n"; + } + editor.getEditor().setText(result); +} +protected void setTable(){ + params.setModel(getTableModel()); + params.getColumnModel().getColumn(3).setCellEditor(new DefaultCellEditor(getOperateur())); + params.getColumnModel().getColumn(4).setCellEditor(new TableCellEditor() { + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + return getActionButton(row); + } + + @Override + public Object getCellEditorValue() { + return null; + } + + @Override + public boolean isCellEditable(EventObject anEvent) { + return true; + } + + @Override + public boolean shouldSelectCell(EventObject anEvent) { + return true; + } + + @Override + public boolean stopCellEditing() { + return true; + } + + @Override + public void cancelCellEditing() { + } + + @Override + public void addCellEditorListener(CellEditorListener l) { + } + + @Override + public void removeCellEditorListener(CellEditorListener l) { + } + }); +} +protected void add(){ + datas.add(new EquationContinuousDomain()); + newButton(); + setTable(); +} +protected void remove(){ + int i = params.getSelectedRow(); + if (i != -1){ + datas.remove(i); + operateurs.remove(i); + actions.remove(i); + setTable(); + } +} + ]]> + </script> + <Table id='content' constraints='BorderLayout.CENTER'> + <row> + <cell fill='both' columns='2' weightx='1' weighty='0.5'> + <JScrollPane> + <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' enabled='{isContinueSelected()}'/> + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton id='add' text='isisfish.common.add' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='add()'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id='remove' text='isisfish.common.remove' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='remove()'/> + </cell> + </row> + <row> + <cell fill='both' columns='2' weightx='1' weighty='0.5'> + <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' formule='{getFormule()}' lblText='{getLblText()}' + constructorParams='this' bean='{getBean()}' clazz='{getClazz()}' methodGet='{getMethodGet()}' actif='{isContinueSelected()}' + methodSet='{getMethodSet()}' nameEquation='{getNameEquation()}' selectedEquation='{getSelectedEquation()}' + visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + </Table> +</ContinuousPanelContainerUI> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-04-24 15:57:15 UTC (rev 2145) @@ -44,18 +44,18 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(SimulAction.class); - public static void saveContinue(JComponent cOrigine, String name, String comment, String path, ContinuousPanelContainer panel, SimulAction action, boolean exist){ - DefaultContinuousPanel defaultPanel = null; - if (MatrixContinuousPanel.class.isInstance(panel)){ - MatrixContinuousPanel matrixPanel = (MatrixContinuousPanel)panel; + public static void saveContinue(JComponent cOrigine, String name, String comment, String path, ContinuousPanelContainerUI panel, SimulAction action, boolean exist){ + DefaultContinuousPanelUI defaultPanel = null; + if (MatrixContinuousPanelUI.class.isInstance(panel)){ + MatrixContinuousPanelUI matrixPanel = (MatrixContinuousPanelUI)panel; Double coef = Double.valueOf(matrixPanel.getCoef().getText()); MatrixND matrix = matrixPanel.getMatrix(); String operateur = (String)matrixPanel.getOperator().getSelectedItem(); action.addContinuousMatrixFactor(name, comment, path, coef, matrix, operateur, cOrigine, exist); - } else if (EquationContinuousPanel.class.isInstance(panel)){ + } else if (EquationContinuousPanelUI.class.isInstance(panel)){ try { - EquationContinuousPanel equationPanel = (EquationContinuousPanel) panel; + EquationContinuousPanelUI equationPanel = (EquationContinuousPanelUI) panel; TopiaEntity bean = equationPanel.getBean(); String methodSet = equationPanel.getMethodSet(); @@ -80,15 +80,15 @@ log.error("Can't call method : ", ex); } } - } else if (DefaultContinuousPanel.class.isInstance(panel)){ - defaultPanel = (DefaultContinuousPanel)panel; + } else if (DefaultContinuousPanelUI.class.isInstance(panel)){ + defaultPanel = (DefaultContinuousPanelUI)panel; action.addContinuousFactor(name, comment, path, getMin(defaultPanel), getMax(defaultPanel), cOrigine, exist); } } - protected static Double getMin(DefaultContinuousPanel defaultPanel){ + protected static Double getMin(DefaultContinuousPanelUI defaultPanel){ return Double.parseDouble(defaultPanel.getMin()); } - protected static Double getMax(DefaultContinuousPanel defaultPanel){ + protected static Double getMax(DefaultContinuousPanelUI defaultPanel){ return Double.parseDouble(defaultPanel.getMax()); } public static void saveDiscret(JComponent cOrigine, String name, String comment, String path, List<JComponent> components, SimulAction action, boolean exist){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java 2009-04-24 15:57:15 UTC (rev 2145) @@ -37,6 +37,8 @@ * * Last update : $Date: 9 mars 2009 $ * By : $Author: chatellier $ + * + * TODO extends AbstractTreeCellRenderer and remove DefaultMutableTreeNode reference */ public class FactorTreeCellRenderer extends DefaultTreeCellRenderer { Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -1,267 +0,0 @@ - -<JDialog id="FactorTypeChooser" title='isisfish.factor.title' modal='{true}' layout='{new BorderLayout()}'> - - <Boolean id='continuePossible' javaBean='true'/> - - <Boolean id='continueSelected' javaBean='false'/> - - <Boolean id='saveEnabled' javaBean='false'/> - - <Boolean id='existingValue' javaBean='false'/> - - <script><![CDATA[ -import org.apache.commons.lang.StringUtils; -import org.codelutin.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.ui.simulator.SimulAction; -import fr.ifremer.isisfish.ui.input.InputSaveVerifier; -import fr.ifremer.isisfish.simulator.sensitivity.Factor; -import fr.ifremer.isisfish.simulator.sensitivity.Domain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; - -protected JComponent cOrigine = null; -protected TopiaEntity bean = null; -protected java.util.List<JComponent> discretComponents = new ArrayList<JComponent>(); -protected String path = null; -protected ContinuousPanelContainer continuousPanel = null; -protected Factor factor = null; - -addPropertyChangeListener("continuePossible", new PropertyChangeListener(){ - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (continuousPanel != null){ - continuousPanel.setContinuePossible((Boolean)evt.getNewValue()); - } - } - -}); - -addPropertyChangeListener("continueSelected", new PropertyChangeListener(){ - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (continuousPanel != null){ - continuousPanel.setContinueSelected((Boolean)evt.getNewValue()); - } - } - -}); - -public void initNew(JComponent c, TopiaEntity be, Boolean b){ - this.bean = be; - this.cOrigine = c; - - // path is topiaId#property - // ex : fwn#fsd#0.3425345#name - // for JAXX : cOrigine start with upper case - // for commons beanutils : must be lower case - String methodName = StringUtils.uncapitalize(EditorHelper.getMethod(cOrigine)); - this.path = bean.getTopiaId() + "#" + methodName; - - factorName.setText(bean.toString() + "." + methodName); - setContinuePossible(b); - boolean selected = EditorHelper.isContinue(cOrigine); - setContinueSelected(selected); - continueRadion.setSelected(selected); - if (isContinuePossible()){ - if (EditorHelper.isRangeOfValue(cOrigine)){ - continuousPanel = EditorHelper.getContinuousRangeOfValuePanel(cOrigine, bean); - } - else { - continuousPanel = EditorHelper.getContinuousPanel(cOrigine, bean); - } - init(); - } - if (!isContinueSelected() && EditorHelper.isRangeOfValue(cOrigine)){ - int i = 0; - for (String s : EditorHelper.getDiscretRangeOfValueValues(cOrigine, bean)){ - JTextField text = new JTextField(s); - discretComponents.add(text); - tabPane.add(text, "Factor " + (i+1)); - i++; - } - } - if (continuousPanel != null){ - continuousPanel.setContinueSelected(selected); - } - setContinueSelected(EditorHelper.isContinue(cOrigine)); - setSaveEnabled(!factorName.getText().equals("")); -} - -public void initExisting(JComponent cOrigine, Factor f){ - setExistingValue(true); - this.cOrigine = cOrigine; - this.path = f.getPath(); - factorName.setText(f.getName()); - comment.setText(f.getComment()); - Domain domain = f.getDomain(); - this.factor = f; - - if (ContinuousDomain.class.isInstance(domain)){ - ContinuousDomain cDomain = (ContinuousDomain) domain; - - continuousPanel = EditorHelper.getContinuousPanelWithValue(cOrigine, cDomain, f); - init(); - - continueRadion.setSelected(true); - setContinueSelected(true); - setContinuePossible(true); - }else{ - DiscreteDomain dDomain = (DiscreteDomain)domain; - - int nb = dDomain.getValues().size(); - discretNumber.setText(nb + ""); - - discretComponents.clear(); - tabPane.removeAll(); - - SortedMap values = dDomain.getValues(); - int i = 0; - Object cache = null; - for (Object o : values.values()) { - i++; - cache = o; - JComponent c = null; - if (o != null){ - c = EditorHelper.getEditorWithValue(cOrigine, o); - } - else { - c = EditorHelper.getEditorWithValue(cOrigine); - } - discretComponents.add(c); - JScrollPane js = new JScrollPane(c); - tabPane.addTab("Factor " + i, js); - } - setContinuePossible(EditorHelper.canBeContinue(cOrigine, cache)); - - this.pack(); - } - setSaveEnabled(!factorName.getText().equals("")); -} -protected void init(){ - continuousPanelContainer.add(continuousPanel, BorderLayout.CENTER); - this.pack(); -} -protected JComponent getNewComponent(){ - return EditorHelper.getEditor(cOrigine, bean); -} -protected void addTabs(String sNbTab){ - int nbTab = Integer.parseInt(sNbTab); - discretComponents.clear(); - tabPane.removeAll(); - for (int i=0;i<nbTab;i++){ - JComponent c = getNewComponent(); - discretComponents.add(c); - JScrollPane js = new JScrollPane(c); - tabPane.addTab("Factor " + (i+1), js); - } - this.pack(); -} -protected FactorAction getFactorAction(){ - return getContextValue(FactorAction.class); -} -protected SimulAction getSimulAction(){ - return getContextValue(SimulAction.class); -} -protected void save(){ - if (continueRadion.isSelected()){ - getFactorAction().saveContinue(cOrigine, factorName.getText(), comment.getText(), path, continuousPanel, getSimulAction(), isExistingValue()); - } else { - getFactorAction().saveDiscret(cOrigine, factorName.getText(), comment.getText(), path, discretComponents, getSimulAction(), isExistingValue()); - } - getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); - exit(); -} -protected void remove(){ - getSimulAction().removeFactor(factor); - getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); - exit(); -} -protected void exit(){ - this.dispose(); -} - ]]> - </script> - <Table constraints='BorderLayout.CENTER'> - <row> - <cell columns='1' fill='horizontal'> - <JLabel text='isisfish.factor.name'/> - </cell> - <cell columns='3' fill='horizontal' weightx='1'> - <JTextField id='factorName' onKeyReleased='setSaveEnabled(!factorName.getText().equals(""))'/> - </cell> - </row> - <row> - <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='continueRadion' text='isisfish.factor.continue' buttonGroup='factorType' visible='{isContinuePossible()}' selected='{false}' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> - </cell> - </row> - <row> - <cell fill='both' columns='4' weightx='1' weighty='0.5'> - <JPanel id='continuousPanelContainer' layout='{new BorderLayout()}'/> - </cell> - </row> - <row> - <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='discret' text='isisfish.factor.discret' selected='{true}' buttonGroup='factorType' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.factor.selectDiscretNumber' enabled='{!isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JTextField id='discretNumber' enabled='{!isContinueSelected()}'/> - </cell> - <cell columns='2' fill='horizontal' weightx='0.5'> - <JButton text='isisfish.factor.validDiscretNumber' enabled='{!isContinueSelected()}' onActionPerformed='addTabs(discretNumber.getText())'/> - </cell> - </row> - <row> - <cell columns='4' fill='both' weightx='1' weighty='0.3'> - <JTabbedPane id='tabPane' visible='{!isContinueSelected()}' enabled='{!isContinueSelected()}'/> - </cell> - </row> - <row> - <cell columns='4' fill='horizontal'> - <JLabel text='isisfish.factor.comment'/> - </cell> - </row> - <row> - <cell columns='4' fill='both' weightx='1' weighty='0.3'> - <JScrollPane> - <JTextArea id='comment'/> - </JScrollPane> - </cell> - </row> - <row> - <cell fill='horizontal' weightx='0.25'> - <JButton id='cancel' text='isisfish.common.cancel' onActionPerformed='exit()'/> - </cell> - <cell fill='horizontal' weightx='0.25'> - <JButton id='remove' text='isisfish.common.remove' visible='{isExistingValue()}' onActionPerformed='remove()'/> - </cell> - <cell columns='2' fill='horizontal' weightx='0.5'> - <JButton id='save' text='isisfish.common.save' enabled='{isSaveEnabled()}' onActionPerformed='save()'/> - </cell> - </row> - </Table> -</JDialog> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx (from rev 2134, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -0,0 +1,267 @@ + +<JDialog id="FactorTypeChooser" title='isisfish.factor.title' modal='{true}' layout='{new BorderLayout()}'> + + <Boolean id='continuePossible' javaBean='true'/> + + <Boolean id='continueSelected' javaBean='false'/> + + <Boolean id='saveEnabled' javaBean='false'/> + + <Boolean id='existingValue' javaBean='false'/> + + <script><![CDATA[ +import org.apache.commons.lang.StringUtils; +import org.codelutin.topia.persistence.TopiaEntity; +import fr.ifremer.isisfish.ui.simulator.SimulAction; +import fr.ifremer.isisfish.ui.input.InputSaveVerifier; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; + +protected JComponent cOrigine = null; +protected TopiaEntity bean = null; +protected java.util.List<JComponent> discretComponents = new ArrayList<JComponent>(); +protected String path = null; +protected ContinuousPanelContainerUI continuousPanel = null; +protected Factor factor = null; + +addPropertyChangeListener("continuePossible", new PropertyChangeListener(){ + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (continuousPanel != null){ + continuousPanel.setContinuePossible((Boolean)evt.getNewValue()); + } + } + +}); + +addPropertyChangeListener("continueSelected", new PropertyChangeListener(){ + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (continuousPanel != null){ + continuousPanel.setContinueSelected((Boolean)evt.getNewValue()); + } + } + +}); + +public void initNew(JComponent c, TopiaEntity be, Boolean b){ + this.bean = be; + this.cOrigine = c; + + // path is topiaId#property + // ex : fwn#fsd#0.3425345#name + // for JAXX : cOrigine start with upper case + // for commons beanutils : must be lower case + String methodName = StringUtils.uncapitalize(EditorHelper.getMethod(cOrigine)); + this.path = bean.getTopiaId() + "#" + methodName; + + factorName.setText(bean.toString() + "." + methodName); + setContinuePossible(b); + boolean selected = EditorHelper.isContinue(cOrigine); + setContinueSelected(selected); + continueRadion.setSelected(selected); + if (isContinuePossible()){ + if (EditorHelper.isRangeOfValue(cOrigine)){ + continuousPanel = EditorHelper.getContinuousRangeOfValuePanel(cOrigine, bean); + } + else { + continuousPanel = EditorHelper.getContinuousPanel(cOrigine, bean); + } + init(); + } + if (!isContinueSelected() && EditorHelper.isRangeOfValue(cOrigine)){ + int i = 0; + for (String s : EditorHelper.getDiscretRangeOfValueValues(cOrigine, bean)){ + JTextField text = new JTextField(s); + discretComponents.add(text); + tabPane.add(text, "Factor " + (i+1)); + i++; + } + } + if (continuousPanel != null){ + continuousPanel.setContinueSelected(selected); + } + setContinueSelected(EditorHelper.isContinue(cOrigine)); + setSaveEnabled(!factorName.getText().equals("")); +} + +public void initExisting(JComponent cOrigine, Factor f){ + setExistingValue(true); + this.cOrigine = cOrigine; + this.path = f.getPath(); + factorName.setText(f.getName()); + comment.setText(f.getComment()); + Domain domain = f.getDomain(); + this.factor = f; + + if (ContinuousDomain.class.isInstance(domain)){ + ContinuousDomain cDomain = (ContinuousDomain) domain; + + continuousPanel = EditorHelper.getContinuousPanelWithValue(cOrigine, cDomain, f); + init(); + + continueRadion.setSelected(true); + setContinueSelected(true); + setContinuePossible(true); + }else{ + DiscreteDomain dDomain = (DiscreteDomain)domain; + + int nb = dDomain.getValues().size(); + discretNumber.setText(nb + ""); + + discretComponents.clear(); + tabPane.removeAll(); + + SortedMap values = dDomain.getValues(); + int i = 0; + Object cache = null; + for (Object o : values.values()) { + i++; + cache = o; + JComponent c = null; + if (o != null){ + c = EditorHelper.getEditorWithValue(cOrigine, o); + } + else { + c = EditorHelper.getEditorWithValue(cOrigine); + } + discretComponents.add(c); + JScrollPane js = new JScrollPane(c); + tabPane.addTab("Factor " + i, js); + } + setContinuePossible(EditorHelper.canBeContinue(cOrigine, cache)); + + this.pack(); + } + setSaveEnabled(!factorName.getText().equals("")); +} +protected void init(){ + continuousPanelContainer.add(continuousPanel, BorderLayout.CENTER); + this.pack(); +} +protected JComponent getNewComponent(){ + return EditorHelper.getEditor(cOrigine, bean); +} +protected void addTabs(String sNbTab){ + int nbTab = Integer.parseInt(sNbTab); + discretComponents.clear(); + tabPane.removeAll(); + for (int i=0;i<nbTab;i++){ + JComponent c = getNewComponent(); + discretComponents.add(c); + JScrollPane js = new JScrollPane(c); + tabPane.addTab("Factor " + (i+1), js); + } + this.pack(); +} +protected FactorAction getFactorAction(){ + return getContextValue(FactorAction.class); +} +protected SimulAction getSimulAction(){ + return getContextValue(SimulAction.class); +} +protected void save(){ + if (continueRadion.isSelected()){ + getFactorAction().saveContinue(cOrigine, factorName.getText(), comment.getText(), path, continuousPanel, getSimulAction(), isExistingValue()); + } else { + getFactorAction().saveDiscret(cOrigine, factorName.getText(), comment.getText(), path, discretComponents, getSimulAction(), isExistingValue()); + } + getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); + exit(); +} +protected void remove(){ + getSimulAction().removeFactor(factor); + getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); + exit(); +} +protected void exit(){ + this.dispose(); +} + ]]> + </script> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell columns='1' fill='horizontal'> + <JLabel text='isisfish.factor.name'/> + </cell> + <cell columns='3' fill='horizontal' weightx='1'> + <JTextField id='factorName' onKeyReleased='setSaveEnabled(!factorName.getText().equals(""))'/> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1'> + <JRadioButton id='continueRadion' text='isisfish.factor.continue' buttonGroup='factorType' visible='{isContinuePossible()}' selected='{false}' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> + </cell> + </row> + <row> + <cell fill='both' columns='4' weightx='1' weighty='0.5'> + <JPanel id='continuousPanelContainer' layout='{new BorderLayout()}'/> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1'> + <JRadioButton id='discret' text='isisfish.factor.discret' selected='{true}' buttonGroup='factorType' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.factor.selectDiscretNumber' enabled='{!isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JTextField id='discretNumber' enabled='{!isContinueSelected()}'/> + </cell> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JButton text='isisfish.factor.validDiscretNumber' enabled='{!isContinueSelected()}' onActionPerformed='addTabs(discretNumber.getText())'/> + </cell> + </row> + <row> + <cell columns='4' fill='both' weightx='1' weighty='0.3'> + <JTabbedPane id='tabPane' visible='{!isContinueSelected()}' enabled='{!isContinueSelected()}'/> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal'> + <JLabel text='isisfish.factor.comment'/> + </cell> + </row> + <row> + <cell columns='4' fill='both' weightx='1' weighty='0.3'> + <JScrollPane> + <JTextArea id='comment'/> + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.25'> + <JButton id='cancel' text='isisfish.common.cancel' onActionPerformed='exit()'/> + </cell> + <cell fill='horizontal' weightx='0.25'> + <JButton id='remove' text='isisfish.common.remove' visible='{isExistingValue()}' onActionPerformed='remove()'/> + </cell> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JButton id='save' text='isisfish.common.save' enabled='{isSaveEnabled()}' onActionPerformed='save()'/> + </cell> + </row> + </Table> +</JDialog> \ No newline at end of file Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -1,75 +0,0 @@ - -<ContinuousPanelContainer> - - <org.codelutin.math.matrix.MatrixND id='matrix' javaBean='null'/> - - <script><![CDATA[ -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.math.matrix.gui.JAXXMatrixEditor; - ]]> - </script> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.factor.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='both' weightx='1' weighty='1'> -  - <JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> -  - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.factor.coefficient' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='both' columns='2' weightx='1' weighty='1'> - <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.factor.operateur' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='1' columns='3'> - <JComboBox id='operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'> - <item id='plus' value="+"/> - <item id='moins' value="-"/> - <item id='mult' value="*"/> - <item id='div' value="/"/> - </JComboBox> - </cell> - </row> - </Table> -</ContinuousPanelContainer> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx (from rev 2134, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -0,0 +1,62 @@ + +<ContinuousPanelContainerUI> + + <org.codelutin.math.matrix.MatrixND id='matrix' javaBean='null'/> + + <script><![CDATA[ +import org.codelutin.math.matrix.MatrixND; +import org.codelutin.math.matrix.gui.JAXXMatrixEditor; + ]]> + </script> + <Table id='content' constraints='BorderLayout.CENTER'> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.factor.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='both' weightx='1' weighty='1'> +  + <JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> +  + </cell> + </row> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.factor.coefficient' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.factor.operateur' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='1' columns='3'> + <JComboBox id='operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'> + <item id='plus' value="+"/> + <item id='moins' value="-"/> + <item id='mult' value="*"/> + <item id='div' value="/"/> + </JComboBox> + </cell> + </row> + </Table> +</ContinuousPanelContainerUI> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -15,7 +15,8 @@ * 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. - *##%*/ --> + *##%*/ +--> <Table> <script><![CDATA[ import javax.swing.table.DefaultTableModel; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2009-04-24 15:56:19 UTC (rev 2144) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2009-04-24 15:57:15 UTC (rev 2145) @@ -16,16 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/* * - * SensitivitySecondPassUI. - * - * @author chatellier - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ --> <Table> <script><![CDATA[

1 0

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

24 Apr '09

Author: chatellier Date: 2009-04-24 15:56:19 +0000 (Fri, 24 Apr 2009) New Revision: 2144 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/ssh/SSHUserInfo.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: Add log info message if ssh key is found, or not found 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-04-24 10:27:19 UTC (rev 2143) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-24 15:56:19 UTC (rev 2144) @@ -423,6 +423,11 @@ jsch.addIdentity(sshKey.getAbsolutePath()); sshKeyUsed = true; } + else { + if (log.isInfoEnabled()) { + log.info(_("Can't read ssh key : %s", sshKey)); + } + } Session session = jsch.getSession(username, host, port); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUserInfo.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUserInfo.java 2009-04-24 10:27:19 UTC (rev 2143) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUserInfo.java 2009-04-24 15:56:19 UTC (rev 2144) @@ -20,7 +20,6 @@ import javax.swing.JOptionPane; import javax.swing.JPasswordField; -import javax.swing.JTextField; import com.jcraft.jsch.UserInfo; 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-04-24 10:27:19 UTC (rev 2143) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-24 15:56:19 UTC (rev 2144) @@ -16,6 +16,7 @@ Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default= Can't\ instantiate\ %s= Can't\ open\ log\ for\ %s= +Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= Check\ syntax\ of\ the\ current\ script= @@ -166,6 +167,7 @@ isisfish.config.main.regionMap.description= isisfish.config.main.remoteCaparmor.description= isisfish.config.main.resultExport.description= +isisfish.config.main.simulation.max.simultaneous.simulation.description= isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description= isisfish.config.main.simulation.ssh.control.check.interval.description= isisfish.config.main.simulation.ssh.datapath.description= @@ -251,7 +253,6 @@ isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script -isisfish.error.factor.coefValueIsOne=Coefficient can't be equal to 1 isisfish.error.factor.invalid=Factor is not valid isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion @@ -292,7 +293,6 @@ isisfish.error.no.sector=No sector defined isisfish.error.no.select.simulation=could not select simulation isisfish.error.no.target.species=no target species in %1$s for %2$s -isisfish.error.not.found.class=this class does not isisfish.error.not.found.code=could not found codeclass for %1$s isisfish.error.not.found.description=could not found description for %1$s isisfish.error.not.found.field=could not found field %1$s doc for %2$s @@ -359,8 +359,6 @@ isisfish.error.wait.simThread=Can't wait SimThread isisfish.error.warning.title=Warning isisfish.error.write.simulation=Can't write information %1$s -isisfish.exit.text=Something has change, please enter a comment -isisfish.exit.title=Exit isisfish.export.directory=Export directory isisfish.export.saved=Export saved isisfish.export.title=Results export 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-04-24 10:27:19 UTC (rev 2143) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-24 15:56:19 UTC (rev 2144) @@ -16,6 +16,7 @@ Can't\ instanciate\ wanted\ VCS\ (%s),\ use\ default= Can't\ instantiate\ %s= Can't\ open\ log\ for\ %s= +Can't\ read\ ssh\ key\ \:\ %s= Can't\ simulate\ %s= Check\ state\ of\ local\ repository\:\ %s= Check\ syntax\ of\ the\ current\ script= @@ -166,6 +167,7 @@ isisfish.config.main.regionMap.description=le nom du r\u00E9pertoire contenant les maps d'une r\u00E9gion isisfish.config.main.remoteCaparmor.description=lance les simulations sur un serveur distant isisfish.config.main.resultExport.description=TODO +isisfish.config.main.simulation.max.simultaneous.simulation.description= isisfish.config.main.simulation.ssh.addscripttoqueuecommand.description= isisfish.config.main.simulation.ssh.control.check.interval.description= isisfish.config.main.simulation.ssh.datapath.description= @@ -251,7 +253,6 @@ isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script -isisfish.error.factor.coefValueIsOne=Un co\u00E9fficient ne peux pas \u00EAtre \u00E9gual \u00E0 1 isisfish.error.factor.invalid=Le facteur n'est pas valide isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion @@ -292,7 +293,6 @@ isisfish.error.no.sector=il n'y a pas de secteur de d\u00E9finit isisfish.error.no.select.simulation=could not select simulation isisfish.error.no.target.species=no target species in %1$s for %2$s -isisfish.error.not.found.class=this class does not isisfish.error.not.found.code=could not found codeclass for %1$s isisfish.error.not.found.description=could not found description for %1$s isisfish.error.not.found.field=could not found field %1$s doc for %2$s @@ -359,8 +359,6 @@ isisfish.error.wait.simThread=Can't wait SimThread isisfish.error.warning.title=Attention isisfish.error.write.simulation=Can't write information %1$s -isisfish.exit.text=Quelque chose a chang\u00E9, merci de saisir un commentaire -isisfish.exit.title=Exit isisfish.export.directory=Dossier d'export isisfish.export.saved=Exports des r\u00E9sultats sauvegard\u00E9s isisfish.export.title=Export des r\u00E9sultats

1 0

r2143 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 24 Apr '09

24 Apr '09

Author: chatellier Date: 2009-04-24 10:27:19 +0000 (Fri, 24 Apr 2009) New Revision: 2143 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Recupere l'export xml avant le compute (car ce dernier le modifie). Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-04-23 16:08:14 UTC (rev 2142) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-04-24 10:27:19 UTC (rev 2143) @@ -406,15 +406,17 @@ masterExportDirectory.mkdirs(); } + // export designplan as XML + // get as XML (before compute) + // compute do bad modification on design plan + String xmlDesignPlan = MexicoHelper.getDesignPlanAsXML(designPlan); + SensitivityScenarios sensitivityScenarios = sensitivitycalculator .compute(designPlan, masterExportDirectory); // ajout des parametres de simulation param.setSensitivityCalculator(sensitivitycalculator); param.setNumberOfSensitivitySimulation(sensitivityScenarios.getScenarios().size()); - - // export designplan as XML - String xmlDesignPlan = MexicoHelper.getDesignPlanAsXML(designPlan); // on l'ajoute tout de suite a la liste des simulations demandee // init with default "id" must been changed for designPlan

1 0

r2142 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input src/main/resources
by sletellier＠users.labs.libre-entreprise.org 23 Apr '09

23 Apr '09

Author: sletellier Date: 2009-04-23 16:08:14 +0000 (Thu, 23 Apr 2009) New Revision: 2142 Removed: isis-fish/trunk/src/main/resources/log4j.properties Modified: isis-fish/trunk/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx Log: bug fixed Property changes on: isis-fish/trunk ___________________________________________________________________ Name: svn:ignore - maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-23 15:47:53 UTC (rev 2141) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-23 16:08:14 UTC (rev 2142) @@ -100,25 +100,23 @@ } } - protected void accept(ActionEvent e) { - JComponent source = (JComponent) e.getSource(); - Class classBean = (Class)source.getClientProperty("bean"); - String beanID = (String)source.getClientProperty("beanID"); - TopiaEntity bean = null; - if(beanID == null){ - bean = getVerifier().getEntity(classBean); - } - else{ - System.out.println(beanID); - bean = getVerifier().getEntity(classBean, beanID); - } - if (bean != null){ - FactorWizard wizard = new FactorWizard(this); +protected void accept(ActionEvent e) { + JComponent source = (JComponent) e.getSource(); + Class classBean = (Class)source.getClientProperty("bean"); + String beanID = (String)source.getClientProperty("beanID"); + TopiaEntity bean = null; + if (beanID == null){ + bean = getVerifier().getEntity(classBean); + } + else{ + bean = getVerifier().getEntity(classBean, beanID); + } + if (bean != null){ + FactorWizard wizard = new FactorWizard(this); - wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); - wizard.pack(); - wizard.setVisible(true); - } + wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); + wizard.pack(); + wizard.setVisible(true); } } Deleted: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2009-04-23 15:47:53 UTC (rev 2141) +++ isis-fish/trunk/src/main/resources/log4j.properties 2009-04-23 16:08:14 UTC (rev 2142) @@ -1,17 +0,0 @@ -# Global logging configuration -log4j.rootLogger=ERROR, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -# package level -log4j.logger.fr.ifremer.isisfish=INFO -log4j.logger.org.codelutin=INFO -log4j.logger.analyseplans=INFO -log4j.logger.exports=INFO -log4j.logger.formules=INFO -log4j.logger.rules=INFO -log4j.logger.scripts=INFO -log4j.logger.sensitivity=INFO -log4j.logger.simulators=INFO

1 0

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

23 Apr '09

Author: sletellier Date: 2009-04-23 15:47:53 +0000 (Thu, 23 Apr 2009) New Revision: 2141 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Log: Bug StrategiesOneMonth factor resolved Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-23 15:34:25 UTC (rev 2140) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-04-23 15:47:53 UTC (rev 2141) @@ -100,15 +100,25 @@ } } -protected void accept(ActionEvent e) { - JComponent source = (JComponent) e.getSource(); - Class classBean = (Class)source.getClientProperty("bean"); - TopiaEntity bean = getVerifier().getEntity(classBean); - if (bean != null) { - FactorWizard wizard = new FactorWizard(this); - wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); - wizard.pack(); - wizard.setVisible(true); + protected void accept(ActionEvent e) { + JComponent source = (JComponent) e.getSource(); + Class classBean = (Class)source.getClientProperty("bean"); + String beanID = (String)source.getClientProperty("beanID"); + TopiaEntity bean = null; + if(beanID == null){ + bean = getVerifier().getEntity(classBean); + } + else{ + System.out.println(beanID); + bean = getVerifier().getEntity(classBean, beanID); + } + if (bean != null){ + FactorWizard wizard = new FactorWizard(this); + + wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); + wizard.pack(); + wizard.setVisible(true); + } } } 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-04-23 15:34:25 UTC (rev 2140) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-04-23 15:47:53 UTC (rev 2141) @@ -27,6 +27,8 @@ import java.beans.PropertyChangeListener; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; import java.util.List; import javax.swing.JButton; @@ -50,6 +52,8 @@ import fr.ifremer.isisfish.ui.SaveVerifier; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; +import java.util.Map; +import java.util.Map.Entry; /** * InputSaveVerifier. @@ -107,8 +111,8 @@ protected String currentOnglet = null; protected TopiaContext isisContext = null; - protected List<TopiaEntity> currentEntities = new ArrayList<TopiaEntity>(); - protected List<InputContentUI> currentPanels = new ArrayList<InputContentUI>(); + protected Map<String, TopiaEntity> currentEntities = new HashMap <String, TopiaEntity>(); + protected List<InputContentUI> currentPanels = new ArrayList <InputContentUI>(); protected InputUI rootUI; protected SensitivityTabUI sensUI; @@ -269,7 +273,7 @@ public void topiaSave() { try { noModif(); - for (TopiaEntity t : currentEntities) { + for (TopiaEntity t : currentEntities.values()){ t.update(); if (log.isDebugEnabled()) { log.debug("updating : " + t); @@ -294,23 +298,24 @@ try { noModif(); isisContext.rollbackTransaction(); - List<TopiaEntity> canceledEntity = currentEntities; - currentEntities = new ArrayList<TopiaEntity>(); + Map<String, TopiaEntity> canceledEntity = new HashMap<String, TopiaEntity>(); + for (Entry<String, TopiaEntity> currentEntity : currentEntities.entrySet()) { + TopiaEntity t = isisContext.findByTopiaId(currentEntity.getValue().getTopiaId()); - // TODO a quoi ca sert de recharger les entités ? - for (TopiaEntity t : canceledEntity) { - TopiaEntity t2 = isisContext.findByTopiaId(t.getTopiaId()); - - // desynchronise la précédente - // fix : org.hibernate.NonUniqueObjectException: a different object with the - // same identifier value was already associated with the session - //((TopiaContextImpl)isisContext).getHibernate().evict(t2); - //t.setTopiaId(null); - - rootUI.repaintNode(currentNode.getContextPath()); - rootUI.setTreeSelection(currentNode.getContextPath()); - addCurrentEntity(t2); - } + // TODO a quoi ca sert de recharger les entités ? + // desynchronise la précédente + // fix : org.hibernate.NonUniqueObjectException: a different object with the + // same identifier value was already associated with the session + //((TopiaContextImpl)isisContext).getHibernate().evict(t2); + //t.setTopiaId(null); + + rootUI.repaintNode(currentNode.getContextPath()); + rootUI.setTreeSelection(currentNode.getContextPath()); + + String key = currentEntity.getKey(); + canceledEntity.put(key, t); + addCurrentEntity(t); + } rootUI.setInfoText(_("isisfish.message.cancel.finished")); } catch (Exception eee) { if (log.isErrorEnabled()) { @@ -339,7 +344,7 @@ } } - public void addCurrentEntity(TopiaEntity currentEntity) { + public void addCurrentEntity(TopiaEntity currentEntity, String key) { if (currentEntity != null) { editable = true; isisContext = currentEntity.getTopiaContext(); @@ -358,12 +363,17 @@ if (entity != null) { currentEntities.remove(entity); } - this.currentEntities.add(currentEntity); + this.currentEntities.put(key, currentEntity); setPanelsActifs(); } } - public void removeAllEntity() { + public void addCurrentEntity(TopiaEntity currentEntity) { + if (currentEntity != null){ + addCurrentEntity(currentEntity, currentEntity.getTopiaId()); + } + } + public void removeAllEntity(){ currentEntities.clear(); editable = false; noModif(); @@ -446,13 +456,17 @@ return isisContext; } - public List<TopiaEntity> getCurrentEntities() { - return currentEntities; + public Collection<TopiaEntity> getCurrentEntities() { + return currentEntities.values(); } - public <E extends TopiaEntity> E getEntity(Class<E> clazz) { - for (TopiaEntity te : currentEntities) { - if (clazz.isInstance(te)) { + public <E extends TopiaEntity> E getEntity(Class<E> clazz, String key){ + return (E)currentEntities.get(key); + } + + public <E extends TopiaEntity> E getEntity(Class<E> clazz){ + for (TopiaEntity te : currentEntities.values()){ + if (clazz.isInstance(te)){ return (E) te; } } 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-04-23 15:34:25 UTC (rev 2140) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-04-23 15:47:53 UTC (rev 2141) @@ -56,7 +56,7 @@ int month = 0; PropertyChangeListener listener = null; -addPropertyChangeListener("bean", new PropertyChangeListener() { +addPropertyChangeListener("strategyMonthInfo", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { // remove previous binding on getBean() @@ -92,6 +92,9 @@ } } if (getStrategyMonthInfo() != null){ + numberOfTrips.putClientProperty("beanID", getStrategyMonthInfo().getTopiaId()); + fieldStrategyMonthInfoProportion.putClientProperty("beanID", getStrategyMonthInfo().getTopiaId()); + fieldStrategyMonthInfoMinInactivityDays.putClientProperty("beanID", getStrategyMonthInfo().getTopiaId()); ActionListener[] listeners = fieldStrategyMonthInfoTripType.getActionListeners(); for (ActionListener listener : listeners){ fieldStrategyMonthInfoTripType.removeActionListener(listener);

1 0

r2140 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 23 Apr '09

23 Apr '09

Author: chatellier Date: 2009-04-23 15:34:25 +0000 (Thu, 23 Apr 2009) New Revision: 2140 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Reformat one method (label error) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-04-23 15:27:52 UTC (rev 2139) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-04-23 15:34:25 UTC (rev 2140) @@ -371,7 +371,7 @@ * * @return le nombre de simulations authorisé */ - public int getSimulatorSshMaxSimulteaneousSimulation() { + public int getSimulatorSshMaxSimultaneousSimulation() { int result = getOptionAsInt(Option.SIMULATOR_SSH_MAX_SIMULTANEOUS_SIMULATION.key); return result; } 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-04-23 15:27:52 UTC (rev 2139) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-23 15:34:25 UTC (rev 2140) @@ -92,7 +92,7 @@ * Semaphore used to upload only 20 (default) simulations at a time. */ protected static Semaphore semaphore = new Semaphore(IsisFish.config - .getSimulatorSshMaxSimulteaneousSimulation()); + .getSimulatorSshMaxSimultaneousSimulation()); /** * Constructor.

1 0