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

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

02 Nov '09

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 02 Nov '09

02 Nov '09

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 02 Nov '09

02 Nov '09

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

r2726 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input: . population
by chatellier＠users.labs.libre-entreprise.org 02 Nov '09

02 Nov '09

Author: chatellier Date: 2009-11-02 15:57:12 +0000 (Mon, 02 Nov 2009) New Revision: 2726 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx Log: Utilisation des list model pour les zones Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-11-02 15:51:03 UTC (rev 2725) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-11-02 15:57:12 UTC (rev 2726) @@ -23,14 +23,8 @@ <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> <script><![CDATA[ - -import jaxx.runtime.swing.JAXXList; import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationImpl; -import org.nuiton.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.ui.WelcomePanelUI; +import fr.ifremer.isisfish.ui.input.population.ZoneListModel; import org.nuiton.math.matrix.gui.MatrixPanelEvent; import org.nuiton.math.matrix.gui.MatrixPanelListener; @@ -44,8 +38,8 @@ @Override public void refresh(){ setPopulationZonesPresenceModel(); - setFieldPopulationZonesReproductionModel(getSelectedValue(populationZonesPresence)); - setFieldPopulationZonesRecruitmentModel(getSelectedValue(populationZonesPresence)); + setFieldPopulationZonesReproductionModel(getSelectedValues(populationZonesPresence)); + setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZonesPresence)); fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(listener); setFieldPopulationMappingZoneReproZoneRecru(); fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener); @@ -82,59 +76,42 @@ setModel(zones, getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment); } } -protected void setModel(java.util.List<Zone> zones, java.util.List<Zone> selected, JAXXList componant){ - DefaultListModel model = new DefaultListModel(); - java.util.List<GenericCell> selectedZones = new ArrayList<GenericCell>(); - if (zones != null){ - for (Zone z : zones){ - GenericCell cell = new GenericCell(z.getName(), z, Zone.class); - model.addElement(cell); - if (selected != null){ - if (selected.contains(z)){ - selectedZones.add(cell); - } - } - } + +/** + * Change model of {@code associatedList} with all available zones, but keep + * selection with {@code selectedZones}. + */ +protected void setModel(java.util.List<Zone> availableZones, java.util.List<Zone> selectedZones, JList associatedList){ + ZoneListModel zoneModel = new ZoneListModel(availableZones); + associatedList.setModel(zoneModel); + for (Zone selectedZone : selectedZones) { + int index = availableZones.indexOf(selectedZone); + associatedList.addSelectionInterval(index, index); } - componant.setModel(model); - if (selectedZones.size() > 0){ - java.util.List <Integer> indicesList = new ArrayList<Integer>(); - for (GenericCell c : selectedZones){ - indicesList.add(model.indexOf(c)); - } - int[] indices = new int[indicesList.size()]; - int cnt = 0; - for (Integer i : indicesList){ - indices[cnt]=i; - cnt ++; - } - componant.setSelectedIndices(indices); - } } protected void presenceChanged(){ - getBean().setPopulationZone(getSelectedValue(populationZonesPresence)); - setFieldPopulationZonesReproductionModel(getSelectedValue(populationZonesPresence)); - setFieldPopulationZonesRecruitmentModel(getSelectedValue(populationZonesPresence)); + getBean().setPopulationZone(getSelectedValues(populationZonesPresence)); + setFieldPopulationZonesReproductionModel(getSelectedValues(populationZonesPresence)); + setFieldPopulationZonesRecruitmentModel(getSelectedValues(populationZonesPresence)); setFieldPopulationMappingZoneReproZoneRecru(); } protected void reproductionChanged(){ - getBean().setReproductionZone(getSelectedValue(fieldPopulationZonesReproduction)); + getBean().setReproductionZone(getSelectedValues(fieldPopulationZonesReproduction)); setFieldPopulationMappingZoneReproZoneRecru(); } protected void recruitementChanged(){ - getBean().setRecruitmentZone(getSelectedValue(fieldPopulationZonesRecruitment)); + getBean().setRecruitmentZone(getSelectedValues(fieldPopulationZonesRecruitment)); setFieldPopulationMappingZoneReproZoneRecru(); } -protected java.util.List<Zone> getSelectedValue(JAXXList componant){ - Object[] selected = componant.getSelectedValues(); + +/** + * Get selected values for components as list. + */ +protected java.util.List<Zone> getSelectedValues(JList component){ + Object[] selectedValues = component.getSelectedValues(); java.util.List<Zone> selectedZone = new ArrayList<Zone>(); - if (selected != null){ - for (Object i : selected){ - GenericCell cell = (GenericCell)i; - if (cell.getValue() != null){ - selectedZone.add((Zone)cell.getValue()); - } - } + for (Object value : selectedValues) { + selectedZone.add((Zone)value); } return selectedZone; } Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java 2009-11-02 15:57:12 UTC (rev 2726) @@ -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.population; + +import java.util.List; + +import javax.swing.DefaultListModel; + +import fr.ifremer.isisfish.entities.MetierSeasonInfo; +import fr.ifremer.isisfish.entities.Zone; + +/** + * Model pour la liste des {@link MetierSeasonInfo}. + * + * Pas de selection par defaut. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class ZoneListModel extends DefaultListModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6171850179969290032L; + + /** Zones list */ + protected List<Zone> zones; + + /** + * Constructor with species list. + * + * @param zones zones list + */ + public ZoneListModel(List<Zone> zones) { + super(); + this.zones = zones; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return zones.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (zones != null) { + size = zones.size(); + } + return size; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2725 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input: . metier
by chatellier＠users.labs.libre-entreprise.org 02 Nov '09

02 Nov '09

Author: chatellier Date: 2009-11-02 15:51:03 +0000 (Mon, 02 Nov 2009) New Revision: 2725 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java Log: Utilisation des model et renderer pour les MetierSeasonInfo Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-11-02 14:39:50 UTC (rev 2724) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-11-02 15:51:03 UTC (rev 2725) @@ -32,7 +32,7 @@ import fr.ifremer.isisfish.entities.MetierImpl; import fr.ifremer.isisfish.entities.MetierSeasonInfo; import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; +import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; @Override public void refresh() { @@ -60,27 +60,22 @@ } protected void setSeasonModel(){ - DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo(); - if (metierSeasonInfo != null) { - seasonModel.addElement(new GenericCell(" ", null, null)); - for (MetierSeasonInfo m : metierSeasonInfo){ - seasonModel.addElement(new GenericCell(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, MetierSeasonInfo.class)); - } - } + MetierSeasonInfoComboModel seasonModel = new MetierSeasonInfoComboModel(metierSeasonInfo); fieldMetierSeasonInfo.setModel(seasonModel); // fix refresh() problem false, because first is null setMetierSeasonInfoSelected(false); } protected void metierSeasonInfoChanged() { - setMetierSeasonInfoSelected(((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue() != null); + MetierSeasonInfo selectedMSI = (MetierSeasonInfo)fieldMetierSeasonInfo.getSelectedItem(); + setMetierSeasonInfoSelected( selectedMSI != null); if (isMetierSeasonInfoSelected()) { - MetierSeasonInfoImpl msii = (MetierSeasonInfoImpl)((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue(); if (log.isDebugEnabled()) { - log.debug("Metier season changed : " + msii); + log.debug("Metier season changed : " + selectedMSI); } - setMetierSeasonInfo(msii); + // FIXME really need to fix impl cast !!! + setMetierSeasonInfo((MetierSeasonInfoImpl)selectedMSI); getVerifier().addCurrentEntity(getMetierSeasonInfo()); } metierSeasonInfoSpeciesEditor.refresh(); @@ -95,7 +90,8 @@ <JLabel text="isisfish.metierSeasonInfoSpecies.selectSeason" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldMetierSeasonInfo" onActionPerformed='metierSeasonInfoChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldMetierSeasonInfo" onActionPerformed='metierSeasonInfoChanged()' + renderer="{new fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboRenderer()}" enabled='{isActif()}'/> </cell> </row> <row> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java 2009-11-02 15:51:03 UTC (rev 2725) @@ -0,0 +1,76 @@ +/* *##% + * 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.metier; + +import java.util.List; + +import javax.swing.DefaultComboBoxModel; + +import fr.ifremer.isisfish.entities.MetierSeasonInfo; + +/** + * Model pour la liste des {@link MetierSeasonInfo}. + * + * Pas de selection par defaut. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class MetierSeasonInfoComboModel extends DefaultComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6171850179969290032L; + + /** MetierSeasonInfo list */ + protected List<MetierSeasonInfo> metierSeasonInfo; + + /** + * Constructor with species list. + * + * @param metierSeasonInfo species list + */ + public MetierSeasonInfoComboModel(List<MetierSeasonInfo> metierSeasonInfo) { + super(); + this.metierSeasonInfo = metierSeasonInfo; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return metierSeasonInfo.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (metierSeasonInfo != null) { + size = metierSeasonInfo.size(); + } + return size; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java 2009-11-02 15:51:03 UTC (rev 2725) @@ -0,0 +1,65 @@ +/* *##% + * 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.metier; + +import java.awt.Component; + +import javax.swing.DefaultListCellRenderer; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; + +import fr.ifremer.isisfish.entities.MetierSeasonInfo; + +/** + * Renderer pour la combo des {@link MetierSeasonInfo}. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class MetierSeasonInfoComboRenderer extends DefaultListCellRenderer implements + ListCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -8277883340386163087L; + + /* + * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) + */ + @Override + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + + // this must be used to have alterned highlight rows and default + // selection color + JLabel c = (JLabel) super.getListCellRendererComponent(list, value, + index, isSelected, cellHasFocus); + + MetierSeasonInfo metierSeasonInfo = (MetierSeasonInfo) value; + + // there is no default selection + if (value != null) { + c.setText(metierSeasonInfo.getFirstMonth() + "-" + metierSeasonInfo.getLastMonth()); + } + return c; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java 2009-11-02 14:39:50 UTC (rev 2724) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java 2009-11-02 15:51:03 UTC (rev 2725) @@ -40,45 +40,17 @@ /** serialVersionUID. */ private static final long serialVersionUID = 6171850179969290032L; - /** PopulationSeasonInfo list */ + /** Species list */ protected List<Species> speciesList; /** - * Empty constructor. - */ - public SpeciesComboModel() { - this(null); - } - - /** * Constructor with species list. * * @param speciesList species list */ public SpeciesComboModel(List<Species> speciesList) { super(); - setPopulationSeasonInfos(speciesList); - } - - /** - * Get species list. - * - * @return species list - */ - public List<Species> getPopulationSeasonInfos() { - return speciesList; - } - - /** - * Set species list. - * - * @param speciesList species list - */ - public void setPopulationSeasonInfos(List<Species> speciesList) { this.speciesList = speciesList; - - // clear selection - setSelectedItem(null); } /*

1 0

r2724 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier
by chatellier＠users.labs.libre-entreprise.org 02 Nov '09

02 Nov '09

Author: chatellier Date: 2009-11-02 14:39:50 +0000 (Mon, 02 Nov 2009) New Revision: 2724 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java Log: Use species combo model. Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java 2009-11-02 14:06:07 UTC (rev 2723) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java 2009-11-02 14:39:50 UTC (rev 2724) @@ -1,239 +0,0 @@ -/* *##% - * Copyright (C) 2009 Ifremer, 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.metier; - -import static org.nuiton.i18n.I18n._; - -import java.awt.Component; -import java.util.List; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.table.AbstractTableModel; -import javax.swing.table.TableCellRenderer; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; -import fr.ifremer.isisfish.entities.TargetSpecies; - -/** - * Table model for {@link MetierSeasonInfo}#{@link TargetSpecies}. - * - * Columns : - * <li>target species name</li> - * <li>target species equation</li> - * <li>target species primaryCatch</li> - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class MetierSeasonInfoTargetSpeciesModel extends AbstractTableModel implements TableCellRenderer { - - /** Log. */ - private static Log log = LogFactory.getLog(MetierSeasonInfoTargetSpeciesModel.class); - - /** serialVersionUID. */ - private static final long serialVersionUID = 3169786638868209920L; - - /** Columns names. */ - public final static String[] COLUMN_NAMES = { - _("isisfish.metierSeasonInfoSpecies.species"), - _("isisfish.metierSeasonInfoSpecies.targetFactor"), - _("isisfish.metierSeasonInfoSpecies.mainSpecies") }; - - protected List<TargetSpecies> targetSpeciesList; - - /** - * Empty constructor. - */ - public MetierSeasonInfoTargetSpeciesModel() { - this(null); - } - - /** - * Constructor with data. - * - * @param targetSpeciesList initial target species - */ - public MetierSeasonInfoTargetSpeciesModel( - List<TargetSpecies> targetSpeciesList) { - super(); - this.targetSpeciesList = targetSpeciesList; - } - - /** - * Set target species list. - * - * @param targetSpeciesList the targetSpecies to set - */ - public void setTargetSpecies(List<TargetSpecies> targetSpeciesList) { - this.targetSpeciesList = targetSpeciesList; - } - - /* - * @see javax.swing.table.TableModel#getColumnCount() - */ - @Override - public int getColumnCount() { - return COLUMN_NAMES.length; - } - - /* - * @see javax.swing.table.TableModel#getRowCount() - */ - @Override - public int getRowCount() { - int rows = 0; - if (targetSpeciesList != null) { - rows = targetSpeciesList.size(); - } - return rows; - } - - /* - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ - @Override - public Object getValueAt(int rowIndex, int columnIndex) { - - Object result = null; - - TargetSpecies targetSpecies = targetSpeciesList.get(rowIndex); - switch (columnIndex) { - case 0: - result = targetSpecies.getSpecies().getName(); - break; - case 1: - result = targetSpecies.getTargetFactorEquation(); - break; - case 2: - result = targetSpecies.getPrimaryCatch(); - break; - default: - throw new IndexOutOfBoundsException("No such column " + columnIndex); - } - - return result; - } - - /* - * @see javax.swing.table.TableModel#getColumnClass(int) - */ - @Override - public Class<?> getColumnClass(int columnIndex) { - - Class<?> result = null; - - switch (columnIndex) { - case 0: - result = String.class; - break; - case 1: - result = Equation.class; - break; - case 2: - result = Boolean.class; - break; - default: - throw new IndexOutOfBoundsException("No such column " + columnIndex); - } - - return result; - } - - /* - * @see javax.swing.table.TableModel#getColumnName(int) - */ - @Override - public String getColumnName(int columnIndex) { - return COLUMN_NAMES[columnIndex]; - } - - /* - * @see javax.swing.table.TableModel#isCellEditable(int, int) - */ - @Override - public boolean isCellEditable(int rowIndex, int columnIndex) { - return columnIndex > 0; - } - - /* - * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int) - */ - @Override - public void setValueAt(Object value, int rowIndex, int columnIndex) { - - if (log.isDebugEnabled()) { - log.debug("Cell edition (column " + columnIndex + ") = " + value); - } - - TargetSpecies targetSpecies = targetSpeciesList.get(rowIndex); - switch (columnIndex) { - case 1: - Equation eq = (Equation)value; - // two events for event to be fired - targetSpecies.setTargetFactorEquation(null); - targetSpecies.setTargetFactorEquation(eq); - break; - case 2: - Boolean bValue = (Boolean)value; - targetSpecies.setPrimaryCatch(bValue); - break; - default: - throw new IndexOutOfBoundsException("Can't edit column " + columnIndex); - } - - } - - /* - * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) - */ - @Override - public Component getTableCellRendererComponent(JTable table, Object value, - boolean isSelected, boolean hasFocus, int row, int column) { - - Component c = null; - switch (column) { - case 0: - c = new JLabel(value.toString()); - break; - case 1: - Equation equation = (Equation)value; - c = new JButton(equation.getName() + "(" + equation.getCategory() + ")"); - break; - case 2: - Boolean bValue = (Boolean)value; - c = new JCheckBox(); - ((JCheckBox)c).setSelected(bValue); - break; - default: - throw new IndexOutOfBoundsException("No such column " + column); - } - return c; - } - -}

1 0

r2723 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input: . metier
by chatellier＠users.labs.libre-entreprise.org 02 Nov '09

02 Nov '09

Author: chatellier Date: 2009-11-02 14:06:07 +0000 (Mon, 02 Nov 2009) New Revision: 2723 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx Log: Use species combo model. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-11-02 10:11:36 UTC (rev 2722) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-11-02 14:06:07 UTC (rev 2723) @@ -29,17 +29,12 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.MetierImpl; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; -import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; +import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.entities.TargetSpecies; -import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoTargetSpeciesModel; -import fr.ifremer.isisfish.ui.widget.editor.GenericCell; +import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoTargetSpeciesTableModel; +import fr.ifremer.isisfish.ui.input.metier.SpeciesComboModel; import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; -import javax.swing.table.DefaultTableModel; -import fr.ifremer.isisfish.entities.Species; tableTargetSpecies.addMouseListener(new MouseAdapter() { @Override @@ -72,14 +67,8 @@ } protected void setTargetSpeciesModel() { - DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel(); java.util.List<Species> species = getRegion().getSpecies(); - if (species != null){ - fieldTargetSpeciesModel.addElement(new GenericCell(" ", null, null)); - for (Species s : species){ - fieldTargetSpeciesModel.addElement(new GenericCell(s.getName(), s, Species.class)); - } - } + SpeciesComboModel fieldTargetSpeciesModel = new SpeciesComboModel(species); fieldTargetSpecies.setModel(fieldTargetSpeciesModel); } @@ -98,7 +87,7 @@ } // set table model - MetierSeasonInfoTargetSpeciesModel model = new MetierSeasonInfoTargetSpeciesModel(targetSpecies); + MetierSeasonInfoTargetSpeciesTableModel model = new MetierSeasonInfoTargetSpeciesTableModel(targetSpecies); tableTargetSpecies.setModel(model); tableTargetSpecies.setDefaultRenderer(Equation.class, model); tableTargetSpecies.setDefaultEditor(Equation.class, new EquationTableEditor()); @@ -106,15 +95,14 @@ } protected void add() { - Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); - if (getMetierSeasonInfo() != null && species != null) { + Species selectedSpecies = (Species)fieldTargetSpecies.getSelectedItem(); + if (getMetierSeasonInfo() != null && selectedSpecies != null) { // il n'y en a pas a la creaion de la base //Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem(); getContextValue(InputAction.class).addTargetSpecies( getBean(), getMetierSeasonInfo(), - (Species)species, - /* selectedFormule.getName(), */ + selectedSpecies, targetFactor.getEditor().getText(), fieldPrimaryCatch.isSelected()); setTableTargetSpeciesModel(); Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java (from rev 2668, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesModel.java) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java 2009-11-02 14:06:07 UTC (rev 2723) @@ -0,0 +1,239 @@ +/* *##% + * Copyright (C) 2009 Ifremer, 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.metier; + +import static org.nuiton.i18n.I18n._; + +import java.awt.Component; +import java.util.List; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableCellRenderer; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.entities.MetierSeasonInfo; +import fr.ifremer.isisfish.entities.TargetSpecies; + +/** + * Table model for {@link MetierSeasonInfo}#{@link TargetSpecies}. + * + * Columns : + * <li>target species name</li> + * <li>target species equation</li> + * <li>target species primaryCatch</li> + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MetierSeasonInfoTargetSpeciesTableModel extends AbstractTableModel implements TableCellRenderer { + + /** Log. */ + private static Log log = LogFactory.getLog(MetierSeasonInfoTargetSpeciesTableModel.class); + + /** serialVersionUID. */ + private static final long serialVersionUID = 3169786638868209920L; + + /** Columns names. */ + public final static String[] COLUMN_NAMES = { + _("isisfish.metierSeasonInfoSpecies.species"), + _("isisfish.metierSeasonInfoSpecies.targetFactor"), + _("isisfish.metierSeasonInfoSpecies.mainSpecies") }; + + protected List<TargetSpecies> targetSpeciesList; + + /** + * Empty constructor. + */ + public MetierSeasonInfoTargetSpeciesTableModel() { + this(null); + } + + /** + * Constructor with data. + * + * @param targetSpeciesList initial target species + */ + public MetierSeasonInfoTargetSpeciesTableModel( + List<TargetSpecies> targetSpeciesList) { + super(); + this.targetSpeciesList = targetSpeciesList; + } + + /** + * Set target species list. + * + * @param targetSpeciesList the targetSpecies to set + */ + public void setTargetSpecies(List<TargetSpecies> targetSpeciesList) { + this.targetSpeciesList = targetSpeciesList; + } + + /* + * @see javax.swing.table.TableModel#getColumnCount() + */ + @Override + public int getColumnCount() { + return COLUMN_NAMES.length; + } + + /* + * @see javax.swing.table.TableModel#getRowCount() + */ + @Override + public int getRowCount() { + int rows = 0; + if (targetSpeciesList != null) { + rows = targetSpeciesList.size(); + } + return rows; + } + + /* + * @see javax.swing.table.TableModel#getValueAt(int, int) + */ + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + + Object result = null; + + TargetSpecies targetSpecies = targetSpeciesList.get(rowIndex); + switch (columnIndex) { + case 0: + result = targetSpecies.getSpecies().getName(); + break; + case 1: + result = targetSpecies.getTargetFactorEquation(); + break; + case 2: + result = targetSpecies.getPrimaryCatch(); + break; + default: + throw new IndexOutOfBoundsException("No such column " + columnIndex); + } + + return result; + } + + /* + * @see javax.swing.table.TableModel#getColumnClass(int) + */ + @Override + public Class<?> getColumnClass(int columnIndex) { + + Class<?> result = null; + + switch (columnIndex) { + case 0: + result = String.class; + break; + case 1: + result = Equation.class; + break; + case 2: + result = Boolean.class; + break; + default: + throw new IndexOutOfBoundsException("No such column " + columnIndex); + } + + return result; + } + + /* + * @see javax.swing.table.TableModel#getColumnName(int) + */ + @Override + public String getColumnName(int columnIndex) { + return COLUMN_NAMES[columnIndex]; + } + + /* + * @see javax.swing.table.TableModel#isCellEditable(int, int) + */ + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + return columnIndex > 0; + } + + /* + * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int) + */ + @Override + public void setValueAt(Object value, int rowIndex, int columnIndex) { + + if (log.isDebugEnabled()) { + log.debug("Cell edition (column " + columnIndex + ") = " + value); + } + + TargetSpecies targetSpecies = targetSpeciesList.get(rowIndex); + switch (columnIndex) { + case 1: + Equation eq = (Equation)value; + // two events for event to be fired + targetSpecies.setTargetFactorEquation(null); + targetSpecies.setTargetFactorEquation(eq); + break; + case 2: + Boolean bValue = (Boolean)value; + targetSpecies.setPrimaryCatch(bValue); + break; + default: + throw new IndexOutOfBoundsException("Can't edit column " + columnIndex); + } + + } + + /* + * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) + */ + @Override + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + + Component c = null; + switch (column) { + case 0: + c = new JLabel(value.toString()); + break; + case 1: + Equation equation = (Equation)value; + c = new JButton(equation.getName() + "(" + equation.getCategory() + ")"); + break; + case 2: + Boolean bValue = (Boolean)value; + c = new JCheckBox(); + ((JCheckBox)c).setSelected(bValue); + break; + default: + throw new IndexOutOfBoundsException("No such column " + column); + } + return c; + } + +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java 2009-11-02 14:06:07 UTC (rev 2723) @@ -0,0 +1,104 @@ +/* *##% + * 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.metier; + +import java.util.List; + +import javax.swing.DefaultComboBoxModel; + +import fr.ifremer.isisfish.entities.Species; + +/** + * Model pour la liste des {@link Species}. + * + * Pas de selection par defaut. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class SpeciesComboModel extends DefaultComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6171850179969290032L; + + /** PopulationSeasonInfo list */ + protected List<Species> speciesList; + + /** + * Empty constructor. + */ + public SpeciesComboModel() { + this(null); + } + + /** + * Constructor with species list. + * + * @param speciesList species list + */ + public SpeciesComboModel(List<Species> speciesList) { + super(); + setPopulationSeasonInfos(speciesList); + } + + /** + * Get species list. + * + * @return species list + */ + public List<Species> getPopulationSeasonInfos() { + return speciesList; + } + + /** + * Set species list. + * + * @param speciesList species list + */ + public void setPopulationSeasonInfos(List<Species> speciesList) { + this.speciesList = speciesList; + + // clear selection + setSelectedItem(null); + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return speciesList.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (speciesList != null) { + size = speciesList.size(); + } + return size; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2722 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 02 Nov '09

02 Nov '09

Author: chatellier Date: 2009-11-02 10:11:36 +0000 (Mon, 02 Nov 2009) New Revision: 2722 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java Log: Restore previous mecanism (store i18n key non-translated) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-10-30 17:12:08 UTC (rev 2721) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-11-02 10:11:36 UTC (rev 2722) @@ -507,10 +507,10 @@ if (mat == null) { log.debug("Capturability is null, create new matrix"); mat = MatrixFactory.getInstance().create( - _("isisfish.population.capturability"), + n_("isisfish.population.capturability"), sems, - new String[] { _("isisfish.population.group"), - _("isisfish.population.season") }); + new String[] { n_("isisfish.population.group"), + n_("isisfish.population.season") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old @@ -518,10 +518,10 @@ log.debug("Capturability has changed, create new matrix and copy old: " + mat.getSemantics() + " " + sems); MatrixND newmat = MatrixFactory.getInstance().create( - _("isisfish.population.capturability"), + n_("isisfish.population.capturability"), sems, - new String[] { _("isisfish.population.group"), - _("isisfish.population.season") }); + new String[] { n_("isisfish.population.group"), + n_("isisfish.population.season") }); boolean allNull = true; for (List l : mat.getSemantics()) { @@ -559,17 +559,17 @@ mat = MatrixFactory.getInstance().create( n_("isisfish.population.mappingZoneReproZoneRecru"), sems, - new String[] { _("isisfish.population.reproduction"), - _("isisfish.population.recruitment") }); + new String[] { n_("isisfish.population.reproduction"), + n_("isisfish.population.recruitment") }); // we don't call setMappingZoneReproZoneRecru because is better to create a valid // matrix when MappingZoneReproZoneRecru is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { MatrixND newmat = MatrixFactory.getInstance().create( - _("isisfish.population.mappingZoneReproZoneRecru"), + n_("isisfish.population.mappingZoneReproZoneRecru"), sems, - new String[] { _("isisfish.population.reproduction"), - _("isisfish.population.recruitment") }); + new String[] { n_("isisfish.population.reproduction"), + n_("isisfish.population.recruitment") }); newmat.paste(mat); mat = newmat; } @@ -588,7 +588,7 @@ int maxY = N.getDim(1); MatrixND result = MatrixFactory.getInstance().create( - _("isisfish.population.matrixAbundance1D"), + n_("isisfish.population.matrixAbundance1D"), new int[] { 1, maxX * maxY }); for (int x = 0; x < maxX; x++) { @@ -612,10 +612,10 @@ int nbZone = zones.size(); MatrixND result = MatrixFactory.getInstance().create( - _("isisfish.population.matrixAbundance"), + n_("isisfish.population.matrixAbundance"), new List[] { groups, zones }, - new String[] { _("isisfish.population.groups"), - _("isisfish.population.zones") }); + new String[] { n_("isisfish.population.groups"), + n_("isisfish.population.zones") }); try { int c = 0; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-10-30 17:12:08 UTC (rev 2721) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-11-02 10:11:36 UTC (rev 2722) @@ -77,9 +77,9 @@ if (!months.equals(oldMonths)) { MatrixND tmp = MatrixFactory.getInstance().create( - _("isisfish.populationSeasonInfo.distributionSpawing"), + n_("isisfish.populationSeasonInfo.distributionSpawing"), new List[] { months }, - new String[] { _("isisfish.populationSeasonInfo.months") }); + new String[] { n_("isisfish.populationSeasonInfo.months") }); tmp.pasteSemantics(result); result = tmp; } @@ -107,23 +107,23 @@ if (mat == null) { mat = MatrixFactory.getInstance().create( - _("isisfish.populationSeasonInfo.migration"), + n_("isisfish.populationSeasonInfo.migration"), sems, new String[] { - _("isisfish.populationSeasonInfo.group"), - _("isisfish.populationSeasonInfo.departure"), - _("isisfish.populationSeasonInfo.arrival") }); + n_("isisfish.populationSeasonInfo.group"), + n_("isisfish.populationSeasonInfo.departure"), + n_("isisfish.populationSeasonInfo.arrival") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { MatrixND newmat = MatrixFactory.getInstance().create( - _("isisfish.populationSeasonInfo.migration"), + n_("isisfish.populationSeasonInfo.migration"), sems, new String[] { - _("isisfish.populationSeasonInfo.group"), - _("isisfish.populationSeasonInfo.departure"), - _("isisfish.populationSeasonInfo.arrival") }); + n_("isisfish.populationSeasonInfo.group"), + n_("isisfish.populationSeasonInfo.departure"), + n_("isisfish.populationSeasonInfo.arrival") }); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user @@ -147,11 +147,11 @@ if (mat == null) { mat = MatrixFactory.getInstance().create( - _("isisfish.populationSeasonInfo.emigration"), + n_("isisfish.populationSeasonInfo.emigration"), sems, new String[] { - _("isisfish.populationSeasonInfo.group"), - _("isisfish.populationSeasonInfo.departure") }); + n_("isisfish.populationSeasonInfo.group"), + n_("isisfish.populationSeasonInfo.departure") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old @@ -160,8 +160,8 @@ n_("isisfish.populationSeasonInfo.emigration"), sems, new String[] { - _("isisfish.populationSeasonInfo.group"), - _("isisfish.populationSeasonInfo.departure") }); + n_("isisfish.populationSeasonInfo.group"), + n_("isisfish.populationSeasonInfo.departure") }); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user @@ -185,11 +185,11 @@ if (mat == null) { mat = MatrixFactory.getInstance().create( - _("isisfish.populationSeasonInfo.immigration"), + n_("isisfish.populationSeasonInfo.immigration"), sems, new String[] { - _("isisfish.populationSeasonInfo.group"), - _("isisfish.populationSeasonInfo.arrival") }); + n_("isisfish.populationSeasonInfo.group"), + n_("isisfish.populationSeasonInfo.arrival") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old @@ -198,8 +198,8 @@ n_("isisfish.populationSeasonInfo.immigration"), sems, new String[] { - _("isisfish.populationSeasonInfo.group"), - _("isisfish.populationSeasonInfo.arrival") }); + n_("isisfish.populationSeasonInfo.group"), + n_("isisfish.populationSeasonInfo.arrival") }); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user

1 0

r2721 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 30 Oct '09

30 Oct '09

Author: chatellier Date: 2009-10-30 17:12:08 +0000 (Fri, 30 Oct 2009) New Revision: 2721 Modified: isis-fish/trunk/pom.xml Log: Remove default deprecation display (unreadable) Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-10-30 10:51:04 UTC (rev 2720) +++ isis-fish/trunk/pom.xml 2009-10-30 17:12:08 UTC (rev 2721) @@ -480,7 +480,8 @@ <configuration> <source>1.6</source> <target>1.6</target> - <showDeprecation>true</showDeprecation> +  </configuration> </plugin> <plugin>

1 0

r2720 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions
by chatellier＠users.labs.libre-entreprise.org 30 Oct '09

30 Oct '09

Author: chatellier Date: 2009-10-30 10:51:04 +0000 (Fri, 30 Oct 2009) New Revision: 2720 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java Log: Update actions Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-10-30 10:26:13 UTC (rev 2719) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-10-30 10:51:04 UTC (rev 2720) @@ -36,7 +36,8 @@ import fr.ifremer.isisfish.datastore.SimulatorStorage; /** - * + * Import actions. + * * @author poussin * @version $Revision: 1862 $ * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-10-30 10:26:13 UTC (rev 2719) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-10-30 10:51:04 UTC (rev 2720) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2008 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, 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 @@ -19,58 +19,38 @@ package fr.ifremer.isisfish.actions; -import static org.nuiton.i18n.I18n._; +import java.util.Arrays; -import java.io.File; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import fr.ifremer.isisfish.IsisConfig; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.vcs.VCS; -import java.util.Arrays; /** - * + * Other actions. + * * @author poussin * @version $Revision: 1862 $ - * + * * Last update: $Date: 2009-02-23 16:42:34 +0100 (lun. 23 févr. 2009) $ * by : $Author: chatellier $ */ public class OtherAction { - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(OtherAction.class); - protected IsisConfig config = null; - + public OtherAction(IsisConfig config) { this.config = config; } - + static public void help() { System.out.println("Usage: isis-fish [-h]"); - System.out.println("Options (set with --option <key> <value>:"); + System.out.println("Options (set with --option <key> <value>) :"); for (IsisConfig.Option o : IsisConfig.Option.values()) { - System.out.println("\t" + o.key + "(" + o.defaultValue + "):" + o.description); + System.out.println("\t" + o.key + "(" + o.defaultValue + ") : " + o.description); } System.out.println("Actions:"); for (IsisConfig.Action a : IsisConfig.Action.values()) { - System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + "):" + a.description); + System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + ") : " + a.description); } System.exit(0); } - - public void chekoutMavenFile() throws Exception { - VCS vcs = IsisFish.vcs; - File dest = config.getDatabaseDirectory(); - File file = new File(dest, "pom.xml"); - log.info(_("Checkout pom.xml to %s", file)); - vcs.update(file, false); - } - - } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-10-30 10:26:13 UTC (rev 2719) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-10-30 10:51:04 UTC (rev 2720) @@ -31,7 +31,8 @@ import fr.ifremer.isisfish.IsisConfig; /** - * + * VCS actions. + * * @author poussin * @version $Revision: 1862 $ * @@ -78,10 +79,11 @@ } public void vcsUpdate() throws Exception { - // ATTENTION: il est inutil de d'accepter cette option au premier + // ATTENTION: il est inutile de d'accepter cette option au premier // lancement! car on a effectue soit un checkout, soit - // une migration // !IsisContext.get().isFirstLaunch() -// Welcome.updateVCS(null); + // une migration + // !IsisContext.get().isFirstLaunch() + // Welcome.updateVCS(null); } public void vcsAdd(File ... file) throws Exception { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2009-10-30 10:26:13 UTC (rev 2719) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2009-10-30 10:51:04 UTC (rev 2720) @@ -1,5 +1,5 @@ /** - * Command line action classes implementation. + * Command line actions classes implementation. */ package fr.ifremer.isisfish.actions;

1 0