From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:46 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r3279 - in
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input: . model
Date: Thu, 21 Apr 2011 14:53:31 +0200
Message-ID: <20110421125331.E60A62F165@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8925139397370212788=="
--===============8925139397370212788==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Author: chatellier
Date: 2011-04-21 12:53:31 +0000 (Thu, 21 Apr 2011)
New Revision: 3279
Log:
Fix save/cancel buttons binding.
Remove deprecated code.
Added:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/=
PortComboModel.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/=
SetOfVesselsComboModel.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/=
TripTypeComboModel.java
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model/=
VesselTypeComboModel.java
Modified:
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Effort=
DescriptionParametersUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Metier=
SeasonInfoSpeciesUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Popula=
tionGroupUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Popula=
tionSeasonsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Select=
ivityUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfV=
esselsBasicsUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Strate=
gyMonthInfoUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Strate=
gyOneMonthInfoUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Strate=
gyTabUI.jaxx
isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Vessel=
TypeUI.jaxx
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input=
/EffortDescriptionParametersUI.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Effor=
tDescriptionParametersUI.jaxx 2011-04-21 12:52:57 UTC (rev 3278)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Effor=
tDescriptionParametersUI.jaxx 2011-04-21 12:53:31 UTC (rev 3279)
@@ -26,6 +26,7 @@
=20
+
=20
@@ -43,7 +44,15 @@
bean=3D'{getBean()}' beanClass=3D'fr.ifremer.isisfish.entities.SetOf=
Vessels'
uiClass=3D"jaxx.runtime.validator.swing.ui.ImageValidationUI">
- =20
+
+
+
+
+
+
@@ -122,7 +124,9 @@
|
-
+
|
@@ -146,13 +150,14 @@
|
+ onActionPerformed=3D'getBean().setInacti=
vityEquationUsed(fieldUseEquationInactivity.isSelected())' enabled=3D'{isActi=
ve()}' decorator=3D'boxed'/>
|
|
Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input=
/VesselTypeUI.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Vesse=
lTypeUI.jaxx 2011-04-21 12:52:57 UTC (rev 3278)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/Vesse=
lTypeUI.jaxx 2011-04-21 12:53:31 UTC (rev 3279)
@@ -45,6 +45,8 @@
=20
@@ -208,8 +217,7 @@
|
-
Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/mo=
del/PortComboModel.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model=
/PortComboModel.java (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model=
/PortComboModel.java 2011-04-21 12:53:31 UTC (rev 3279)
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * IsisFish
+ *=20
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric
+ * %%
+ * 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=20
+ * License, or (at your option) any later version.
+ *=20
+ * 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.
+ *=20
+ * You should have received a copy of the GNU General Public=20
+ * License along with this program. If not, see
+ * .
+ * #L%
+ */
+
+package fr.ifremer.isisfish.ui.input.model;
+
+import java.util.List;
+
+import javax.swing.DefaultComboBoxModel;
+
+import fr.ifremer.isisfish.entities.Port;
+
+/**
+ * Model pour la liste des {@link Port}.
+ *=20
+ * Pas de selection par defaut.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class PortComboModel extends DefaultComboBoxModel {
+
+ /** serialVersionUID. */
+ private static final long serialVersionUID =3D 6171850179969290032L;
+
+ /** Port list */
+ protected List portsList;
+
+ /**
+ * Constructor with ports list.
+ *=20
+ * @param portsList ports list
+ */
+ public PortComboModel(List portsList) {
+ this.portsList =3D portsList;
+ }
+
+ /*
+ * @see javax.swing.ListModel#getElementAt(int)
+ */
+ @Override
+ public Object getElementAt(int index) {
+ return portsList.get(index);
+ }
+
+ /*
+ * @see javax.swing.ListModel#getSize()
+ */
+ @Override
+ public int getSize() {
+ int size =3D 0;
+
+ if (portsList !=3D null) {
+ size =3D portsList.size();
+ }
+ return size;
+ }
+}
Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfi=
sh/ui/input/model/PortComboModel.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/mo=
del/SetOfVesselsComboModel.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model=
/SetOfVesselsComboModel.java (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model=
/SetOfVesselsComboModel.java 2011-04-21 12:53:31 UTC (rev 3279)
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * IsisFish
+ *=20
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric
+ * %%
+ * 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=20
+ * License, or (at your option) any later version.
+ *=20
+ * 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.
+ *=20
+ * You should have received a copy of the GNU General Public=20
+ * License along with this program. If not, see
+ * .
+ * #L%
+ */
+
+package fr.ifremer.isisfish.ui.input.model;
+
+import java.util.List;
+
+import javax.swing.DefaultComboBoxModel;
+
+import fr.ifremer.isisfish.entities.SetOfVessels;
+
+/**
+ * Model pour la liste des {@link SetOfVessels}.
+ *=20
+ * Pas de selection par defaut.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class SetOfVesselsComboModel extends DefaultComboBoxModel {
+
+ /** serialVersionUID. */
+ private static final long serialVersionUID =3D 6171850179969290032L;
+
+ /** VesselType list */
+ protected List setOfVesselsList;
+
+ /**
+ * Constructor with ports list.
+ *=20
+ * @param setOfVesselsList ports list
+ */
+ public SetOfVesselsComboModel(List setOfVesselsList) {
+ this.setOfVesselsList =3D setOfVesselsList;
+ }
+
+ /*
+ * @see javax.swing.ListModel#getElementAt(int)
+ */
+ @Override
+ public Object getElementAt(int index) {
+ return setOfVesselsList.get(index);
+ }
+
+ /*
+ * @see javax.swing.ListModel#getSize()
+ */
+ @Override
+ public int getSize() {
+ int size =3D 0;
+
+ if (setOfVesselsList !=3D null) {
+ size =3D setOfVesselsList.size();
+ }
+ return size;
+ }
+}
Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfi=
sh/ui/input/model/SetOfVesselsComboModel.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/mo=
del/TripTypeComboModel.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model=
/TripTypeComboModel.java (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model=
/TripTypeComboModel.java 2011-04-21 12:53:31 UTC (rev 3279)
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * IsisFish
+ *=20
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric
+ * %%
+ * 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=20
+ * License, or (at your option) any later version.
+ *=20
+ * 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.
+ *=20
+ * You should have received a copy of the GNU General Public=20
+ * License along with this program. If not, see
+ * .
+ * #L%
+ */
+
+package fr.ifremer.isisfish.ui.input.model;
+
+import java.util.List;
+
+import javax.swing.DefaultComboBoxModel;
+
+import fr.ifremer.isisfish.entities.TripType;
+
+/**
+ * Model pour la liste des {@link TripType}.
+ *=20
+ * Pas de selection par defaut.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class TripTypeComboModel extends DefaultComboBoxModel {
+
+ /** serialVersionUID. */
+ private static final long serialVersionUID =3D 6171850179969290032L;
+
+ /** Trip types list */
+ protected List tripTypes;
+
+ /**
+ * Constructor with trip types list.
+ *=20
+ * @param tripTypes Trip types list
+ */
+ public TripTypeComboModel(List tripTypes) {
+ this.tripTypes =3D 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 =3D 0;
+
+ if (tripTypes !=3D null) {
+ size =3D tripTypes.size();
+ }
+ return size;
+ }
+}
Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfi=
sh/ui/input/model/TripTypeComboModel.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/mo=
del/VesselTypeComboModel.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model=
/VesselTypeComboModel.java (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/model=
/VesselTypeComboModel.java 2011-04-21 12:53:31 UTC (rev 3279)
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * IsisFish
+ *=20
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric
+ * %%
+ * 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=20
+ * License, or (at your option) any later version.
+ *=20
+ * 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.
+ *=20
+ * You should have received a copy of the GNU General Public=20
+ * License along with this program. If not, see
+ * .
+ * #L%
+ */
+
+package fr.ifremer.isisfish.ui.input.model;
+
+import java.util.List;
+
+import javax.swing.DefaultComboBoxModel;
+
+import fr.ifremer.isisfish.entities.VesselType;
+
+/**
+ * Model pour la liste des {@link VesselType}.
+ *=20
+ * Pas de selection par defaut.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class VesselTypeComboModel extends DefaultComboBoxModel {
+
+ /** serialVersionUID. */
+ private static final long serialVersionUID =3D 6171850179969290032L;
+
+ /** VesselType list */
+ protected List vesselTypeList;
+
+ /**
+ * Constructor with ports list.
+ *=20
+ * @param vesselTypeList ports list
+ */
+ public VesselTypeComboModel(List vesselTypeList) {
+ this.vesselTypeList =3D vesselTypeList;
+ }
+
+ /*
+ * @see javax.swing.ListModel#getElementAt(int)
+ */
+ @Override
+ public Object getElementAt(int index) {
+ return vesselTypeList.get(index);
+ }
+
+ /*
+ * @see javax.swing.ListModel#getSize()
+ */
+ @Override
+ public int getSize() {
+ int size =3D 0;
+
+ if (vesselTypeList !=3D null) {
+ size =3D vesselTypeList.size();
+ }
+ return size;
+ }
+}
Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfi=
sh/ui/input/model/VesselTypeComboModel.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
--===============8925139397370212788==--
|