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

r2736 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 3, 2009

Nov. 3, 2009

Author: chatellier Date: 2009-11-03 08:52:12 +0000 (Tue, 03 Nov 2009) New Revision: 2736 Modified: isis-fish/trunk/pom.xml Log: Swingx version bump. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-11-02 16:55:21 UTC (rev 2735) +++ isis-fish/trunk/pom.xml 2009-11-03 08:52:12 UTC (rev 2736) @@ -208,7 +208,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx</artifactId> - <version>1.0</version> + <version>1.6</version> <scope>compile</scope> </dependency>

1 0

r2735 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 2, 2009

Nov. 2, 2009

Author: chatellier Date: 2009-11-02 16:55:21 +0000 (Mon, 02 Nov 2009) New Revision: 2735 Modified: isis-fish/trunk/changelog.txt Log: Update changelog Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-11-02 16:53:44 UTC (rev 2734) +++ isis-fish/trunk/changelog.txt 2009-11-02 16:55:21 UTC (rev 2735) @@ -1,5 +1,7 @@ isis-fish (3.3.0.0) stable; urgency=low + * Remove some deprecated unused UI classes + * Remove all GenericCell reference (now model based implementation) * Add missing log category in simulation filter appender * Add -m n option to qsub to not send email for each simulation * Remove duplicated SSH key configuration, common configuration for VCS and caparmor

1 0

r2734 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity util
by chatellier＠users.labs.libre-entreprise.org Nov. 2, 2009

Nov. 2, 2009

Author: chatellier Date: 2009-11-02 16:53:44 +0000 (Mon, 02 Nov 2009) New Revision: 2734 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtils.java Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx Log: Move UtilsUI to SensitivityUtils since it's sensitivity specific code. 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-11-02 16:39:25 UTC (rev 2733) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-11-02 16:53:44 UTC (rev 2734) @@ -59,7 +59,7 @@ import fr.ifremer.isisfish.entities.FisheryRegion; import org.nuiton.topia.persistence.TopiaEntity; import javax.swing.JComponent; -import fr.ifremer.isisfish.ui.util.UtilsUI; +import fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; @@ -133,7 +133,7 @@ String method = (String)boxed.getClientProperty("method"); boolean isSensitivityFactorEnabled = false; if (classBean != null) { - isSensitivityFactorEnabled = UtilsUI.isSensitivityFactorEnabled(classBean.getSimpleName().replace("Impl", "") + "." + method); + isSensitivityFactorEnabled = SensitivityUtils.isSensitivityFactorEnabled(classBean.getSimpleName().replace("Impl", "") + "." + method); } if (isSensitivityFactorEnabled) { jaxx.runtime.swing.BlockingLayerUI2 ui = layerUI2.clone(); Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtils.java (from rev 2668, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtils.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtils.java 2009-11-02 16:53:44 UTC (rev 2734) @@ -0,0 +1,94 @@ +/* *##% + * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + * ##%*/ + +package fr.ifremer.isisfish.ui.sensitivity; + +import java.io.InputStream; +import java.io.IOException; +import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Utility class to parse Sensitivity properties file. + * + * @author letellier + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class SensitivityUtils { + + /** Log. */ + private static final Log log = LogFactory.getLog(SensitivityUtils.class); + + /** Properties file resource path. */ + private final static String PROPERTIES_PATH = "/sensitivity.properties"; + + /** Cached properties. */ + private static Properties sensitivityProperties; + + /** + * Is field sensitivity enabled. + * + * Return true, if field name is present in properties file. + * + * @param sensitivityFactorName name + * @return <tt>true</tt> if factor name is sensitivity enabled + */ + public static boolean isSensitivityFactorEnabled(String sensitivityFactorName) { + Properties data = loadProperties(); + return data.getProperty(sensitivityFactorName) != null; + + } + + /** + * Return cached properties file. + * Load it at first call. + * + * @return properties + */ + private static Properties loadProperties() { + + if (sensitivityProperties == null) { + sensitivityProperties = new Properties(); + InputStream stream = null; + try { + stream = SensitivityUtils.class.getResourceAsStream(PROPERTIES_PATH); + sensitivityProperties.load(stream); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't load sensitivity properties file", ex); + } + } finally { + try { + if (stream != null) { + stream.close(); + } + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't load sensitivity properties file", ex); + } + } + } + } + return sensitivityProperties; + } +} Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-11-02 16:39:25 UTC (rev 2733) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-11-02 16:53:44 UTC (rev 2734) @@ -1,94 +0,0 @@ -/* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - * ##%*/ - -package fr.ifremer.isisfish.ui.util; - -import java.io.InputStream; -import java.io.IOException; -import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Utility class to parse Sensitivity properties file. - * - * @author letellier - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class UtilsUI { - - /** Log. */ - private static final Log log = LogFactory.getLog(UtilsUI.class); - - /** Properties file resource path. */ - private final static String PROPERTIES_PATH = "/sensitivity.properties"; - - /** Cached properties. */ - private static Properties sensitivityProperties; - - /** - * Is field sensitivity enabled. - * - * Return true, if field name is present in properties file. - * - * @param sensitivityFactorName name - * @return <tt>true</tt> if factor name is sensitivity enabled - */ - public static boolean isSensitivityFactorEnabled(String sensitivityFactorName) { - Properties data = loadProperties(); - return data.getProperty(sensitivityFactorName) != null; - - } - - /** - * Return cached properties file. - * Load it at first call. - * - * @return properties - */ - private static Properties loadProperties() { - - if (sensitivityProperties == null) { - sensitivityProperties = new Properties(); - InputStream stream = null; - try { - stream = UtilsUI.class.getResourceAsStream(PROPERTIES_PATH); - sensitivityProperties.load(stream); - } catch (IOException ex) { - if (log.isErrorEnabled()) { - log.error("Can't load sensitivity properties file", ex); - } - } finally { - try { - if (stream != null) { - stream.close(); - } - } catch (IOException ex) { - if (log.isErrorEnabled()) { - log.error("Can't load sensitivity properties file", ex); - } - } - } - } - return sensitivityProperties; - } -}

1 0

r2733 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget
by chatellier＠users.labs.libre-entreprise.org Nov. 2, 2009

Nov. 2, 2009

Author: chatellier Date: 2009-11-02 16:39:25 +0000 (Mon, 02 Nov 2009) New Revision: 2733 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/HidablePanel.java Log: Not used anymore Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/HidablePanel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/HidablePanel.java 2009-11-02 16:39:13 UTC (rev 2732) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/HidablePanel.java 2009-11-02 16:39:25 UTC (rev 2733) @@ -1,42 +0,0 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.ui.widget; - -import javax.swing.JPanel; - -/** - * HidablePanel. - * - * Created: 7 mars 2006 22:48:25 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - * - * @deprecated since 20090414 seams to be unused - */ -public class HidablePanel extends JPanel { - - /** serialVersionUID. */ - private static final long serialVersionUID = 4153300672681154582L; - -}

1 0

r2732 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: simulator widget
by chatellier＠users.labs.libre-entreprise.org Nov. 2, 2009

Nov. 2, 2009

Author: chatellier Date: 2009-11-02 16:39:13 +0000 (Mon, 02 Nov 2009) New Revision: 2732 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/EnabledIfItemSelectedInList.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/EnabledIfListNotEmpty.java Log: Replaced by jaxx bindings Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java 2009-11-02 16:37:16 UTC (rev 2731) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorListeners.java 2009-11-02 16:39:13 UTC (rev 2732) @@ -1,171 +0,0 @@ -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.ui.simulator; - -import fr.ifremer.isisfish.simulator.launcher.SimulationService; -import fr.ifremer.isisfish.ui.widget.EnabledIfListNotEmpty; -import fr.ifremer.isisfish.ui.widget.EnabledIfItemSelectedInList; - -import static org.nuiton.i18n.I18n._; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.JButton; -import javax.swing.JList; -import javax.swing.JTable; -import javax.swing.ListModel; - -/** - * This class contains some listeners used in ui. Some are generics and could - * be push in a library. - * <p/> - * TODO ne fonctionne pas avec l'uitlisation de l'attribut init dans le xml - * TODO Il faudrait fixer cette anomalie afin de pouvoir directement appelé - * TODO ce code depuis le xml... - * - * @author chemit - * - * @deprecated since 20090414, use jaxx bindings instead - */ -public class SimulatorListeners { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(SimulatorListeners.class); - - public static void initAnalysePlanButtonsListener(JButton remove, JList list) { - initButtonRemoveIfItemSelected(remove, list); - } - - public static void initRuleButtonsListener(JButton remove, JList list) { - initButtonRemoveIfItemSelected(remove, list); - - } - -// public static void initSimulQueueButtonsListener( -// final JButton start, final JButton remove, final JButton showLog, -// final JTable table, final JTable tableDone) { -// -// SimulationService.getService().addPropertyChangeListener("autoLaunch", -// new PropertyChangeListener() { -// public void propertyChange(PropertyChangeEvent evt) { -// start.setEnabled(isSimulStartButtonEnabled(table)); -// } -// }); -// -// table.getModel().addTableModelListener(new TableModelListener() { -// public void tableChanged(TableModelEvent e) { -// start.setEnabled(isSimulStartButtonEnabled(table)); -// } -// }); -// -// table.getSelectionModel().addListSelectionListener( -// new ListSelectionListener() { -// public void valueChanged(ListSelectionEvent e) { -// remove.setEnabled(isSimulRemoveButtonEnabled(table)); -// } -// }); -// -// tableDone.getSelectionModel().addListSelectionListener( -// new ListSelectionListener() { -// public void valueChanged(ListSelectionEvent e) { -// showLog.setEnabled(isSimulShowLogButtonEnabled(tableDone)); -// } -// } -// ); -// -// // apply it now -// start.setEnabled(isSimulStartButtonEnabled(table)); -// remove.setEnabled(isSimulRemoveButtonEnabled(table)); -// showLog.setEnabled(isSimulShowLogButtonEnabled(tableDone)); -// } - - public static void initButtonRemoveIfItemSelected( - final JButton button, final JList list) { - if (button == null || list == null) { - log.warn(_("isisfish.error.init.remove.button", button, list)); - return; - } - button.setEnabled(list.getSelectedIndex() > -1); - EnabledIfItemSelectedInList listener = new EnabledIfItemSelectedInList(button, list); - list.getSelectionModel().addListSelectionListener(listener); - // apply it now - listener.setEnabled(button, list); - } - - public static void initButtonClearIfListNotEmpty( - final JButton button, final ListModel list) { - - EnabledIfListNotEmpty listener = new EnabledIfListNotEmpty(list, button); - list.addListDataListener(listener); - // apply it now - listener.setEnabled(button, list); - } - - /** - * Wonders if user can actually launch simulations based on two criteri : - * <ul><li> first : simulationManager must not be in autoLaunch mode</li> - * <li> second : simulation table must not be empty</li></ul> - * - * @param table table containing queue of simulations not already done - * @return <code>true</code> if user can launch simulations, - * <code>false</code> otherwise - */ - public static boolean isSimulStartButtonEnabled(JTable table) { - return !SimulationService.getService().isAutoLaunch() && - (table.getRowCount() > 0); - } - - /** - * Wonders if user can actually stop a simulation on two criteri : - * <ul><li> first : use must have select a simulation - * (but not a done one)</li> - * <li> second : the selected simulation must be running</li></ul> - * - * @param table table containing queue of simulations not already done - * @return <code>true</code> if user can stop the selected simulation, - * <code>false</code> otherwise - */ - public static boolean isSimulRemoveButtonEnabled(JTable table) { - return isItemSelected(table); - } - - /** - * Wonders if user can actually show log of a done simulation on one criteria : - * <ul><li> first : use must have select a done simulation - * (but not a undone one)</li> - * - * @param table table containing queue of simulations not already done - * @return <code>true</code> if user can show log the selected done - * simulation,<code>false</code> otherwise - */ - public static boolean isSimulShowLogButtonEnabled(JTable table) { - return isItemSelected(table); - } - - public static boolean isItemSelected(JTable table) { - return table.getRowCount() > 0 && table.getSelectedRow() > -1; - } - - public static boolean isItemSelected(JList table) { - return table.getModel().getSize() > 0 && table.getSelectedIndex() > -1; - } - -} Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/EnabledIfItemSelectedInList.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/EnabledIfItemSelectedInList.java 2009-11-02 16:37:16 UTC (rev 2731) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/EnabledIfItemSelectedInList.java 2009-11-02 16:39:13 UTC (rev 2732) @@ -1,46 +0,0 @@ -/* *##% - * Copyright (C) 2002 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.ui.widget; - -import javax.swing.event.ListSelectionListener; -import javax.swing.event.ListSelectionEvent; -import javax.swing.JComponent; -import javax.swing.JList; -import javax.swing.JButton; - -/** - * Enable a button if the associated list is not empty. - */ -public class EnabledIfItemSelectedInList implements ListSelectionListener { - private final JComponent button; - private final JList list; - - public EnabledIfItemSelectedInList(JButton button, JList list) { - this.button = button; - this.list = list; - } - - public void setEnabled(JComponent button, JList list) { - button.setEnabled(list.getSelectedIndex() > -1); - } - - public void valueChanged(ListSelectionEvent e) { - setEnabled(button, list); - } -} Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/EnabledIfListNotEmpty.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/EnabledIfListNotEmpty.java 2009-11-02 16:37:16 UTC (rev 2731) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/EnabledIfListNotEmpty.java 2009-11-02 16:39:13 UTC (rev 2732) @@ -1,59 +0,0 @@ -/* *##% - * Copyright (C) 2002 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.ui.widget; - -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.ListModel; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; - -/** - * Enable a button if the associated list is not empty. - */ -public class EnabledIfListNotEmpty implements ListDataListener { - - private JComponent target; - private ListModel list; - - public EnabledIfListNotEmpty(ListModel list, JButton target) { - this.target = target; - this.list = list; - } - - public void contentsChanged(ListDataEvent e) { - setEnabled(target, list); - } - - public void intervalAdded(ListDataEvent e) { - setEnabled(target, list); - } - - public void intervalRemoved(ListDataEvent e) { - setEnabled(target, list); - } - - public void setEnabled(JComponent button, ListModel list) { - button.setEnabled(list.getSize() > 0); - } - - public void setTarget(JComponent target) { - this.target = target; - } -}

1 0

r2731 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity
by chatellier＠users.labs.libre-entreprise.org Nov. 2, 2009

Nov. 2, 2009

Author: chatellier Date: 2009-11-02 16:37:16 +0000 (Mon, 02 Nov 2009) New Revision: 2731 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx Log: Unused imports Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-11-02 16:28:34 UTC (rev 2730) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-11-02 16:37:16 UTC (rev 2731) @@ -31,7 +31,6 @@ import fr.ifremer.isisfish.entities.SetOfVessels; import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.ui.WelcomePanelUI; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; @Override public void refresh() { 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-11-02 16:28:34 UTC (rev 2730) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-11-02 16:37:16 UTC (rev 2731) @@ -21,18 +21,12 @@ <script><![CDATA[ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; - import jaxx.runtime.swing.Item; - import fr.ifremer.isisfish.datastore.ExportStorage; - import fr.ifremer.isisfish.datastore.SensitivityStorage; import fr.ifremer.isisfish.ui.simulator.SimulAction; - import fr.ifremer.isisfish.ui.widget.editor.GenericCell; - import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor; import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.export.SensitivityExport; - import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel; import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer;

1 0

r2730 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor
by chatellier＠users.labs.libre-entreprise.org Nov. 2, 2009

Nov. 2, 2009

Author: chatellier Date: 2009-11-02 16:28:34 +0000 (Mon, 02 Nov 2009) New Revision: 2730 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/GenericCell.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java Log: Replaced by model style implementation Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/GenericCell.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/GenericCell.java 2009-11-02 16:27:43 UTC (rev 2729) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/GenericCell.java 2009-11-02 16:28:34 UTC (rev 2730) @@ -1,60 +0,0 @@ -/* *##% - * Copyright (C) 2002 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.ui.widget.editor; - -/** - * GenericCell. - * - * @author letellier - * Copyright Code Lutin - * @version $Revision: 1628 $ - * - * Mise a jour: $Date: 2008-11-28 10:25:59 +0100 (ven 28 nov 2008) $ - * par : $Author: chatellier $ - * - * @deprecated since 3.2.0.5, Use specific model instead - */ -public class GenericCell { - private String name; - private Object value; - private Class<?> type; - - public GenericCell(String n, Object c, Class<?> t) { - name = n; - value = c; - type = t; - } - - @Override - public String toString() { - return name; - } - - public Object getValue() { - return value; - } - - public String getName() { - return name; - } - - public Class<?> getType() { - return type; - } -} Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java 2009-11-02 16:27:43 UTC (rev 2729) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterColumnEditor.java 2009-11-02 16:28:34 UTC (rev 2730) @@ -1,500 +0,0 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.ui.widget.editor; - -import java.awt.Component; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.FocusEvent; -import java.util.ArrayList; -import java.util.EventObject; -import java.util.HashSet; -import java.util.List; - -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.event.CellEditorListener; -import javax.swing.event.ChangeEvent; -import javax.swing.table.TableCellEditor; - -import org.apache.commons.beanutils.ConvertUtilsBean; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.MonthEnum; -import org.nuiton.util.EnumEditor; - -import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.util.ConverterUtil; -import java.awt.event.ActionListener; -import java.awt.event.FocusListener; - -/** - * ParameterColumnEditor. - * - * Created: 25 sept. 06 12:35:21 - * - * @author poussin - * @author chemit - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - * - * @deprecated since 3.2.0.5, Use specific model instead - */ -public class ParameterColumnEditor extends JComponent implements - TableCellEditor { - - /** Class logger. */ - private static Log log = LogFactory.getLog(ParameterColumnEditor.class); - - private enum TypeClassMapping { - /** - * for simple int - */ - Int(int.class), - /** - * for a topia entity - */ - Topia(TopiaEntity.class), - /** - * for a mounth - */ - Mounth(Month.class), - /** - * for a simple date - */ - Date(Date.class), - /** - * for a simple boolean - */ - Double(double.class), - /** - * for a simple boolean - */ - Boolean(boolean.class), - /** - * for a file location - */ - File(java.io.File.class), - /** - * for a simple String - * - */ - String(java.lang.String.class); - - final Class<?> klazz; - - TypeClassMapping(Class<?> klazz) { - this.klazz = klazz; - } - - protected static TypeClassMapping getMapping(Class<?> klazz) { - for (TypeClassMapping t : TypeClassMapping.values()) - if (t.klazz.isAssignableFrom(klazz)) - return t; - throw new RuntimeException( - "could not found a TypeClassMapping for this class " - + klazz); - } - } - - private static final long serialVersionUID = 6860330126841984303L; - - protected HashSet<CellEditorListener> listeners = new HashSet<CellEditorListener>(); - - protected RegionStorage region = null; - - protected Component editor = null; - - protected Class type = null; - - /** - * @return Returns the topiaContext. - */ - public RegionStorage getRegion() { - return this.region; - } - - /** - * @param region - * The topiaContext to set. - */ - public void setRegion(RegionStorage region) { - this.region = region; - } - - @SuppressWarnings( { "unchecked" }) - public Component getTableCellEditorComponent(JTable table, Object value, - boolean isSelected, int row, int column) { - // Map.Entry<String, Class> p = (Map.Entry<String, Class>) table.getValueAt(row, 0); - // type = p.getValue(); - // log.debug(p.getKey() + " P.type:" + type); - GenericCell p = (GenericCell) table.getValueAt(row, 0); - type = (Class) p.getValue(); - JComboBox c; - //if (!table.hasFocus()) return null; - - TypeClassMapping mapping = TypeClassMapping.getMapping(type); - switch (mapping) { - case Topia: - // on a un bean comme parametre - try { - if (region == null) { - return null; - } - TopiaContext context = region.getStorage().beginTransaction(); - if (context != null) { - List list = context.find("from " + type.getName()); - c = new JComboBox(list.toArray()); - c.setSelectedItem(value); - editor = c; - context.closeContext(); - } - - } catch (Exception eee) { - if (log.isWarnEnabled()) { - log.warn("Can't get entity object for combobox", eee); - } - } - break; - case Boolean: - List<Boolean> listB = new ArrayList<Boolean>(); - listB.add(Boolean.TRUE); - listB.add(Boolean.FALSE); - c = new JComboBox(listB.toArray()); - listB.clear(); - // TODO See how to convert - c.setSelectedItem(value); - editor = c; - break; - case Date: - Date date = (Date) value; - if (date == null) - date = new Date(0); - int mou = date.getMonth().getMonthNumber(); - int yea = date.getYear(); - editor = new DateComponent(mou, yea, region == null ? null : region - .getStorage()); - //editor = new JTextField(String.valueOf(date.getDate())); - break; - case Mounth: - editor = DateComponent.createMounthCombo(((Month) value) - .getMonthNumber(), region == null ? null : region - .getStorage()); - break; - case File: - // break; - default: - editor = new JTextField(value.toString()); - } - if (editor != null) { - if (JComboBox.class.isInstance(editor)) { - ((JComboBox) editor).addActionListener(getComboListener()); - } else if (JTextField.class.isInstance(editor)) { - ((JTextField) editor).addFocusListener(new FocusListener() { - - @Override - public void focusGained(FocusEvent e) { - - } - - @Override - public void focusLost(FocusEvent e) { - stopCellEditing(); - } - }); - } else if (DateComponent.class.isInstance(editor)) { - DateComponent date = ((DateComponent) editor); - if (date.getMounthCombo() != null) { - date.getMounthCombo().addActionListener(getComboListener()); - } - if (date.getYearCombo() != null) { - date.getYearCombo().addActionListener(getComboListener()); - } - } - } - if (log.isInfoEnabled()) { - log.info("getCellEditorValue [" + type + "] [mapping:" + mapping + "=" - + editor); - } - //+ editor==null?null:editor.getClass().getSimpleName()); - return editor; - } - - protected ActionListener getComboListener() { - return new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - stopCellEditing(); - } - }; - } - - public Object getCellEditorValue() { - - Object result = null; - TopiaContext context = null; - if (editor == null) - return ""; - TypeClassMapping mapping = TypeClassMapping.getMapping(type); - switch (mapping) { - case Topia: - result = getComboBoxValue(editor); - break; - case Boolean: - result = getComboBoxValue(editor); - // TODO test - break; - case Mounth: - result = getComboBoxIndex(editor) + ""; - break; - case Date: - result = ((DateComponent) editor).getSelectedValue() + ""; - break; - case File: - //TODO - // result = getTextFieldValue(editor);break; - default: - if (editor instanceof JTextField) { - result = ((JTextField) editor).getText(); - } else if (editor instanceof JComboBox) { - result = ((JComboBox) editor).getSelectedItem(); - } - } - - if (result instanceof String && !String.class.equals(type)) { - if (region != null) - context = region.getStorage(); - ConvertUtilsBean cub = ConverterUtil.getConverter(context); - result = cub.convert((String) result, type); - } - - if (log.isInfoEnabled()) { - log.info("getCellEditorValue [" + type + "] [mapping:" + mapping - + "]= " + result); - } - - return result; - } - - protected Object getTextFieldValue(Component editor) { - return ((JTextField) editor).getText(); - } - - protected Object getComboBoxValue(Component editor) { - return ((JComboBox) editor).getSelectedItem(); - } - - protected int getComboBoxIndex(Component editor) { - return (((JComboBox) editor)).getSelectedIndex(); - } - - public Object getCellEditorValueOld() { - - Object result = null; - if (editor instanceof JTextField) { - result = ((JTextField) editor).getText(); - } else if (editor instanceof JComboBox) { - result = ((JComboBox) editor).getSelectedItem(); - } - - if (result instanceof String && !String.class.equals(type)) { - TopiaContext context = null; - if (region != null) { - context = region.getStorage(); - } - ConvertUtilsBean cub = ConverterUtil.getConverter(context); - result = cub.convert((String) result, type); - } - - return result; - } - - /* - * (non-Javadoc) - * - * @see javax.swing.CellEditor#addCellEditorListener(javax.swing.event.CellEditorListener) - */ - public void addCellEditorListener(CellEditorListener l) { - listeners.add(l); - } - - /* - * @see javax.swing.CellEditor#cancelCellEditing() - */ - public void cancelCellEditing() { - if (log.isDebugEnabled()) { - log.debug("cancelCellEditing"); - } - ChangeEvent e = new ChangeEvent(this); - for (CellEditorListener listener : listeners) { - listener.editingCanceled(e); - } - } - - /* - * @see javax.swing.CellEditor#isCellEditable(java.util.EventObject) - */ - public boolean isCellEditable(EventObject anEvent) { - return true; - } - - /* - * @see javax.swing.CellEditor#removeCellEditorListener(javax.swing.event.CellEditorListener) - */ - public void removeCellEditorListener(CellEditorListener l) { - listeners.remove(l); - } - - /* - * @see javax.swing.CellEditor#shouldSelectCell(java.util.EventObject) - */ - public boolean shouldSelectCell(EventObject anEvent) { - return true; - } - - /* - * @see javax.swing.CellEditor#stopCellEditing() - */ - public boolean stopCellEditing() { - // to prevent concurent modification exception - if (log.isDebugEnabled()) { - log.debug("stopCellEditing"); - } - CellEditorListener[] list = listeners - .toArray(new CellEditorListener[listeners.size()]); - - ChangeEvent e = new ChangeEvent(this); - for (CellEditorListener l : list) { - l.editingStopped(e); - } - return true; - } - - public static class DateComponent extends JPanel { - - private static final long serialVersionUID = -6694461572642939712L; - - protected JComboBox mounth; - - protected JComboBox year; - - public DateComponent(int mounth, int year, TopiaContext context) { - super(new GridLayout(0, 2)); - - this.mounth = createMounthCombo(mounth, context); - this.year = createYearCombo(200, year); - - this.add(this.mounth); - this.add(this.year); - } - - public JComboBox getYearCombo() { - return year; - } - - public JComboBox getMounthCombo() { - return mounth; - } - - public int getSelectedMounth() { - return mounth.getSelectedIndex(); - } - - public int getSelectedYear() { - return year.getSelectedIndex(); - } - - public void setSelectedValue(int year, int mounth) { - this.mounth.setSelectedIndex(mounth); - this.year.setSelectedIndex(year); - } - - public int getSelectedValue() { - int selectedYear = getSelectedYear(); - int selectedMounth = getSelectedMounth(); - if (log.isInfoEnabled()) { - log.info("selected mounth " + selectedMounth); - log.info("selected year " + selectedYear); - } - return selectedMounth + selectedYear * 12; - } - - public static JComboBox createMounthCombo(int mounth, - TopiaContext context) { - JComboBox combo = EnumEditor.newEditor(MonthEnum.class); - combo.setSelectedIndex(mounth); - return combo; - } - - /*public static JComboBox createMounthCombo(int mounth, TopiaContext context) { - JComboBox combo = createMounthCombo0(context); - combo.setSelectedIndex(mounth); - return combo; - }*/ - /*public static JComboBox createMounthCombo(Object mounth, TopiaContext context) { - JComboBox combo = createMounthCombo0(context); - combo.setSelectedItem(mounth); - return combo; - }*/ - - /*private static JComboBox createMounthCombo0(TopiaContext context) { - - List<String> listM = new ArrayList<String>(); - // TODO Should use database ? data instead of thoses awfull hardcore - // code... - listM.add("janvier"); - listM.add("fevrier"); - listM.add("mars"); - listM.add("avril"); - listM.add("mai"); - listM.add("juin"); - listM.add("juillet"); - listM.add("aout"); - listM.add("septembre"); - listM.add("octobre"); - listM.add("novembre"); - listM.add("decembre"); - JComboBox combo = new JComboBox(listM.toArray()); - listM.clear(); - return combo; - }*/ - - public static JComboBox createYearCombo(int nb, int yearS) { - - List<Integer> listI = new ArrayList<Integer>(); - for (int i = 0; i < nb; i++) - listI.add(i); - JComboBox year = new JComboBox(listI.toArray()); - listI.clear(); - year.setSelectedIndex(yearS); - return year; - } - } -}

1 0

r2729 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input: . gear
by chatellier＠users.labs.libre-entreprise.org Nov. 2, 2009

Nov. 2, 2009

Author: chatellier Date: 2009-11-02 16:27:43 +0000 (Mon, 02 Nov 2009) New Revision: 2729 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx Log: Utilisation des combo model pour les populations Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-11-02 16:27:12 UTC (rev 2728) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-11-02 16:27:43 UTC (rev 2729) @@ -27,7 +27,6 @@ <Boolean id='selectivityPopulationSelected' javaBean='false'/> <script><![CDATA[ -import javax.swing.table.DefaultTableModel; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.GearImpl; @@ -36,8 +35,8 @@ import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.ui.input.gear.GearPopulationSelectivityModel; +import fr.ifremer.isisfish.ui.input.gear.PopulationComboModel; import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; selectivityTable.addMouseListener(new MouseAdapter() { @Override @@ -115,23 +114,22 @@ protected DefaultComboBoxModel getSelectivityPopulationModel() { java.util.List<Species> species = getRegion().getSpecies(); - DefaultComboBoxModel selectivityPopulationModel = new DefaultComboBoxModel(); + java.util.List<Population> populations = new ArrayList<Population>(); if (species != null) { - selectivityPopulationModel.addElement(new GenericCell(" ", null, null)); for (Species s : species) { if (s.getPopulation() != null) { - for (Population p : s.getPopulation()) { - selectivityPopulationModel.addElement(new GenericCell(p.getName(), p, Population.class)); - } + populations.addAll(s.getPopulation()); } } } + PopulationComboModel selectivityPopulationModel = new PopulationComboModel(populations); return selectivityPopulationModel; } protected void selectivityChanged() { setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null); - setPopulation((PopulationImpl) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue()); + // FIXME remove Impl reference + setPopulation((PopulationImpl)fieldSelectivityPopulation.getSelectedItem()); addSelectivityButton.setEnabled(isSelectivityPopulationSelected()); } ]]></script> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java 2009-11-02 16:27:43 UTC (rev 2729) @@ -0,0 +1,77 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.input.gear; + +import java.util.List; + +import javax.swing.DefaultComboBoxModel; + +import fr.ifremer.isisfish.entities.MetierSeasonInfo; +import fr.ifremer.isisfish.entities.Population; + +/** + * Model pour la liste des {@link Population}. + * + * Pas de selection par defaut. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class PopulationComboModel extends DefaultComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6171850179969290032L; + + /** Population list */ + protected List<Population> populations; + + /** + * Constructor with species list. + * + * @param populations populations list + */ + public PopulationComboModel(List<Population> populations) { + super(); + this.populations = populations; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return populations.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (populations != null) { + size = populations.size(); + } + return size; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2728 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: map ui/input
by chatellier＠users.labs.libre-entreprise.org Nov. 2, 2009

Nov. 2, 2009

Author: chatellier Date: 2009-11-02 16:27:12 +0000 (Mon, 02 Nov 2009) New Revision: 2728 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Move clipboard copy listener to "map" package Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java (from rev 2668, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java 2009-11-02 16:27:12 UTC (rev 2728) @@ -0,0 +1,201 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.map; + +import static org.nuiton.i18n.I18n._; + +import java.awt.Graphics; +import java.awt.GraphicsEnvironment; +import java.awt.Image; +import java.awt.Toolkit; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; +import java.awt.image.BufferedImage; +import java.io.IOException; + +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.bbn.openmap.MapBean; +import com.bbn.openmap.event.MapMouseListener; + +/** + * Listener for openmap map bean to display popop menu on rigth clic. + * + * Currently, this listener can : + * - copy current map to system clip board + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CopyMapToClipboardListener implements ActionListener, + MapMouseListener { + + /** Class logger. */ + private static Log log = LogFactory + .getLog(CopyMapToClipboardListener.class); + + /** Copy to clic board action command. */ + protected static final String COPY_TO_CLICBOARD_COMMAND = "copytoclipboard"; + + /** Popop menu. */ + public JPopupMenu menu; + + /** Open map bean. */ + protected MapBean mapBean; + + /** + * Constructor with map. + * + * @param mapBean open map bean + */ + public CopyMapToClipboardListener(MapBean mapBean) { + this.mapBean = mapBean; + + menu = new JPopupMenu(); + JMenuItem copyClicboardItem = new JMenuItem(); + copyClicboardItem.setText(_("isisfish.input.map.copytoclicboard")); + copyClicboardItem.setActionCommand(COPY_TO_CLICBOARD_COMMAND); + copyClicboardItem.addActionListener(this); + menu.add(copyClicboardItem); + } + + public MapBean getMapBean() { + return mapBean; + } + + protected void copyToClipBoard() { + + // Get image from mapBean + int width = getMapBean().getWidth(); + int height = getMapBean().getHeight(); + BufferedImage image = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + GraphicsEnvironment ge = GraphicsEnvironment + .getLocalGraphicsEnvironment(); + Graphics g = ge.createGraphics(image); + g.setClip(0, 0, width, height); + getMapBean().paintAll(g); + ImageSelection imgSel = new ImageSelection(image); + + Toolkit.getDefaultToolkit().getSystemClipboard().setContents(imgSel, + null); + + if (log.isInfoEnabled()) { + log.info("Copy current image to system clipboard"); + } + } + + // This class is used to hold an image while on the clipboard. + public static class ImageSelection implements Transferable { + private Image image; + + public ImageSelection(Image image) { + this.image = image; + } + + // Returns supported flavors + public DataFlavor[] getTransferDataFlavors() { + return new DataFlavor[] { DataFlavor.imageFlavor }; + } + + // Returns true if flavor is supported + public boolean isDataFlavorSupported(DataFlavor flavor) { + return DataFlavor.imageFlavor.equals(flavor); + } + + // Returns image + public Object getTransferData(DataFlavor flavor) + throws UnsupportedFlavorException, IOException { + if (!DataFlavor.imageFlavor.equals(flavor)) { + throw new UnsupportedFlavorException(flavor); + } + return image; + } + } + + @Override + public String[] getMouseModeServiceList() { + return null; + } + + @Override + public boolean mouseClicked(MouseEvent e) { + + // seulement en menu contextuel + if (e.getButton() == MouseEvent.BUTTON3) { + menu.show(mapBean, e.getX(), e.getY()); + } + return false; + } + + @Override + public boolean mouseDragged(MouseEvent arg0) { + return false; + } + + @Override + public void mouseEntered(MouseEvent arg0) { + + } + + @Override + public void mouseExited(MouseEvent arg0) { + + } + + @Override + public void mouseMoved() { + + } + + @Override + public boolean mouseMoved(MouseEvent arg0) { + return false; + } + + @Override + public boolean mousePressed(MouseEvent arg0) { + return false; + } + + @Override + public boolean mouseReleased(MouseEvent arg0) { + return false; + } + + @Override + public void actionPerformed(ActionEvent e) { + + if (e.getActionCommand().equals(COPY_TO_CLICBOARD_COMMAND)) { + copyToClipBoard(); + } + + } +} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-11-02 16:24:27 UTC (rev 2727) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-11-02 16:27:12 UTC (rev 2728) @@ -30,6 +30,7 @@ import com.bbn.openmap.gui.OMToolSet; import com.bbn.openmap.event.SelectMouseMode; import fr.ifremer.isisfish.map.CellSelectionLayer; +import fr.ifremer.isisfish.map.CopyMapToClipboardListener; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; protected OMToolSet toolSet = new OMToolSet(); Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java 2009-11-02 16:24:27 UTC (rev 2727) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java 2009-11-02 16:27:12 UTC (rev 2728) @@ -1,201 +0,0 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -package fr.ifremer.isisfish.ui.input; - -import static org.nuiton.i18n.I18n._; - -import java.awt.Graphics; -import java.awt.GraphicsEnvironment; -import java.awt.Image; -import java.awt.Toolkit; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.datatransfer.UnsupportedFlavorException; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseEvent; -import java.awt.image.BufferedImage; -import java.io.IOException; - -import javax.swing.JMenuItem; -import javax.swing.JPopupMenu; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.bbn.openmap.MapBean; -import com.bbn.openmap.event.MapMouseListener; - -/** - * Listener for openmap map bean to display popop menu on rigth clic. - * - * Currently, this listener can : - * - copy current map to system clip board - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class CopyMapToClipboardListener implements ActionListener, - MapMouseListener { - - /** Class logger. */ - private static Log log = LogFactory - .getLog(CopyMapToClipboardListener.class); - - /** Copy to clic board action command. */ - protected static final String COPY_TO_CLICBOARD_COMMAND = "copytoclipboard"; - - /** Popop menu. */ - public JPopupMenu menu; - - /** Open map bean. */ - protected MapBean mapBean; - - /** - * Constructor with map. - * - * @param mapBean open map bean - */ - public CopyMapToClipboardListener(MapBean mapBean) { - this.mapBean = mapBean; - - menu = new JPopupMenu(); - JMenuItem copyClicboardItem = new JMenuItem(); - copyClicboardItem.setText(_("isisfish.input.map.copytoclicboard")); - copyClicboardItem.setActionCommand(COPY_TO_CLICBOARD_COMMAND); - copyClicboardItem.addActionListener(this); - menu.add(copyClicboardItem); - } - - public MapBean getMapBean() { - return mapBean; - } - - protected void copyToClipBoard() { - - // Get image from mapBean - int width = getMapBean().getWidth(); - int height = getMapBean().getHeight(); - BufferedImage image = new BufferedImage(width, height, - BufferedImage.TYPE_INT_RGB); - GraphicsEnvironment ge = GraphicsEnvironment - .getLocalGraphicsEnvironment(); - Graphics g = ge.createGraphics(image); - g.setClip(0, 0, width, height); - getMapBean().paintAll(g); - ImageSelection imgSel = new ImageSelection(image); - - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(imgSel, - null); - - if (log.isInfoEnabled()) { - log.info("Copy current image to system clipboard"); - } - } - - // This class is used to hold an image while on the clipboard. - public static class ImageSelection implements Transferable { - private Image image; - - public ImageSelection(Image image) { - this.image = image; - } - - // Returns supported flavors - public DataFlavor[] getTransferDataFlavors() { - return new DataFlavor[] { DataFlavor.imageFlavor }; - } - - // Returns true if flavor is supported - public boolean isDataFlavorSupported(DataFlavor flavor) { - return DataFlavor.imageFlavor.equals(flavor); - } - - // Returns image - public Object getTransferData(DataFlavor flavor) - throws UnsupportedFlavorException, IOException { - if (!DataFlavor.imageFlavor.equals(flavor)) { - throw new UnsupportedFlavorException(flavor); - } - return image; - } - } - - @Override - public String[] getMouseModeServiceList() { - return null; - } - - @Override - public boolean mouseClicked(MouseEvent e) { - - // seulement en menu contextuel - if (e.getButton() == MouseEvent.BUTTON3) { - menu.show(mapBean, e.getX(), e.getY()); - } - return false; - } - - @Override - public boolean mouseDragged(MouseEvent arg0) { - return false; - } - - @Override - public void mouseEntered(MouseEvent arg0) { - - } - - @Override - public void mouseExited(MouseEvent arg0) { - - } - - @Override - public void mouseMoved() { - - } - - @Override - public boolean mouseMoved(MouseEvent arg0) { - return false; - } - - @Override - public boolean mousePressed(MouseEvent arg0) { - return false; - } - - @Override - public boolean mouseReleased(MouseEvent arg0) { - return false; - } - - @Override - public void actionPerformed(ActionEvent e) { - - if (e.getActionCommand().equals(COPY_TO_CLICBOARD_COMMAND)) { - copyToClipBoard(); - } - - } -} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-11-02 16:24:27 UTC (rev 2727) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-11-02 16:27:12 UTC (rev 2728) @@ -25,6 +25,7 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.FisheryRegionImpl; +import fr.ifremer.isisfish.map.CopyMapToClipboardListener; import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-11-02 16:24:27 UTC (rev 2727) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-11-02 16:27:12 UTC (rev 2728) @@ -30,6 +30,7 @@ import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; import fr.ifremer.isisfish.map.CellSelectionLayer; +import fr.ifremer.isisfish.map.CopyMapToClipboardListener; import com.bbn.openmap.event.SelectMouseMode; protected OMToolSet toolSet = new OMToolSet(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-11-02 16:24:27 UTC (rev 2727) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-11-02 16:27:12 UTC (rev 2728) @@ -27,6 +27,7 @@ import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.entities.ZoneImpl; import fr.ifremer.isisfish.map.CellSelectionLayer; +import fr.ifremer.isisfish.map.CopyMapToClipboardListener; import com.bbn.openmap.event.SelectMouseMode; import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet;

1 0

r2727 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor
by chatellier＠users.labs.libre-entreprise.org Nov. 2, 2009

Nov. 2, 2009

Author: chatellier Date: 2009-11-02 16:24:27 +0000 (Mon, 02 Nov 2009) New Revision: 2727 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java Log: Since 1.1.0, will be moved in jaxx-runtime-swing Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2009-11-02 15:57:12 UTC (rev 2726) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2009-11-02 16:24:27 UTC (rev 2727) @@ -25,9 +25,7 @@ import java.awt.event.ActionListener; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; import java.util.ArrayList; -import java.util.EventObject; import java.util.List; import javax.swing.AbstractCellEditor; @@ -37,12 +35,13 @@ import javax.swing.JTextField; import javax.swing.table.TableCellEditor; +import jaxx.runtime.swing.editor.EnumEditor; + import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.EnumEditor; import org.nuiton.util.MonthEnum; import fr.ifremer.isisfish.datastore.RegionStorage;

1 0