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

r3538 - in trunk/src/main/java/fr/ifremer/isisfish/ui: result widget
by echatellier＠users.forge.codelutin.com 22 Nov '11

22 Nov '11

Author: echatellier Date: 2011-11-22 15:46:53 +0100 (Tue, 22 Nov 2011) New Revision: 3538 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3538 Log: Fix binding Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-22 14:00:17 UTC (rev 3537) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-22 14:46:53 UTC (rev 3538) @@ -37,21 +37,19 @@ <JLabel text="isisfish.result.choose.simulation"/> </cell> <cell fill="horizontal" weightx="1"> - <fr.ifremer.isisfish.ui.widget.FilterableComboBox id="simulationComboBox"/> + <fr.ifremer.isisfish.ui.widget.FilterableComboBox id="simulationComboBox" + onActionPerformed="openButton.setEnabled(getSimulationComboBox().getSelectedItem() != null);removeButton.setEnabled(getSimulationComboBox().getSelectedItem() != null);logButton.setEnabled(getSimulationComboBox().getSelectedItem() != null);"/> </cell> <cell> - <JButton text="isisfish.result.new.window" - enabled="{getSimulationComboBox().getSelectedItem() != null}" + <JButton id="openButton" text="isisfish.result.new.window" onActionPerformed="getHandler().openNewSimulation(this)"/> </cell> <cell> - <JButton text="isisfish.result.remove.simulation" - enabled="{getSimulationComboBox().getSelectedItem() != null}" + <JButton id="removeButton" text="isisfish.result.remove.simulation" onActionPerformed="getHandler().deleteSimulation(this)"/> </cell> <cell> - <JButton text="isisfish.result.show.simulation.log" - enabled="{getSimulationComboBox().getSelectedItem() != null}" + <JButton id="logButton" text="isisfish.result.show.simulation.log" onActionPerformed="getHandler().showLog(this)"/> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-22 14:00:17 UTC (rev 3537) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-22 14:46:53 UTC (rev 3538) @@ -33,6 +33,7 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -70,13 +71,11 @@ protected FilterComboBoxModel filterModel; protected List<ActionListener> actionListeners; - protected List<ItemListener> itemListeners; protected boolean filtering = false; public FilterableComboBox() { actionListeners = new ArrayList<ActionListener>(); - itemListeners = new ArrayList<ItemListener>(); buildLayout(); } @@ -178,20 +177,6 @@ } } } - - class ComboBoxItemListener implements ItemListener { - /* - * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) - */ - @Override - public void itemStateChanged(ItemEvent e) { - if (!filtering) { - for (ItemListener i : itemListeners) { - i.itemStateChanged(e); - } - } - } - } /** * Build layout. @@ -199,7 +184,6 @@ private void buildLayout() { dataBox = new JXComboBox(); dataBox.addActionListener(new ComboBoxActionListener()); - dataBox.addItemListener(new ComboBoxItemListener()); filterField = new JXTextField(_("isisfish.common.filter")); // fix size filterField.setPreferredSize(new Dimension(200, 0)); @@ -242,12 +226,4 @@ public boolean removeActionListener(ActionListener o) { return actionListeners.remove(o); } - - public boolean addItemListener(ItemListener e) { - return itemListeners.add(e); - } - - public boolean removeItemListener(ItemListener o) { - return itemListeners.remove(o); - } } \ No newline at end of file

1 0

r3537 - in trunk/src/main: java/fr/ifremer/isisfish/ui/result java/fr/ifremer/isisfish/ui/simulator java/fr/ifremer/isisfish/ui/widget resources/i18n
by echatellier＠users.forge.codelutin.com 22 Nov '11

22 Nov '11

Author: echatellier Date: 2011-11-22 15:00:17 +0100 (Tue, 22 Nov 2011) New Revision: 3537 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3537 Log: #517 : Ajouter un filtrage des simulations plus simple (seulement par le nom) Added: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2011-11-22 14:00:17 UTC (rev 3537) @@ -109,7 +109,7 @@ protected void initSimulationList(ResultUI resultUI) { java.util.List<String> value = SimulationStorage.getSimulationNames(); - resultUI.getSimulationComboBox().setEditable(false); + //resultUI.getSimulationComboBox().setEditable(false); StringComboModel model = new StringComboModel(value); resultUI.getSimulationComboBox().setModel(model); resultUI.getSimulationComboBox().setSelectedItem(null); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2011-11-22 14:00:17 UTC (rev 3537) @@ -37,7 +37,7 @@ <JLabel text="isisfish.result.choose.simulation"/> </cell> <cell fill="horizontal" weightx="1"> - <JComboBox id="simulationComboBox"/> + <fr.ifremer.isisfish.ui.widget.FilterableComboBox id="simulationComboBox"/> </cell> <cell> <JButton text="isisfish.result.new.window" Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-11-22 14:00:17 UTC (rev 3537) @@ -31,33 +31,34 @@ <import> java.util.EventObject; java.text.ParseException; - fr.ifremer.isisfish.datastore.RegionStorage; - fr.ifremer.isisfish.datastore.StorageChangeEvent; - fr.ifremer.isisfish.datastore.StorageChangeListener; - fr.ifremer.isisfish.datastore.StorageException; - fr.ifremer.isisfish.entities.Population; - fr.ifremer.isisfish.entities.Strategy; - fr.ifremer.isisfish.entities.FisheryRegion; - fr.ifremer.isisfish.ui.SimulationUI; - fr.ifremer.isisfish.ui.WelcomePanelUI; - fr.ifremer.isisfish.ui.WelcomeTabUI; - fr.ifremer.isisfish.ui.models.common.StringComboModel; - fr.ifremer.isisfish.ui.models.rule.RuleComboModel; - fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer; - fr.ifremer.isisfish.ui.models.rule.RuleListModel; - fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; - fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; - fr.ifremer.isisfish.rule.Rule; - fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; - fr.ifremer.isisfish.simulator.launcher.SimulationService; - fr.ifremer.isisfish.simulator.launcher.SimulationJob; - fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; - fr.ifremer.isisfish.simulator.sensitivity.Factor; - org.nuiton.topia.TopiaException; - org.nuiton.topia.TopiaContext; - org.nuiton.math.matrix.MatrixND; - org.nuiton.math.matrix.gui.MatrixPanelEditor; - org.apache.commons.lang3.ArrayUtils; + fr.ifremer.isisfish.datastore.RegionStorage + fr.ifremer.isisfish.datastore.StorageChangeEvent + fr.ifremer.isisfish.datastore.StorageChangeListener + fr.ifremer.isisfish.datastore.StorageException + fr.ifremer.isisfish.entities.Population + fr.ifremer.isisfish.entities.Strategy + fr.ifremer.isisfish.entities.FisheryRegion + fr.ifremer.isisfish.ui.SimulationUI + fr.ifremer.isisfish.ui.WelcomePanelUI + fr.ifremer.isisfish.ui.WelcomeTabUI + fr.ifremer.isisfish.ui.models.common.StringComboModel + fr.ifremer.isisfish.ui.models.rule.RuleComboModel + fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer + fr.ifremer.isisfish.ui.models.rule.RuleListModel + fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI + fr.ifremer.isisfish.ui.sensitivity.SensitivityUI + fr.ifremer.isisfish.ui.widget.FilterableComboBox + fr.ifremer.isisfish.rule.Rule + fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher + fr.ifremer.isisfish.simulator.launcher.SimulationService + fr.ifremer.isisfish.simulator.launcher.SimulationJob + fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener + fr.ifremer.isisfish.simulator.sensitivity.Factor + org.nuiton.topia.TopiaException + org.nuiton.topia.TopiaContext + org.nuiton.math.matrix.MatrixND + org.nuiton.math.matrix.gui.MatrixPanelEditor + org.apache.commons.lang3.ArrayUtils javax.swing.SwingUtilities javax.swing.DefaultComboBoxModel java.awt.CardLayout @@ -329,20 +330,10 @@ <JLabel text="isisfish.params.loadOldSimulation" /> </cell> <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSimulParamsSelect" + <FilterableComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()' /> </cell> - <cell> - <JButton text="isisfish.params.filter" - id="buttonSimulParamsSelectFilter" - onActionPerformed='selectFilter()' enabled="false" /> - </cell> - <cell> - <JButton text="isisfish.params.clearFilter" - id="buttonSimulParamsSelectClearFilter" - onActionPerformed='resetFilter()' enabled="false" /> - </cell> </row> </Table> </cell> Added: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2011-11-22 14:00:17 UTC (rev 3537) @@ -0,0 +1,253 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.widget; + +import static org.nuiton.i18n.I18n._; + +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.ComboBoxModel; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; + +import org.jdesktop.swingx.JXComboBox; +import org.jdesktop.swingx.JXTextField; +import org.nuiton.util.Resource; + +/** + * A filterable combobox using an additional text field and reset button. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FilterableComboBox extends JPanel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -6669320998140538372L; + + protected JComboBox dataBox; + protected JTextField filterField; + protected JButton resetButton; + + protected FilterComboBoxModel filterModel; + + protected List<ActionListener> actionListeners; + protected List<ItemListener> itemListeners; + + protected boolean filtering = false; + + public FilterableComboBox() { + actionListeners = new ArrayList<ActionListener>(); + itemListeners = new ArrayList<ItemListener>(); + buildLayout(); + } + + public FilterableComboBox(ComboBoxModel model) { + this(); + setModel(model); + } + + class FilterComboBoxModel extends DefaultComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6256289874593024153L; + + protected ComboBoxModel model; + + public FilterComboBoxModel(ComboBoxModel model) { + this.model = model; + } + + @Override + public int getSize() { + int delegateSize = model.getSize(); + int realSize = 0; + for (int i = 0; i < delegateSize; ++i) { + if (model.getElementAt(i).toString().matches(".*" + filterField.getText() + ".*")) { + realSize++; + } + } + return realSize; + } + + @Override + public Object getElementAt(int index) { + int delegateSize = model.getSize(); + int realIndex = -1; + for (int i = 0; i < delegateSize; ++i) { + Object element = model.getElementAt(i); + if (element.toString().matches(".*" + filterField.getText() + ".*")) { + realIndex++; + } + if (index == realIndex) { + return element; + } + } + return null; + } + + public void fireDataChanged() { + filtering = true; + super.fireContentsChanged(this, 0, model.getSize()); + filtering = false; + } + + + } + + class FilterDocumentListener implements DocumentListener { + @Override + public void insertUpdate(DocumentEvent e) { + updateFilter(); + } + + @Override + public void removeUpdate(DocumentEvent e) { + updateFilter(); + } + + @Override + public void changedUpdate(DocumentEvent e) { + updateFilter(); + } + + protected void updateFilter() { + ((FilterComboBoxModel)dataBox.getModel()).fireDataChanged(); + resetButton.setEnabled(!filterField.getText().isEmpty()); + } + } + + class FilterActionListener implements ActionListener { + /* + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(ActionEvent e) { + filterField.setText(""); + } + } + + class ComboBoxActionListener implements ActionListener { + /* + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(ActionEvent e) { + if (!filtering) { + for (ActionListener a : actionListeners) { + a.actionPerformed(e); + } + } + } + } + + class ComboBoxItemListener implements ItemListener { + /* + * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) + */ + @Override + public void itemStateChanged(ItemEvent e) { + if (!filtering) { + for (ItemListener i : itemListeners) { + i.itemStateChanged(e); + } + } + } + } + + /** + * Build layout. + */ + private void buildLayout() { + dataBox = new JXComboBox(); + dataBox.addActionListener(new ComboBoxActionListener()); + dataBox.addItemListener(new ComboBoxItemListener()); + filterField = new JXTextField(_("isisfish.common.filter")); + // fix size + filterField.setPreferredSize(new Dimension(200, 0)); + resetButton = new JButton(Resource.getIcon("/icons/cancel.png")); + resetButton.addActionListener(new FilterActionListener()); + resetButton.setEnabled(false); + filterField.getDocument().addDocumentListener(new FilterDocumentListener()); + + setLayout(new BorderLayout()); + add(dataBox, BorderLayout.CENTER); + + JPanel filterPanel = new JPanel(new BorderLayout()); + filterPanel.add(filterField, BorderLayout.CENTER); + filterPanel.add(resetButton, BorderLayout.EAST); + + add(filterPanel, BorderLayout.EAST); + } + + /** + * Change model. + * + * @param model model to set + */ + public void setModel(ComboBoxModel model) { + dataBox.setModel(new FilterComboBoxModel(model)); + } + + public Object getSelectedItem() { + return dataBox.getSelectedItem(); + } + + public void setSelectedItem(Object object) { + dataBox.setSelectedItem(object); + } + + public boolean addActionListener(ActionListener e) { + return actionListeners.add(e); + } + + public boolean removeActionListener(ActionListener o) { + return actionListeners.remove(o); + } + + public boolean addItemListener(ItemListener e) { + return itemListeners.add(e); + } + + public boolean removeItemListener(ItemListener o) { + return itemListeners.remove(o); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2011-11-22 14:00:17 UTC (rev 3537) @@ -99,6 +99,7 @@ isisfish.common.equation=Equation isisfish.common.error=error isisfish.common.file=File +isisfish.common.filter=Filter isisfish.common.finish=Finish isisfish.common.gear=Gear isisfish.common.immigration=immigration Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-21 15:30:51 UTC (rev 3536) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2011-11-22 14:00:17 UTC (rev 3537) @@ -99,6 +99,7 @@ isisfish.common.equation=Equation isisfish.common.error=Erreur isisfish.common.file=Fichier +isisfish.common.filter=Filtrer isisfish.common.finish=Terminer isisfish.common.gear=Engin isisfish.common.immigration=immigration

1 0

r3536 - trunk/src/main/java/fr/ifremer/isisfish/ui/script
by echatellier＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: echatellier Date: 2011-11-21 16:30:51 +0100 (Mon, 21 Nov 2011) New Revision: 3536 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3536 Log: Fix community script creation Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-11-21 10:41:34 UTC (rev 3535) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-11-21 15:30:51 UTC (rev 3536) @@ -291,7 +291,7 @@ Language.JAVA); break; case CommunitySimulationPlan: - script = SimulationPlanStorage.getSimulationPlan(fileName); + script = SimulationPlanStorage.getCommunitySimulationPlan(fileName); break; case CommunityExport: script = ExportStorage.getCommunityExport(fileName);

1 0

r3535 - trunk
by echatellier＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: echatellier Date: 2011-11-21 11:41:34 +0100 (Mon, 21 Nov 2011) New Revision: 3535 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3535 Log: Prepare release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-21 10:21:00 UTC (rev 3534) +++ trunk/pom.xml 2011-11-21 10:41:34 UTC (rev 3535) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-beta-3-SNAPSHOT</version> + <version>4.0.0.0-SNAPSHOT</version>  <dependencies>

1 0

r3534 - trunk/src/main/java/fr/ifremer/isisfish/ui/config
by echatellier＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: echatellier Date: 2011-11-21 11:21:00 +0100 (Mon, 21 Nov 2011) New Revision: 3534 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3534 Log: Add log.warn Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-11-21 10:19:40 UTC (rev 3533) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-11-21 10:21:00 UTC (rev 3534) @@ -33,7 +33,8 @@ import javax.swing.JOptionPane; import org.apache.commons.lang3.StringUtils; -import org.jfree.util.Log; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; @@ -49,6 +50,8 @@ */ public class RConfigHandler { + private static Log log = LogFactory.getLog(RConfigHandler.class); + /** * Initialise l'ui. * @@ -96,8 +99,8 @@ engine.eval("library('lhs')"); } catch (RException ex) { - if (Log.isWarningEnabled()) { - Log.warn("Can find 'lhs'", ex); + if (log.isWarnEnabled()) { + log.warn("Can find 'lhs'", ex); } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.lhsnotinstalled"), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); @@ -107,8 +110,8 @@ engine.eval("library('sensitivity')"); } catch (RException ex) { - if (Log.isWarningEnabled()) { - Log.warn("Can find 'sensitivity'", ex); + if (log.isWarnEnabled()) { + log.warn("Can find 'sensitivity'", ex); } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.sensitivitynotinstalled"), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); @@ -121,8 +124,8 @@ } } catch (RException ex) { - if (Log.isWarningEnabled()) { - Log.warn("Can find call R", ex); + if (log.isWarnEnabled()) { + log.warn("Can find call R", ex); } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.cantinit", ex.getMessage()), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE);

1 0

r3533 - trunk/src/main/java/fr/ifremer/isisfish/ui/config
by echatellier＠users.forge.codelutin.com 21 Nov '11

21 Nov '11

Author: echatellier Date: 2011-11-21 11:19:40 +0100 (Mon, 21 Nov 2011) New Revision: 3533 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3533 Log: Add log.warn Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-11-18 16:01:14 UTC (rev 3532) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2011-11-21 10:19:40 UTC (rev 3533) @@ -33,6 +33,7 @@ import javax.swing.JOptionPane; import org.apache.commons.lang3.StringUtils; +import org.jfree.util.Log; import org.nuiton.j2r.REngine; import org.nuiton.j2r.RException; import org.nuiton.j2r.RProxy; @@ -95,6 +96,9 @@ engine.eval("library('lhs')"); } catch (RException ex) { + if (Log.isWarningEnabled()) { + Log.warn("Can find 'lhs'", ex); + } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.lhsnotinstalled"), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); error = true; @@ -103,6 +107,9 @@ engine.eval("library('sensitivity')"); } catch (RException ex) { + if (Log.isWarningEnabled()) { + Log.warn("Can find 'sensitivity'", ex); + } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.sensitivitynotinstalled"), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); error = true; @@ -114,6 +121,9 @@ } } catch (RException ex) { + if (Log.isWarningEnabled()) { + Log.warn("Can find call R", ex); + } JOptionPane.showMessageDialog(rconfigUI, _("isisfish.simulator.configuration.r.cantinit", ex.getMessage()), _("isisfish.simulator.configuration.r.title"), JOptionPane.ERROR_MESSAGE); }

1 0

r3532 - trunk
by echatellier＠users.forge.codelutin.com 18 Nov '11

18 Nov '11

Author: echatellier Date: 2011-11-18 17:01:14 +0100 (Fri, 18 Nov 2011) New Revision: 3532 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3532 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-18 16:01:10 UTC (rev 3531) +++ trunk/pom.xml 2011-11-18 16:01:14 UTC (rev 3532) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-beta-2</version> + <version>4.0.0.0-beta-3-SNAPSHOT</version>  <dependencies> @@ -709,9 +709,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0-beta-2</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3531 - in tags: . isis-fish-4.0.0.0-beta-2
by echatellier＠users.forge.codelutin.com 18 Nov '11

18 Nov '11

Author: echatellier Date: 2011-11-18 17:01:10 +0100 (Fri, 18 Nov 2011) New Revision: 3531 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3531 Log: [maven-release-plugin] copy for tag isis-fish-4.0.0.0-beta-2 Added: tags/isis-fish-4.0.0.0-beta-2/ Property changes on: tags/isis-fish-4.0.0.0-beta-2 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo +

1 0

r3530 - trunk
by echatellier＠users.forge.codelutin.com 18 Nov '11

18 Nov '11

Author: echatellier Date: 2011-11-18 17:01:06 +0100 (Fri, 18 Nov 2011) New Revision: 3530 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3530 Log: [maven-release-plugin] prepare release isis-fish-4.0.0.0-beta-2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-18 15:45:59 UTC (rev 3529) +++ trunk/pom.xml 2011-11-18 16:01:06 UTC (rev 3530) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.0-beta-2-SNAPSHOT</version> + <version>4.0.0.0-beta-2</version>  <dependencies> @@ -709,9 +709,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0…</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.0-beta-2</url> </scm> <repositories>

1 0

r3529 - in trunk/src: license main/java/fr/ifremer/isisfish/ui/simulator
by echatellier＠users.forge.codelutin.com 18 Nov '11

18 Nov '11

Author: echatellier Date: 2011-11-18 16:45:59 +0100 (Fri, 18 Nov 2011) New Revision: 3529 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3529 Log: Update licenses Modified: trunk/src/license/THIRD-PARTY.properties trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2011-11-18 14:57:44 UTC (rev 3528) +++ trunk/src/license/THIRD-PARTY.properties 2011-11-18 15:45:59 UTC (rev 3529) @@ -12,11 +12,13 @@ # - BSD licence # - BSD style # - BSD-style license +# - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public Licence # - GPL +# - GPLv2+CE # - ICU License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - JDom license @@ -27,7 +29,6 @@ # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 -# - License Agreement for JavaMail(TM) API # - MIT License # - Revised BSD # - Sun's Binary Code License @@ -42,7 +43,7 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 28 15:35:59 CEST 2011 +#Fri Nov 18 15:56:18 CET 2011 antlr--antlr--2.7.6=BSD License asm--asm-commons--3.1=http\://asm.ow2.org/license.html asm--asm-tree--3.1=http\://asm.ow2.org/license.html @@ -56,7 +57,6 @@ dom4j--dom4j--1.6.1=BSD License javassist--javassist--3.8.0.GA=GNU Lesser General Public License javax.activation--activation--1.1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API javax.transaction--jta--1.1=Java Transaction API (JTA) License jaxen--jaxen--1.1.1=Jaxen license jdom--jdom--1.0=JDom license Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2011-11-18 14:57:44 UTC (rev 3528) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2011-11-18 15:45:59 UTC (rev 3529) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-2.0.html>. * #L% */

1 0