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 ddb8b0a2c6d1c8287b95ae1f6ab9b8da9ea4f693 Author: Kevin Morin <morin@codelutin.com> Date: Tue Nov 4 18:14:09 2014 +0100 refs #5997 --- .../AbstractOpenReplaceTemporaryUIAction.java | 3 +- .../action/ExportExistingTemporaryGearAction.java | 3 +- .../ExportExistingTemporaryPersonAction.java | 3 +- .../ExportExistingTemporarySpeciesAction.java | 3 +- .../ExportExistingTemporaryVesselAction.java | 3 +- .../action/ExportTemporaryGearExampleAction.java | 3 +- .../action/ExportTemporaryPersonExampleAction.java | 3 +- .../ExportTemporarySpeciesExampleAction.java | 3 +- .../action/ExportTemporaryVesselExampleAction.java | 3 +- .../ui/swing/action/ImportTemporaryGearAction.java | 5 +- .../swing/action/ImportTemporaryPersonAction.java | 6 ++- .../swing/action/ImportTemporarySpeciesAction.java | 6 ++- .../swing/action/ImportTemporaryVesselAction.java | 6 ++- .../referential/ManageTemporaryReferentialUI.css | 24 ++++++--- .../referential/ManageTemporaryReferentialUI.jaxx | 6 +-- .../ManageTemporaryReferentialUIHandler.java | 34 +++++++++++- .../ManageTemporaryReferentialUIModel.java | 61 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 16 +++--- 18 files changed, 157 insertions(+), 34 deletions(-) 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 c2288e0..e246404 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 @@ -31,6 +31,7 @@ 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; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemporaryUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemporaryUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; @@ -51,7 +52,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.6 */ -public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiReferentialEntity, M extends AbstractReplaceTemporaryUIModel<E>, UI extends AbstractReplaceTemporaryUI<E, M>> extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiReferentialEntity, M extends AbstractReplaceTemporaryUIModel<E>, UI extends AbstractReplaceTemporaryUI<E, M>> extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = 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 61b834c..79427b1 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 @@ -27,6 +27,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportExistingTemporaryGearAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ExportExistingTemporaryGearAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = 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 3bc6ca4..f0b26e2 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 @@ -27,6 +27,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportExistingTemporaryPersonAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ExportExistingTemporaryPersonAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ 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 fa6da80..62e69e9 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 @@ -27,6 +27,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportExistingTemporarySpeciesAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ExportExistingTemporarySpeciesAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = 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 a759de1..d2c24e0 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 @@ -27,6 +27,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportExistingTemporaryVesselAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ExportExistingTemporaryVesselAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java index f407390..7b3c5ff 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java @@ -27,6 +27,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportTemporaryGearExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ExportTemporaryGearExampleAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java index 68bc2b1..f3d8ad3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java @@ -27,6 +27,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportTemporaryPersonExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ExportTemporaryPersonExampleAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java index 5760244..0f54d44 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java @@ -27,6 +27,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportTemporarySpeciesExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ExportTemporarySpeciesExampleAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java index 24389de..ada1dc4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java @@ -27,6 +27,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportTemporaryVesselExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ExportTemporaryVesselExampleAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = 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 c6e68ad..e55d935 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 @@ -29,6 +29,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +43,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryGearAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryGearAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = @@ -89,6 +90,8 @@ public class ImportTemporaryGearAction extends AbstractTuttiAction<TuttiUIContex ReferentialImportService service = getContext().getTuttiReferentialImportService(); result = service.importTemporaryGear(file); + int nbRef = getModel().getNbTemporaryGears(); + getModel().setNbTemporaryGears(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); // reset ui cache getDataContext().resetGears(); 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 414a680..77c25e9 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 @@ -29,6 +29,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +43,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryPersonAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryPersonAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = @@ -92,6 +93,9 @@ public class ImportTemporaryPersonAction extends AbstractTuttiAction<TuttiUICont result = service.importTemporaryPerson(file); + int nbRef = getModel().getNbTemporaryPersons(); + getModel().setNbTemporaryPersons(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); + // reset ui cache getDataContext().resetPersons(); 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 1174984..58cf9ca 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 @@ -29,6 +29,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +43,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporarySpeciesAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporarySpeciesAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = @@ -91,6 +92,9 @@ public class ImportTemporarySpeciesAction extends AbstractTuttiAction<TuttiUICon result = service.importTemporarySpecies(file); + int nbRef = getModel().getNbTemporarySpecies(); + getModel().setNbTemporarySpecies(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); + // reset ui cache getDataContext().resetSpecies(); 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 15cb64a..6464a51 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 @@ -29,6 +29,7 @@ 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; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +43,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryVesselAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryVesselAction extends AbstractTuttiAction<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { /** Logger. */ private static final Log log = @@ -91,6 +92,9 @@ public class ImportTemporaryVesselAction extends AbstractTuttiAction<TuttiUICont result = service.importTemporaryVessel(file); + int nbRef = getModel().getNbTemporaryVessels(); + getModel().setNbTemporaryVessels(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); + // reset ui cache getDataContext().resetVessels(); 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 e340a55..4491db0 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 @@ -30,8 +30,8 @@ } #speciesLabel { - text: "tutti.manageTemporaryReferential.field.species"; - toolTipText: "tutti.manageTemporaryReferential.field.species.tip"; + text: { t("tutti.manageTemporaryReferential.field.species", model.getNbTemporarySpecies()) }; + toolTipText: { t("tutti.manageTemporaryReferential.field.species.tip", model.getNbTemporarySpecies()) }; icon: {SwingUtil.createImageIcon("action-species.gif")}; } @@ -52,6 +52,7 @@ actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportExistingTemporarySpeciesAction.class}; + enabled: { model.getNbTemporarySpecies() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies.tip"; _help: {"tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies.help"}; } @@ -68,13 +69,14 @@ actionIcon: replace; text: "tutti.manageTemporaryReferential.action.replaceTemporarySpecies"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.OpenReplaceTemporarySpeciesUIAction.class}; + enabled: { model.getNbTemporarySpecies() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.replaceTemporarySpecies.tip"; _help: {"tutti.manageTemporaryReferential.action.replaceTemporarySpecies.help"}; } #vesselLabel { - text: "tutti.manageTemporaryReferential.field.vessel"; - toolTipText: "tutti.manageTemporaryReferential.field.vessel.tip"; + text: { t("tutti.manageTemporaryReferential.field.vessel", model.getNbTemporaryVessels()) }; + toolTipText: { t("tutti.manageTemporaryReferential.field.vessel.tip", model.getNbTemporaryVessels()) }; actionIcon: vessel; } @@ -96,6 +98,7 @@ text: "tutti.manageTemporaryReferential.action.exportExistingTemporaryVessel"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportExistingTemporaryVesselAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.exportExistingTemporaryVessel.tip"; + enabled: { model.getNbTemporaryVessels() > 0 }; _help: {"tutti.manageTemporaryReferential.action.exportExistingTemporaryVessel.help"}; } @@ -111,13 +114,14 @@ actionIcon: replace; text: "tutti.manageTemporaryReferential.action.replaceTemporaryVessel"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.OpenReplaceTemporaryVesselUIAction.class}; + enabled: { model.getNbTemporaryVessels() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.replaceTemporaryVessel.tip"; _help: {"tutti.manageTemporaryReferential.action.replaceTemporaryVessel.help"}; } #gearLabel { - text: "tutti.manageTemporaryReferential.field.gear"; - toolTipText: "tutti.manageTemporaryReferential.field.gear.tip"; + text: { t("tutti.manageTemporaryReferential.field.gear", model.getNbTemporaryGears()) }; + toolTipText: { t("tutti.manageTemporaryReferential.field.gear.tip", model.getNbTemporaryGears()) }; actionIcon: gear; } @@ -138,6 +142,7 @@ actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportExistingTemporaryGear"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportExistingTemporaryGearAction.class}; + enabled: { model.getNbTemporaryGears() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.exportExistingTemporaryGear.tip"; _help: {"tutti.manageTemporaryReferential.action.exportExistingTemporaryGear.help"}; } @@ -154,13 +159,14 @@ actionIcon: replace; text: "tutti.manageTemporaryReferential.action.replaceTemporaryGear"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.OpenReplaceTemporaryGearUIAction.class}; + enabled: { model.getNbTemporaryGears() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.replaceTemporaryGear.tip"; _help: {"tutti.manageTemporaryReferential.action.replaceTemporaryGear.help"}; } #personLabel { - text: "tutti.manageTemporaryReferential.field.person"; - toolTipText: "tutti.manageTemporaryReferential.field.person.tip"; + text: { t("tutti.manageTemporaryReferential.field.person", model.getNbTemporaryPersons()) }; + toolTipText: { t("tutti.manageTemporaryReferential.field.person.tip", model.getNbTemporaryPersons()) }; actionIcon: person; } @@ -181,6 +187,7 @@ 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"}; } @@ -197,6 +204,7 @@ actionIcon: replace; text: "tutti.manageTemporaryReferential.action.replaceTemporaryPerson"; _applicationAction: {fr.ifremer.tutti.ui.swing.action.OpenReplaceTemporaryPersonUIAction.class}; + enabled: { model.getNbTemporaryPersons() > 0 }; toolTipText: "tutti.manageTemporaryReferential.action.replaceTemporaryPerson.tip"; _help: {"tutti.manageTemporaryReferential.action.replaceTemporaryPerson.help"}; } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx index d4a1164..7428d89 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx @@ -21,7 +21,7 @@ --> <JPanel id='manageTemporaryReferentialTopPanel' layout='{new BorderLayout()}' decorator='help' - implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<TuttiUIContext, ManageTemporaryReferentialUIHandler>'> + implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUIHandler>'> <import> @@ -41,8 +41,8 @@ } ]]></script> - <TuttiUIContext id='model' - initializer='getContextValue(TuttiUIContext.class)'/> + <ManageTemporaryReferentialUIModel id='model' + initializer='getContextValue(ManageTemporaryReferentialUIModel.class)'/> <TuttiHelpBroker id='broker' constructorParams='"tutti.manageTemporaryReferential.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 be9ba9a..c89cd78 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 @@ -22,6 +22,11 @@ package fr.ifremer.tutti.ui.swing.content.referential; * #L% */ +import fr.ifremer.tutti.persistence.entities.referential.Gear; +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; @@ -32,12 +37,14 @@ import org.apache.commons.logging.LogFactory; import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; /** * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, ManageTemporaryReferentialUI> { +public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI> { /** Logger. */ private static final Log log = @@ -52,6 +59,29 @@ public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler< @Override public void beforeInit(ManageTemporaryReferentialUI ui) { super.beforeInit(ui); + + ManageTemporaryReferentialUIModel model = new ManageTemporaryReferentialUIModel(); + PersistenceService persistenceService = getContext().getPersistenceService(); + + List<Species> temporarySpecies = new ArrayList<Species>(persistenceService.getAllSpecies()); + temporarySpecies = persistenceService.retainTemporarySpeciesList(temporarySpecies); + model.setNbTemporarySpecies(temporarySpecies.size()); + + List<Vessel> temporaryVessels = new ArrayList<Vessel>(persistenceService.getAllFishingVessel()); + temporaryVessels.addAll(persistenceService.getAllScientificVessel()); + temporaryVessels = persistenceService.retainTemporaryVesselList(temporaryVessels); + model.setNbTemporaryVessels(temporaryVessels.size()); + + List<Gear> temporaryGears = new ArrayList<Gear>(persistenceService.getAllFishingGear()); + temporaryGears.addAll(persistenceService.getAllScientificGear()); + temporaryGears = persistenceService.retainTemporaryGearList(temporaryGears); + model.setNbTemporaryGears(temporaryGears.size()); + + List<Person> temporaryPersons = new ArrayList<Person>(persistenceService.getAllPerson()); + temporaryPersons = persistenceService.retainTemporaryPersonList(temporaryPersons); + model.setNbTemporaryPersons(temporaryPersons.size()); + + ui.setContextValue(model); } @Override @@ -78,7 +108,7 @@ public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler< } @Override - public SwingValidator<TuttiUIContext> getValidator() { + public SwingValidator<ManageTemporaryReferentialUIModel> getValidator() { return null; } 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 new file mode 100644 index 0000000..77538fd --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java @@ -0,0 +1,61 @@ +package fr.ifremer.tutti.ui.swing.content.referential; + +import org.jdesktop.beans.AbstractBean; +import org.jdesktop.beans.AbstractSerializableBean; + +/** + * @author Kevin Morin (Code Lutin) + * @since 3.8 + */ +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"; + + protected int nbTemporarySpecies; + protected int nbTemporaryVessels; + protected int nbTemporaryGears; + protected int nbTemporaryPersons; + + public int getNbTemporarySpecies() { + return nbTemporarySpecies; + } + + public void setNbTemporarySpecies(int nbTemporarySpecies) { + Integer oldValue = getNbTemporarySpecies(); + this.nbTemporarySpecies = nbTemporarySpecies; + firePropertyChange(PROPERTY_NB_TEMPORARY_SPECIES, oldValue, nbTemporarySpecies); + } + + public int getNbTemporaryVessels() { + return nbTemporaryVessels; + } + + public void setNbTemporaryVessels(int nbTemporaryVessels) { + Integer oldValue = getNbTemporaryVessels(); + this.nbTemporaryVessels = nbTemporaryVessels; + firePropertyChange(PROPERTY_NB_TEMPORARY_VESSELS, oldValue, nbTemporaryVessels); + } + + public int getNbTemporaryGears() { + return nbTemporaryGears; + } + + public void setNbTemporaryGears(int nbTemporaryGears) { + Integer oldValue = getNbTemporaryGears(); + this.nbTemporaryGears = nbTemporaryGears; + firePropertyChange(PROPERTY_NB_TEMPORARY_GEARS, oldValue, nbTemporaryGears); + } + + public int getNbTemporaryPersons() { + return nbTemporaryPersons; + } + + public void setNbTemporaryPersons(int nbTemporaryPersons) { + Integer oldValue = getNbTemporaryPersons(); + this.nbTemporaryPersons = nbTemporaryPersons; + firePropertyChange(PROPERTY_NB_TEMPORARY_PERSONS, oldValue, nbTemporaryPersons); + } +} diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 8c5e81e..0483eb8 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1430,14 +1430,14 @@ tutti.manageTemporaryReferential.action.replaceTemporarySpecies=Remplacer donné tutti.manageTemporaryReferential.action.replaceTemporarySpecies.tip=Remplacer une espèce temporaire tutti.manageTemporaryReferential.action.replaceTemporaryVessel=Remplacer donnée temporaire tutti.manageTemporaryReferential.action.replaceTemporaryVessel.tip=Remplacer un navire temporaire -tutti.manageTemporaryReferential.field.gear=Référentiel Engin -tutti.manageTemporaryReferential.field.gear.tip=Gestion du référentiel temporaire pour les engins -tutti.manageTemporaryReferential.field.person=Référentiel Personne -tutti.manageTemporaryReferential.field.person.tip=Gestion du référentiel temporaire pour les personnes -tutti.manageTemporaryReferential.field.species=Référentiel Espèce -tutti.manageTemporaryReferential.field.species.tip=Gestion du référentiel temporaire pour les espèces -tutti.manageTemporaryReferential.field.vessel=Référentiel Navire -tutti.manageTemporaryReferential.field.vessel.tip=Gestion du référentiel temporaire pour les navires +tutti.manageTemporaryReferential.field.gear=Référentiel Engin (%s) +tutti.manageTemporaryReferential.field.gear.tip=%s engins temporaires dans le référentiel +tutti.manageTemporaryReferential.field.person=Référentiel Personne (%s) +tutti.manageTemporaryReferential.field.person.tip=%s personnes temporaires dans le référentiel +tutti.manageTemporaryReferential.field.species=Référentiel Espèce (%s) +tutti.manageTemporaryReferential.field.species.tip=%s espèces temporaires dans le référentiel +tutti.manageTemporaryReferential.field.vessel=Référentiel Navire (%s) +tutti.manageTemporaryReferential.field.vessel.tip=%s navires temporaires dans le référentiel tutti.manageTemporaryReferential.passwordDialog.error.message=Le mot de passe que vous avez entré est incorrect tutti.manageTemporaryReferential.passwordDialog.error.title=Mot de passe incorrect tutti.manageTemporaryReferential.passwordDialog.message=Vous souhaitez entrer dans une partie sensible de l'application -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.