[tutti] branch develop updated (266df68 -> 19d2a4c)
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 266df68 fixes #5725: [TECHNIQUE] Fichier de configuration - Mise à jour de la 3.7 au lieu de la 3.7.1 new 19d2a4c fixes #5729: [PROTOCOLE] erreur creation protocole 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 19d2a4ce676e4efae479a3e8fcea0b8d1fbf9779 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 2 12:40:27 2014 +0200 fixes #5729: [PROTOCOLE] erreur creation protocole Summary of changes: .../fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java | 3 +-- .../tutti/ui/swing/content/protocol/EditProtocolUIHandler.java | 7 ++----- .../fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx | 5 ++++- .../tutti/ui/swing/util/species/SelectSpeciesUIHandler.java | 9 ++++++++- 4 files changed, 15 insertions(+), 9 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 19d2a4ce676e4efae479a3e8fcea0b8d1fbf9779 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 2 12:40:27 2014 +0200 fixes #5729: [PROTOCOLE] erreur creation protocole --- .../fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java | 3 +-- .../tutti/ui/swing/content/protocol/EditProtocolUIHandler.java | 7 ++----- .../fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx | 5 ++++- .../tutti/ui/swing/util/species/SelectSpeciesUIHandler.java | 9 ++++++++- 4 files changed, 15 insertions(+), 9 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 808b79b..a21205e 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 @@ -98,9 +98,8 @@ public abstract class AbstractTuttiAction<M extends AbstractBean, UI extends Tut } } - protected Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialogContent = new SelectSpeciesUI(getUI()); + SelectSpeciesUI dialogContent = new SelectSpeciesUI(true, getUI()); SelectSpeciesUIModel model = dialogContent.getModel(); model.setSelectedSpecies(null); model.setSpecies(species); 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 720a25e..00a6950 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 @@ -470,11 +470,8 @@ 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); + dialog = new SelectSpeciesUI(false, this.ui); + } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx index fd2c02a..be03444 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx @@ -31,7 +31,10 @@ <script><![CDATA[ -public SelectSpeciesUI(TuttiUI parentUI) { +boolean useSurveyCode; + +public SelectSpeciesUI(boolean useSurveyCode, TuttiUI parentUI) { + this.useSurveyCode = useSurveyCode; TuttiUIUtil.setParentUI(this, parentUI); } ]]></script> 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 8453704..88342c8 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 @@ -55,10 +55,17 @@ public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpecies public void afterInit(SelectSpeciesUI ui) { initUI(ui); + String context = ui.useSurveyCode ?DecoratorService.WITH_SURVEY_CODE : null; + initBeanFilterableComboBox(ui.getSpeciesCombo(), Lists.<Species>newArrayList(), null, - DecoratorService.WITH_SURVEY_CODE); + context); + +// initBeanFilterableComboBox(ui.getSpeciesCombo(), +// Lists.<Species>newArrayList(), +// null, +// DecoratorService.WITH_SURVEY_CODE); getModel().addPropertyChangeListener( SelectSpeciesUIModel.PROPERTY_SPECIES, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm