Author: chatellier Date: 2009-11-05 15:22:34 +0000 (Thu, 05 Nov 2009) New Revision: 2743 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java Log: Replace jaxx item use by list models Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-11-05 15:22:13 UTC (rev 2742) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-11-05 15:22:34 UTC (rev 2743) @@ -27,10 +27,11 @@ import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.VesselTypeImpl; import fr.ifremer.isisfish.entities.TripType; +import fr.ifremer.isisfish.types.TimeUnit; +import fr.ifremer.isisfish.ui.input.triptype.TripTypeListModel; import jaxx.runtime.swing.editor.NumberEditor; -import jaxx.runtime.swing.Item; -import fr.ifremer.isisfish.types.TimeUnit; + setButtonTitle(_("isisfish.input.continueSetOfVessels")); setNextPath("$root/$setOfVessels"); addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -83,11 +84,17 @@ } protected void setListModel() { - java.util.List<Item> items = new java.util.ArrayList<Item>(); + + java.util.List<TripType> tripTypes = getRegion().getTripType(); + TripTypeListModel tripTypeModel = new TripTypeListModel(tripTypes); + vesselTypeTripType.setModel(tripTypeModel); + + /*java.util.List<Item> items = new java.util.ArrayList<Item>(); for (TripType tt : getRegion().getTripType()){ items.add(new Item(tt.getTopiaId(), tt.getName(), tt, false)); } - vesselTypeTripType.setItems(items); + vesselTypeTripType.setItems(items);*/ + if (getBean() != null && getBean().getTripType() != null){ vesselTypeTripType.setSelectedValues(getBean().getTripType().toArray()); } @@ -199,7 +206,9 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane> - <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType() == null ? null : getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' + <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType() == null ? null : getBean().getTripType().toArray()}' + onMouseClicked='tripTypeChanged()' + cellRenderer="{new fr.ifremer.isisfish.ui.input.triptype.TripTypeListRenderer()}" enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"TripType"'/> </JScrollPane> </cell> Modified: 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 2009-11-05 15:22:13 UTC (rev 2742) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java 2009-11-05 15:22:34 UTC (rev 2743) @@ -22,11 +22,10 @@ import javax.swing.DefaultListModel; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; import fr.ifremer.isisfish.entities.Zone; /** - * Model pour la liste des {@link MetierSeasonInfo}. + * Model pour la liste des {@link Zone}. * * Pas de selection par defaut. * @@ -45,7 +44,7 @@ protected List<Zone> zones; /** - * Constructor with species list. + * Constructor with zone list. * * @param zones zones list */ Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListModel.java 2009-11-05 15:22:34 UTC (rev 2743) @@ -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.triptype; + +import java.util.List; + +import javax.swing.DefaultListModel; + +import fr.ifremer.isisfish.entities.TripType; + +/** + * Model pour la liste des {@link TripType}. + * + * Pas de selection par defaut. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class TripTypeListModel extends DefaultListModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6171850179969290032L; + + /** Trip types list */ + protected List<TripType> tripTypes; + + /** + * Constructor with trip types list. + * + * @param tripTypes Trip types list + */ + public TripTypeListModel(List<TripType> tripTypes) { + super(); + this.tripTypes = tripTypes; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return tripTypes.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (tripTypes != null) { + size = tripTypes.size(); + } + return size; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListModel.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java 2009-11-05 15:22:34 UTC (rev 2743) @@ -0,0 +1,60 @@ +/* *##% + * 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.triptype; + +import java.awt.Component; + +import javax.swing.DefaultListCellRenderer; +import javax.swing.JLabel; +import javax.swing.JList; + +import fr.ifremer.isisfish.entities.TripType; + +/** + * Renderer pour liste des trip types. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class TripTypeListRenderer extends DefaultListCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1113492654780402245L; + + /* + * @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 alternated highlight rows and default + // selection color + JLabel c = (JLabel) super.getListCellRendererComponent(list, value, + index, isSelected, cellHasFocus); + + TripType tripType = (TripType) value; + c.setText(tripType.getName()); + + return c; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"