[Tutti-commits] [tutti] 01/01: refs #5997: [IMPORT] Améliorer la gestion des référentiels temporaires

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 d3f8f0908638ee0a0e232547097105caae39bcd9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 4 21:15:52 2014 +0100 refs #5997: [IMPORT] Améliorer la gestion des référentiels temporaires --- pom.xml | 2 +- .../action/AbstractOpenReplaceTemporaryUIAction.java | 7 +++++-- .../ui/swing/action/AbstractReplaceTemporaryUIAction.java | 15 ++++++++------- .../swing/action/ExportExistingTemporaryGearAction.java | 2 +- .../swing/action/ExportExistingTemporaryPersonAction.java | 3 +-- .../action/ExportExistingTemporarySpeciesAction.java | 3 +-- .../swing/action/ExportExistingTemporaryVesselAction.java | 3 +-- .../tutti/ui/swing/action/ImportTemporaryGearAction.java | 2 +- .../ui/swing/action/ImportTemporaryPersonAction.java | 2 +- .../ui/swing/action/ImportTemporarySpeciesAction.java | 2 +- .../ui/swing/action/ImportTemporaryVesselAction.java | 2 +- .../ui/swing/action/OpenReplaceTemporaryGearUIAction.java | 6 ++++++ .../swing/action/OpenReplaceTemporaryPersonUIAction.java | 6 ++++++ .../swing/action/OpenReplaceTemporarySpeciesUIAction.java | 6 ++++++ .../swing/action/OpenReplaceTemporaryVesselUIAction.java | 6 ++++++ .../tutti/ui/swing/action/ReplaceTemporaryGearAction.java | 11 +++++++---- .../ui/swing/action/ReplaceTemporaryPersonAction.java | 11 +++++++---- .../ui/swing/action/ReplaceTemporarySpeciesAction.java | 12 +++++++----- .../ui/swing/action/ReplaceTemporaryVesselAction.java | 12 +++++++----- .../content/referential/ManageTemporaryReferentialUI.css | 4 ++-- .../referential/ManageTemporaryReferentialUIHandler.java | 9 +++++++-- .../referential/ManageTemporaryReferentialUIModel.java | 9 ++++++++- 22 files changed, 91 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 84714d2..a349a66 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <eugenePluginVersion>2.13</eugenePluginVersion> - <jaxxVersion>2.13</jaxxVersion> + <jaxxVersion>2.16-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.7</slf4jVersion> <adagioVersion>3.6.4-SNAPSHOT</adagioVersion> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractOpenReplaceTemporaryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractOpenReplaceTemporaryUIAction.java index e246404..9917d83 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractOpenReplaceTemporaryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractOpenReplaceTemporaryUIAction.java @@ -27,7 +27,6 @@ package fr.ifremer.tutti.ui.swing.action; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; @@ -41,6 +40,7 @@ import jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JButton; import javax.swing.SwingUtilities; import java.util.List; @@ -76,10 +76,12 @@ public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiRefere super(handler, true); } + protected abstract JButton getButton(); + @Override public boolean prepareAction() throws Exception { - boolean doAction = super.prepareAction(); + boolean doAction = super.prepareAction() && getButton().isEnabled(); if (doAction) { @@ -159,6 +161,7 @@ public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiRefere new Runnable() { @Override public void run() { + dialog.setContextValue(getUI(), "owner"); dialog.setVisible(true); ((TuttiUI) dialog).getHandler().onCloseUI(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java index 4fb3794..428a288 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java @@ -27,6 +27,7 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemporaryUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; @@ -47,17 +48,17 @@ public abstract class AbstractReplaceTemporaryUIAction<E extends TuttiReferentia private static final Log log = LogFactory.getLog(AbstractReplaceTemporaryUIAction.class); - protected abstract String getEntityLabel(); - protected E source; protected E target; protected Boolean delete; + protected abstract String getEntityLabel(); + protected abstract void replaceReferentialEntity(PersistenceService persistenceService, E source, E target, boolean delete); - protected abstract void resetCaches(); + protected abstract void updateNumberOfTemporaryEntities(ManageTemporaryReferentialUI mainUi); protected AbstractReplaceTemporaryUIAction(H handler) { super(handler, true); @@ -102,9 +103,6 @@ public abstract class AbstractReplaceTemporaryUIAction<E extends TuttiReferentia replaceReferentialEntity(getContext().getPersistenceService(), source, target, delete); - // reset cache - resetCaches(); - } @Override @@ -120,6 +118,10 @@ public abstract class AbstractReplaceTemporaryUIAction<E extends TuttiReferentia super.postSuccessAction(); if (delete) { + + ManageTemporaryReferentialUI mainUi= getUI().getContextValue(ManageTemporaryReferentialUI.class, "owner"); + + updateNumberOfTemporaryEntities(mainUi); sendMessage(t("tutti.replaceTemporaryAndDelete.done", getEntityLabel(), decorate(source), decorate(target))); } else { sendMessage(t("tutti.replaceTemporary.done", getEntityLabel(), decorate(source), decorate(target))); @@ -127,5 +129,4 @@ public abstract class AbstractReplaceTemporaryUIAction<E extends TuttiReferentia } - } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryGearAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryGearAction.java index 79427b1..b6dedec 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryGearAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryGearAction.java @@ -56,7 +56,7 @@ public class ExportExistingTemporaryGearAction extends AbstractTuttiAction<Manag @Override public boolean prepareAction() throws Exception { - boolean doAction = super.prepareAction(); + boolean doAction = super.prepareAction() && getUI().getExportExistingGearButton().isEnabled(); if (doAction) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryPersonAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryPersonAction.java index f0b26e2..48fc2d9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryPersonAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryPersonAction.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Preconditions; import fr.ifremer.tutti.service.referential.ReferentialExportService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; @@ -57,7 +56,7 @@ public class ExportExistingTemporaryPersonAction extends AbstractTuttiAction<Man @Override public boolean prepareAction() throws Exception { - boolean doAction = super.prepareAction(); + boolean doAction = super.prepareAction() && getUI().getExportExistingPersonButton().isEnabled(); if (doAction) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporarySpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporarySpeciesAction.java index 62e69e9..bd307fb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporarySpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporarySpeciesAction.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Preconditions; import fr.ifremer.tutti.service.referential.ReferentialExportService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; @@ -56,7 +55,7 @@ public class ExportExistingTemporarySpeciesAction extends AbstractTuttiAction<Ma @Override public boolean prepareAction() throws Exception { - boolean doAction = super.prepareAction(); + boolean doAction = super.prepareAction() && getUI().getExportExistingSpeciesButton().isEnabled(); if (doAction) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryVesselAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryVesselAction.java index d2c24e0..b0d58dc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryVesselAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportExistingTemporaryVesselAction.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Preconditions; import fr.ifremer.tutti.service.referential.ReferentialExportService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; @@ -56,7 +55,7 @@ public class ExportExistingTemporaryVesselAction extends AbstractTuttiAction<Man @Override public boolean prepareAction() throws Exception { - boolean doAction = super.prepareAction(); + boolean doAction = super.prepareAction() && getUI().getExportExistingVesselButton().isEnabled(); if (doAction) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java index e55d935..f832ad3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialImportService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; @@ -50,6 +49,7 @@ public class ImportTemporaryGearAction extends AbstractTuttiAction<ManageTempora LogFactory.getLog(ImportTemporaryGearAction.class); private File file; + private ReferentialImportResult<Gear> result; public ImportTemporaryGearAction(ManageTemporaryReferentialUIHandler handler) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java index 77c25e9..24530c5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialImportService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; @@ -50,6 +49,7 @@ public class ImportTemporaryPersonAction extends AbstractTuttiAction<ManageTempo LogFactory.getLog(ImportTemporaryPersonAction.class); private File file; + private ReferentialImportResult<Person> result; public ImportTemporaryPersonAction(ManageTemporaryReferentialUIHandler handler) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java index 58cf9ca..0322b8a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialImportService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; @@ -50,6 +49,7 @@ public class ImportTemporarySpeciesAction extends AbstractTuttiAction<ManageTemp LogFactory.getLog(ImportTemporarySpeciesAction.class); private File file; + private ReferentialImportResult<Species> result; public ImportTemporarySpeciesAction(ManageTemporaryReferentialUIHandler handler) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java index 6464a51..74c310e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialImportService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; @@ -50,6 +49,7 @@ public class ImportTemporaryVesselAction extends AbstractTuttiAction<ManageTempo LogFactory.getLog(ImportTemporaryVesselAction.class); private File file; + private ReferentialImportResult<Vessel> result; public ImportTemporaryVesselAction(ManageTemporaryReferentialUIHandler handler) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java index 6893a51..90f4790 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java @@ -32,6 +32,7 @@ import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryGea import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryGearUIModel; import jaxx.runtime.context.JAXXInitialContext; +import javax.swing.JButton; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -49,6 +50,11 @@ public class OpenReplaceTemporaryGearUIAction extends AbstractOpenReplaceTempora } @Override + protected JButton getButton() { + return getUI().getReplaceGearButton(); + } + + @Override protected String getEntityLabel() { return t("tutti.common.referential.gear"); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryPersonUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryPersonUIAction.java index 4086f0a..c999a6d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryPersonUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryPersonUIAction.java @@ -32,6 +32,7 @@ import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryPer import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryPersonUIModel; import jaxx.runtime.context.JAXXInitialContext; +import javax.swing.JButton; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -49,6 +50,11 @@ public class OpenReplaceTemporaryPersonUIAction extends AbstractOpenReplaceTempo } @Override + protected JButton getButton() { + return getUI().getReplacePersonButton(); + } + + @Override protected String getEntityLabel() { return t("tutti.common.referential.person"); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporarySpeciesUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporarySpeciesUIAction.java index a98df83..6198f3f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporarySpeciesUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporarySpeciesUIAction.java @@ -32,6 +32,7 @@ import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporarySpe import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporarySpeciesUIModel; import jaxx.runtime.context.JAXXInitialContext; +import javax.swing.JButton; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -49,6 +50,11 @@ public class OpenReplaceTemporarySpeciesUIAction extends AbstractOpenReplaceTemp } @Override + protected JButton getButton() { + return getUI().getReplaceSpeciesButton(); + } + + @Override protected String getEntityLabel() { return t("tutti.common.referential.species"); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java index e5afb4c..ebee1ab 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java @@ -32,6 +32,7 @@ import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryVes import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryVesselUIModel; import jaxx.runtime.context.JAXXInitialContext; +import javax.swing.JButton; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -49,6 +50,11 @@ public class OpenReplaceTemporaryVesselUIAction extends AbstractOpenReplaceTempo } @Override + protected JButton getButton() { + return getUI().getReplaceVesselButton(); + } + + @Override protected String getEntityLabel() { return t("tutti.common.referential.vessel"); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryGearAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryGearAction.java index bbb9d16..169d710 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryGearAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryGearAction.java @@ -26,6 +26,7 @@ package fr.ifremer.tutti.ui.swing.action; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryGearUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryGearUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryGearUIModel; @@ -45,6 +46,12 @@ public class ReplaceTemporaryGearAction extends AbstractReplaceTemporaryUIAction } @Override + protected void updateNumberOfTemporaryEntities(ManageTemporaryReferentialUI mainUi) { + int nbRef = mainUi.getModel().getNbTemporaryGears() - 1; + mainUi.getModel().setNbTemporaryGears(nbRef); + } + + @Override protected String getEntityLabel() { return t("tutti.common.referential.gear"); } @@ -55,8 +62,4 @@ public class ReplaceTemporaryGearAction extends AbstractReplaceTemporaryUIAction persistenceService.replaceGear(source, target, delete); } - @Override - protected void resetCaches() { - - } } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryPersonAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryPersonAction.java index 5874645..1750c14 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryPersonAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryPersonAction.java @@ -26,6 +26,7 @@ package fr.ifremer.tutti.ui.swing.action; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryPersonUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryPersonUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryPersonUIModel; @@ -45,6 +46,12 @@ public class ReplaceTemporaryPersonAction extends AbstractReplaceTemporaryUIActi } @Override + protected void updateNumberOfTemporaryEntities(ManageTemporaryReferentialUI mainUi) { + int nbRef = mainUi.getModel().getNbTemporaryPersons() - 1; + mainUi.getModel().setNbTemporaryPersons(nbRef); + } + + @Override protected String getEntityLabel() { return t("tutti.common.referential.person"); } @@ -55,8 +62,4 @@ public class ReplaceTemporaryPersonAction extends AbstractReplaceTemporaryUIActi persistenceService.replacePerson(source, target, delete); } - @Override - protected void resetCaches() { - - } } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporarySpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporarySpeciesAction.java index ef1bba3..cf8c07d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporarySpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporarySpeciesAction.java @@ -26,6 +26,7 @@ package fr.ifremer.tutti.ui.swing.action; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporarySpeciesUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporarySpeciesUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporarySpeciesUIModel; @@ -45,6 +46,12 @@ public class ReplaceTemporarySpeciesAction extends AbstractReplaceTemporaryUIAct } @Override + protected void updateNumberOfTemporaryEntities(ManageTemporaryReferentialUI mainUi) { + int nbRef = mainUi.getModel().getNbTemporarySpecies() - 1; + mainUi.getModel().setNbTemporarySpecies(nbRef); + } + + @Override protected String getEntityLabel() { return t("tutti.common.referential.species"); } @@ -55,9 +62,4 @@ public class ReplaceTemporarySpeciesAction extends AbstractReplaceTemporaryUIAct persistenceService.replaceSpecies(source, target, delete); } - @Override - protected void resetCaches() { - - } - } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryVesselAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryVesselAction.java index 98bad85..3f85eb5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryVesselAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryVesselAction.java @@ -26,6 +26,7 @@ package fr.ifremer.tutti.ui.swing.action; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryVesselUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryVesselUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryVesselUIModel; @@ -45,6 +46,12 @@ public class ReplaceTemporaryVesselAction extends AbstractReplaceTemporaryUIActi } @Override + protected void updateNumberOfTemporaryEntities(ManageTemporaryReferentialUI mainUi) { + int nbRef = mainUi.getModel().getNbTemporaryVessels() - 1; + mainUi.getModel().setNbTemporaryVessels(nbRef); + } + + @Override protected String getEntityLabel() { return t("tutti.common.referential.vessel"); } @@ -55,9 +62,4 @@ public class ReplaceTemporaryVesselAction extends AbstractReplaceTemporaryUIActi persistenceService.replaceVessel(source, target, delete); } - @Override - protected void resetCaches() { - - } - } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css index 4491db0..0cb5de9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css @@ -52,7 +52,7 @@ actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportExistingTemporarySpeciesAction.class}; - enabled: { model.getNbTemporarySpecies() > 0 }; + visible: { model.getNbTemporarySpecies() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies.tip"; _help: {"tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies.help"}; } @@ -179,6 +179,7 @@ actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportExistingTemporaryPerson"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportExistingTemporaryPersonAction.class}; + enabled: { model.getNbTemporaryPersons() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.exportExistingTemporaryPerson.tip"; _help: {"tutti.manageTemporaryReferential.action.exportExistingTemporaryPerson.help"}; } @@ -187,7 +188,6 @@ actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportTemporaryPersonExampleAction.class}; - enabled: { model.getNbTemporaryPersons() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip"; _help: {"tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java index c89cd78..29e8434 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java @@ -27,14 +27,16 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.AbstractButton; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JComponent; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; import java.util.ArrayList; @@ -114,8 +116,11 @@ public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler< protected boolean resetExportSpeciesAction; + protected boolean resetExportVesselsAction; + protected boolean resetExportGearsAction; + protected boolean resetExportPersonsAction; public void resetExportSpeciesAction() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java index 77538fd..2346cb0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java @@ -1,6 +1,5 @@ package fr.ifremer.tutti.ui.swing.content.referential; -import org.jdesktop.beans.AbstractBean; import org.jdesktop.beans.AbstractSerializableBean; /** @@ -10,13 +9,21 @@ import org.jdesktop.beans.AbstractSerializableBean; public class ManageTemporaryReferentialUIModel extends AbstractSerializableBean { public static final String PROPERTY_NB_TEMPORARY_SPECIES = "nbTemporarySpecies"; + public static final String PROPERTY_NB_TEMPORARY_VESSELS = "nbTemporaryVessels"; + public static final String PROPERTY_NB_TEMPORARY_GEARS = "nbTemporaryGears"; + public static final String PROPERTY_NB_TEMPORARY_PERSONS = "nbTemporaryPersons"; + private static final long serialVersionUID = 1L; + protected int nbTemporarySpecies; + protected int nbTemporaryVessels; + protected int nbTemporaryGears; + protected int nbTemporaryPersons; public int getNbTemporarySpecies() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.