[tutti] branch develop updated (216ab87 -> d3a0103)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 216ab87 fixes #5719: [TECHNIQUE] Changer l'url de mises à jour des livrables : seule la valeur par défaut est modifiée new d3a0103 fixes #5720: [CAPTURE] dans tableau espèce, clic droit ... The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d3a0103a7b117216ecc2043515773a9c5cc662f9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 1 16:24:41 2014 +0200 fixes #5720: [CAPTURE] dans tableau espèce, clic droit ... Summary of changes: .../tutti/ui/swing/action/AbstractTuttiAction.java | 18 ++++++++++++++++++ .../ui/swing/action/RenameBenthosBatchAction.java | 8 ++++---- .../ui/swing/action/RenameSpeciesBatchAction.java | 8 ++++---- .../ui/swing/action/SelectOtherBenthosAction.java | 4 +--- .../ui/swing/action/SelectOtherSpeciesAction.java | 3 +-- .../action/SelectSpeciesForBenthosBatchAction.java | 3 +-- ...ectSpeciesForIndividualObservationBatchAction.java | 3 +-- .../action/SelectSpeciesForSpeciesBatchAction.java | 3 +-- .../create/CreateAccidentalBatchUIHandler.java | 18 +----------------- .../catches/benthos/BenthosBatchUIHandler.java | 11 ----------- .../benthos/create/CreateBenthosBatchUIHandler.java | 12 ------------ .../CreateIndividualObservationBatchUIHandler.java | 16 +--------------- .../create/CreateMarineLitterBatchUIHandler.java | 19 +------------------ .../catches/species/SpeciesBatchUIHandler.java | 14 -------------- .../species/create/CreateSpeciesBatchUIHandler.java | 12 ------------ .../swing/content/protocol/EditProtocolUIHandler.java | 5 +++++ .../ui/swing/util/species/SelectSpeciesUIHandler.java | 11 ++++++++++- 17 files changed, 49 insertions(+), 119 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d3a0103a7b117216ecc2043515773a9c5cc662f9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 1 16:24:41 2014 +0200 fixes #5720: [CAPTURE] dans tableau espèce, clic droit ... --- .../tutti/ui/swing/action/AbstractTuttiAction.java | 18 ++++++++++++++++++ .../ui/swing/action/RenameBenthosBatchAction.java | 8 ++++---- .../ui/swing/action/RenameSpeciesBatchAction.java | 8 ++++---- .../ui/swing/action/SelectOtherBenthosAction.java | 4 +--- .../ui/swing/action/SelectOtherSpeciesAction.java | 3 +-- .../action/SelectSpeciesForBenthosBatchAction.java | 3 +-- ...ectSpeciesForIndividualObservationBatchAction.java | 3 +-- .../action/SelectSpeciesForSpeciesBatchAction.java | 3 +-- .../create/CreateAccidentalBatchUIHandler.java | 18 +----------------- .../catches/benthos/BenthosBatchUIHandler.java | 11 ----------- .../benthos/create/CreateBenthosBatchUIHandler.java | 12 ------------ .../CreateIndividualObservationBatchUIHandler.java | 16 +--------------- .../create/CreateMarineLitterBatchUIHandler.java | 19 +------------------ .../catches/species/SpeciesBatchUIHandler.java | 14 -------------- .../species/create/CreateSpeciesBatchUIHandler.java | 12 ------------ .../swing/content/protocol/EditProtocolUIHandler.java | 5 +++++ .../ui/swing/util/species/SelectSpeciesUIHandler.java | 11 ++++++++++- 17 files changed, 49 insertions(+), 119 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java index e2f86e8..808b79b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java @@ -22,6 +22,9 @@ package fr.ifremer.tutti.ui.swing.action; * #L% */ +import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; +import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; @@ -35,6 +38,8 @@ import org.nuiton.util.StringUtil; import javax.swing.JOptionPane; import java.awt.Component; +import java.awt.Dimension; +import java.util.List; /** * Tutti base action. @@ -93,6 +98,19 @@ public abstract class AbstractTuttiAction<M extends AbstractBean, UI extends Tut } } + + protected Species openAddSpeciesDialog(String title, List<Species> species) { + SelectSpeciesUI dialogContent = new SelectSpeciesUI(getUI()); + SelectSpeciesUIModel model = dialogContent.getModel(); + model.setSelectedSpecies(null); + model.setSpecies(species); + + getHandler().openDialog(dialogContent, title, new Dimension(400, 130)); + + return model.getSelectedSpecies(); + } + + protected boolean askAdminPassword(String askMessage, String askMessageTitle, String errorMessage, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java index 57cf78b..0071c23 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java @@ -32,9 +32,12 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchT import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIModel; +import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; +import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import jaxx.runtime.SwingUtil; import org.jdesktop.swingx.JXTable; +import java.awt.Dimension; import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -74,10 +77,7 @@ public class RenameBenthosBatchAction extends AbstractTuttiAction<BenthosBatchUI model.getSpeciesUsed().get( (CaracteristicQualitativeValue) categoryValue)); - selectedSpecies = getHandler().openAddSpeciesDialog( - t("tutti.selectSpecies.title"), - speciesList - ); + selectedSpecies = openAddSpeciesDialog(t("tutti.selectSpecies.title"), speciesList); result &= selectedSpecies != null; return result; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java index fd5ec56..62b9412 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java @@ -32,9 +32,12 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchT import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; +import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; +import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import jaxx.runtime.SwingUtil; import org.jdesktop.swingx.JXTable; +import java.awt.Dimension; import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -73,10 +76,7 @@ public class RenameSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUI speciesList.removeAll( model.getSpeciesUsed().get((CaracteristicQualitativeValue) categoryValue)); - selectedSpecies = getHandler().openAddSpeciesDialog( - t("tutti.selectSpecies.title"), - speciesList - ); + selectedSpecies = openAddSpeciesDialog(t("tutti.selectSpecies.title"), speciesList); result &= selectedSpecies != null; return result; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java index 5a3f693..a2a444d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.action; /* @@ -61,8 +60,7 @@ public class SelectOtherBenthosAction extends AbstractTuttiAction<EditProtocolUI List<Species> species = Lists.newArrayList(model.getAllSynonyms()); - selectedSpecies = getHandler().openSelectOtherSpeciesDialog( - t("tutti.selectBenthos.title"), species); + selectedSpecies = getHandler().openSelectOtherSpeciesDialog(t("tutti.selectBenthos.title"), species); if (log.isInfoEnabled()) { log.info("SelectedBenthos: " + selectedSpecies); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java index c3c2cab..52e34a7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java @@ -61,8 +61,7 @@ public class SelectOtherSpeciesAction extends AbstractTuttiAction<EditProtocolUI List<Species> species = Lists.newArrayList(model.getAllSynonyms()); - selectedSpecies = getHandler().openSelectOtherSpeciesDialog( - t("tutti.selectSpecies.title"), species); + selectedSpecies = getHandler().openSelectOtherSpeciesDialog(t("tutti.selectSpecies.title"), species); if (log.isInfoEnabled()) { log.info("SelectedSpecies: " + selectedSpecies); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java index 6dea7b4..409b1e8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java @@ -66,8 +66,7 @@ public class SelectSpeciesForBenthosBatchAction extends AbstractTuttiAction<Crea List<Species> species = Lists.newArrayList(allSpecies); species.removeAll(model.getAvailableSpecies()); - selectedSpecies = getHandler().openAddSpeciesDialog( - t("tutti.selectSpecies.title"), species); + selectedSpecies = openAddSpeciesDialog(t("tutti.selectSpecies.title"), species); canContinue = selectedSpecies != null; } return canContinue; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java index 207948b..e5795d6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java @@ -68,8 +68,7 @@ public class SelectSpeciesForIndividualObservationBatchAction extends AbstractTu List<Species> species = Lists.newArrayList(allSpecies); species.removeAll(model.getAvailableSpecies()); - selectedSpecies = getHandler().openAddSpeciesDialog( - t("tutti.selectSpecies.title"), species); + selectedSpecies = openAddSpeciesDialog(t("tutti.selectSpecies.title"), species); canContinue = selectedSpecies != null; } return canContinue; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java index be7d4bf..3f348bf 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java @@ -66,8 +66,7 @@ public class SelectSpeciesForSpeciesBatchAction extends AbstractTuttiAction<Crea List<Species> species = Lists.newArrayList(allSpecies); species.removeAll(model.getAvailableSpecies()); - selectedSpecies = getHandler().openAddSpeciesDialog( - t("tutti.selectSpecies.title"), species); + selectedSpecies = openAddSpeciesDialog(t("tutti.selectSpecies.title"), species); canContinue = selectedSpecies != null; } return canContinue; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java index 7693e5c..9cbe3bc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java @@ -23,21 +23,16 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create; */ import com.google.common.collect.Lists; -import org.nuiton.jaxx.application.swing.util.Cancelable; -import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.swing.util.Cancelable; import javax.swing.JComponent; -import java.awt.Dimension; -import java.util.List; /** * @author kmorin <kmorin@codelutin.com> @@ -166,15 +161,4 @@ public class CreateAccidentalBatchUIHandler extends AbstractTuttiUIHandler<Creat closeUI(ui); } - public Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); - SelectSpeciesUIModel model = dialogContent.getModel(); - model.setSelectedSpecies(null); - model.setSpecies(species); - - openDialog(dialogContent, title, new Dimension(400, 130)); - - Species result = model.getSelectedSpecies(); - return result; - } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java index 3759db0..ba3674b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java @@ -1497,17 +1497,6 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent } } - public Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); - SelectSpeciesUIModel model = dialogContent.getModel(); - model.setSelectedSpecies(null); - model.setSpecies(species); - - openDialog(dialogContent, title, new Dimension(400, 130)); - - return model.getSelectedSpecies(); - } - //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java index 813a855..fb70abd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java @@ -411,18 +411,6 @@ public class CreateBenthosBatchUIHandler extends AbstractTuttiTableUIHandler<Spl closeUI(ui); } - public Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); - SelectSpeciesUIModel model = dialogContent.getModel(); - model.setSelectedSpecies(null); - model.setSpecies(species); - - openDialog(dialogContent, title, new Dimension(400, 130)); - - Species result = model.getSelectedSpecies(); - return result; - } - //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java index 91d6d66..94ab5d9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservatio import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; @@ -41,8 +40,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.Table; import jaxx.runtime.swing.editor.NumberEditor; @@ -52,11 +49,11 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.util.Cancelable; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JTextField; -import java.awt.Dimension; import java.awt.GridBagConstraints; import java.awt.Insets; import java.awt.event.KeyAdapter; @@ -482,15 +479,4 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa closeUI(ui); } - public Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); - SelectSpeciesUIModel model = dialogContent.getModel(); - model.setSelectedSpecies(null); - model.setSpecies(species); - - openDialog(dialogContent, title, new Dimension(400, 130)); - - Species result = model.getSelectedSpecies(); - return result; - } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java index e3251e1..84631e8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java @@ -24,24 +24,19 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.create; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.swing.util.Cancelable; import javax.swing.JComponent; -import java.awt.Dimension; -import java.util.List; /** * @author tchemit <chemit@codelutin.com> @@ -175,16 +170,4 @@ public class CreateMarineLitterBatchUIHandler extends AbstractTuttiUIHandler<Cre closeUI(ui); } - public Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); - SelectSpeciesUIModel model = dialogContent.getModel(); - model.setSelectedSpecies(null); - model.setSpecies(species); - - openDialog(dialogContent, title, new Dimension(400, 130)); - - Species result = model.getSelectedSpecies(); - return result; - } - } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index abef32c..68f6755 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -67,8 +67,6 @@ import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellRenderer; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import fr.ifremer.tutti.util.Weights; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.NumberEditor; @@ -99,7 +97,6 @@ import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; import java.awt.Color; import java.awt.Component; -import java.awt.Dimension; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -1458,17 +1455,6 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec } } - public Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); - SelectSpeciesUIModel model = dialogContent.getModel(); - model.setSelectedSpecies(null); - model.setSpecies(species); - - openDialog(dialogContent, title, new Dimension(400, 130)); - - return model.getSelectedSpecies(); - } - //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index 0f22e80..bc4c7da 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -411,18 +411,6 @@ public class CreateSpeciesBatchUIHandler extends closeUI(ui); } - public Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); - SelectSpeciesUIModel model = dialogContent.getModel(); - model.setSelectedSpecies(null); - model.setSpecies(species); - - openDialog(dialogContent, title, new Dimension(400, 130)); - - Species result = model.getSelectedSpecies(); - return result; - } - //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index 39d9e82..720a25e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -471,6 +471,10 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI }); dialog = new SelectSpeciesUI(this.ui); + + // we cant use here survey code for species + initBeanFilterableComboBox(dialog.getSpeciesCombo(), + Lists.<Species>newArrayList(), null); } @Override @@ -598,6 +602,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI } } + //FIXME tchemit-2014-01-09 Bad place for this! public Species openSelectOtherSpeciesDialog(String title, List<Species> species) { SelectSpeciesUIModel model = dialog.getModel(); model.setSpecies(species); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java index a33dad7..8453704 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.ui.swing.util.species; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -56,7 +57,8 @@ public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpecies initBeanFilterableComboBox(ui.getSpeciesCombo(), Lists.<Species>newArrayList(), - null); + null, + DecoratorService.WITH_SURVEY_CODE); getModel().addPropertyChangeListener( SelectSpeciesUIModel.PROPERTY_SPECIES, @@ -66,6 +68,13 @@ public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpecies SelectSpeciesUIHandler.this.ui.getSpeciesCombo().getHandler().sortData(); } }); + + getModel().addPropertyChangeListener(SelectSpeciesUIModel.PROPERTY_SPECIES,new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + + } + }); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm