From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:14 2026 From: chatellier@users.labs.libre-entreprise.org To: isis-fish-commits@list.isis-fish.org Subject: [Isis-fish-commits] r2394 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input: . population Date: Wed, 17 Jun 2009 10:34:54 +0200 Message-ID: <20090617083454.B0381461CCC@labs.libre-entreprise.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2549808460777124685==" --===============2549808460777124685== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: chatellier Date: 2009-06-17 08:34:54 +0000 (Wed, 17 Jun 2009) New Revision: 2394 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/Popu= lationSeasonInfoComboModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/Popu= lationSeasonInfoComboRenderer.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra= tionEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra= tionImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra= tionUI.jaxx Log: Conservation de la selection. Am?\195?\169lioration des propri?\195?\169t?\195?\169s 'enabled/actif'. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati= onMigrationEquationUI.jaxx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr= ationEquationUI.jaxx 2009-06-16 15:54:04 UTC (rev 2393) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr= ationEquationUI.jaxx 2009-06-17 08:34:54 UTC (rev 2394) @@ -46,29 +46,29 @@ } ]]> - +
- + - + - + Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati= onMigrationImmigrationUI.jaxx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr= ationImmigrationUI.jaxx 2009-06-16 15:54:04 UTC (rev 2393) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr= ationImmigrationUI.jaxx 2009-06-17 08:34:54 UTC (rev 2394) @@ -144,10 +144,10 @@ } ]]> -
+
- + @@ -177,12 +177,12 @@ - + - +
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati= onMigrationUI.jaxx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr= ationUI.jaxx 2009-06-16 15:54:04 UTC (rev 2393) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr= ationUI.jaxx 2009-06-17 08:34:54 UTC (rev 2394) @@ -23,26 +23,26 @@ =20 + + =20 @@ -125,46 +132,51 @@ - + + text=3D"isisfish.populationMigration.useEquation" onActionPe= rformed=3D'useEquationChanged()' enabled=3D'{isSelectedPopulationSeasonInfo()= }' decorator=3D'boxed'/> - - - + + + _bean=3D'{PopulationSeasonInfoImpl.class}' _method= =3D'"MigrationMatrix"' actif=3D'{isSelectedPopulationSeasonInfo()}' /> + _bean=3D'{PopulationSeasonInfoImpl.class}' _method= =3D'"ImmigrationMatrix"' actif=3D'{isSelectedPopulationSeasonInfo()}' /> + _bean=3D'{PopulationSeasonInfoImpl.class}' _method= =3D'"EmigrationMatrix"' actif=3D'{isSelectedPopulationSeasonInfo()}' /> + - + + enabled=3D'{isSelectedPopulationSeasonInfo()}' decorator= =3D'boxed'/> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/= PopulationSeasonInfoComboModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/Pop= ulationSeasonInfoComboModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/Pop= ulationSeasonInfoComboModel.java 2009-06-17 08:34:54 UTC (rev 2394) @@ -0,0 +1,102 @@ +/* *##% + * 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, US= A. + *##%*/ + +package fr.ifremer.isisfish.ui.input.population; + +import java.util.List; + +import javax.swing.DefaultComboBoxModel; + +import fr.ifremer.isisfish.entities.PopulationSeasonInfo; + +/** + * Model pour la liste des {@link PopulationSeasonInfo}. + * + * @author chatellier + * @version $Revision: 2350 $ + *=20 + * Last update : $Date: 2009-06-09 13:52:58 +0200 (mar. 09 juin 2009) $ + * By : $Author: chatellier $ + */ +public class PopulationSeasonInfoComboModel extends DefaultComboBoxModel { + + /** serialVersionUID. */ + private static final long serialVersionUID =3D 6171850179969290032L; + + /** PopulationSeasonInfo list */ + protected List populationSeasonInfos; + + /** + * Empty constructor. + */ + public PopulationSeasonInfoComboModel() { + this(null); + } + + /** + * Constructor with population season info list. + *=20 + * @param populationSeasonInfos population season info list + */ + public PopulationSeasonInfoComboModel(List populat= ionSeasonInfos) { + super(); + setPopulationSeasonInfos(populationSeasonInfos); + } + + /** + * Get population season info list. + *=20 + * @return population season info list + */ + public List getPopulationSeasonInfos() { + return populationSeasonInfos; + } + + /** + * Set population season info list. + *=20 + * @param populationSeasonInfos the population season info list to set + */ + public void setPopulationSeasonInfos(List populati= onSeasonInfos) { + this.populationSeasonInfos =3D populationSeasonInfos; + =20 + // clear selection + setSelectedItem(null); + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return populationSeasonInfos.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size =3D 0; + + if (populationSeasonInfos !=3D null) { + size =3D populationSeasonInfos.size(); + } + return size; + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/= PopulationSeasonInfoComboRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/Pop= ulationSeasonInfoComboRenderer.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/Pop= ulationSeasonInfoComboRenderer.java 2009-06-17 08:34:54 UTC (rev 2394) @@ -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, US= A. + *##%*/ + +package fr.ifremer.isisfish.ui.input.population; + +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.PopulationSeasonInfo; + +/** + * Renderer pour la combo des {@link PopulationSeasonInfo}. + * + * @author chatellier + * @version $Revision: 2350 $ + *=20 + * Last update : $Date: 2009-06-09 13:52:58 +0200 (mar. 09 juin 2009) $ + * By : $Author: chatellier $ + */ +public class PopulationSeasonInfoComboRenderer extends DefaultListCellRender= er implements + ListCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID =3D -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 =3D (JLabel) super.getListCellRendererComponent(list, value, + index, isSelected, cellHasFocus); + + PopulationSeasonInfo populationSeasonInfo =3D (PopulationSeasonInfo)= value; + =20 + // there is no default selection + if (value !=3D null) { + c.setText(populationSeasonInfo.getFirstMonth() + " - " + populat= ionSeasonInfo.getLastMonth()); + } + return c; + } +} --===============2549808460777124685==--