Isis-fish-commits

Download

isis-fish-commits@list.isis-fish.org

June 2009

5 participants
152 discussions

r2298 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/simulator/sensitivity main/java/fr/ifremer/isisfish/ui/sensitivity main/java/fr/ifremer/isisfish/ui/simulator test/java/fr/ifremer/isisfish/simulator/sensitivity test/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 02 Jun '09

02 Jun '09

Author: chatellier Date: 2009-06-02 08:50:57 +0000 (Tue, 02 Jun 2009) New Revision: 2298 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.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/FactorTreeModel.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/SensitivityTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java Log: Refactor sensitivity tree model (remove use of nodes) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2009-06-02 08:50:57 UTC (rev 2298) @@ -5,18 +5,14 @@ import java.util.Iterator; import java.util.List; -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.j2r.REngine; import org.codelutin.j2r.RException; import org.codelutin.j2r.RProxy; -import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.util.ConverterUtil; public abstract class AbstractSensitivityCalculator implements SensitivityCalculator { @@ -47,7 +43,7 @@ String isisfactors = "isis.factors<-data.frame(nomFacteur,Nominal,Continu,Binf,Bsup)"; //Create the vectors - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); for (int i = 0; i < factors.size(); i++) { Factor factor = factors.get(i); if (i != 0) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2009-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2009-06-02 08:50:57 UTC (rev 2298) @@ -40,13 +40,13 @@ private static final long serialVersionUID = 977975461743758075L; /** Liste des facteurs a utiliser */ - protected List<Factor> factors; + protected List<Factor<?, ?>> factors; /** * Constructor. */ public DesignPlan() { - factors = new ArrayList<Factor>(); + factors = new ArrayList<Factor<?, ?>>(); } /** @@ -54,7 +54,7 @@ * * @return factors list */ - public List<Factor> getFactors() { + public List<Factor<?, ?>> getFactors() { return factors; } @@ -63,7 +63,7 @@ * * @param factors the factors list to set */ - public void setFactors(List<Factor> factors) { + public void setFactors(List<Factor<?, ?>> factors) { this.factors = factors; } @@ -74,7 +74,7 @@ */ public void accept(DesignPlanVisitor visitor) { visitor.start(this); - for(Factor factor : factors) { + for (Factor<?, ?> factor : factors) { visitor.visit(this, factor); } visitor.end(this); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-06-02 08:50:57 UTC (rev 2298) @@ -22,8 +22,6 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; /** @@ -136,8 +134,7 @@ /** * Set comment. * - * @param the - * comment to set + * @param comment comment to set */ public void setComment(String comment) { this.comment = comment; 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-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeCellRenderer.java 2009-06-02 08:50:57 UTC (rev 2298) @@ -24,7 +24,7 @@ import javax.swing.JLabel; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.DefaultTreeCellRenderer; +import javax.swing.tree.TreeCellRenderer; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; @@ -37,10 +37,8 @@ * * Last update : $Date: 9 mars 2009 $ * By : $Author: chatellier $ - * - * TODO extends AbstractTreeCellRenderer and remove DefaultMutableTreeNode reference */ -public class FactorTreeCellRenderer extends DefaultTreeCellRenderer { +public class FactorTreeCellRenderer extends JLabel implements TreeCellRenderer { /** serialVersionUID. */ private static final long serialVersionUID = 1686424876690392268L; @@ -52,30 +50,23 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { - - JLabel c = (JLabel)super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus); - if (value instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode) value; - Object userObject = node.getUserObject(); + if (value instanceof List) { + setText("Facteurs : "); + } + else if (value instanceof Factor) { + Factor<? ,?> factor = (Factor<?, ?>)value; - if (userObject instanceof List) { - c.setText("Facteurs : "); + if (factor.getDomain() instanceof EquationContinuousDomain) { + EquationContinuousDomain domain = (EquationContinuousDomain)factor.getDomain(); + setText(factor.getName() + "." + domain.getVariableName()); } - else if (userObject instanceof Factor) { - Factor factor = (Factor)userObject; - //c = new JLabel(factor.getName()); - if (factor.getDomain() instanceof EquationContinuousDomain){ - EquationContinuousDomain domain = (EquationContinuousDomain)factor.getDomain(); - c.setText(factor.getName() + "." + domain.getVariableName()); - } - else { - c.setText(factor.getName()); - } + else { + setText(factor.getName()); } } - return c; + return this; } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModel.java 2009-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModel.java 2009-06-02 08:50:57 UTC (rev 2298) @@ -18,11 +18,13 @@ package fr.ifremer.isisfish.ui.sensitivity; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreeNode; +import javax.swing.event.TreeModelListener; +import javax.swing.tree.TreeModel; +import javax.swing.tree.TreePath; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -35,83 +37,70 @@ * Last update : $Date: 2008-06-13 11:05:57 +0200 (ven., 13 juin 2008) * $ By : $Author: chatellier $ */ -public class FactorTreeModel extends DefaultTreeModel { +public class FactorTreeModel implements TreeModel { /** serialVersionUID. */ private static final long serialVersionUID = 593284613450915826L; + /** Tree model root. */ + protected List<Factor<?,?>> factorsList; + + /** Tree model listeners. */ + protected Collection<TreeModelListener> modelListeners; + /** * Constructor. * - * @param root root node + * @param factorsList factors list */ - public FactorTreeModel(TreeNode root) { - super(root); + public FactorTreeModel(List<Factor<?,?>> factorsList) { + this.factorsList = factorsList; + modelListeners = new ArrayList<TreeModelListener>(); } /* - * @see javax.swing.tree.DefaultTreeModel#getChild(java.lang.Object, int) + * @see javax.swing.tree.TreeModel#getChild(java.lang.Object, int) */ @Override public Object getChild(Object parent, int index) { Object value = null; - if (parent instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode) parent; - Object userObject = node.getUserObject(); - - if (userObject instanceof List) { - Object localUserObject = ((DefaultMutableTreeNode)root).getUserObject(); - List<Factor> factors = (List<Factor>)localUserObject; - value = new DefaultMutableTreeNode(factors.get(index)); - } + if (parent instanceof List) { + List<Factor<?,?>> factors = (List<Factor<?,?>>)parent; + value = factors.get(index); } return value; } /* - * @see org.jdesktop.swingx.treetable.DefaultTreeTableModel#getChildCount(java.lang.Object) + * @see javax.swing.tree.TreeModel#getChildCount(java.lang.Object) */ @Override public int getChildCount(Object parent) { int childCount = 0; - if (parent instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode) parent; - Object userObject = node.getUserObject(); - - if (userObject instanceof List) { - Object localUserObject = ((DefaultMutableTreeNode)root).getUserObject(); - List<Factor> factors = (List<Factor>)localUserObject; - childCount = factors.size(); - } + if (parent instanceof List) { + List<Factor<?,?>> factors = (List<Factor<?,?>>)parent; + childCount = factors.size(); } return childCount; } /* - * @see javax.swing.tree.DefaultTreeModel#getIndexOfChild(java.lang.Object, java.lang.Object) + * @see javax.swing.tree.TreeModel#getIndexOfChild(java.lang.Object, java.lang.Object) */ @Override public int getIndexOfChild(Object parent, Object child) { int childIndex = -1; - if (parent instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode) parent; - Object userObject = node.getUserObject(); - DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) child; - Object childUserObject = childNode.getUserObject(); - - if (userObject instanceof List) { - Object localUserObject = ((DefaultMutableTreeNode)root).getUserObject(); - List<Factor> factors = (List<Factor>)localUserObject; - childIndex = factors.indexOf(childUserObject); - } + if (parent instanceof List) { + List<Factor<?,?>> factors = (List<Factor<?,?>>)parent; + childIndex = factors.indexOf(child); } return childIndex; @@ -125,4 +114,36 @@ return getChildCount(node) == 0; } + /* + * @see javax.swing.tree.TreeModel#addTreeModelListener(javax.swing.event.TreeModelListener) + */ + @Override + public void addTreeModelListener(TreeModelListener l) { + modelListeners.add(l); + } + + /* + * @see javax.swing.tree.TreeModel#getRoot() + */ + @Override + public Object getRoot() { + return factorsList; + } + + /* + * @see javax.swing.tree.TreeModel#removeTreeModelListener(javax.swing.event.TreeModelListener) + */ + @Override + public void removeTreeModelListener(TreeModelListener l) { + modelListeners.remove(l); + } + + /* + * @see javax.swing.tree.TreeModel#valueForPathChanged(javax.swing.tree.TreePath, java.lang.Object) + */ + @Override + public void valueForPathChanged(TreePath path, Object newValue) { + throw new RuntimeException("Not implemented"); + } + } 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-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-06-02 08:50:57 UTC (rev 2298) @@ -153,13 +153,13 @@ return result; } }; - java.util.List<Factor> factors = getSimulAction().getFactors(); + java.util.List<Factor<?, ?>> factors = getSimulAction().getFactors(); - java.util.List<Factor> factorsContinue = new ArrayList<Factor>(); + java.util.List<Factor<?, ?>> factorsContinue = new ArrayList<Factor<?, ?>>(); java.util.List<String> factorsContinueCardinalities = new ArrayList<String>(); - for (Factor f : factors){ + for (Factor<?, ?> f : factors) { Domain domain = f.getDomain(); - if (ContinuousDomain.class.isInstance(domain)){ + if (ContinuousDomain.class.isInstance(domain)) { ContinuousDomain continuousDomain = (ContinuousDomain)domain; factorsContinue.add(f); factorsContinueCardinalities.add(continuousDomain.getCardinality() + ""); 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-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-06-02 08:50:57 UTC (rev 2298) @@ -49,7 +49,7 @@ getVerifier().setSensPanel(this); new fr.ifremer.isisfish.ui.sensitivity.SensitivityNavigationTreeSelectionAdapter(this); -factors.addMouseListener(new MouseListener() { +factorsTree.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { // clic droit @@ -70,23 +70,6 @@ factorSelected(); } } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override - public void mouseReleased(MouseEvent e) { - } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } - }); protected InputAction getInputAction() { @@ -106,15 +89,14 @@ } protected void factorSelected() { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)factors.getSelectionValue(); - if (node != null) { - Object o = node.getUserObject(); - if (Factor.class.isInstance(o)) { - Factor f = (Factor)o; + Object selectedObject = factorsTree.getSelectionValue(); + if (selectedObject != null) { + if (selectedObject instanceof Factor) { + Factor<?, ?> selectedFactor = (Factor<?, ?>)selectedObject; FactorWizardUI wizard = new FactorWizardUI(this); - JComponent c = getSimulAction().getFactorComponent(f); - if (c != null) { - wizard.initExisting(c, f); + JComponent component = getSimulAction().getFactorComponent(selectedFactor); + if (component != null) { + wizard.initExisting(component, selectedFactor); wizard.pack(); wizard.setVisible(true); } @@ -154,25 +136,24 @@ navigation.setModel(model); } public void setFactorModel() { - TreeNode root = new DefaultMutableTreeNode(getSimulAction().getFactors()); - factors.setRootVisible(true); - FactorTreeModel model = new FactorTreeModel(root); - factors.setModel(model); - factors.setCellRenderer(new FactorTreeCellRenderer()); + java.util.List<Factor<?, ?>> factors = getSimulAction().getFactors(); + FactorTreeModel model = new FactorTreeModel(factors); + factorsTree.setModel(model); + factorsTree.setRootVisible(true); + factorsTree.setCellRenderer(new FactorTreeCellRenderer()); getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setFactorCardinalityTableModel(); } protected void deleteSelectedFactors() { - DefaultMutableTreeNode node = (DefaultMutableTreeNode)factors.getSelectionValue(); + Object selectedObject = factorsTree.getSelectionValue(); - if (node != null) { - Object o = node.getUserObject(); - if (o instanceof Factor) { - Factor factor = (Factor)o; + if (selectedObject != null) { + if (selectedObject instanceof Factor) { + Factor<?, ?> selectedFactor = (Factor<?, ?>)selectedObject; if (log.isDebugEnabled()) { - log.debug("Deleting factor " + factor.getName()); + log.debug("Deleting factor " + selectedFactor.getName()); } - getSimulAction().removeFactor(factor); + getSimulAction().removeFactor(selectedFactor); setFactorModel(); } } @@ -196,7 +177,7 @@ </Table> <JPanel id="factorPanel" name="factorPanel" layout='{new BorderLayout()}'> <JScrollPane constraints='BorderLayout.CENTER'> - <JTree id="factors" rootVisible="true" selectionRow='0' + <JTree id="factorsTree" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}' /> </JScrollPane> </JPanel> 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-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-06-02 08:50:57 UTC (rev 2298) @@ -954,15 +954,20 @@ } } - public List<Factor> getFactors() { - List<Factor> result = new ArrayList<Factor>(); - for (Map.Entry entry : factors.entrySet()) { - result.add((Factor) entry.getValue()); + /** + * Get current simulation factor list. + * + * @return factor list + */ + public List<Factor<?, ?>> getFactors() { + List<Factor<?, ?>> result = new ArrayList<Factor<?, ?>>(); + for (Map.Entry<?, ?> entry : factors.entrySet()) { + result.add((Factor<?, ?>) entry.getValue()); } return result; } - public void addFactor(Factor f, JComponent c) { + public void addFactor(Factor<?, ?> f, JComponent c) { factors.put(f.getPath() + f.getName(), f); factorComponent.put(f.getPath() + f.getName(), c); designPlan.setFactors(getFactors()); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2009-06-02 08:50:57 UTC (rev 2298) @@ -89,7 +89,7 @@ // return result SensitivityScenarios sensitivityScenarios = new SensitivityScenarios(); - List<Factor> factors = plan.getFactors(); + List<Factor<?, ?>> factors = plan.getFactors(); for (int i = 0; i < factors.size() * 2; ++i) { Scenario scenario = new Scenario(); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-06-02 08:50:14 UTC (rev 2297) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2009-06-02 08:50:57 UTC (rev 2298) @@ -63,7 +63,7 @@ * * @return la liste des facteur */ - protected List<Factor> getFactors() { + protected List<Factor<?,?>> getFactors() { Factor<Integer, Integer> factor1 = new Factor<Integer, Integer>( "testint"); @@ -101,11 +101,10 @@ domain2.getValues().put("m1", matrix1); domain2.getValues().put("m2", matrix2); factor2.setDomain(domain2); - factor2 - .setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); + factor2.setPath("org.codelutin.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier("m2"); - List<Factor> factors1 = new ArrayList<Factor>(); + List<Factor<?,?>> factors1 = new ArrayList<Factor<?,?>>(); factors1.add(factor1); factors1.add(factor2); @@ -118,10 +117,9 @@ @Test public void testJTreeModel() throws InterruptedException { - TreeNode root = new DefaultMutableTreeNode(getFactors()); - final JTree tree = new JTree(root); + final JTree tree = new JTree(); tree.setRootVisible(true); - FactorTreeModel model = new FactorTreeModel(root); + FactorTreeModel model = new FactorTreeModel(getFactors()); tree.setModel(model); tree.setCellRenderer(new FactorTreeCellRenderer());

1 0

r2297 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/aspect java/fr/ifremer/isisfish/datastore java/fr/ifremer/isisfish/simulator/sensitivity/domain java/fr/ifremer/isisfish/ui java/fr/ifremer/isisfish/ui/input resources/i18n
by chatellier＠users.labs.libre-entreprise.org 02 Jun '09

02 Jun '09

Author: chatellier Date: 2009-06-02 08:50:14 +0000 (Tue, 02 Jun 2009) New Revision: 2297 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.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: Fix doc, variables names and javadoc Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -72,7 +72,6 @@ import fr.ifremer.isisfish.vcs.VCSActionEvent; import fr.ifremer.isisfish.vcs.VCSException; import fr.ifremer.isisfish.vcs.VCSFactory; -import fr.ifremer.isisfish.vcs.VCSNone; import fr.ifremer.isisfish.vcs.VetoableActionListener; /** @@ -286,7 +285,6 @@ * à l'utilisateur. * * @param msg msg to show - * @return true if user confirm question */ protected static void warn(String msg) { JOptionPane.showMessageDialog(null, msg, Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -3,8 +3,8 @@ * * Contains two aspects : * <ul> - * <li>{@link Cache} : cache aspect</li> - * <li>{@link Trace} : trace expect</li> + * <li>{@link fr.ifremer.isisfish.aspect.Cache} : cache aspect</li> + * <li>{@link fr.ifremer.isisfish.aspect.Trace} : trace expect</li> * </ul> */ package fr.ifremer.isisfish.aspect; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2005 Code Lutin, Cédric Pineau, + * Copyright (C) 2002-2009 Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -33,34 +33,26 @@ import static org.codelutin.i18n.I18n._; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Properties; import java.util.Set; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.i18n.I18n; import org.codelutin.math.matrix.MatrixFactory; import org.codelutin.math.matrix.MatrixIterator; import org.codelutin.math.matrix.MatrixND; import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; import org.codelutin.util.ArrayUtil; import org.codelutin.util.HashList; -import org.codelutin.util.VersionNumberUtil; -import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.entities.ActiveRule; import fr.ifremer.isisfish.entities.ActiveRuleDAO; import fr.ifremer.isisfish.entities.Population; @@ -100,7 +92,7 @@ /** * Les ResultStorage ne doivent pas etre instancier directement, mais * recuperer a partir d'un - * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultManager} + * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultStorage()} */ public ResultStorage(SimulationStorage simulation) { this.simulation = simulation; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -18,21 +18,12 @@ package fr.ifremer.isisfish.simulator.sensitivity.domain; -import java.io.Serializable; - -import org.codelutin.math.matrix.MapFunction; - -import fr.ifremer.isisfish.entities.Equation; - /** * Domaine continu portant sur variable pouvant prendre diférente valeur par * rapport à une valeur initiale. * * Composé d'un borne min et max et d'un opération. * - * @param <E> - * type des valeurs gérées par le domaine - * * @author chatellier * @version $Revision: 1.0 $ * @@ -124,8 +115,7 @@ /** * Set coefficient. * - * @param the - * coefficient to set + * @param coefficient the coefficient to set */ public void setCoefficient(Double coefficient) { this.coefficient = coefficient; @@ -143,8 +133,7 @@ /** * Set reference value. * - * @param the - * reference value.to set + * @param referenceValue the reference value.to set */ public void setReferenceValue(Double referenceValue) { this.referenceValue = referenceValue; @@ -176,6 +165,7 @@ * In equation continuous domain, value appear in continuous domain values * only. Here : return identifier. */ + @Override public Double getValueForIdentifier(Double identifier) { this.value = identifier; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -28,9 +28,6 @@ * * Composé d'un borne min et max et d'une matrice. * - * @param <E> - * type des valeurs gérées par le domaine - * * @author chatellier * @version $Revision: 1.0 $ * @@ -135,14 +132,13 @@ } /** - * {@inheritDoc}. - * - * In continuous domain, just return identifier + * In continuous domain, just return identifier. */ public MatrixND getValueForIdentifier(final Serializable identifier) { return getValueForIdentifier((Double)identifier); } - /** + + /** * {@inheritDoc}. * * In continuous domain, just return identifier @@ -197,7 +193,7 @@ this.value = value; } - public MatrixContinuousDomain clone(){ + public MatrixContinuousDomain clone() { MatrixContinuousDomain cloned = new MatrixContinuousDomain(); cloned.setCardinality(this.cardinality); cloned.setMaxBound(this.maxBound); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -57,7 +57,7 @@ for (SaveVerifier s : verifiers) { int reponse = s.checkEdit(); - + // return false, if at least one verifier // return cancel option if (reponse == JOptionPane.CANCEL_OPTION) { 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-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-02 08:50:14 UTC (rev 2297) @@ -132,23 +132,29 @@ @Override public int checkEdit() { - int responce = JOptionPane.NO_OPTION; + int response = JOptionPane.NO_OPTION; if (editable) { if (changed) { // ask user to close edition // still in edit mode, must warn user - responce = askUser(_("isisfish.message.page.modified")); - if (responce == JOptionPane.NO_OPTION) { + response = askUser(_("isisfish.message.page.modified")); + if (response == JOptionPane.NO_OPTION) { topiaCancel(); - } else if (responce == JOptionPane.YES_OPTION) { + } else if (response == JOptionPane.YES_OPTION) { topiaSave(); } } } - return responce; + return response; } - public int askUser(String message) { + /** + * Ask user option to save non saved datas. + * + * @param message message to display + * @return user option + */ + protected int askUser(String message) { int response = JOptionPane.showConfirmDialog(rootUI, message, _("isisfish.input.menu.commit"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); @@ -173,9 +179,15 @@ setEnabled(currentDeleteButton, editable); } - protected void setEnabled(JButton b, boolean enabled) { - if (b != null) { - b.setEnabled(enabled); + /** + * Set component enabled state. + * + * @param c component + * @param enabled enabled state + */ + protected void setEnabled(Component c, boolean enabled) { + if (c != null) { + c.setEnabled(enabled); } } 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-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-02 08:50:14 UTC (rev 2297) @@ -234,7 +234,7 @@ isisfish.equation.editor.title=Equation Editor isisfish.error.acceptable.population=New value isn't acceptable value for this population isisfish.error.add.card=Error while adding of result to the map. -isisfish.error.add.logger.simulation\ =isisfish.error.add.logger.simulation +isisfish.error.add.logger.simulation=isisfish.error.add.logger.simulation isisfish.error.add.result.data=Error while adding result ot data. isisfish.error.add.result.graph=Error while adding result to graph isisfish.error.add.tray=Can't add system tray icon @@ -266,6 +266,7 @@ isisfish.error.empty.unit=measure unit is empty isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s +isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.factor.invalid=Factor is not valid isisfish.error.file.already.exists=The file %1$s already exist @@ -619,8 +620,7 @@ isisfish.message.setting.trace.aspects=Setting Trace aspects isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution -isisfish.message.simulation.prepare=Preparing simulation -isisfish.message.spacialized.visualisation= +isisfish.message.simulation.prepare= isisfish.message.tray.disabled=SystemTray disabled isisfish.message.update.finished=update finished isisfish.metier.comments=Comments @@ -753,6 +753,7 @@ isisfish.populationSeasons.selectSeason=Select a season isisfish.populationSeasons.showSpacialized=Show the spacialized isisfish.populationSeasons.spacialized=Spacialized +isisfish.populationSeasons.spacialized.visualisation=Spacialized isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Match between spawning and recruitment areas isisfish.populationZones.selectPopulationAreas=Select the population areas 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-05-29 13:56:11 UTC (rev 2296) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-02 08:50:14 UTC (rev 2297) @@ -232,9 +232,9 @@ isisfish.effortDescription.toString=EffortDescription for %1$s with %2$s isisfish.effortDescription.unitCostOfFishing=Co\u00FBt unitaire de la p\u00EAche isisfish.equation.editor.title=Editeur d'\u00E9quation -isisfish.error.acceptable.population=La\t nouvelle valeur n'est pas une valeur valide pour cette population +isisfish.error.acceptable.population=La nouvelle valeur n'est pas une valeur valide pour cette population isisfish.error.add.card=Erreur lors de l'ajout du r\u00E9sultat \u00E0 la carte. -isisfish.error.add.logger.simulation\ =isisfish.error.add.logger.simulation +isisfish.error.add.logger.simulation=isisfish.error.add.logger.simulation isisfish.error.add.result.data=Erreur lors de l'ajout du r\u00E9sultat au data. isisfish.error.add.result.graph=Erreur lors de l'ajout du r\u00E9sultat au graph. isisfish.error.add.tray=Impossible d'ajouter une icone de notification @@ -266,6 +266,7 @@ isisfish.error.empty.unit=l'unit\u00E9 de mesure est vide isisfish.error.equation.return.number=EquationImpl must retun a number\: %1$s isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s +isisfish.error.evaluate.preplan.script= isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.factor.invalid=Le facteur n'est pas valide isisfish.error.file.already.exists=The file %1$s already exist @@ -603,7 +604,7 @@ isisfish.message.old.simulation.loaded=Ancienne simulation charg\u00E9e isisfish.message.page.modified=Cette page a \u00E9t\u00E9 modifi\u00E9, voulez-vous la sauvegarder ? isisfish.message.presimulation.script.execution=Ex\u00E9cution des scripts de Presimulation -isisfish.message.recruitment.number.month=Input the number of month of recruitment +isisfish.message.recruitment.number.month=Entrez le nombre de mois de recrutement isisfish.message.region.commited=R\u00E9gion commit\u00E9e isisfish.message.region.loaded=R\u00E9gion charg\u00E9e isisfish.message.region.remove.canceled=Suppression de r\u00E9gion annul\u00E9 @@ -620,7 +621,6 @@ isisfish.message.simulation.ended=Simulation termin\u00E9e isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Pr\u00E9paration de la simulation -isisfish.message.spacialized.visualisation= isisfish.message.tray.disabled=Icone de notification d\u00E9sactiv\u00E9e isisfish.message.update.finished=Mise \u00E0 jour termin\u00E9e isisfish.metier.comments=Commentaires @@ -753,6 +753,7 @@ isisfish.populationSeasons.selectSeason=S\u00E9lectionnez une saison isisfish.populationSeasons.showSpacialized=Voir les coefficients spatialis\u00E9s isisfish.populationSeasons.spacialized=spatialis\u00E9 +isisfish.populationSeasons.spacialized.visualisation=Coefficients spatialis\u00E9s isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Correspondance entre les zones de reproduction et de recrutement isisfish.populationZones.selectPopulationAreas=S\u00E9lectionnez les zones des populations

1 0

Jump to page: