[Tutti-commits] r1410 - in trunk: . tutti-ui-swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db tut

Author: tchemit Date: 2013-11-28 18:55:19 +0100 (Thu, 28 Nov 2013) New Revision: 1410 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1410 Log: use jaxx 2.6 and ifremer-shared 1.0 Modified: trunk/pom.xml trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditCatchBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/pom.xml 2013-11-28 17:55:19 UTC (rev 1410) @@ -120,7 +120,7 @@ <!-- libraries version --> - <ifremerApplicationVersion>1.0-SNAPSHOT</ifremerApplicationVersion> + <ifremerApplicationVersion>1.0</ifremerApplicationVersion> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> @@ -132,7 +132,7 @@ <eugenePluginVersion>2.7.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.6-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.6</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.15.1</xworkVersion> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/pom.xml 2013-11-28 17:55:19 UTC (rev 1410) @@ -48,6 +48,7 @@ <jaxx.generateSearch>false</jaxx.generateSearch> <jaxx.autoImportCss>true</jaxx.autoImportCss> <jaxx.autoRecurseInCss>false</jaxx.autoRecurseInCss> + <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> <!-- jaxx help configuration --> <jaxx.helpsetName>tutti</jaxx.helpsetName> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -68,7 +68,7 @@ TuttiConfiguration config = new TuttiConfiguration("tutti.config", args); // Create application context - TuttiUIContext context = TuttiUIContext.newContext(config); + final TuttiUIContext context = TuttiUIContext.newContext(config); // override default exception management (after config init) Thread.setDefaultUncaughtExceptionHandler(new TuttiExceptionHandler(context.getErrorHelper())); @@ -101,7 +101,13 @@ if (canUpdateApplication) { // try to update jre - i18n - application - help and exit if so - UpdateApplicationAction logicAction = context.getActionFactory().createLogicAction(new MainUIHandler(context), + UpdateApplicationAction logicAction = context.getActionFactory().createLogicAction(new MainUIHandler() { + + @Override + public TuttiUIContext getContext() { + return context; + } + }, UpdateApplicationAction.class); context.getActionEngine().runActionAndWait(logicAction); @@ -113,7 +119,13 @@ if (canUpdateData) { // try to update report and exit if so - UpdateReportAction logicAction = context.getActionFactory().createLogicAction(new MainUIHandler(context), + UpdateReportAction logicAction = context.getActionFactory().createLogicAction(new MainUIHandler() { + + @Override + public TuttiUIContext getContext() { + return context; + } + }, UpdateReportAction.class); context.getActionEngine().runActionAndWait(logicAction); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditCatchBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditCatchBatchAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditCatchBatchAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; 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.EditCatchesUIModel; @@ -60,7 +61,8 @@ public EditFishingOperationAction getEditAction() { if (editAction == null) { - editAction = getContext().getActionFactory().createLogicAction(getHandler().getParentHandler(), + FishingOperationsUI parentContainer = handler.getParentContainer(FishingOperationsUI.class); + editAction = getContext().getActionFactory().createLogicAction(parentContainer.getHandler(), EditFishingOperationAction.class); } return editAction; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -62,7 +62,7 @@ getContext().setDbLoaded(false); // close services + repon a fake persistence service - getHandler().reloadPersistenceService(); + getContext().reloadPersistenceService(); // clean db context getContext().clearDbContext(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -138,7 +138,7 @@ } protected Float openMelagWeightDialog() { - Frame frame = SwingUtil.getParentContainer(getUI(), Frame.class); + Frame frame = handler.getParentContainer(Frame.class); EnterMelagWeightDialog dialog = new EnterMelagWeightDialog( frame, getConfig().getShortcutClosePopup()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -138,7 +138,7 @@ } protected Float openMelagWeightDialog() { - Frame frame = SwingUtil.getParentContainer(getUI(), Frame.class); + Frame frame = handler.getParentContainer(Frame.class); EnterMelagWeightDialog dialog = new EnterMelagWeightDialog( frame, getConfig().getShortcutClosePopup()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -51,7 +51,7 @@ public class EditCruiseFishingOperationAction extends AbstractTuttiAction<ValidateCruiseUIModel, ValidateCruiseUI, ValidateCruiseUIHandler> { /** Validation service. */ - private final ValidateCruiseOperationsService validationService = getContext().getValidateCruiseOperationsService(); + private final ValidateCruiseOperationsService validationService; /** * The incoming fishing operation to edit. @@ -138,6 +138,7 @@ public EditCruiseFishingOperationAction(ValidateCruiseUIHandler handler) { super(handler, true); setActionDescription(_("tutti.editFishingOperation.action.editFishingOperation.tip")); + validationService = getContext().getValidateCruiseOperationsService(); } public void setFishingOperation(FishingOperation fishingOperation) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -102,7 +102,7 @@ getContext().setDbLoaded(false); // close services + repon a fake persistence service - getHandler().reloadPersistenceService(); + getContext().reloadPersistenceService(); // clean db context getContext().clearDbContext(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -103,7 +103,7 @@ progressionModel.setMessage(_("tutti.exportDb.step.closeDb")); getContext().setDbLoaded(false); - getHandler().reloadPersistenceService(); + getContext().reloadPersistenceService(); // export @@ -116,7 +116,7 @@ progressionModel.increments(_("tutti.exportDb.step.openDb")); getContext().setDbLoaded(true); - getHandler().reloadPersistenceService(); + getContext().reloadPersistenceService(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -153,7 +153,7 @@ try { getContext().setDbExist(true); getContext().setDbLoaded(true); - handler.reloadPersistenceService(); + getContext().reloadPersistenceService(); } catch (Exception e) { if (log.isErrorEnabled()) { @@ -161,7 +161,7 @@ } // no more db getContext().setDbLoaded(false); - handler.reloadPersistenceService(); + getContext().reloadPersistenceService(); // could not load db throw new ApplicationBusinessException(_("tutti.dbManager.action.importdb.couldNotOpen"), e); @@ -174,7 +174,7 @@ progressionModel.increments(_("tutti.importDb.step.checkSchemaVersion")); TuttiPersistence persistenceService = - handler.getPersistenceService(); + getContext().getPersistenceService(); dbVersion = persistenceService.getDbVersion(); @@ -280,7 +280,7 @@ progressionModel.increments(message); sendMessage(message); - handler.getPersistenceService().updateSchema(); + getContext().getPersistenceService().updateSchema(); sendMessage(_("tutti.flash.info.db.schema.updated", dbVersion, applicationVersion)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -32,6 +32,8 @@ import fr.ifremer.tutti.persistence.service.TuttiEnumerationFile; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.pupitri.PupitriImportExportService; +import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; @@ -72,7 +74,9 @@ public EditFishingOperationAction getEditAction() { if (editAction == null) { - editAction = getContext().getActionFactory().createLogicAction(getHandler().getParentUi().getHandler().getParentHandler(), + //editAction = getContext().getActionFactory().createLogicAction(getHandler().getParentUi().getHandler().getParentHandler(), + FishingOperationsUI parentContainer = handler.getParentContainer(FishingOperationsUI.class); + editAction = getContext().getActionFactory().createLogicAction(parentContainer.getHandler(), EditFishingOperationAction.class); } return editAction; @@ -141,7 +145,9 @@ PupitriImportExportService pupitriImportExportService = getContext().getTuttiPupitriImportExportService(); - EditCatchesUIModel model = getUI().getHandler().getParentUi().getModel(); +// EditCatchesUIModel model = getUI().getHandler().getParentUi().getModel(); + EditCatchesUI parentContainer = handler.getParentContainer(EditCatchesUI.class); + EditCatchesUIModel model = parentContainer.getModel(); FishingOperation operation = model.getFishingOperation(); CatchBatch catchBatch = model.toEntity(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -150,7 +150,7 @@ progressionModel.increments(_("tutti.openDb.step.open", jdbcUrl)); try { getContext().setDbLoaded(true); - getHandler().reloadPersistenceService(); + getContext().reloadPersistenceService(); } catch (Exception e) { if (log.isErrorEnabled()) { @@ -158,7 +158,7 @@ } // no more db getContext().setDbLoaded(false); - getHandler().reloadPersistenceService(); + getContext().reloadPersistenceService(); // could not load db throw new ApplicationBusinessException(_("tutti.dbManager.action.openDb.couldNotOpen")); @@ -171,7 +171,7 @@ progressionModel.increments(_("tutti.openDb.step.checkSchemaVersion")); TuttiPersistence persistenceService = - getHandler().getPersistenceService(); + getContext().getPersistenceService(); dbVersion = persistenceService.getDbVersion(); @@ -291,7 +291,7 @@ progressionModel.increments(message); sendMessage(message); - getHandler().getPersistenceService().updateSchema(); + getContext().getPersistenceService().updateSchema(); } if (updateReferentiel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -142,7 +142,7 @@ // close db progressionModel.increments(_("tutti.reimport.step.closeDb", jdbcUrl)); getContext().setDbLoaded(false); - getHandler().reloadPersistenceService(); + getContext().reloadPersistenceService(); // backup db progressionModel.increments(_("tutti.reimport.step.backupDb", backupFile)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -122,7 +122,7 @@ progressionModel.increments(_("tutti.reinstallDb.step.closeDb", jdbcUrl)); getContext().setDbLoaded(false); - getHandler().reloadPersistenceService(); + getContext().reloadPersistenceService(); // backup db progressionModel.increments(_("tutti.reinstallDb.step.backupDb", backupFile)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -31,6 +31,7 @@ fr.ifremer.tutti.ui.swing.TuttiScreen fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.action.* + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.BlockingLayerUI jaxx.runtime.validator.swing.SwingValidatorMessageWidget @@ -43,8 +44,8 @@ <TuttiUIContext id='model' initializer='getContextValue(TuttiUIContext.class)'/> - <MainUIHandler id='handler' - initializer='getContextValue(MainUIHandler.class)'/> + <!--<MainUIHandler id='handler'--> + <!--initializer='getContextValue(MainUIHandler.class)'/>--> <TuttiHelpBroker id='broker' constructorParams='"tutti.main.help"'/> @@ -52,15 +53,16 @@ <script><![CDATA[ public MainUI(TuttiUIContext context) { - setContextValue(context); - MainUIHandler handler = new MainUIHandler(context, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setApplicationContext(this, context); + //setContextValue(context); + //MainUIHandler handler = new MainUIHandler(context, this); + //setContextValue(handler); + //handler.beforeInitUI(); } - protected void $afterCompleteSetup() { + /*protected void $afterCompleteSetup() { handler.afterInitUI(); - } + }*/ ]]></script> <!-- menu --> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -31,7 +31,6 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.TuttiUIContext; @@ -86,20 +85,6 @@ protected JComponent currentBody; - protected PersistenceService persistenceService; - - protected MainUIHandler(TuttiUIContext context, MainUI ui) { - super(context, ui); - this.persistenceService = getContext().getPersistenceService(); - getContext().setMainUI(ui); - getContext().setActionUI(new ApplicationActionUI(ui, context)); - } - - public MainUIHandler(TuttiUIContext context) { - super(context, null); - this.persistenceService = null; - } - public void reloadDbManagerText() { TuttiUI<?, ?> body = (TuttiUI<?, ?>) currentBody; @@ -115,8 +100,11 @@ //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(MainUI ui) { + super.beforeInit(ui); TuttiUIContext context = getContext(); + context.setMainUI(ui); + context.setActionUI(new ApplicationActionUI(ui, context)); context.addPropertyChangeListener(new RemoveablePropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -183,7 +171,7 @@ } @Override - public void afterInitUI() { + public void afterInit(MainUI ui) { initUI(ui); @@ -346,25 +334,6 @@ return canClose; } - /** - * Reload the persistence service and set the new ne into the handler. - * - * @since 1.0 - */ - public void reloadPersistenceService() { - this.persistenceService = getContext().reloadPersistenceService(); - } - - /** - * Get the persistence service instance used by the handler. - * - * @return the persistence service instance used by the handler - * @since 1.0 - */ - public PersistenceService getPersistenceService() { - return persistenceService; - } - //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -31,6 +31,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox @@ -44,23 +45,14 @@ <script><![CDATA[ public EditSampleCategoryModelUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - TuttiUIContext context = parentUI.getHandler().getContext(); - EditSampleCategoryModelUIHandler handler = new EditSampleCategoryModelUIHandler(context, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> <!-- bean property --> <EditSampleCategoryModelUIModel id='model' initializer='getContextValue(EditSampleCategoryModelUIModel.class)'/> - <EditSampleCategoryModelUIHandler id='handler' - initializer='getContextValue(EditSampleCategoryModelUIHandler.class)'/> - <TuttiHelpBroker id='broker' constructorParams='"tutti.editSampleCategoryModel.help"'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,12 +26,10 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.shared.application.swing.util.CloseableUI; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.SwingUtil; @@ -63,13 +61,9 @@ private static final Log log = LogFactory.getLog(EditSampleCategoryModelUIHandler.class); - protected PersistenceService persistenceService; - - public EditSampleCategoryModelUIHandler(TuttiUIContext context, EditSampleCategoryModelUI ui) { - super(context, ui, - EditSampleCategoryModelRowModel.PROPERTY_CARACTERISTIC, + public EditSampleCategoryModelUIHandler() { + super(EditSampleCategoryModelRowModel.PROPERTY_CARACTERISTIC, EditSampleCategoryModelRowModel.PROPERTY_LABEL); - this.persistenceService = context.getPersistenceService(); } //------------------------------------------------------------------------// @@ -219,20 +213,22 @@ //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(EditSampleCategoryModelUI ui) { + super.beforeInit(ui); + if (log.isDebugEnabled()) { log.debug("for " + ui); } List<Caracteristic> caracteristics = Lists.newArrayList( - persistenceService.getAllCaracteristicForSampleCategory()); + getPersistenceService().getAllCaracteristicForSampleCategory()); SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); EditSampleCategoryModelUIModel model = new EditSampleCategoryModelUIModel( - persistenceService.getEnumerationFile(), + getPersistenceService().getEnumerationFile(), sampleCategoryModel.getCategory(), caracteristics); @@ -240,7 +236,7 @@ } @Override - public void afterInitUI() { + public void afterInit(EditSampleCategoryModelUI ui) { initUI(ui); EditSampleCategoryModelUIModel model = getModel(); @@ -255,9 +251,9 @@ if (log.isDebugEnabled()) { log.debug("propertyChange " + EditSampleCategoryModelUIModel.PROPERTY_CARACTERISTIC_LIST); } - ui.getAvailableCaracteristicsComboBox().setData(null); - ui.getAvailableCaracteristicsComboBox().setData((List<Caracteristic>) evt.getNewValue()); - ui.getAvailableCaracteristicsComboBox().setSelectedItem(null); + EditSampleCategoryModelUIHandler.this.ui.getAvailableCaracteristicsComboBox().setData(null); + EditSampleCategoryModelUIHandler.this.ui.getAvailableCaracteristicsComboBox().setData((List<Caracteristic>) evt.getNewValue()); + EditSampleCategoryModelUIHandler.this.ui.getAvailableCaracteristicsComboBox().setSelectedItem(null); } }); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,29 +28,16 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil </import> <script><![CDATA[ - protected TuttiUIContext uiContext; - public TuttiConfigUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - uiContext = parentUI.getHandler().getContext(); - TuttiConfigUIHandler handler = - new TuttiConfigUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } ]]></script> - <TuttiConfigUIHandler id='handler' - initializer='getContextValue(TuttiConfigUIHandler.class)'/> - <TuttiUIContext id='model' initializer='getContextValue(TuttiUIContext.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.ui.swing.action.GoToPreviousScreenAction; import fr.ifremer.tutti.ui.swing.action.ReloadTuttiAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.editor.TuttiLocationTableCell; import fr.ifremer.tutti.ui.swing.util.editor.VesselTableCell; import jaxx.runtime.SwingUtil; @@ -64,23 +63,14 @@ public static final String CALLBACK_SHORTCUT = "shortcut"; - public TuttiConfigUIHandler(TuttiUI<?, ?> parentUI, TuttiConfigUI ui) { - super(parentUI.getHandler().getContext(), ui); - } - @Override public SwingValidator<TuttiUIContext> getValidator() { return null; } @Override - public void beforeInitUI() { + public void afterInit(TuttiConfigUI ui) { - } - - @Override - public void afterInitUI() { - initUI(ui); TuttiConfiguration config = getConfig(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -33,6 +33,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment jaxx.runtime.swing.editor.NumberEditor @@ -52,20 +53,10 @@ <script><![CDATA[ public EditCruiseUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - EditCruiseUIHandler handler = new EditCruiseUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } ]]></script> - <EditCruiseUIHandler id='handler' - initializer='getContextValue(EditCruiseUIHandler.class)'/> - <EditCruiseUIModel id='model' initializer='getContextValue(EditCruiseUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -39,7 +39,6 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.JAXXUtil; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.swing.editor.bean.BeanDoubleListModel; @@ -92,28 +91,17 @@ } /** - * Persistence service. - * - * @since 0.1 - */ - private final PersistenceService persistenceService; - - /** * The gear selected popup grab from the double list. * * @since 2.6 */ protected JPopupMenu gearPopupMenu; - public EditCruiseUIHandler(TuttiUI<?, ?> parentUi, EditCruiseUI ui) { - super(parentUi.getHandler().getContext(), ui); - persistenceService = getContext().getPersistenceService(); - } - - @Override - public void beforeInitUI() { + public void beforeInit(EditCruiseUI ui) { + super.beforeInit(ui); + getDataContext().resetValidationDataContext(); EditCruiseUIModel model = new EditCruiseUIModel(); @@ -136,7 +124,7 @@ } // load attachments - List<Attachment> attachments = persistenceService.getAllAttachments( + List<Attachment> attachments = getPersistenceService().getAllAttachments( model.getObjectType(), model.getObjectId()); model.addAllAttachment(attachments); @@ -156,14 +144,16 @@ } } listModelIsModify(model); - ui.setContextValue(model); + this.ui.setContextValue(model); } @Override - public void afterInitUI() { + public void afterInit(EditCruiseUI ui) { - initUI(ui); + initUI(this.ui); + PersistenceService persistenceService = getPersistenceService(); + List<Person> users = persistenceService.getAllPerson(); EditCruiseUIModel model = getModel(); @@ -209,35 +199,35 @@ } } - ui.getGearList().getHandler().clearFilters(); - ui.getVesselComboBox().setData(null); - ui.getVesselComboBox().setData(allVesselList); + EditCruiseUIHandler.this.ui.getGearList().getHandler().clearFilters(); + EditCruiseUIHandler.this.ui.getVesselComboBox().setData(null); + EditCruiseUIHandler.this.ui.getVesselComboBox().setData(allVesselList); if (gearPredicate != null) { - ui.getGearList().getHandler().addFilter(gearPredicate); + EditCruiseUIHandler.this.ui.getGearList().getHandler().addFilter(gearPredicate); } } }); - initBeanFilterableComboBox(ui.getProgramComboBox(), + initBeanFilterableComboBox(this.ui.getProgramComboBox(), Lists.newArrayList(persistenceService.getAllProgram()), model.getProgram(), DecoratorService.ONLY_NAME); - initBeanFilterableComboBox(ui.getDepartureLocationComboBox(), + initBeanFilterableComboBox(this.ui.getDepartureLocationComboBox(), Lists.newArrayList(persistenceService.getAllHarbour()), model.getDepartureLocation()); - initBeanFilterableComboBox(ui.getReturnLocationComboBox(), + initBeanFilterableComboBox(this.ui.getReturnLocationComboBox(), Lists.newArrayList(persistenceService.getAllHarbour()), model.getReturnLocation()); - initBeanFilterableComboBox(ui.getVesselComboBox(), + initBeanFilterableComboBox(this.ui.getVesselComboBox(), allVesselList, model.getVessel()); - ui.getGearList().setModel(new BeanDoubleListModel<Gear>() { + this.ui.getGearList().setModel(new BeanDoubleListModel<Gear>() { private static final long serialVersionUID = 1L; @@ -329,28 +319,28 @@ selectedModel.refresh(); } }); - initBeanList(ui.getGearList(), + initBeanList(this.ui.getGearList(), allGearList, (List) model.getGear(), getDecorator(Gear.class, DecoratorService.GEAR_WITH_RANK_ORDER)); // add more actions on selected gear popup - gearPopupMenu = ui.getGearList().getSelectedList().getComponentPopupMenu(); - ui.getGearList().getSelectedList().setComponentPopupMenu(null); + gearPopupMenu = this.ui.getGearList().getSelectedList().getComponentPopupMenu(); + this.ui.getGearList().getSelectedList().setComponentPopupMenu(null); gearPopupMenu.add(new JSeparator(), 0); - gearPopupMenu.add(ui.getViewGearCaracteristicsItem(), 0); - gearPopupMenu.add(ui.getEditGearCaracteristicsItem(), 0); + gearPopupMenu.add(this.ui.getViewGearCaracteristicsItem(), 0); + gearPopupMenu.add(this.ui.getEditGearCaracteristicsItem(), 0); - initBeanList(ui.getHeadOfMissionList(), + initBeanList(this.ui.getHeadOfMissionList(), users, model.getHeadOfMission()); - initBeanList(ui.getHeadOfSortRoomList(), + initBeanList(this.ui.getHeadOfSortRoomList(), users, model.getHeadOfSortRoom()); - ui.getGearList().getSelectedList().addMouseListener(new MouseAdapter() { + this.ui.getGearList().getSelectedList().addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { @@ -372,7 +362,7 @@ } }); - ui.getGearList().getSelectedList().addKeyListener(new KeyAdapter() { + this.ui.getGearList().getSelectedList().addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_CONTEXT_MENU) { @@ -397,7 +387,7 @@ } }); - SwingValidator validator = ui.getValidator(); + SwingValidator validator = this.ui.getValidator(); listenValidatorValid(validator, model); model.setVesselType(VesselTypeEnum.SCIENTIFIC); @@ -472,7 +462,8 @@ if (gear != null) { editMenuEnabled = !getModel().isCreate() && !getModel().isModify() && - (!gear.isScientificGear() || persistenceService.isTemporary(gear)); + (!gear.isScientificGear() || + getPersistenceService().isTemporary(gear)); viewMenuEnabled = true; GEAR_EDIT_CONTEXT.setContextValue(ui, gear); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -25,6 +25,7 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Caracteristic fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable @@ -32,12 +33,17 @@ java.awt.Color </import> - <GearCaracteristicsEditorUIHandler id='handler' - initializer='getContextValue(GearCaracteristicsEditorUIHandler.class)'/> - <GearCaracteristicsEditorUIModel id='model' initializer='getContextValue(GearCaracteristicsEditorUIModel.class)'/> + <script><![CDATA[ + +public GearCaracteristicsEditorUI(TuttiUI parentUI) { + TuttiUIUtil.setParentUI(this, parentUI); +} + + ]]></script> + <JPopupMenu id='tablePopup'> <JMenuItem id='removeCaracteristicMenu' onActionPerformed='handler.removeCaracteristic()'/> @@ -71,19 +77,6 @@ </JPanel> </cell> </row> - <script><![CDATA[ -public GearCaracteristicsEditorUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - GearCaracteristicsEditorUIHandler handler = new GearCaracteristicsEditorUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); -} -protected void $afterCompleteSetup() { - handler.afterInitUI(); -} - - ]]></script> - </Table> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -24,14 +24,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueRenderer; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; @@ -58,11 +56,8 @@ private final static Log log = LogFactory.getLog(GearCaracteristicsEditorUIHandler.class); - protected final PersistenceService persistenceService = getContext().getPersistenceService(); - - public GearCaracteristicsEditorUIHandler(TuttiUI<?,?> parentUi, - GearCaracteristicsEditorUI ui) { - super(parentUi.getHandler().getContext(), ui, GearCaracteristicsEditorRowModel.PROPERTY_VALUE); + public GearCaracteristicsEditorUIHandler() { + super(GearCaracteristicsEditorRowModel.PROPERTY_VALUE); } @Override @@ -124,10 +119,11 @@ } @Override - public void beforeInitUI() { + public void beforeInit(GearCaracteristicsEditorUI ui) { + super.beforeInit(ui); GearCaracteristicsEditorUIModel model = new GearCaracteristicsEditorUIModel(); - getUI().setContextValue(model); + ui.setContextValue(model); model.addPropertyChangeListener(GearCaracteristicsEditorUIModel.PROPERTY_GEAR, new PropertyChangeListener() { @Override @@ -139,8 +135,8 @@ } @Override - public void afterInitUI() { - initUI(getUI()); + public void afterInit(GearCaracteristicsEditorUI ui) { + initUI(ui); initBeanFilterableComboBox(getKeyCombo(), Lists.<Caracteristic>newArrayList(), null); getModel().setAvailableCaracteristics(getDataContext().getCaracteristics()); @@ -288,7 +284,7 @@ Gear gear = getModel().getGear(); gear.setCaracteristics((CaracteristicMap) getModel().getCaracteristicMap().clone()); - persistenceService.saveGearCaracteristics(gear, getDataContext().getCruise()); + getPersistenceService().saveGearCaracteristics(gear, getDataContext().getCruise()); closeUI(ui); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -29,6 +29,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil org.jdesktop.swingx.JXTitledPanel @@ -36,20 +37,10 @@ <script><![CDATA[ public ValidateCruiseUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - ValidateCruiseUIHandler handler = new ValidateCruiseUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } ]]></script> - <ValidateCruiseUIHandler id='handler' - initializer='getContextValue(ValidateCruiseUIHandler.class)'/> - <ValidateCruiseUIModel id='model' initializer='getContextValue(ValidateCruiseUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -31,12 +31,10 @@ import fr.ifremer.shared.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.action.EditCruiseFishingOperationAction; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -74,25 +72,19 @@ private final static Log log = LogFactory.getLog(ValidateCruiseUIHandler.class); - /** Validation service. */ - private final ValidateCruiseOperationsService validationService; - protected EditCruiseFishingOperationAction editFishingOperationAction; - public ValidateCruiseUIHandler(TuttiUI<?, ?> parentUi, ValidateCruiseUI ui) { - super(parentUi.getHandler().getContext(), ui); - validationService = getContext().getValidateCruiseOperationsService(); - } - @Override - public void beforeInitUI() { + public void beforeInit(ValidateCruiseUI ui) { + super.beforeInit(ui); + ValidateCruiseUIModel model = new ValidateCruiseUIModel(); ProgressionModel progressionModel = new ProgressionModel(); ApplicationActionUIModel actionUIModel = getContext().getActionUI().getModel(); actionUIModel.setProgressionModel(progressionModel); - model.setValidator(validationService.validateCruiseOperations(progressionModel)); + model.setValidator(getValidateCruiseOperationsService().validateCruiseOperations(progressionModel)); actionUIModel.setProgressionModel(null); model.addPropertyChangeListener(ValidateCruiseUIModel.PROPERTY_SELECTED_FISHING_OPERATION, @@ -105,16 +97,16 @@ } }); - ui.setContextValue(model); + this.ui.setContextValue(model); } @Override - public void afterInitUI() { - initUI(ui); + public void afterInit(ValidateCruiseUI ui) { + initUI(this.ui); editFishingOperationAction = getContext().getActionFactory().createLogicAction(this, EditCruiseFishingOperationAction.class); - ui.getOperationPanel().getModel().setSelectedFishingOperation(null); + this.ui.getOperationPanel().getModel().setSelectedFishingOperation(null); DefaultMutableTreeNode root = new DefaultMutableTreeNode(); Map<FishingOperation, NuitonValidatorResult> validator = getModel().getValidator(); @@ -126,13 +118,13 @@ } TreeModel model = new DefaultTreeModel(root); - JTree navigation = ui.getNavigation(); + JTree navigation = this.ui.getNavigation(); navigation.setModel(model); navigation.setCellRenderer(new ValidationTreeCellRenderer()); SwingUtil.expandTree(navigation); SwingUtil.addExpandOnClickListener(navigation); - FishingOperationsUI operationPanel = ui.getOperationPanel(); + FishingOperationsUI operationPanel = this.ui.getOperationPanel(); operationPanel.getTopPanel().setVisible(false); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,6 +28,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil javax.swing.border.EmptyBorder @@ -37,20 +38,11 @@ <script><![CDATA[ public DbManagerUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - DbManagerUIHandler handler = new DbManagerUIHandler(parentUI.getHandler().getContext(), this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } ]]></script> - <DbManagerUIHandler id='handler' - initializer='getContextValue(DbManagerUIHandler.class)'/> - <TuttiUIContext id='model' initializer='getContextValue(TuttiUIContext.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -55,14 +55,6 @@ /** Logger. */ private static final Log log = LogFactory.getLog(DbManagerUIHandler.class); - public DbManagerUIHandler(TuttiUIContext context, DbManagerUI ui) { - super(context, ui); - } - - @Override - public void beforeInitUI() { - } - public void updateMessage() { boolean dbExist = getContext().isDbExist(); @@ -144,9 +136,9 @@ } @Override - public void afterInitUI() { + public void afterInit(DbManagerUI ui) { - initUI(ui); + initUI(this.ui); getModel().addPropertyChangeListener(TuttiUIContext.PROPERTY_DB_EXIST, new PropertyChangeListener() { @Override @@ -160,7 +152,7 @@ mnemonic = _("tutti.dbManager.action.installDb.mnemonic"); } if (StringUtils.isNotBlank(mnemonic)) { - ui.getInstallOrReinstallDbButton().setMnemonic(mnemonic.charAt(0)); + DbManagerUIHandler.this.ui.getInstallOrReinstallDbButton().setMnemonic(mnemonic.charAt(0)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -32,6 +32,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.shared.application.swing.util.ActionListCellRenderer jaxx.runtime.swing.editor.bean.BeanFilterableComboBox @@ -44,22 +45,11 @@ protected TuttiUIContext uiContext; public SelectCruiseUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - uiContext = parentUI.getHandler().getContext(); - SelectCruiseUIHandler handler = - new SelectCruiseUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); + uiContext = TuttiUIUtil.getApplicationContext(parentUI); } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } ]]></script> - <SelectCruiseUIHandler id='handler' - initializer='getContextValue(SelectCruiseUIHandler.class)'/> - <SelectCruiseUIModel id='model' initializer='getContextValue(SelectCruiseUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; @@ -61,8 +60,6 @@ private static final Log log = LogFactory.getLog(SelectCruiseUIHandler.class); - protected final PersistenceService persistenceService; - public static final MouseListener GRAB_FOCUS_ON_ENTER_LISTENER = new MouseAdapter() { @Override public void mouseEntered(MouseEvent e) { @@ -71,18 +68,17 @@ } }; - public SelectCruiseUIHandler(TuttiUI<?, ?> parentUI, SelectCruiseUI ui) { - super(parentUI.getHandler().getContext(), ui); - persistenceService = getContext().getPersistenceService(); - } - @Override public SwingValidator<SelectCruiseUIModel> getValidator() { return ui.getValidator(); } @Override - public void beforeInitUI() { + public void beforeInit(SelectCruiseUI ui) { + super.beforeInit(ui); + + PersistenceService persistenceService = getContext().getPersistenceService(); + SelectCruiseUIModel model = new SelectCruiseUIModel(); List<Program> programs = persistenceService.getAllProgram(); @@ -143,7 +139,7 @@ } @Override - public void afterInitUI() { + public void afterInit(SelectCruiseUI ui) { initUI(ui); @@ -182,13 +178,13 @@ @Override public void propertyChange(PropertyChangeEvent evt) { // reload combo box - BeanFilterableComboBox<TuttiProtocol> combobox = ui.getProtocolCombobox(); + BeanFilterableComboBox<TuttiProtocol> combobox = SelectCruiseUIHandler.this.ui.getProtocolCombobox(); List<TuttiProtocol> protocols = (List<TuttiProtocol>) evt.getNewValue(); combobox.setData(null); combobox.setData(protocols); - ui.applyDataBinding(SelectCruiseUI.BINDING_PROTOCOL_COMBOBOX_ENABLED); + SelectCruiseUIHandler.this.ui.applyDataBinding(SelectCruiseUI.BINDING_PROTOCOL_COMBOBOX_ENABLED); } }); @@ -205,7 +201,7 @@ if (noProgram) { cruises = Lists.newArrayList(); } else { - cruises = persistenceService.getAllCruise(newValue.getId()); + cruises = getPersistenceService().getAllCruise(newValue.getId()); } SelectCruiseUIModel source = (SelectCruiseUIModel) evt.getSource(); source.setCruises(cruises); @@ -217,7 +213,7 @@ @Override public void propertyChange(PropertyChangeEvent evt) { // reload combo box - BeanFilterableComboBox<Cruise> combobox = ui.getCruiseCombobox(); + BeanFilterableComboBox<Cruise> combobox = SelectCruiseUIHandler.this.ui.getCruiseCombobox(); List<Cruise> campaigns = (List<Cruise>) evt.getNewValue(); combobox.setData(null); combobox.setData(campaigns); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -34,9 +34,11 @@ fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUI fr.ifremer.tutti.ui.swing.TuttiHelpBroker - fr.ifremer.shared.application.type.CoordinateEditorType + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment + fr.ifremer.shared.application.type.CoordinateEditorType + jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanDoubleList jaxx.runtime.swing.editor.NumberEditor @@ -55,18 +57,9 @@ <script><![CDATA[ public EditFishingOperationUI(FishingOperationsUI parentUI) { - JAXXUtil.initContext(this, parentUI); - EditFishingOperationUIHandler handler = new EditFishingOperationUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); -} + TuttiUIUtil.setParentUI(this, parentUI); +} ]]></script> -protected void $afterCompleteSetup() { handler.afterInitUI(); } - ]]></script> - - <EditFishingOperationUIHandler id='handler' - initializer='getContextValue(EditFishingOperationUIHandler.class)'/> - <EditFishingOperationUIModel id='model' initializer='getContextValue(EditFishingOperationUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,6 +28,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.shared.application.ApplicationDataUtil; +import fr.ifremer.shared.application.swing.tab.TabHandler; import fr.ifremer.shared.application.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; @@ -44,7 +45,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.AbstractCaracteristicTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.VesselUseFeatureTabUIModel; -import fr.ifremer.shared.application.swing.tab.TabHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.caracteristics.GearCaracteristicListCellRenderer; @@ -89,10 +89,6 @@ private static final Log log = LogFactory.getLog(EditFishingOperationUIHandler.class); - private final FishingOperationsUI parentUi; - - private final PersistenceService persistenceService; - /** * listener to set the same end date as the start date * when the user changes it only (remove this listener before selecting the @@ -191,13 +187,16 @@ * * @since 0.3 */ - private final TuttiBeanMonitor<EditFishingOperationUIModel> fishingOperationMonitor; + private TuttiBeanMonitor<EditFishingOperationUIModel> fishingOperationMonitor; - public EditFishingOperationUIHandler(FishingOperationsUI parentUi, - EditFishingOperationUI ui) { - super(parentUi.getHandler().getContext(), ui); - this.parentUi = parentUi; - this.persistenceService = getContext().getPersistenceService(); + //------------------------------------------------------------------------// + //-- AbstractTuttiUIHandler methods --// + //------------------------------------------------------------------------// + + @Override + public void beforeInit(EditFishingOperationUI ui) { + super.beforeInit(ui); + this.fishingOperationMonitor = new TuttiBeanMonitor<EditFishingOperationUIModel>( EditFishingOperationUIModel.PROPERTY_STATION_NUMBER, EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_NUMBER, @@ -257,15 +256,7 @@ EditFishingOperationUIModel.PROPERTY_GEAR, EditFishingOperationUIModel.PROPERTY_MULTIRIG_AGGREGATION, EditFishingOperationUIModel.PROPERTY_COMMENT); - } - //------------------------------------------------------------------------// - //-- AbstractTuttiUIHandler methods --// - //------------------------------------------------------------------------// - - @Override - public void beforeInitUI() { - EditFishingOperationUIModel model = new EditFishingOperationUIModel(); model.setCoordinateEditorType(getConfig().getCoordinateEditorType()); model.setValidationContext(getContext().getValidationContext()); @@ -322,9 +313,8 @@ } @Override - public void afterInitUI() { + public void afterInit(EditFishingOperationUI ui) { - ui.getSecondaryVesselList().getBeforeFilterPanel().add(ui.getSecondaryVesselFilterPane(), BorderLayout.CENTER); ui.getFishingOperationValidPanel().remove( @@ -399,6 +389,7 @@ TuttiLocation location = model.getLocation(); + PersistenceService persistenceService = getPersistenceService(); String zoneId = zone.getId(); List<TuttiLocation> stratas = Lists.newArrayList(persistenceService.getAllFishingOperationStrata(zoneId)); @@ -465,16 +456,16 @@ } // clean vessel filter - ui.getSecondaryVesselList().getHandler().clearFilters(); + EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getHandler().clearFilters(); // get selected vessel - List<Vessel> selected = Lists.newArrayList(ui.getSecondaryVesselList().getModel().getSelected()); + List<Vessel> selected = Lists.newArrayList(EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getModel().getSelected()); // set new universe of vessel - ui.getSecondaryVesselList().getModel().setUniverse(vessels); + EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getModel().setUniverse(vessels); // push back selected vessel - ui.getSecondaryVesselList().getModel().setSelected(selected); + EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getModel().setSelected(selected); // push back modify state model.setModify(modify); @@ -510,7 +501,7 @@ new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - JButton button = ui.getCancelButton(); + JButton button = EditFishingOperationUIHandler.this.ui.getCancelButton(); CancelEditFishingOperationAction action = getContext().getActionFactory().getLogicAction(button); if (evt.getNewValue() == null) { @@ -694,7 +685,7 @@ } public FishingOperationsUI getParentUi() { - return parentUi; + return getParentContainer(FishingOperationsUI.class); } public TuttiBeanMonitor<EditFishingOperationUIModel> getFishingOperationMonitor() { @@ -750,10 +741,10 @@ String strataId = newStrata == null ? null : newStrata.getId(); List<TuttiLocation> subStrata = - persistenceService.getAllFishingOperationSubStrata(zoneId, strataId); + getPersistenceService().getAllFishingOperationSubStrata(zoneId, strataId); List<TuttiLocation> location = - persistenceService.getAllFishingOperationLocation(zoneId, strataId, null); + getPersistenceService().getAllFishingOperationLocation(zoneId, strataId, null); ui.getSubStrataComboBox().setData(subStrata); @@ -794,7 +785,7 @@ String strataId = strata == null ? null : strata.getId(); List<TuttiLocation> location = - persistenceService.getAllFishingOperationLocation(zoneId, strataId, subStrataId); + getPersistenceService().getAllFishingOperationLocation(zoneId, strataId, subStrataId); ui.getLocationComboBox().setData(location); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,6 +26,8 @@ import com.google.common.collect.Lists; import fr.ifremer.shared.application.ApplicationDataUtil; +import fr.ifremer.shared.application.swing.tab.TabContentModel; +import fr.ifremer.shared.application.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; @@ -37,16 +39,12 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.shared.application.type.CoordinateEditorType; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import jaxx.runtime.swing.editor.gis.DmdCoordinate; import jaxx.runtime.swing.editor.gis.DmsCoordinate; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -867,10 +865,6 @@ return CoordinateEditorType.DMD.equals(getCoordinateEditorType()); } - /** Logger. */ - private static final Log log = - LogFactory.getLog(EditFishingOperationUIModel.class); - public void convertGearShootingCoordinatesFromDD() { switch (coordinateEditorType) { @@ -879,10 +873,6 @@ setGearShootingStartLongitudeDms(getGearShootingStartLongitude()); setGearShootingEndLatitudeDms(getGearShootingEndLatitude()); setGearShootingEndLongitudeDms(getGearShootingEndLongitude()); - - if (log.isInfoEnabled()) { - log.info("startLongitude dms: "+gearShootingStartLongitudeDms); - } break; case DMD: Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -32,6 +32,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox @@ -42,20 +43,10 @@ <script><![CDATA[ public FishingOperationsUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - FishingOperationsUIHandler handler = new FishingOperationsUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { - handler.afterInitUI(); -} ]]></script> - <FishingOperationsUIHandler id='handler' - initializer='getContextValue(FishingOperationsUIHandler.class)'/> - <FishingOperationsUIModel id='model' initializer='getContextValue(FishingOperationsUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -36,7 +36,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,25 +61,19 @@ private static final Log log = LogFactory.getLog(FishingOperationsUIHandler.class); - private final PersistenceService persistenceService; - protected EditFishingOperationAction editFishingOperationAction; - public FishingOperationsUIHandler(TuttiUI<?, ?> parentUI, - FishingOperationsUI ui) { - super(parentUI.getHandler().getContext(), ui); - persistenceService = getContext().getPersistenceService(); - } - //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(FishingOperationsUI ui) { + super.beforeInit(ui); + if (log.isDebugEnabled()) { - log.debug("for " + ui); + log.debug("for " + this.ui); } FishingOperationsUIModel model = new FishingOperationsUIModel(); @@ -93,6 +86,8 @@ // load existing cruise Cruise cruise = getDataContext().getCruise(); + PersistenceService persistenceService = getPersistenceService(); + TuttiProtocol protocol; if (getContext().isProtocolFilled()) { @@ -119,14 +114,14 @@ " fishingOperation(s)."); } - ui.setContextValue(model); - ui.setContextValue(catchesUIModel); + this.ui.setContextValue(model); + this.ui.setContextValue(catchesUIModel); } @Override - public void afterInitUI() { + public void afterInit(FishingOperationsUI ui) { - initUI(ui); + initUI(this.ui); editFishingOperationAction = getContext().getActionFactory().createLogicAction(this, EditFishingOperationAction.class); @@ -135,7 +130,7 @@ List<FishingOperation> fishingOperations = model.getFishingOperation(); - initBeanFilterableComboBox(ui.getFishingOperationComboBox(), + initBeanFilterableComboBox(this.ui.getFishingOperationComboBox(), fishingOperations, model.getSelectedFishingOperation()); @@ -155,7 +150,7 @@ if (newValue == null) { operation = null; } else { - operation = persistenceService.getFishingOperation(newValue.getId()); + operation = getPersistenceService().getFishingOperation(newValue.getId()); Cruise cruise = getDataContext().getCruise(); operation.setCruise(cruise); } @@ -196,8 +191,8 @@ if (log.isDebugEnabled()) { log.debug("propertyChange " + FishingOperationsUIModel.PROPERTY_FISHING_OPERATION); } - ui.getFishingOperationComboBox().setData(null); - ui.getFishingOperationComboBox().setData((List<FishingOperation>) evt.getNewValue()); + FishingOperationsUIHandler.this.ui.getFishingOperationComboBox().setData(null); + FishingOperationsUIHandler.this.ui.getFishingOperationComboBox().setData((List<FishingOperation>) evt.getNewValue()); } }); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -59,10 +59,8 @@ public abstract void selectFishingOperation(FishingOperation bean); - protected AbstractTuttiBatchTableUIHandler(TuttiUI<?, ?> parentUi, - UI ui, - String... properties) { - super(parentUi.getHandler().getContext(), ui, properties); + protected AbstractTuttiBatchTableUIHandler(String... properties) { + super(properties); } /** Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -45,6 +45,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI fr.ifremer.shared.application.swing.computable.ComputableDataEditor @@ -60,18 +61,10 @@ <script><![CDATA[ public EditCatchesUI(FishingOperationsUI parentUI) { - JAXXUtil.initContext(this, parentUI); - EditCatchesUIHandler handler = new EditCatchesUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <EditCatchesUIHandler id='handler' - initializer='getContextValue(EditCatchesUIHandler.class)'/> - <EditCatchesUIModel id='model' initializer='getContextValue(EditCatchesUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -25,6 +25,7 @@ */ import com.google.common.collect.Sets; +import fr.ifremer.shared.application.swing.tab.TabHandler; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIHandler; @@ -36,10 +37,10 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUI; -import fr.ifremer.shared.application.swing.tab.TabHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.CardLayout2Ext; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -50,6 +51,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; +import java.awt.Container; import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -87,13 +89,16 @@ * * @since 0.3 */ - private final TuttiBeanMonitor<EditCatchesUIModel> catchBatchMonitor; + private TuttiBeanMonitor<EditCatchesUIModel> catchBatchMonitor; - protected final FishingOperationsUI parentUi; + //------------------------------------------------------------------------// + //-- AbstractTuttiUIHandler methods --// + //------------------------------------------------------------------------// - public EditCatchesUIHandler(FishingOperationsUI parentUi, EditCatchesUI ui) { - super(parentUi.getHandler().getContext(), ui); - this.parentUi = parentUi; + @Override + public void beforeInit(EditCatchesUI ui) { + super.beforeInit(ui); + this.catchBatchMonitor = new TuttiBeanMonitor<EditCatchesUIModel>( EditCatchesUIModel.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, @@ -102,15 +107,7 @@ EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); - } - //------------------------------------------------------------------------// - //-- AbstractTuttiUIHandler methods --// - //------------------------------------------------------------------------// - - @Override - public void beforeInitUI() { - EditCatchesUIModel model = ui.getContextValue(EditCatchesUIModel.class); listModelIsModify(model); @@ -119,7 +116,7 @@ } @Override - public void afterInitUI() { + public void afterInit(EditCatchesUI ui) { ui.getBenthosTabSplitBatch().getModel().setSplitMode(true); ui.getBenthosTabAddSampleCategoryBatch().getModel().setSplitMode(false); @@ -280,14 +277,6 @@ return catchBatchMonitor; } - public FishingOperationsUI getParentUi() { - return parentUi; - } - - public FishingOperationsUIHandler getParentHandler() { - return getParentUi().getHandler(); - } - protected void registerValidators() { registerValidators(getValidator(), ui.getSpeciesTabContent().getHandler().getValidator(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -27,15 +27,14 @@ <import> fr.ifremer.tutti.ui.swing.TuttiHelpBroker - fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil org.jdesktop.swingx.JXTable javax.swing.ListSelectionModel java.awt.Color - java.awt.Dimension static org.nuiton.i18n.I18n._ </import> @@ -43,22 +42,13 @@ <script><![CDATA[ public AccidentalBatchUI(TuttiUI<?,?> parentUI) { - JAXXUtil.initContext(this, parentUI); - AccidentalBatchUIHandler handler = new AccidentalBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <AccidentalBatchUIHandler id='handler' - initializer='getContextValue(AccidentalBatchUIHandler.class)'/> - <AccidentalBatchUIModel id='model' initializer='getContextValue(AccidentalBatchUIModel.class)'/> - <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> </BeanValidator> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,6 +26,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -34,8 +36,6 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.ValidationService; -import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -53,8 +53,6 @@ import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -78,29 +76,24 @@ private static final Log log = LogFactory.getLog(AccidentalBatchUIHandler.class); - protected ValidationService validationService = getContext().getValidationService(); - /** * Weight unit. * * @since 2.5 */ - protected final WeightUnit weightUnit; + protected WeightUnit weightUnit; - public AccidentalBatchUIHandler(TuttiUI<?, ?> parentUi, - AccidentalBatchUI ui) { - super(parentUi, ui, - AccidentalBatchRowModel.PROPERTY_SPECIES, - AccidentalBatchRowModel.PROPERTY_GENDER, - AccidentalBatchRowModel.PROPERTY_WEIGHT, - AccidentalBatchRowModel.PROPERTY_SIZE, - AccidentalBatchRowModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, - AccidentalBatchRowModel.PROPERTY_DEAD_OR_ALIVE, - AccidentalBatchRowModel.PROPERTY_CARACTERISTICS, - AccidentalBatchRowModel.PROPERTY_COMMENT, - AccidentalBatchRowModel.PROPERTY_ATTACHMENT); - - weightUnit = getConfig().getAccidentalCatchWeightUnit(); + public AccidentalBatchUIHandler() { + super( + AccidentalBatchRowModel.PROPERTY_SPECIES, + AccidentalBatchRowModel.PROPERTY_GENDER, + AccidentalBatchRowModel.PROPERTY_WEIGHT, + AccidentalBatchRowModel.PROPERTY_SIZE, + AccidentalBatchRowModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, + AccidentalBatchRowModel.PROPERTY_DEAD_OR_ALIVE, + AccidentalBatchRowModel.PROPERTY_CARACTERISTICS, + AccidentalBatchRowModel.PROPERTY_COMMENT, + AccidentalBatchRowModel.PROPERTY_ATTACHMENT); } //------------------------------------------------------------------------// @@ -140,7 +133,7 @@ // get all marine litter root List<AccidentalBatch> batches = - persistenceService.getAllAccidentalBatch(bean.getId()); + getPersistenceService().getAllAccidentalBatch(bean.getId()); for (AccidentalBatch aBatch : batches) { AccidentalBatchRowModel entry = loadBatch(aBatch); @@ -183,7 +176,8 @@ @Override protected boolean isRowValid(AccidentalBatchRowModel row) { AccidentalBatch batch = row.toBean(); - NuitonValidatorResult validator = validationService.validateAccidentalBatch(batch); + NuitonValidatorResult validator = + getValidationService().validateAccidentalBatch(batch); boolean result = !validator.hasErrorMessagess(); return result; } @@ -225,8 +219,11 @@ } @Override - public void beforeInitUI() { + public void beforeInit(AccidentalBatchUI ui) { + super.beforeInit(ui); + weightUnit = getConfig().getAccidentalCatchWeightUnit(); + if (log.isDebugEnabled()) { log.debug("beforeInit: " + ui); } @@ -239,7 +236,7 @@ } @Override - public void afterInitUI() { + public void afterInit(AccidentalBatchUI ui) { if (log.isDebugEnabled()) { log.debug("afterInit: " + ui); @@ -362,19 +359,19 @@ @Override public CaracteristicMapEditorUI getCaracteristicMapEditor() { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); return parent.getAccidentalCaracteristicMapEditor(); } @Override public void showCaracteristicMapEditor(Species species) { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setAccidentalSelectedCard(EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD, species); } @Override public void hideCaracteristicMapEditor() { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setAccidentalSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -384,7 +381,7 @@ public void createBatch() { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); CreateAccidentalBatchUI createBatchEditor = parent.getAccidentalTabCreateBatch(); createBatchEditor.getHandler().openUI(); @@ -423,8 +420,8 @@ new AccidentalBatchRowModel(weightUnit, aBatch); List<Attachment> attachments = - persistenceService.getAllAttachments(newRow.getObjectType(), - newRow.getObjectId()); + getPersistenceService().getAllAttachments(newRow.getObjectType(), + newRow.getObjectId()); newRow.addAllAttachment(attachments); @@ -443,10 +440,10 @@ if (TuttiEntities.isNew(entityToSave)) { - persistenceService.createAccidentalBatch(entityToSave); + getPersistenceService().createAccidentalBatch(entityToSave); row.setId(entityToSave.getId()); } else { - persistenceService.saveAccidentalBatch(entityToSave); + getPersistenceService().saveAccidentalBatch(entityToSave); } getModel().fireBatchUpdated(row); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -31,6 +31,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.NumberEditor @@ -41,18 +42,10 @@ <script><![CDATA[ public CreateAccidentalBatchUI(EditCatchesUI parentUI) { - JAXXUtil.initContext(this, parentUI); - CreateAccidentalBatchUIHandler handler = new CreateAccidentalBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <CreateAccidentalBatchUIHandler id='handler' - initializer='getContextValue(CreateAccidentalBatchUIHandler.class)'/> - <CreateAccidentalBatchUIModel id='model' initializer='getContextValue(CreateAccidentalBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -23,16 +23,14 @@ */ import com.google.common.collect.Lists; +import fr.ifremer.shared.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.shared.application.swing.util.Cancelable; -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.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -51,24 +49,20 @@ private static final Log log = LogFactory.getLog(CreateAccidentalBatchUIHandler.class); - public CreateAccidentalBatchUIHandler(TuttiUI<?,?> parentUi, - CreateAccidentalBatchUI ui) { - super(parentUi.getHandler().getContext(), ui); - } - //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(CreateAccidentalBatchUI ui) { + super.beforeInit(ui); CreateAccidentalBatchUIModel model = new CreateAccidentalBatchUIModel(); ui.setContextValue(model); listModelIsModify(model); } @Override - public void afterInitUI() { + public void afterInit(CreateAccidentalBatchUI ui) { initUI(ui); @@ -109,7 +103,7 @@ // when canceling always invalid model getModel().setValid(false); - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setAccidentalSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -151,7 +145,7 @@ log.debug("Save And Continue UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); AccidentalBatchUI accidentalTabContent = parent.getAccidentalTabContent(); accidentalTabContent.getHandler().addBatch(getModel()); @@ -165,7 +159,7 @@ log.debug("Save And Close UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getAccidentalTabContent().getHandler().addBatch(getModel()); // close dialog Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.TableViewMode fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.shared.application.swing.computable.ComputableDataEditor org.jdesktop.swingx.JXTable @@ -45,18 +46,10 @@ <script><![CDATA[ public BenthosBatchUI(TuttiUI<?,?> parentUI) { - JAXXUtil.initContext(this, parentUI); - BenthosBatchUIHandler handler = new BenthosBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <BenthosBatchUIHandler id='handler' - initializer='getContextValue(BenthosBatchUIHandler.class)'/> - <BenthosBatchUIModel id='model' initializer='getContextValue(BenthosBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -45,7 +45,6 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.TuttiDecorator; import fr.ifremer.tutti.service.ValidationService; -import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -119,90 +118,85 @@ private static final Log log = LogFactory.getLog(BenthosBatchUIHandler.class); - private final EnumMap<TableViewMode, RowFilter<BenthosBatchTableModel, Integer>> tableFilters; + private EnumMap<TableViewMode, RowFilter<BenthosBatchTableModel, Integer>> tableFilters; - protected ValidationService validationService; - - protected ValidateCruiseOperationsService validationCruiseService; - /** * Sample categories model. * * @since 2.4 */ - protected final SampleCategoryModel sampleCategoryModel; + protected SampleCategoryModel sampleCategoryModel; /** * Weight unit. * * @since 2.5 */ - protected final WeightUnit weightUnit; + protected WeightUnit weightUnit; /** * id of the unsorted qualitative value to remove of V/HV universe. * * @since 2.6 */ - protected final Integer qualitative_unsorted_id; + protected Integer qualitative_unsorted_id; - public BenthosBatchUIHandler(TuttiUI<?, ?> parentUi, - BenthosBatchUI ui) { - super(parentUi, ui, - SpeciesBatchRowModel.PROPERTY_SPECIES, - SpeciesBatchRowModel.PROPERTY_WEIGHT, - SpeciesBatchRowModel.PROPERTY_NUMBER, - SpeciesBatchRowModel.PROPERTY_SAMPLE_CATEGORY_WEIGHT, - SpeciesBatchRowModel.PROPERTY_COMMENT, - SpeciesBatchRowModel.PROPERTY_ATTACHMENT, - SpeciesBatchRowModel.PROPERTY_FREQUENCY, - SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM); + public BenthosBatchUIHandler() { + super( + SpeciesBatchRowModel.PROPERTY_SPECIES, + SpeciesBatchRowModel.PROPERTY_WEIGHT, + SpeciesBatchRowModel.PROPERTY_NUMBER, + SpeciesBatchRowModel.PROPERTY_SAMPLE_CATEGORY_WEIGHT, + SpeciesBatchRowModel.PROPERTY_COMMENT, + SpeciesBatchRowModel.PROPERTY_ATTACHMENT, + SpeciesBatchRowModel.PROPERTY_FREQUENCY, + SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM); - qualitative_unsorted_id = - getContext().getPersistenceService().getEnumerationFile().QUALITATIVE_UNSORTED_ID; - - weightUnit = getConfig().getBenthosWeightUnit(); - - sampleCategoryModel = getDataContext().getSampleCategoryModel(); - - tableFilters = new EnumMap<TableViewMode, RowFilter<BenthosBatchTableModel, Integer>>(TableViewMode.class); - - tableFilters.put(TableViewMode.ALL, new RowFilter<BenthosBatchTableModel, Integer>() { - @Override - public boolean include(Entry<? extends BenthosBatchTableModel, ? extends Integer> entry) { - return true; - } - }); - - tableFilters.put(TableViewMode.ROOT, new RowFilter<BenthosBatchTableModel, Integer>() { - @Override - public boolean include(Entry<? extends BenthosBatchTableModel, ? extends Integer> entry) { - boolean result = false; - Integer rowIndex = entry.getIdentifier(); - if (rowIndex != null) { - BenthosBatchTableModel model = entry.getModel(); - BenthosBatchRowModel row = model.getEntry(rowIndex); - result = row != null && row.isBatchRoot(); - } - return result; - } - }); - - tableFilters.put(TableViewMode.LEAF, new RowFilter<BenthosBatchTableModel, Integer>() { - @Override - public boolean include(Entry<? extends BenthosBatchTableModel, ? extends Integer> entry) { - boolean result = false; - Integer rowIndex = entry.getIdentifier(); - if (rowIndex != null) { - BenthosBatchTableModel model = entry.getModel(); - BenthosBatchRowModel row = model.getEntry(rowIndex); - result = row != null && row.isBatchLeaf(); - } - return result; - } - }); - validationService = getContext().getValidationService(); - validationCruiseService = getContext().getValidateCruiseOperationsService(); +// qualitative_unsorted_id = +// getContext().getPersistenceService().getEnumerationFile().QUALITATIVE_UNSORTED_ID; +// +// weightUnit = getConfig().getBenthosWeightUnit(); +// +// sampleCategoryModel = getDataContext().getSampleCategoryModel(); +// +// tableFilters = new EnumMap<TableViewMode, RowFilter<BenthosBatchTableModel, Integer>>(TableViewMode.class); +// +// tableFilters.put(TableViewMode.ALL, new RowFilter<BenthosBatchTableModel, Integer>() { +// @Override +// public boolean include(Entry<? extends BenthosBatchTableModel, ? extends Integer> entry) { +// return true; +// } +// }); +// +// tableFilters.put(TableViewMode.ROOT, new RowFilter<BenthosBatchTableModel, Integer>() { +// @Override +// public boolean include(Entry<? extends BenthosBatchTableModel, ? extends Integer> entry) { +// boolean result = false; +// Integer rowIndex = entry.getIdentifier(); +// if (rowIndex != null) { +// BenthosBatchTableModel model = entry.getModel(); +// BenthosBatchRowModel row = model.getEntry(rowIndex); +// result = row != null && row.isBatchRoot(); +// } +// return result; +// } +// }); +// +// tableFilters.put(TableViewMode.LEAF, new RowFilter<BenthosBatchTableModel, Integer>() { +// @Override +// public boolean include(Entry<? extends BenthosBatchTableModel, ? extends Integer> entry) { +// boolean result = false; +// Integer rowIndex = entry.getIdentifier(); +// if (rowIndex != null) { +// BenthosBatchTableModel model = entry.getModel(); +// BenthosBatchRowModel row = model.getEntry(rowIndex); +// result = row != null && row.isBatchLeaf(); +// } +// return result; +// } +// }); +// validationService = getContext().getValidationService(); +// validationCruiseService = getContext().getValidateCruiseOperationsService(); } //------------------------------------------------------------------------// @@ -242,7 +236,7 @@ // get all batch species root (says the one with only a species sample category) BatchContainer<BenthosBatch> rootBenthosBatch = - persistenceService.getRootBenthosBatch( + getPersistenceService().getRootBenthosBatch( bean.getId(), sampleCategoryModel); List<BenthosBatch> catches = rootBenthosBatch.getChildren(); @@ -290,7 +284,7 @@ @Override protected boolean isRowValid(BenthosBatchRowModel row) { BenthosBatch batch = convertRowToEntity(row, true); - NuitonValidatorResult validator = validationService.validateBenthosBatch(batch); + NuitonValidatorResult validator = getValidationService().validateBenthosBatch(batch); boolean result = !validator.hasErrorMessagess(); if (result @@ -301,7 +295,7 @@ BenthosFrequencyRowModel.toEntity( row.getFrequency(), batch); - result = validationCruiseService.isBenthosBatchValid( + result = getValidateCruiseOperationsService().isBenthosBatchValid( batch, frequencies); } @@ -670,8 +664,53 @@ } @Override - public void beforeInitUI() { + public void beforeInit(BenthosBatchUI ui) { + super.beforeInit(ui); + + qualitative_unsorted_id = + getContext().getPersistenceService().getEnumerationFile().QUALITATIVE_UNSORTED_ID; + + weightUnit = getConfig().getBenthosWeightUnit(); + + sampleCategoryModel = getDataContext().getSampleCategoryModel(); + + tableFilters = new EnumMap<TableViewMode, RowFilter<BenthosBatchTableModel, Integer>>(TableViewMode.class); + + tableFilters.put(TableViewMode.ALL, new RowFilter<BenthosBatchTableModel, Integer>() { + @Override + public boolean include(Entry<? extends BenthosBatchTableModel, ? extends Integer> entry) { + return true; + } + }); + + tableFilters.put(TableViewMode.ROOT, new RowFilter<BenthosBatchTableModel, Integer>() { + @Override + public boolean include(Entry<? extends BenthosBatchTableModel, ? extends Integer> entry) { + boolean result = false; + Integer rowIndex = entry.getIdentifier(); + if (rowIndex != null) { + BenthosBatchTableModel model = entry.getModel(); + BenthosBatchRowModel row = model.getEntry(rowIndex); + result = row != null && row.isBatchRoot(); + } + return result; + } + }); + + tableFilters.put(TableViewMode.LEAF, new RowFilter<BenthosBatchTableModel, Integer>() { + @Override + public boolean include(Entry<? extends BenthosBatchTableModel, ? extends Integer> entry) { + boolean result = false; + Integer rowIndex = entry.getIdentifier(); + if (rowIndex != null) { + BenthosBatchTableModel model = entry.getModel(); + BenthosBatchRowModel row = model.getEntry(rowIndex); + result = row != null && row.isBatchLeaf(); + } + return result; + } + }); if (log.isDebugEnabled()) { log.debug("beforeInit: " + ui); } @@ -685,7 +724,7 @@ } @Override - public void afterInitUI() { + public void afterInit(BenthosBatchUI ui) { if (log.isDebugEnabled()) { log.debug("afterInit: " + ui); @@ -900,7 +939,7 @@ public void createBatch() { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); CreateBenthosBatchUI createBatchEditor = parent.getBenthosTabCreateBatch(); createBatchEditor.getHandler().openUI(getModel()); @@ -1002,7 +1041,7 @@ log.debug("Open split batch ui for row [" + rowIndex + ']'); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); SplitBenthosBatchUI splitBatchEditor = parent.getBenthosTabSplitBatch(); parent.getHandler().splitBenthosBatch(parentBatch, splitBatchEditor); @@ -1041,8 +1080,7 @@ log.debug("Open addChangeCategory batch ui for row [" + rowIndex + "] and category " + sampleCategoryId); } - EditCatchesUI parent = - SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); SplitBenthosBatchUI splitBatchEditor = parent.getBenthosTabAddSampleCategoryBatch(); @@ -1329,7 +1367,7 @@ String id = aBatch.getId(); List<BenthosBatchFrequency> frequencies = - persistenceService.getAllBenthosBatchFrequency(id); + getPersistenceService().getAllBenthosBatchFrequency(id); BenthosBatchRowModel newRow = new BenthosBatchRowModel(weightUnit, @@ -1338,8 +1376,8 @@ frequencies); List<Attachment> attachments = - persistenceService.getAllAttachments(newRow.getObjectType(), - newRow.getObjectId()); + getPersistenceService().getAllAttachments(newRow.getObjectType(), + newRow.getObjectId()); newRow.addAllAttachment(attachments); @@ -1468,14 +1506,14 @@ log.debug("Persist new species batch with parentId: " + parentBatchId); } - entityToSave = persistenceService.createBenthosBatch(entityToSave, - parentBatchId); + entityToSave = getPersistenceService().createBenthosBatch(entityToSave, + parentBatchId); row.setId(entityToSave.getId()); } else { if (log.isDebugEnabled()) { log.debug("Persist existing species batch: " + entityToSave.getId() + " (parent : " + entityToSave.getParentBatch() + ")"); } - persistenceService.saveBenthosBatch(entityToSave); + getPersistenceService().saveBenthosBatch(entityToSave); } List<BenthosFrequencyRowModel> frequencyRows = row.getFrequency(); @@ -1488,7 +1526,7 @@ if (log.isDebugEnabled()) { log.debug("Will save " + frequency.size() + " frequencies."); } - frequency = persistenceService.saveBenthosBatchFrequency( + frequency = getPersistenceService().saveBenthosBatchFrequency( entityToSave.getId(), frequency); // push it back to row model Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -33,6 +33,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil org.jdesktop.swingx.JXTable @@ -49,18 +50,10 @@ <script><![CDATA[ public CreateBenthosBatchUI(EditCatchesUI parentUI) { - JAXXUtil.initContext(this, parentUI); - CreateBenthosBatchUIHandler handler = new CreateBenthosBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <CreateBenthosBatchUIHandler id='handler' - initializer='getContextValue(CreateBenthosBatchUIHandler.class)'/> - <CreateBenthosBatchUIModel id='model' initializer='getContextValue(CreateBenthosBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -27,6 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; +import fr.ifremer.shared.application.swing.util.Cancelable; +import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; @@ -34,21 +36,17 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; 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.benthos.BenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchTableModel; -import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -73,53 +71,31 @@ private static final Log log = LogFactory.getLog(CreateBenthosBatchUIHandler.class); - private final PersistenceService persistenceService; - /** * Qualitative value for the Vrac. * * @since 2.5 */ - protected final CaracteristicQualitativeValue sortedValue; + protected CaracteristicQualitativeValue sortedValue; /** * Sample categories model. * * @since 2.4 */ - protected final SampleCategoryModel sampleCategoryModel; + protected SampleCategoryModel sampleCategoryModel; /** * Weight unit. * * @since 2.6 */ - protected final WeightUnit weightUnit; + protected WeightUnit weightUnit; - public CreateBenthosBatchUIHandler(TuttiUI<?,?> parentUi, - CreateBenthosBatchUI ui) { - super(parentUi.getHandler().getContext(), ui, - SplitBenthosBatchRowModel.PROPERTY_SELECTED, + public CreateBenthosBatchUIHandler() { + super(SplitBenthosBatchRowModel.PROPERTY_SELECTED, SplitBenthosBatchRowModel.PROPERTY_CATEGORY_VALUE, SplitBenthosBatchRowModel.PROPERTY_WEIGHT); - this.persistenceService = getContext().getPersistenceService(); - this.weightUnit = getConfig().getBenthosWeightUnit(); - this.sampleCategoryModel = getDataContext().getSampleCategoryModel(); - - SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); - - Integer vracId = this.persistenceService.getEnumerationFile().QUALITATIVE_VRAC_ID; - - CaracteristicQualitativeValue vracValue = null; - for (CaracteristicQualitativeValue caracteristicQualitativeValue : caracteristic.getCaracteristic().getQualitativeValue()) { - - if (vracId.equals(caracteristicQualitativeValue.getIdAsInt())) { - vracValue = caracteristicQualitativeValue; - break; - } - } - Preconditions.checkNotNull(vracValue, "Could not found vrac qualitative value"); - sortedValue = vracValue; } //------------------------------------------------------------------------// @@ -191,20 +167,39 @@ //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(CreateBenthosBatchUI ui) { + super.beforeInit(ui); + this.weightUnit = getConfig().getBenthosWeightUnit(); + this.sampleCategoryModel = getDataContext().getSampleCategoryModel(); + + SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); + + Integer vracId = getPersistenceService().getEnumerationFile().QUALITATIVE_VRAC_ID; + + CaracteristicQualitativeValue vracValue = null; + for (CaracteristicQualitativeValue caracteristicQualitativeValue : caracteristic.getCaracteristic().getQualitativeValue()) { + + if (vracId.equals(caracteristicQualitativeValue.getIdAsInt())) { + vracValue = caracteristicQualitativeValue; + break; + } + } + Preconditions.checkNotNull(vracValue, "Could not found vrac qualitative value"); + this.sortedValue = vracValue; + CreateBenthosBatchUIModel model = new CreateBenthosBatchUIModel(sampleCategoryModel); - ui.setContextValue(model); + this.ui.setContextValue(model); listModelIsModify(model); } @Override - public void afterInitUI() { + public void afterInit(CreateBenthosBatchUI ui) { - initUI(ui); + initUI(this.ui); - initBeanFilterableComboBox(ui.getSpeciesComboBox(), + initBeanFilterableComboBox(this.ui.getSpeciesComboBox(), Lists.<Species>newArrayList(), null, DecoratorService.FROM_PROTOCOL); @@ -217,14 +212,14 @@ // remove the first one (V/HV) categories.remove(0); - initBeanFilterableComboBox(ui.getCategoryComboBox(), + initBeanFilterableComboBox(this.ui.getCategoryComboBox(), Lists.<SampleCategoryModelEntry>newArrayList(categories), null); Caracteristic caracteristic = - persistenceService.getSortedUnsortedCaracteristic(); + getPersistenceService().getSortedUnsortedCaracteristic(); - initBeanFilterableComboBox(ui.getSampleCategoryComboBox(), + initBeanFilterableComboBox(this.ui.getSampleCategoryComboBox(), Lists.newArrayList(caracteristic.getQualitativeValue()), null); @@ -252,7 +247,7 @@ // look for best value for V/HV category : if sorted is available then use it List<CaracteristicQualitativeValue> qualitativeValues = - ui.getSampleCategoryComboBox().getData(); + CreateBenthosBatchUIHandler.this.ui.getSampleCategoryComboBox().getData(); CaracteristicQualitativeValue newCategory = null; @@ -281,7 +276,7 @@ // try to find the first category from protocol // TuttiProtocol protocol = getDataContext().getProtocol(); - SpeciesProtocol speciesProtocol = persistenceService.getBenthosProtocol(newValue); + SpeciesProtocol speciesProtocol = getPersistenceService().getBenthosProtocol(newValue); if (speciesProtocol != null) { // species defined in protocol @@ -345,7 +340,7 @@ initTable(getTable()); - listenValidatorValid(ui.getValidator(), model); + listenValidatorValid(this.ui.getValidator(), model); } @Override @@ -366,7 +361,7 @@ // when canceling always invalid model getModel().setValid(false); - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -430,7 +425,7 @@ log.debug("Save and Continue UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); BenthosBatchUI benthosTabContent = parent.getBenthosTabContent(); benthosTabContent.getHandler().addBatch(getModel()); @@ -444,7 +439,7 @@ log.debug("Save and Close UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getBenthosTabContent().getHandler().addBatch(getModel()); // close dialog Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,13 +26,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import fr.ifremer.shared.application.swing.computable.ComputableData; +import fr.ifremer.shared.application.swing.table.ColumnIdentifier; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; -import fr.ifremer.shared.application.swing.computable.ComputableData; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -213,7 +213,7 @@ } EditCatchesUI parent = - SwingUtil.getParentContainer(ui, EditCatchesUI.class); + ui.getHandler().getParentContainer(EditCatchesUI.class); parent.getHandler().editBenthosFrequencies(this); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -54,21 +54,11 @@ <script><![CDATA[ - public BenthosFrequencyUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - BenthosFrequencyUIHandler handler = new BenthosFrequencyUIHandler(parentUI.getHandler().getContext(), this); - setContextValue(handler); - handler.beforeInitUI(); - } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } +public BenthosFrequencyUI(TuttiUI parentUI) { + TuttiUIUtil.setParentUI(this, parentUI); +} ]]></script> - <BenthosFrequencyUIHandler id='handler' - initializer='getContextValue(BenthosFrequencyUIHandler.class)'/> - <BenthosFrequencyUIModel id='model' initializer='getContextValue(BenthosFrequencyUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,22 +28,20 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.shared.application.ApplicationDataUtil; +import fr.ifremer.shared.application.swing.util.Cancelable; +import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; 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.benthos.BenthosBatchRowModel; -import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; @@ -89,16 +87,12 @@ * * @since 2.5 */ - protected final WeightUnit weightUnit; + protected WeightUnit weightUnit; - public BenthosFrequencyUIHandler(TuttiUIContext context, - BenthosFrequencyUI ui) { - super(context, ui, - BenthosFrequencyRowModel.PROPERTY_LENGTH_STEP, + public BenthosFrequencyUIHandler() { + super(BenthosFrequencyRowModel.PROPERTY_LENGTH_STEP, BenthosFrequencyRowModel.PROPERTY_NUMBER, BenthosFrequencyRowModel.PROPERTY_WEIGHT); - - this.weightUnit = context.getConfig().getBenthosWeightUnit(); } //------------------------------------------------------------------------// @@ -197,19 +191,22 @@ } @Override - public void beforeInitUI() { + public void beforeInit(BenthosFrequencyUI ui) { + super.beforeInit(ui); + + this.weightUnit = getConfig().getBenthosWeightUnit(); SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); BenthosFrequencyUIModel model = new BenthosFrequencyUIModel(weightUnit, sampleCategoryModel); - ui.setContextValue(model); + this.ui.setContextValue(model); } @Override - public void afterInitUI() { + public void afterInit(BenthosFrequencyUI ui) { initUI(ui); @@ -254,7 +251,7 @@ public void keyReleased(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { e.consume(); - Float step = (Float) ui.getRafaleStepField().getModel(); + Float step = (Float) BenthosFrequencyUIHandler.this.ui.getRafaleStepField().getModel(); applyRafaleStep(step); @@ -283,7 +280,7 @@ getModel().setStep(precision); recomputeRowValidState(rowModel); } - ui.getValidator().doValidate(); + BenthosFrequencyUIHandler.this.ui.getValidator().doValidate(); } }); @@ -324,7 +321,6 @@ model); - table.setModel(tableModel); table.setColumnModel(columnModel); @@ -356,7 +352,7 @@ getModel().setSimpleCount(null); - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -382,7 +378,7 @@ public void addLengthStepCaracteristic() { // compute list of possible caracteristics (all but the one in the select box) - List<Caracteristic> allNumericCaracteristic = persistenceService.getAllNumericCaracteristic(); + List<Caracteristic> allNumericCaracteristic = getPersistenceService().getAllNumericCaracteristic(); List<Caracteristic> toSelect = Lists.newArrayList(allNumericCaracteristic); List<Caracteristic> knownCaracteristics = getUI().getLengthStepCaracteristicComboBox().getData(); toSelect.removeAll(knownCaracteristics); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -29,6 +29,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil org.jdesktop.swingx.JXTable @@ -45,18 +46,10 @@ <script><![CDATA[ public SplitBenthosBatchUI(EditCatchesUI parentUI) { - JAXXUtil.initContext(this, parentUI); - SplitBenthosBatchUIHandler handler = new SplitBenthosBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <SplitBenthosBatchUIHandler id='handler' - initializer='getContextValue(SplitBenthosBatchUIHandler.class)'/> - <SplitBenthosBatchUIModel id='model' initializer='getContextValue(SplitBenthosBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,6 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; @@ -36,11 +37,9 @@ 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.benthos.BenthosBatchRowModel; -import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; @@ -72,10 +71,8 @@ private static final Log log = LogFactory.getLog(SplitBenthosBatchUIHandler.class); - public SplitBenthosBatchUIHandler(EditCatchesUI parentUi, - SplitBenthosBatchUI ui) { - super(parentUi.getHandler().getContext(), ui, - SplitBenthosBatchRowModel.PROPERTY_SELECTED, + public SplitBenthosBatchUIHandler() { + super(SplitBenthosBatchRowModel.PROPERTY_SELECTED, SplitBenthosBatchRowModel.PROPERTY_CATEGORY_VALUE, SplitBenthosBatchRowModel.PROPERTY_WEIGHT); } @@ -152,8 +149,9 @@ } @Override - public void beforeInitUI() { + public void beforeInit(SplitBenthosBatchUI ui) { + super.beforeInit(ui); SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); @@ -164,7 +162,7 @@ } @Override - public void afterInitUI() { + public void afterInit(SplitBenthosBatchUI ui) { initUI(ui); @@ -183,7 +181,7 @@ // fill comboBox with new list List<SampleCategoryModelEntry> data = (List<SampleCategoryModelEntry>) evt.getNewValue(); - ui.getCategoryComboBox().setModel(new DefaultComboBoxModel(data.toArray())); + SplitBenthosBatchUIHandler.this.ui.getCategoryComboBox().setModel(new DefaultComboBoxModel(data.toArray())); } }); @@ -240,7 +238,7 @@ getModel().setValid(false); getModel().setSelectedCategory(null); - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -371,7 +369,7 @@ log.debug("Save UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); SplitBenthosBatchUIModel model = getModel(); if (model.isValid()) { if (model.isSplitMode()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -29,6 +29,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.NumberEditor @@ -45,18 +46,10 @@ <script><![CDATA[ public IndividualObservationBatchUI(TuttiUI<?,?> parentUI) { - JAXXUtil.initContext(this, parentUI); - IndividualObservationBatchUIHandler handler = new IndividualObservationBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <IndividualObservationBatchUIHandler id='handler' - initializer='getContextValue(IndividualObservationBatchUIHandler.class)'/> - <IndividualObservationBatchUIModel id='model' initializer='getContextValue(IndividualObservationBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -36,7 +36,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.ValidationService; +import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -57,7 +57,6 @@ 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.table.CaracteristicColumnIdentifier; -import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; @@ -88,22 +87,19 @@ private static final Log log = LogFactory.getLog(IndividualObservationBatchUIHandler.class); - protected ValidationService validationService = getContext().getValidationService(); - /** * Weight unit. * * @since 2.5 */ - protected final WeightUnit weightUnit; + protected WeightUnit weightUnit; - protected final WeightUnit speciesWeightUnit; + protected WeightUnit speciesWeightUnit; - public final Integer PMFM_ID_SORTED_UNSORTED; + public Integer PMFM_ID_SORTED_UNSORTED; - public IndividualObservationBatchUIHandler(TuttiUI<?, ?> parentUi, IndividualObservationBatchUI ui) { - super(parentUi, ui, - IndividualObservationBatchRowModel.PROPERTY_SPECIES, + public IndividualObservationBatchUIHandler() { + super(IndividualObservationBatchRowModel.PROPERTY_SPECIES, IndividualObservationBatchRowModel.PROPERTY_WEIGHT, IndividualObservationBatchRowModel.PROPERTY_SIZE, IndividualObservationBatchRowModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, @@ -111,12 +107,6 @@ IndividualObservationBatchRowModel.PROPERTY_DEFAULT_CARACTERISTICS, IndividualObservationBatchRowModel.PROPERTY_COMMENT, IndividualObservationBatchRowModel.PROPERTY_ATTACHMENT); - - weightUnit = getConfig().getIndividualObservationWeightUnit(); - speciesWeightUnit = getConfig().getSpeciesWeightUnit(); - - PMFM_ID_SORTED_UNSORTED = - persistenceService.getSortedUnsortedCaracteristic().getIdAsInt(); } //------------------------------------------------------------------------// @@ -153,6 +143,7 @@ rows = Lists.newArrayList(); if (!TuttiEntities.isNew(bean)) { + PersistenceService persistenceService = getPersistenceService(); List<IndividualObservationBatch> batches = persistenceService.getAllIndividualObservationBatch(bean.getId()); @@ -203,7 +194,7 @@ @Override protected boolean isRowValid(IndividualObservationBatchRowModel row) { IndividualObservationBatch batch = row.toBean(); - NuitonValidatorResult validator = validationService.validateIndividualObservationBatch(batch); + NuitonValidatorResult validator = getValidationService().validateIndividualObservationBatch(batch); boolean result = !validator.hasErrorMessagess(); return result; } @@ -245,12 +236,19 @@ } @Override - public void beforeInitUI() { + public void beforeInit(IndividualObservationBatchUI ui) { + super.beforeInit(ui); if (log.isDebugEnabled()) { log.debug("beforeInit: " + ui); } + weightUnit = getConfig().getIndividualObservationWeightUnit(); + speciesWeightUnit = getConfig().getSpeciesWeightUnit(); + + PMFM_ID_SORTED_UNSORTED = + getPersistenceService().getSortedUnsortedCaracteristic().getIdAsInt(); + // get the default caracteristics List<Caracteristic> defaultCaracteristic = getDataContext().getDefaultIndividualObservationCaracteristics(); @@ -265,7 +263,7 @@ } @Override - public void afterInitUI() { + public void afterInit(IndividualObservationBatchUI ui) { if (log.isDebugEnabled()) { log.debug("afterInit: " + ui); @@ -433,19 +431,19 @@ @Override public CaracteristicMapEditorUI getCaracteristicMapEditor() { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); return parent.getIndividualObservationCaracteristicMapEditor(); } @Override public void showCaracteristicMapEditor(Species species) { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setIndividualObservationSelectedCard(EditCatchesUIHandler.EDIT_CARACTERISTICS_CARD, species); } @Override public void hideCaracteristicMapEditor() { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setIndividualObservationSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -455,7 +453,7 @@ public void createBatch() { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); CreateIndividualObservationBatchUI createBatchEditor = parent.getIndividualObservationTabCreateBatch(); createBatchEditor.getHandler().openUI(getModel()); @@ -509,7 +507,7 @@ return; } } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); SpeciesBatchUIModel speciesBatchUIModel = parent.getSpeciesTabContent().getModel(); @@ -751,10 +749,10 @@ if (TuttiEntities.isNew(entityToSave)) { - entityToSave = persistenceService.createIndividualObservationBatch(entityToSave); + entityToSave = getPersistenceService().createIndividualObservationBatch(entityToSave); row.setId(entityToSave.getId()); } else { - persistenceService.saveIndividualObservationBatch(entityToSave); + getPersistenceService().saveIndividualObservationBatch(entityToSave); } getModel().fireBatchUpdated(row); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -31,6 +31,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.NumberEditor @@ -41,18 +42,10 @@ <script><![CDATA[ public CreateIndividualObservationBatchUI(EditCatchesUI parentUI) { - JAXXUtil.initContext(this, parentUI); - CreateIndividualObservationBatchUIHandler handler = new CreateIndividualObservationBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <CreateIndividualObservationBatchUIHandler id='handler' - initializer='getContextValue(CreateIndividualObservationBatchUIHandler.class)'/> - <CreateIndividualObservationBatchUIModel id='model' initializer='getContextValue(CreateIndividualObservationBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,6 +26,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.shared.application.ApplicationDataUtil; +import fr.ifremer.shared.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; @@ -40,7 +41,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.shared.application.swing.util.Cancelable; 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; @@ -78,18 +78,15 @@ private static final Log log = LogFactory.getLog(CreateIndividualObservationBatchUIHandler.class); - public CreateIndividualObservationBatchUIHandler(TuttiUI<?,?> parentUi, - CreateIndividualObservationBatchUI ui) { - super(parentUi.getHandler().getContext(), ui); - } - //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(CreateIndividualObservationBatchUI ui) { + super.beforeInit(ui); + // get the default caracteristics List<Caracteristic> defaultCaracteristic = getDataContext().getDefaultIndividualObservationCaracteristics(); @@ -102,7 +99,7 @@ @Override - public void afterInitUI() { + public void afterInit(CreateIndividualObservationBatchUI ui) { initUI(ui); @@ -343,7 +340,7 @@ // when canceling always invalid model getModel().setValid(false); - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setIndividualObservationSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -386,8 +383,7 @@ List<Species> speciesList; - EditCatchesUI parent = - SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); SpeciesBatchUIModel speciesBatchUIModel = parent.getSpeciesTabContent().getModel(); boolean withSpeciesBatch = @@ -463,7 +459,7 @@ log.debug("Save And Continue UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); IndividualObservationBatchUI individualObservationTabContent = parent.getIndividualObservationTabContent(); individualObservationTabContent.getHandler().addBatch(getModel()); @@ -480,7 +476,7 @@ log.debug("Save And Close UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getIndividualObservationTabContent().getHandler().addBatch(getModel()); // close dialog Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -29,6 +29,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.shared.application.swing.computable.ComputableDataEditor org.jdesktop.swingx.JXTable @@ -44,18 +45,10 @@ <script><![CDATA[ public MarineLitterBatchUI(TuttiUI<?,?> parentUI) { - JAXXUtil.initContext(this, parentUI); - MarineLitterBatchUIHandler handler = new MarineLitterBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <MarineLitterBatchUIHandler id='handler' - initializer='getContextValue(MarineLitterBatchUIHandler.class)'/> - <MarineLitterBatchUIModel id='model' initializer='getContextValue(MarineLitterBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -27,14 +27,14 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.shared.application.listener.PropagatePropertyChangeListener; +import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.service.ValidationService; -import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -48,8 +48,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.shared.application.swing.table.ColumnIdentifier; -import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -69,24 +67,20 @@ private static final Log log = LogFactory.getLog(MarineLitterBatchUIHandler.class); - protected ValidationService validationService = getContext().getValidationService(); - /** * Weight unit. * * @since 2.5 */ - protected final WeightUnit weightUnit; + protected WeightUnit weightUnit; - public MarineLitterBatchUIHandler(TuttiUI<?, ?> parentUi, MarineLitterBatchUI ui) { - super(parentUi, ui, - MarineLitterBatchRowModel.PROPERTY_MARINE_LITTER_CATEGORY, - MarineLitterBatchRowModel.PROPERTY_MARINE_LITTER_SIZE_CATEGORY, - MarineLitterBatchRowModel.PROPERTY_WEIGHT, - MarineLitterBatchRowModel.PROPERTY_NUMBER, - MarineLitterBatchRowModel.PROPERTY_COMMENT); - - weightUnit = getConfig().getMarineLitterWeightUnit(); + public MarineLitterBatchUIHandler() { + super( + MarineLitterBatchRowModel.PROPERTY_MARINE_LITTER_CATEGORY, + MarineLitterBatchRowModel.PROPERTY_MARINE_LITTER_SIZE_CATEGORY, + MarineLitterBatchRowModel.PROPERTY_WEIGHT, + MarineLitterBatchRowModel.PROPERTY_NUMBER, + MarineLitterBatchRowModel.PROPERTY_COMMENT); } //------------------------------------------------------------------------// @@ -126,7 +120,7 @@ // get all marine litter root BatchContainer<MarineLitterBatch> batchContainer = - persistenceService.getRootMarineLitterBatch(bean.getId()); + getPersistenceService().getRootMarineLitterBatch(bean.getId()); for (MarineLitterBatch aBatch : batchContainer.getChildren()) { MarineLitterBatchRowModel entry = loadBatch(aBatch); @@ -154,7 +148,7 @@ @Override protected boolean isRowValid(MarineLitterBatchRowModel row) { MarineLitterBatch batch = row.toBean(); - NuitonValidatorResult validator = validationService.validateMarineLitterBatch(batch); + NuitonValidatorResult validator = getValidationService().validateMarineLitterBatch(batch); boolean result = !validator.hasErrorMessagess(); return result; } @@ -206,12 +200,15 @@ } @Override - public void beforeInitUI() { + public void beforeInit(MarineLitterBatchUI ui) { + super.beforeInit(ui); if (log.isDebugEnabled()) { log.debug("beforeInit: " + ui); } + weightUnit = getConfig().getMarineLitterWeightUnit(); + EditCatchesUIModel catchesUIModel = ui.getContextValue(EditCatchesUIModel.class); @@ -227,7 +224,7 @@ } @Override - public void afterInitUI() { + public void afterInit(MarineLitterBatchUI ui) { if (log.isDebugEnabled()) { log.debug("afterInit: " + ui); @@ -334,7 +331,7 @@ public void createBatch() { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); CreateMarineLitterBatchUI createBatchEditor = parent.getMarineLitterTabCreateBatch(); createBatchEditor.getHandler().openUI(getModel()); @@ -374,8 +371,8 @@ new MarineLitterBatchRowModel(weightUnit, aBatch); List<Attachment> attachments = - persistenceService.getAllAttachments(newRow.getObjectType(), - newRow.getObjectId()); + getPersistenceService().getAllAttachments(newRow.getObjectType(), + newRow.getObjectId()); newRow.addAllAttachment(attachments); return newRow; @@ -393,10 +390,10 @@ if (TuttiEntities.isNew(entityToSave)) { - entityToSave = persistenceService.createMarineLitterBatch(entityToSave); + entityToSave = getPersistenceService().createMarineLitterBatch(entityToSave); row.setId(entityToSave.getId()); } else { - persistenceService.saveMarineLitterBatch(entityToSave); + getPersistenceService().saveMarineLitterBatch(entityToSave); } getModel().fireBatchUpdated(row); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.NumberEditor @@ -40,18 +41,10 @@ <script><![CDATA[ public CreateMarineLitterBatchUI(EditCatchesUI parentUI) { - JAXXUtil.initContext(this, parentUI); - CreateMarineLitterBatchUIHandler handler = new CreateMarineLitterBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <CreateMarineLitterBatchUIHandler id='handler' - initializer='getContextValue(CreateMarineLitterBatchUIHandler.class)'/> - <CreateMarineLitterBatchUIModel id='model' initializer='getContextValue(CreateMarineLitterBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.tutti.persistence.TuttiPersistence; +import fr.ifremer.shared.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; @@ -35,11 +35,8 @@ 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.shared.application.swing.util.Cancelable; -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.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,38 +55,31 @@ private static final Log log = LogFactory.getLog(CreateMarineLitterBatchUIHandler.class); - private final TuttiPersistence persistenceService; - - public CreateMarineLitterBatchUIHandler(TuttiUI<?,?> parentUi, - CreateMarineLitterBatchUI ui) { - super(parentUi.getHandler().getContext(), ui); - this.persistenceService = getContext().getPersistenceService(); - } - //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(CreateMarineLitterBatchUI ui) { + super.beforeInit(ui); CreateMarineLitterBatchUIModel model = new CreateMarineLitterBatchUIModel(); ui.setContextValue(model); listModelIsModify(model); } @Override - public void afterInitUI() { + public void afterInit(CreateMarineLitterBatchUI ui) { initUI(ui); Caracteristic marineLitterCategoryCaracteristic = - persistenceService.getMarineLitterCategoryCaracteristic(); + getPersistenceService().getMarineLitterCategoryCaracteristic(); initBeanFilterableComboBox(ui.getMarineLitterCategoryComboBox(), Lists.newArrayList(marineLitterCategoryCaracteristic.getQualitativeValue()), null); Caracteristic marineLitterSizeCategoryCaracteristic = - persistenceService.getMarineLitterSizeCategoryCaracteristic(); + getPersistenceService().getMarineLitterSizeCategoryCaracteristic(); initBeanFilterableComboBox(ui.getMarineLitterSizeCategoryComboBox(), Lists.newArrayList(marineLitterSizeCategoryCaracteristic.getQualitativeValue()), @@ -116,7 +106,7 @@ // when canceling always invalid model getModel().setValid(false); - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setMarineLitterSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -166,7 +156,7 @@ log.debug("Save And Continue UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); MarineLitterBatchUI marineLitterTabContent = parent.getMarineLitterTabContent(); marineLitterTabContent.getHandler().addBatch(getModel()); @@ -180,7 +170,7 @@ log.debug("Save And Close UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getMarineLitterTabContent().getHandler().addBatch(getModel()); // close dialog Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -25,6 +25,7 @@ <import> fr.ifremer.tutti.ui.swing.TuttiUIContext + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.FileEditor org.jdesktop.swingx.JXTitledPanel @@ -35,16 +36,9 @@ public ImportPupitriPopupUI(TuttiUIContext context) { super(context.getMainUI()); - setContextValue(context); - ImportPupitriPopupUIHandler handler = new ImportPupitriPopupUIHandler(context, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setApplicationContext(this, context); } -protected void $afterCompleteSetup() { - getHandler().afterInitUI(); -} - public void open() { handler.open(); } @@ -54,12 +48,6 @@ and the button to remove existing attachments --> <Boolean id='editable' javaBean='true'/> - <!-- bean property --> - <!--<AttachmentModelAware id='bean' javaBean='null'/>--> - - <ImportPupitriPopupUIHandler id='handler' - initializer='getContextValue(ImportPupitriPopupUIHandler.class)'/> - <Table id='mainPanel' fill='both'> <row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -24,8 +24,9 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; +import jaxx.runtime.spi.UIHandler; import javax.swing.JOptionPane; @@ -36,22 +37,17 @@ * @author tchemit <chemit@codelutin.com> * @since 0.2 */ -public class ImportPupitriPopupUIHandler { +public class ImportPupitriPopupUIHandler implements UIHandler<ImportPupitriPopupUI> { - protected final ImportPupitriPopupUI ui; + protected ImportPupitriPopupUI ui; - protected final TuttiUIContext context; - - public ImportPupitriPopupUIHandler(TuttiUIContext context, - ImportPupitriPopupUI ui) { - this.context = context; + @Override + public void beforeInit(ImportPupitriPopupUI ui) { this.ui = ui; } - protected void beforeInitUI() { - } - - protected void afterInitUI() { + @Override + public void afterInit(ImportPupitriPopupUI ui) { ui.getTrunkFile().setDialogOwner(ui); ui.getCarrouselFile().setDialogOwner(ui); ui.pack(); @@ -64,7 +60,7 @@ public void open() { resetFields(); - SwingUtil.center(context.getMainUI(), ui); + SwingUtil.center(TuttiUIUtil.getApplicationContext(ui).getMainUI(), ui); ui.setVisible(true); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.content.operation.catches.TableViewMode fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.shared.application.swing.computable.ComputableDataEditor org.jdesktop.swingx.JXTable @@ -45,18 +46,10 @@ <script><![CDATA[ public SpeciesBatchUI(EditCatchesUI parentUI) { - JAXXUtil.initContext(this, parentUI); - SpeciesBatchUIHandler handler = new SpeciesBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <SpeciesBatchUIHandler id='handler' - initializer='getContextValue(SpeciesBatchUIHandler.class)'/> - <SpeciesBatchUIModel id='model' initializer='getContextValue(SpeciesBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,6 +28,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.shared.application.swing.computable.ComputableDataTableCell; +import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; @@ -43,8 +45,6 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.TuttiDecorator; import fr.ifremer.tutti.service.ValidationService; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -68,7 +68,6 @@ import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; @@ -118,39 +117,31 @@ private static final Log log = LogFactory.getLog(SpeciesBatchUIHandler.class); - private final EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>> tableFilters; + private EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>> tableFilters; - protected ValidationService validationService; - - protected ValidateCruiseOperationsService validationCruiseService; - - protected final EditCatchesUI parentUi; - /** * Sample categories model. * * @since 2.4 */ - protected final SampleCategoryModel sampleCategoryModel; + protected SampleCategoryModel sampleCategoryModel; /** * Weight unit. * * @since 2.5 */ - protected final WeightUnit weightUnit; + protected WeightUnit weightUnit; /** * id of the unsorted qualitative value to remove of V/HV universe. * * @since 2.6 */ - protected final Integer qualitative_unsorted_id; + protected Integer qualitative_unsorted_id; - public SpeciesBatchUIHandler(EditCatchesUI parentUi, - SpeciesBatchUI ui) { - super(parentUi, ui, - SpeciesBatchRowModel.PROPERTY_SPECIES, + public SpeciesBatchUIHandler() { + super(SpeciesBatchRowModel.PROPERTY_SPECIES, SpeciesBatchRowModel.PROPERTY_WEIGHT, SpeciesBatchRowModel.PROPERTY_NUMBER, SpeciesBatchRowModel.PROPERTY_COMMENT, @@ -158,59 +149,8 @@ SpeciesBatchRowModel.PROPERTY_SAMPLE_CATEGORY_WEIGHT, SpeciesBatchRowModel.PROPERTY_FREQUENCY, SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM); - - qualitative_unsorted_id = - getContext().getPersistenceService().getEnumerationFile().QUALITATIVE_UNSORTED_ID; - - weightUnit = getConfig().getSpeciesWeightUnit(); - - sampleCategoryModel = getDataContext().getSampleCategoryModel(); - - this.parentUi = parentUi; - tableFilters = new EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>>(TableViewMode.class); - - tableFilters.put(TableViewMode.ALL, new RowFilter<SpeciesBatchTableModel, Integer>() { - @Override - public boolean include(Entry<? extends SpeciesBatchTableModel, ? extends Integer> entry) { - return true; - } - }); - - tableFilters.put(TableViewMode.ROOT, new RowFilter<SpeciesBatchTableModel, Integer>() { - @Override - public boolean include(Entry<? extends SpeciesBatchTableModel, ? extends Integer> entry) { - boolean result = false; - Integer rowIndex = entry.getIdentifier(); - if (rowIndex != null) { - SpeciesBatchTableModel model = entry.getModel(); - SpeciesBatchRowModel row = model.getEntry(rowIndex); - result = row != null && row.isBatchRoot(); - } - return result; - } - }); - - tableFilters.put(TableViewMode.LEAF, new RowFilter<SpeciesBatchTableModel, Integer>() { - @Override - public boolean include(Entry<? extends SpeciesBatchTableModel, ? extends Integer> entry) { - boolean result = false; - Integer rowIndex = entry.getIdentifier(); - if (rowIndex != null) { - SpeciesBatchTableModel model = entry.getModel(); - SpeciesBatchRowModel row = model.getEntry(rowIndex); - result = row != null && row.isBatchLeaf(); - } - return result; - } - }); - validationCruiseService = getContext().getValidateCruiseOperationsService(); - validationService = getContext().getValidationService(); } - public EditCatchesUI getParentUi() { - return parentUi; - } - //------------------------------------------------------------------------// //-- AbstractTuttiBatchTableUIHandler methods --// //------------------------------------------------------------------------// @@ -248,7 +188,7 @@ // get all batch species root (says the one with only a species sample category) BatchContainer<SpeciesBatch> rootSpeciesBatch = - persistenceService.getRootSpeciesBatch( + getPersistenceService().getRootSpeciesBatch( bean.getId(), sampleCategoryModel); List<SpeciesBatch> catches = rootSpeciesBatch.getChildren(); @@ -297,7 +237,8 @@ @Override protected boolean isRowValid(SpeciesBatchRowModel row) { SpeciesBatch batch = convertRowToEntity(row, true); - NuitonValidatorResult validator = validationService.validateSpeciesBatch(batch); + NuitonValidatorResult validator = + getValidationService().validateSpeciesBatch(batch); boolean result = !validator.hasErrorMessagess(); if (result @@ -309,7 +250,7 @@ SpeciesFrequencyRowModel.toEntity( row.getFrequency(), batch); - result = validationCruiseService.isSpeciesBatchValid( + result = getValidateCruiseOperationsService().isSpeciesBatchValid( batch, frequencies); } @@ -678,12 +619,57 @@ } @Override - public void beforeInitUI() { + public void beforeInit(SpeciesBatchUI ui) { + super.beforeInit(ui); if (log.isDebugEnabled()) { log.debug("beforeInit: " + ui); } + qualitative_unsorted_id = + getContext().getPersistenceService().getEnumerationFile().QUALITATIVE_UNSORTED_ID; + + weightUnit = getConfig().getSpeciesWeightUnit(); + + sampleCategoryModel = getDataContext().getSampleCategoryModel(); + + tableFilters = new EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>>(TableViewMode.class); + + tableFilters.put(TableViewMode.ALL, new RowFilter<SpeciesBatchTableModel, Integer>() { + @Override + public boolean include(Entry<? extends SpeciesBatchTableModel, ? extends Integer> entry) { + return true; + } + }); + + tableFilters.put(TableViewMode.ROOT, new RowFilter<SpeciesBatchTableModel, Integer>() { + @Override + public boolean include(Entry<? extends SpeciesBatchTableModel, ? extends Integer> entry) { + boolean result = false; + Integer rowIndex = entry.getIdentifier(); + if (rowIndex != null) { + SpeciesBatchTableModel model = entry.getModel(); + SpeciesBatchRowModel row = model.getEntry(rowIndex); + result = row != null && row.isBatchRoot(); + } + return result; + } + }); + + tableFilters.put(TableViewMode.LEAF, new RowFilter<SpeciesBatchTableModel, Integer>() { + @Override + public boolean include(Entry<? extends SpeciesBatchTableModel, ? extends Integer> entry) { + boolean result = false; + Integer rowIndex = entry.getIdentifier(); + if (rowIndex != null) { + SpeciesBatchTableModel model = entry.getModel(); + SpeciesBatchRowModel row = model.getEntry(rowIndex); + result = row != null && row.isBatchLeaf(); + } + return result; + } + }); + EditCatchesUIModel catchesUIModel = ui.getContextValue(EditCatchesUIModel.class); @@ -693,7 +679,7 @@ } @Override - public void afterInitUI() { + public void afterInit(SpeciesBatchUI ui) { if (log.isDebugEnabled()) { log.debug("afterInit: " + ui); @@ -909,7 +895,7 @@ public void createBatch() { - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); CreateSpeciesBatchUI createBatchEditor = parent.getSpeciesTabCreateBatch(); createBatchEditor.getHandler().openUI(getModel()); @@ -1010,7 +996,7 @@ log.debug("Open split batch ui for row [" + rowIndex + ']'); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); SplitSpeciesBatchUI splitBatchEditor = parent.getSpeciesTabSplitBatch(); parent.getHandler().splitSpeciesBatch(parentBatch, splitBatchEditor); @@ -1049,8 +1035,7 @@ log.debug("Open addChangeCategory batch ui for row [" + rowIndex + "] and category " + sampleCategoryId); } - EditCatchesUI parent = - SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); SplitSpeciesBatchUI splitBatchEditor = parent.getSpeciesTabAddSampleCategoryBatch(); @@ -1337,7 +1322,7 @@ String id = aBatch.getId(); List<SpeciesBatchFrequency> frequencies = - persistenceService.getAllSpeciesBatchFrequency(id); + getPersistenceService().getAllSpeciesBatchFrequency(id); SpeciesBatchRowModel newRow = new SpeciesBatchRowModel(weightUnit, @@ -1346,8 +1331,8 @@ frequencies); List<Attachment> attachments = - persistenceService.getAllAttachments(newRow.getObjectType(), - newRow.getObjectId()); + getPersistenceService().getAllAttachments(newRow.getObjectType(), + newRow.getObjectId()); newRow.addAllAttachment(attachments); @@ -1488,14 +1473,14 @@ log.debug("Persist new species batch with parentId: " + parentBatchId); } - catchBean = persistenceService.createSpeciesBatch(catchBean, - parentBatchId); + catchBean = getPersistenceService().createSpeciesBatch(catchBean, + parentBatchId); row.setId(catchBean.getId()); } else { if (log.isDebugEnabled()) { log.debug("Persist existing species batch: " + catchBean.getId() + " (parent : " + catchBean.getParentBatch() + ")"); } - persistenceService.saveSpeciesBatch(catchBean); + getPersistenceService().saveSpeciesBatch(catchBean); } List<SpeciesFrequencyRowModel> frequencyRows = row.getFrequency(); @@ -1508,7 +1493,7 @@ if (log.isDebugEnabled()) { log.debug("Will save " + frequency.size() + " frequencies."); } - frequency = persistenceService.saveSpeciesBatchFrequency( + frequency = getPersistenceService().saveSpeciesBatchFrequency( catchBean.getId(), frequency); // push it back to row model Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -33,6 +33,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil org.jdesktop.swingx.JXTable @@ -49,18 +50,10 @@ <script><![CDATA[ public CreateSpeciesBatchUI(EditCatchesUI parentUI) { - JAXXUtil.initContext(this, parentUI); - CreateSpeciesBatchUIHandler handler = new CreateSpeciesBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <CreateSpeciesBatchUIHandler id='handler' - initializer='getContextValue(CreateSpeciesBatchUIHandler.class)'/> - <CreateSpeciesBatchUIModel id='model' initializer='getContextValue(CreateSpeciesBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -36,7 +36,6 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; 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.species.SpeciesBatchUI; @@ -48,7 +47,6 @@ import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -74,53 +72,31 @@ private static final Log log = LogFactory.getLog(CreateSpeciesBatchUIHandler.class); - private final PersistenceService persistenceService; - /** * Qualitative value for the Vrac. * * @since 2.5 */ - protected final CaracteristicQualitativeValue sortedValue; + protected CaracteristicQualitativeValue sortedValue; /** * Sample categories model. * * @since 2.4 */ - protected final SampleCategoryModel sampleCategoryModel; + protected SampleCategoryModel sampleCategoryModel; /** * Weight unit. * * @since 2.6 */ - protected final WeightUnit weightUnit; + protected WeightUnit weightUnit; - public CreateSpeciesBatchUIHandler(TuttiUI<?, ?> parentUi, - CreateSpeciesBatchUI ui) { - super(parentUi.getHandler().getContext(), ui, - SplitSpeciesBatchRowModel.PROPERTY_SELECTED, + public CreateSpeciesBatchUIHandler() { + super(SplitSpeciesBatchRowModel.PROPERTY_SELECTED, SplitSpeciesBatchRowModel.PROPERTY_CATEGORY_VALUE, SplitSpeciesBatchRowModel.PROPERTY_WEIGHT); - this.persistenceService = getContext().getPersistenceService(); - this.weightUnit = getConfig().getSpeciesWeightUnit(); - this.sampleCategoryModel = getDataContext().getSampleCategoryModel(); - - SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); - - Integer vracId = this.persistenceService.getEnumerationFile().QUALITATIVE_VRAC_ID; - - CaracteristicQualitativeValue vracValue = null; - for (CaracteristicQualitativeValue caracteristicQualitativeValue : caracteristic.getCaracteristic().getQualitativeValue()) { - - if (vracId.equals(caracteristicQualitativeValue.getIdAsInt())) { - vracValue = caracteristicQualitativeValue; - break; - } - } - Preconditions.checkNotNull(vracValue, "Could not found vrac qualitative value"); - sortedValue = vracValue; } //------------------------------------------------------------------------// @@ -192,20 +168,39 @@ //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(CreateSpeciesBatchUI ui) { + super.beforeInit(ui); + this.weightUnit = getConfig().getSpeciesWeightUnit(); + this.sampleCategoryModel = getDataContext().getSampleCategoryModel(); + + SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); + + Integer vracId = getPersistenceService().getEnumerationFile().QUALITATIVE_VRAC_ID; + + CaracteristicQualitativeValue vracValue = null; + for (CaracteristicQualitativeValue caracteristicQualitativeValue : caracteristic.getCaracteristic().getQualitativeValue()) { + + if (vracId.equals(caracteristicQualitativeValue.getIdAsInt())) { + vracValue = caracteristicQualitativeValue; + break; + } + } + Preconditions.checkNotNull(vracValue, "Could not found vrac qualitative value"); + sortedValue = vracValue; + CreateSpeciesBatchUIModel model = new CreateSpeciesBatchUIModel(sampleCategoryModel); - ui.setContextValue(model); + this.ui.setContextValue(model); listModelIsModify(model); } @Override - public void afterInitUI() { + public void afterInit(CreateSpeciesBatchUI ui) { - initUI(ui); + initUI(this.ui); - initBeanFilterableComboBox(ui.getSpeciesComboBox(), + initBeanFilterableComboBox(this.ui.getSpeciesComboBox(), Lists.<Species>newArrayList(), null, DecoratorService.FROM_PROTOCOL); @@ -218,14 +213,14 @@ // remove the first one (V/HV) categories.remove(0); - initBeanFilterableComboBox(ui.getCategoryComboBox(), + initBeanFilterableComboBox(this.ui.getCategoryComboBox(), Lists.<SampleCategoryModelEntry>newArrayList(categories), null); Caracteristic caracteristic = - persistenceService.getSortedUnsortedCaracteristic(); + getPersistenceService().getSortedUnsortedCaracteristic(); - initBeanFilterableComboBox(ui.getSampleCategoryComboBox(), + initBeanFilterableComboBox(this.ui.getSampleCategoryComboBox(), caracteristic.getQualitativeValue(), null); @@ -253,7 +248,7 @@ // look for best value for V/HV category : if sorted is available then use it List<CaracteristicQualitativeValue> qualitativeValues = - ui.getSampleCategoryComboBox().getData(); + CreateSpeciesBatchUIHandler.this.ui.getSampleCategoryComboBox().getData(); CaracteristicQualitativeValue newCategory = null; @@ -285,7 +280,7 @@ } // try to find the first category from protocol // TuttiProtocol protocol = getDataContext().getProtocol(); - SpeciesProtocol speciesProtocol = persistenceService.getSpeciesProtocol(newValue); + SpeciesProtocol speciesProtocol = getPersistenceService().getSpeciesProtocol(newValue); if (speciesProtocol != null) { if (log.isInfoEnabled()) { @@ -355,7 +350,7 @@ initTable(getTable()); - listenValidatorValid(ui.getValidator(), model); + listenValidatorValid(this.ui.getValidator(), model); } @Override @@ -376,7 +371,7 @@ // when canceling always invalid model getModel().setValid(false); - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -439,7 +434,7 @@ log.debug("Save And Continue UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); SpeciesBatchUI speciesTabContent = parent.getSpeciesTabContent(); speciesTabContent.getHandler().addBatch(getModel()); @@ -453,7 +448,7 @@ log.debug("Save and Close UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getSpeciesTabContent().getHandler().addBatch(getModel()); // close dialog Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -213,7 +213,7 @@ } EditCatchesUI parent = - SwingUtil.getParentContainer(ui, EditCatchesUI.class); + ui.getHandler().getParentContainer(EditCatchesUI.class); parent.getHandler().editSpeciesFrequencies(this); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -54,21 +54,11 @@ <script><![CDATA[ - public SpeciesFrequencyUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - SpeciesFrequencyUIHandler handler = new SpeciesFrequencyUIHandler(parentUI.getHandler().getContext(), this); - setContextValue(handler); - handler.beforeInitUI(); - } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } +public SpeciesFrequencyUI(TuttiUI parentUI) { + TuttiUIUtil.setParentUI(this, parentUI); +} ]]></script> - <SpeciesFrequencyUIHandler id='handler' - initializer='getContextValue(SpeciesFrequencyUIHandler.class)'/> - <SpeciesFrequencyUIModel id='model' initializer='getContextValue(SpeciesFrequencyUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,23 +28,21 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.shared.application.ApplicationDataUtil; +import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; 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.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent.FrequencyCellEditor; -import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; @@ -79,8 +77,6 @@ private FrequencyCellEditor frequencyEditor; -// private TuttiProtocol protocol; - private Map<Integer, SpeciesProtocol> speciesProtocol; private Map<String, Caracteristic> lengthStepCaracteristics; @@ -92,15 +88,13 @@ * * @since 2.5 */ - protected final WeightUnit weightUnit; + protected WeightUnit weightUnit; - public SpeciesFrequencyUIHandler(TuttiUIContext context, - SpeciesFrequencyUI ui) { - super(context, ui, - SpeciesFrequencyRowModel.PROPERTY_LENGTH_STEP, + public SpeciesFrequencyUIHandler() { + super(SpeciesFrequencyRowModel.PROPERTY_LENGTH_STEP, SpeciesFrequencyRowModel.PROPERTY_NUMBER, SpeciesFrequencyRowModel.PROPERTY_WEIGHT); - this.weightUnit = context.getConfig().getSpeciesWeightUnit(); + } //------------------------------------------------------------------------// @@ -198,20 +192,23 @@ } @Override - public void beforeInitUI() { + public void beforeInit(SpeciesFrequencyUI ui) { + super.beforeInit(ui); + this.weightUnit = getConfig().getSpeciesWeightUnit(); + SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); SpeciesFrequencyUIModel model = new SpeciesFrequencyUIModel( weightUnit, sampleCategoryModel); - ui.setContextValue(model); + this.ui.setContextValue(model); } @Override - public void afterInitUI() { + public void afterInit(SpeciesFrequencyUI ui) { - initUI(ui); + initUI(this.ui); List<Caracteristic> lengthStepCaracterics = Lists.newArrayList(getDataContext().getLengthStepCaracteristics()); @@ -223,14 +220,14 @@ if (getContext().isProtocolFilled()) { // FIXME 20130128 kmorin: the species have no technical id - speciesProtocol = persistenceService.toSpeciesProtocolMap(); + speciesProtocol = getPersistenceService().toSpeciesProtocolMap(); } else { speciesProtocol = Maps.newHashMap(); } Caracteristic modelCaracteristic = model.getLengthStepCaracteristic(); - initBeanFilterableComboBox(ui.getLengthStepCaracteristicComboBox(), + initBeanFilterableComboBox(this.ui.getLengthStepCaracteristicComboBox(), lengthStepCaracterics, modelCaracteristic); @@ -247,13 +244,13 @@ model.setMinStep(null); model.setMaxStep(null); - ui.getRafaleStepField().getTextField().addKeyListener(new KeyAdapter() { + this.ui.getRafaleStepField().getTextField().addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { e.consume(); - Float step = (Float) ui.getRafaleStepField().getModel(); + Float step = (Float) SpeciesFrequencyUIHandler.this.ui.getRafaleStepField().getModel(); applyRafaleStep(step); @@ -282,7 +279,7 @@ getModel().setStep(precision); recomputeRowValidState(rowModel); } - ui.getValidator().doValidate(); + SpeciesFrequencyUIHandler.this.ui.getValidator().doValidate(); } }); @@ -329,7 +326,7 @@ installTableKeyListener(columnModel, table); - listenValidatorValid(ui.getValidator(), model); + listenValidatorValid(this.ui.getValidator(), model); } @Override @@ -353,7 +350,7 @@ getModel().setSimpleCount(null); - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -379,7 +376,7 @@ public void addLengthStepCaracteristic() { // compute list of possible caracteristics (all but the one in the select box) - List<Caracteristic> allNumericCaracteristic = persistenceService.getAllNumericCaracteristic(); + List<Caracteristic> allNumericCaracteristic = getPersistenceService().getAllNumericCaracteristic(); List<Caracteristic> toSelect = Lists.newArrayList(allNumericCaracteristic); List<Caracteristic> knownCaracteristics = getUI().getLengthStepCaracteristicComboBox().getData(); toSelect.removeAll(knownCaracteristics); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -29,6 +29,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil org.jdesktop.swingx.JXTable @@ -45,18 +46,10 @@ <script><![CDATA[ public SplitSpeciesBatchUI(EditCatchesUI parentUI) { - JAXXUtil.initContext(this, parentUI); - SplitSpeciesBatchUIHandler handler = new SplitSpeciesBatchUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <SplitSpeciesBatchUIHandler id='handler' - initializer='getContextValue(SplitSpeciesBatchUIHandler.class)'/> - <SplitSpeciesBatchUIModel id='model' initializer='getContextValue(SplitSpeciesBatchUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,6 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; @@ -36,11 +37,9 @@ 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.species.SpeciesBatchRowModel; -import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; @@ -72,10 +71,8 @@ private static final Log log = LogFactory.getLog(SplitSpeciesBatchUIHandler.class); - public SplitSpeciesBatchUIHandler(EditCatchesUI parentUi, - SplitSpeciesBatchUI ui) { - super(parentUi.getHandler().getContext(), ui, - SplitSpeciesBatchRowModel.PROPERTY_SELECTED, + public SplitSpeciesBatchUIHandler() { + super(SplitSpeciesBatchRowModel.PROPERTY_SELECTED, SplitSpeciesBatchRowModel.PROPERTY_CATEGORY_VALUE, SplitSpeciesBatchRowModel.PROPERTY_WEIGHT); } @@ -154,8 +151,8 @@ } @Override - public void beforeInitUI() { - + public void beforeInit(SplitSpeciesBatchUI ui) { + super.beforeInit(ui); SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); @@ -166,7 +163,7 @@ } @Override - public void afterInitUI() { + public void afterInit(SplitSpeciesBatchUI ui) { initUI(ui); @@ -185,7 +182,7 @@ // fill comboBox with new list List<SampleCategoryModelEntry> data = (List<SampleCategoryModelEntry>) evt.getNewValue(); - ui.getCategoryComboBox().setModel(new DefaultComboBoxModel(data.toArray())); + SplitSpeciesBatchUIHandler.this.ui.getCategoryComboBox().setModel(new DefaultComboBoxModel(data.toArray())); } }); @@ -241,7 +238,7 @@ getModel().setValid(false); getModel().setSelectedCategory(null); - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.MAIN_CARD); } @@ -372,7 +369,7 @@ log.debug("Save UI " + ui); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + EditCatchesUI parent = getParentContainer(EditCatchesUI.class); SplitSpeciesBatchUIModel model = getModel(); if (model.isValid()) { if (model.isSplitMode()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -32,7 +32,6 @@ import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; @@ -55,10 +54,11 @@ UI extends TuttiUI<M, ?>> extends AbstractTuttiTableUIHandler<RM, M, UI> { - private static final Log log = LogFactory.getLog(AbstractCaracteristicTabUIHandler.class); + private static final Log log = + LogFactory.getLog(AbstractCaracteristicTabUIHandler.class); - public AbstractCaracteristicTabUIHandler(EditFishingOperationUI parentUi, UI ui, String... properties) { - super(parentUi.getHandler().getContext(), ui, properties); + public AbstractCaracteristicTabUIHandler(String... properties) { + super(properties); } //------------------------------------------------------------------------// @@ -120,14 +120,15 @@ } @Override - public void beforeInitUI() { + public void beforeInit(UI ui) { + super.beforeInit(ui); M model = createModel(); - getUI().setContextValue(model); + ui.setContextValue(model); } @Override - public void afterInitUI() { - initUI(getUI()); + public void afterInit(UI ui) { + initUI(ui); initBeanFilterableComboBox(getKeyCombo(), Lists.<Caracteristic>newArrayList(), null); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -27,6 +27,7 @@ <import> fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI fr.ifremer.tutti.persistence.entities.referential.Caracteristic + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable @@ -34,12 +35,16 @@ java.awt.Color </import> - <GearUseFeatureTabUIHandler id='handler' - initializer='getContextValue(GearUseFeatureTabUIHandler.class)'/> - <GearUseFeatureTabUIModel id='model' initializer='getContextValue(GearUseFeatureTabUIModel.class)'/> + <script><![CDATA[ + +public GearUseFeatureTabUI(EditFishingOperationUI parentUI) { + TuttiUIUtil.setParentUI(this, parentUI); +} + ]]></script> + <JPopupMenu id='tablePopup'> <JMenuItem id='removeCaracteristicMenu' onActionPerformed='handler.removeCaracteristic()'/> @@ -63,19 +68,4 @@ </JScrollPane> </cell> </row> - <script><![CDATA[ - -public GearUseFeatureTabUI(EditFishingOperationUI parentUI) { - JAXXUtil.initContext(this, parentUI); - GearUseFeatureTabUIHandler handler = new GearUseFeatureTabUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); -} - -protected void $afterCompleteSetup() { - handler.afterInitUI(); -} - - ]]></script> - </Table> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,7 +28,6 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueRenderer; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; @@ -43,9 +42,8 @@ */ public class GearUseFeatureTabUIHandler extends AbstractCaracteristicTabUIHandler<GearUseFeatureRowModel, GearUseFeatureTabUIModel, GearUseFeatureTableModel, GearUseFeatureTabUI> { - public GearUseFeatureTabUIHandler(EditFishingOperationUI parentUi, - GearUseFeatureTabUI ui) { - super(parentUi, ui, GearUseFeatureRowModel.PROPERTY_VALUE); + public GearUseFeatureTabUIHandler() { + super(GearUseFeatureRowModel.PROPERTY_VALUE); } //------------------------------------------------------------------------// @@ -86,8 +84,8 @@ //------------------------------------------------------------------------// @Override - public void afterInitUI() { - super.afterInitUI(); + public void afterInit(GearUseFeatureTabUI ui) { + super.afterInit(ui); JXTable table = getTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -27,6 +27,7 @@ <import> fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI fr.ifremer.tutti.persistence.entities.referential.Caracteristic + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox @@ -36,12 +37,15 @@ java.awt.Color </import> - <VesselUseFeatureTabUIHandler id='handler' - initializer='getContextValue(VesselUseFeatureTabUIHandler.class)'/> - <VesselUseFeatureTabUIModel id='model' initializer='getContextValue(VesselUseFeatureTabUIModel.class)'/> + <script><![CDATA[ +public VesselUseFeatureTabUI(EditFishingOperationUI parentUI) { + TuttiUIUtil.setParentUI(this, parentUI); +} + ]]></script> + <JPopupMenu id='tablePopup'> <JMenuItem id='removeCaracteristicMenu' onActionPerformed='handler.removeCaracteristic()'/> @@ -65,18 +69,4 @@ </JScrollPane> </cell> </row> - <script><![CDATA[ - -public VesselUseFeatureTabUI(EditFishingOperationUI parentUI) { - JAXXUtil.initContext(this, parentUI); - VesselUseFeatureTabUIHandler handler = new VesselUseFeatureTabUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); -} - -protected void $afterCompleteSetup() { - handler.afterInitUI(); -} - - ]]></script> </Table> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,7 +28,6 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueRenderer; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; @@ -43,9 +42,8 @@ */ public class VesselUseFeatureTabUIHandler extends AbstractCaracteristicTabUIHandler<VesselUseFeatureRowModel, VesselUseFeatureTabUIModel, VesselUseFeatureTableModel, VesselUseFeatureTabUI> { - public VesselUseFeatureTabUIHandler(EditFishingOperationUI parentUi, - VesselUseFeatureTabUI ui) { - super(parentUi, ui, VesselUseFeatureRowModel.PROPERTY_VALUE); + public VesselUseFeatureTabUIHandler() { + super(VesselUseFeatureRowModel.PROPERTY_VALUE); } //------------------------------------------------------------------------// @@ -86,8 +84,8 @@ //------------------------------------------------------------------------// @Override - public void afterInitUI() { - super.afterInitUI(); + public void afterInit(VesselUseFeatureTabUI ui) { + super.afterInit(ui); JXTable table = getTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -29,6 +29,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox @@ -39,20 +40,10 @@ <script><![CDATA[ public EditProgramUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - EditProgramUIHandler handler = new EditProgramUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } ]]></script> - <EditProgramUIHandler id='handler' - initializer='getContextValue(EditProgramUIHandler.class)'/> - <EditProgramUIModel id='model' initializer='getContextValue(EditProgramUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -25,11 +25,9 @@ */ import com.google.common.collect.Lists; +import fr.ifremer.shared.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.data.Program; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.shared.application.swing.util.CloseableUI; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -61,21 +59,10 @@ return result; } - /** - * Persistence service. - * - * @since 0.1 - */ - private final PersistenceService persistenceService; - - public EditProgramUIHandler(TuttiUI<?,?> parentUi, EditProgramUI ui) { - super(parentUi.getHandler().getContext(), ui); - this.persistenceService = getContext().getPersistenceService(); - } - @Override - public void beforeInitUI() { + public void beforeInit(EditProgramUI ui) { + super.beforeInit(ui); getDataContext().resetValidationDataContext(); EditProgramUIModel model = new EditProgramUIModel(); @@ -92,7 +79,7 @@ log.info("Edit existing program " + programId); } // load existing program - Program program = persistenceService.getProgram(programId); + Program program = getPersistenceService().getProgram(programId); model.fromBean(program); } @@ -103,13 +90,13 @@ } @Override - public void afterInitUI() { + public void afterInit(EditProgramUI ui) { initUI(ui); EditProgramUIModel model = getModel(); initBeanFilterableComboBox(ui.getZoneComboBox(), - Lists.newArrayList(persistenceService.getAllProgramZone()), + Lists.newArrayList(getPersistenceService().getAllProgramZone()), model.getZone()); SwingValidator validator = ui.getValidator(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanDoubleList @@ -48,21 +49,11 @@ <script><![CDATA[ public EditProtocolUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - EditProtocolUIHandler handler = new EditProtocolUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } ]]> </script> - <EditProtocolUIHandler id='handler' - initializer='getContextValue(EditProtocolUIHandler.class)'/> - <EditProtocolUIModel id='model' initializer='getContextValue(EditProtocolUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -29,6 +29,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; +import fr.ifremer.shared.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; @@ -37,14 +38,11 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiDecorator; import fr.ifremer.tutti.ui.swing.action.CloneProtocolAction; import fr.ifremer.tutti.ui.swing.action.EditProtocolAction; import fr.ifremer.tutti.ui.swing.action.ImportProtocolAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.shared.application.swing.util.CloseableUI; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; @@ -97,8 +95,6 @@ private static final Log log = LogFactory.getLog(EditProtocolUIHandler.class); -// public static final String SPECIES_DECORATOR_INDEX = "decoratorIndex"; - public static String getTitle(boolean exist) { String result; @@ -112,23 +108,10 @@ protected SelectSpeciesUI dialog; - /** - * Persistence service. - * - * @since 0.2 - */ - protected final PersistenceService persistenceService; + protected SampleCategoryModel sampleCategoryModel; - protected final SampleCategoryModel sampleCategoryModel; - protected List<BeanDoubleList<Caracteristic>> allDoubleLists; - public EditProtocolUIHandler(TuttiUI<?,?> parentUi, EditProtocolUI ui) { - super(parentUi.getHandler().getContext(), ui); - this.persistenceService = getContext().getPersistenceService(); - this.sampleCategoryModel = getContext().getDataContext().getSampleCategoryModel(); - } - public JXTable getSpeciesTable() { return ui.getSpeciesTable(); } @@ -155,8 +138,11 @@ } @Override - public void beforeInitUI() { + public void beforeInit(EditProtocolUI ui) { + super.beforeInit(ui); + this.sampleCategoryModel = getContext().getDataContext().getSampleCategoryModel(); + incrementsMessage("Chargement des réferentiels"); getDataContext().resetValidationDataContext(); @@ -188,13 +174,13 @@ // afterUI method to fill model listModelIsModify(model); - ui.setContextValue(model); + this.ui.setContextValue(model); } @Override - public void afterInitUI() { + public void afterInit(EditProtocolUI ui) { - initUI(ui); + initUI(this.ui); EditProtocolUIModel model = getModel(); @@ -208,41 +194,41 @@ protocol = getDataContext().getProtocol(); - if (EditProtocolAction.CLEAN_PROTOCOL_ENTRY.getContextValue(ui) != null) { + if (EditProtocolAction.CLEAN_PROTOCOL_ENTRY.getContextValue(this.ui) != null) { // clean protocol - protocol = EditProtocolAction.CLEAN_PROTOCOL_ENTRY.getContextValue(ui); + protocol = EditProtocolAction.CLEAN_PROTOCOL_ENTRY.getContextValue(this.ui); - EditProtocolAction.CLEAN_PROTOCOL_ENTRY.removeContextValue(ui); + EditProtocolAction.CLEAN_PROTOCOL_ENTRY.removeContextValue(this.ui); model.setCleaned(true); - ui.getSaveWarning().setText(_("tutti.editProtocol.warn.clean")); + this.ui.getSaveWarning().setText(_("tutti.editProtocol.warn.clean")); } model.fromBean(protocol); - } else if ((protocol = ImportProtocolAction.IMPORT_PROTOCOL_ENTRY.getContextValue(ui)) != null) { + } else if ((protocol = ImportProtocolAction.IMPORT_PROTOCOL_ENTRY.getContextValue(this.ui)) != null) { incrementsMessage("Import du protocole"); // import protocol - ImportProtocolAction.IMPORT_PROTOCOL_ENTRY.removeContextValue(ui); + ImportProtocolAction.IMPORT_PROTOCOL_ENTRY.removeContextValue(this.ui); model.fromBean(protocol); model.setImported(true); - ui.getSaveWarning().setText(_("tutti.editProtocol.warn.import")); + this.ui.getSaveWarning().setText(_("tutti.editProtocol.warn.import")); - } else if ((protocol = CloneProtocolAction.CLONE_PROTOCOL_ENTRY.getContextValue(ui)) != null) { + } else if ((protocol = CloneProtocolAction.CLONE_PROTOCOL_ENTRY.getContextValue(this.ui)) != null) { incrementsMessage("Clone du protocole"); // clone protocol - CloneProtocolAction.CLONE_PROTOCOL_ENTRY.removeContextValue(ui); + CloneProtocolAction.CLONE_PROTOCOL_ENTRY.removeContextValue(this.ui); model.fromBean(protocol); model.setCloned(true); - ui.getSaveWarning().setText(_("tutti.editProtocol.warn.clone")); + this.ui.getSaveWarning().setText(_("tutti.editProtocol.warn.clone")); } else { @@ -259,7 +245,7 @@ model.setLengthClassesPmfmId(Lists.<String>newArrayList()); } - SwingValidator validator = ui.getValidator(); + SwingValidator validator = this.ui.getValidator(); listenValidatorValid(validator, model); registerValidators(validator); @@ -267,9 +253,9 @@ Collection<Species> referents = model.getAllReferentSpeciesByTaxonId().values(); - initBeanFilterableComboBox(ui.getSpeciesComboBox(), + initBeanFilterableComboBox(this.ui.getSpeciesComboBox(), Lists.newArrayList(referents), null); - initBeanFilterableComboBox(ui.getBenthosComboBox(), + initBeanFilterableComboBox(this.ui.getBenthosComboBox(), Lists.newArrayList(referents), null); List<EditProtocolSpeciesRowModel> speciesRows; @@ -297,8 +283,8 @@ model.setSpeciesRow(speciesRows); model.setBenthosRow(benthosRows); - ui.getSpeciesComboBox().reset(); - ui.getBenthosComboBox().reset(); + this.ui.getSpeciesComboBox().reset(); + this.ui.getBenthosComboBox().reset(); { // create species table model @@ -419,36 +405,36 @@ } allDoubleLists = Lists.newArrayList( - ui.getLengthClassesList(), - ui.getGearUseFeatureList(), - ui.getIndividualObservationList(), - ui.getVesselUseFeatureList() + this.ui.getLengthClassesList(), + this.ui.getGearUseFeatureList(), + this.ui.getIndividualObservationList(), + this.ui.getVesselUseFeatureList() ); initDoubleList(EditProtocolUIModel.PROPERTY_LENGTH_CLASSES_PMFM_ID, - ui.getLengthClassesList(), + this.ui.getLengthClassesList(), Lists.newArrayList(model.getCaracteristics()), model.getLengthClassesPmfmId()); initDoubleList(EditProtocolUIModel.PROPERTY_GEAR_USE_FEATURE_PMFM_ID, - ui.getGearUseFeatureList(), + this.ui.getGearUseFeatureList(), Lists.newArrayList(model.getCaracteristics()), model.getGearUseFeaturePmfmId()); initDoubleList(EditProtocolUIModel.PROPERTY_VESSEL_USE_FEATURE_PMFM_ID, - ui.getVesselUseFeatureList(), + this.ui.getVesselUseFeatureList(), Lists.newArrayList(model.getCaracteristics()), model.getVesselUseFeaturePmfmId()); initDoubleList(EditProtocolUIModel.PROPERTY_INDIVIDUAL_OBSERVATION_PMFM_ID, - ui.getIndividualObservationList(), + this.ui.getIndividualObservationList(), Lists.newArrayList(model.getCaracteristics()), model.getIndividualObservationPmfmId()); // if new protocol can already cancel his creation model.setModify(model.isCreate() || model.isCleaned()); - ui.getCaracteristicPane().addChangeListener(new ChangeListener() { + this.ui.getCaracteristicPane().addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { JTabbedPane tabPanel = (JTabbedPane) e.getSource(); @@ -457,19 +443,19 @@ log.debug("selected " + selectedIndex); switch (selectedIndex) { case 0: - selectedDoubleList = ui.getLengthClassesList(); + selectedDoubleList = EditProtocolUIHandler.this.ui.getLengthClassesList(); break; case 1: - selectedDoubleList = ui.getGearUseFeatureList(); + selectedDoubleList = EditProtocolUIHandler.this.ui.getGearUseFeatureList(); break; case 2: - selectedDoubleList = ui.getIndividualObservationList(); + selectedDoubleList = EditProtocolUIHandler.this.ui.getIndividualObservationList(); break; case 3: - selectedDoubleList = ui.getVesselUseFeatureList(); + selectedDoubleList = EditProtocolUIHandler.this.ui.getVesselUseFeatureList(); break; default: @@ -481,7 +467,7 @@ } }); - dialog = new SelectSpeciesUI(ui); + dialog = new SelectSpeciesUI(this.ui); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil static org.nuiton.i18n.I18n._ </import> @@ -37,21 +38,10 @@ <script><![CDATA[ public ManageTemporaryReferentialUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - ManageTemporaryReferentialUIHandler handler = - new ManageTemporaryReferentialUIHandler(parentUI.getHandler().getContext(), this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } ]]></script> - <ManageTemporaryReferentialUIHandler id='handler' - initializer='getContextValue(ManageTemporaryReferentialUIHandler.class)'/> - <TuttiUIContext id='model' initializer='getContextValue(TuttiUIContext.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -24,7 +24,6 @@ * #L% */ -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import jaxx.runtime.validator.swing.SwingValidator; @@ -45,24 +44,17 @@ protected JComponent currentBody; - protected final PersistenceService persistenceService; - - protected ManageTemporaryReferentialUIHandler(TuttiUIContext context, - ManageTemporaryReferentialUI ui) { - super(context, ui); - this.persistenceService = context.getPersistenceService(); - } - //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(ManageTemporaryReferentialUI ui) { + super.beforeInit(ui); } @Override - public void afterInitUI() { + public void afterInit(ManageTemporaryReferentialUI ui) { initUI(ui); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -27,6 +27,7 @@ <import> fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.FileEditor jaxx.runtime.swing.editor.bean.BeanFilterableComboBox @@ -40,20 +41,10 @@ <script><![CDATA[ public ReportUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - ReportUIHandler handler = new ReportUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - - protected void $afterCompleteSetup() { - handler.afterInitUI(); - } ]]></script> - <ReportUIHandler id='handler' - initializer='getContextValue(ReportUIHandler.class)'/> - <ReportUIModel id='model' initializer='getContextValue(ReportUIModel.class)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -29,7 +29,6 @@ import fr.ifremer.shared.application.swing.util.CloseableUI; import fr.ifremer.tutti.service.report.ReportService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.swing.editor.FileEditor; import jaxx.runtime.validator.swing.SwingValidator; @@ -55,20 +54,12 @@ /** Logger. */ private static final Log log = LogFactory.getLog(ReportUIHandler.class); - /** - * Persistence service. - * - * @since 0.1 - */ - private final ReportService reportService; + @Override + public void beforeInit(ReportUI ui) { - public ReportUIHandler(TuttiUI<?, ?> parentUi, ReportUI ui) { - super(parentUi.getHandler().getContext(), ui); - this.reportService = getContext().getReportService(); - } + super.beforeInit(ui); - @Override - public void beforeInitUI() { + ReportService reportService = getContext().getReportService(); getDataContext().resetValidationDataContext(); @@ -88,7 +79,7 @@ } @Override - public void afterInitUI() { + public void afterInit(ReportUI ui) { initUI(ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -42,10 +42,6 @@ DelegateTabContainerHandler delegateTabHandler; - protected AbstractTuttiTabContainerUIHandler(TuttiUIContext context, UI ui) { - super(context, ui); - } - /** * Returns the tab handler of the tab i. * Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -34,7 +34,10 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; +import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiDataContext; +import fr.ifremer.tutti.service.ValidationService; +import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; @@ -71,10 +74,6 @@ private static final Log log = LogFactory.getLog(AbstractTuttiUIHandler.class); - protected AbstractTuttiUIHandler(TuttiUIContext context, UI ui) { - super(context, ui); - } - //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// @@ -97,6 +96,18 @@ return getContext().getConfig(); } + public PersistenceService getPersistenceService() { + return getContext().getPersistenceService(); + } + + public ValidationService getValidationService() { + return getContext().getValidationService(); + } + + public ValidateCruiseOperationsService getValidateCruiseOperationsService() { + return getContext().getValidateCruiseOperationsService(); + } + @Override public Component getTopestUI() { Component result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -31,6 +31,9 @@ import fr.ifremer.shared.application.swing.util.ApplicationUIUtil; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiDecorator; +import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -78,6 +81,15 @@ // never instanciate util class } + public static TuttiUIContext getApplicationContext(JAXXObject ui) { + return (TuttiUIContext) ApplicationUIUtil.getApplicationContext(ui); + } + + public static void setParentUI(JAXXObject ui, TuttiUI<?, ?> parentUI) { + JAXXUtil.initContext(ui, parentUI); + setApplicationContext(ui, parentUI.getHandler().getContext()); + } + public static void tryToConnectToUpdateUrl(String urlAsString, String badUrlFormatI18nKey, String notReachI18nKey, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,6 +26,7 @@ <import> fr.ifremer.tutti.ui.swing.TuttiUIContext + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.FileEditor org.jdesktop.swingx.JXTitledPanel @@ -42,23 +43,13 @@ <TuttiUIContext id='model' initializer='getContextValue(TuttiUIContext.class)'/> - <AttachmentEditorUIHandler id='handler' - initializer='getContextValue(AttachmentEditorUIHandler.class)'/> - <script><![CDATA[ public AttachmentEditorUI(TuttiUIContext context) { super(context.getMainUI()); - setContextValue(context); - AttachmentEditorUIHandler handler = new AttachmentEditorUIHandler(context, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setApplicationContext(this, context); } -protected void $afterCompleteSetup() { - getHandler().afterInitUI(); -} - public void openEditor(JComponent component) { handler.openEditor(component); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -27,7 +27,6 @@ import fr.ifremer.shared.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; -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; @@ -67,27 +66,9 @@ public static final String SHOW_DIALOG_ACTION = "showDialog"; - protected final AttachmentEditorUI ui; - - protected final PersistenceService persistenceService; - - protected final TuttiUIContext context; - - public AttachmentEditorUIHandler(TuttiUIContext context, - AttachmentEditorUI ui) { - super(context, ui); - this.context = context; - this.ui = ui; - this.persistenceService = context.getPersistenceService(); - } - @Override - public void beforeInitUI() { - } + public void afterInit(AttachmentEditorUI ui) { - @Override - public void afterInitUI() { - ui.getFile().setDialogOwner(ui); ui.pack(); ui.setResizable(true); @@ -111,8 +92,8 @@ @Override public void actionPerformed(ActionEvent e) { - ui.dispose(); - ui.setVisible(false); + AttachmentEditorUIHandler.this.ui.dispose(); + AttachmentEditorUIHandler.this.ui.setVisible(false); } }; @@ -122,7 +103,7 @@ @Override public void actionPerformed(ActionEvent e) { - ui.setVisible(true); + AttachmentEditorUIHandler.this.ui.setVisible(true); } }; @@ -230,7 +211,7 @@ attachment.setName(name); attachment.setComment(ui.getFileComment().getText()); - attachment = persistenceService.createAttachment(attachment, file); + attachment = getPersistenceService().createAttachment(attachment, file); bean.addAttachment(attachment); resetFields(); @@ -254,7 +235,7 @@ } public void openAttachment(Attachment attachment) { - File file = persistenceService.getAttachmentFile(attachment.getId()); + File file = getPersistenceService().getAttachmentFile(attachment.getId()); if (!file.exists()) { throw new ApplicationTechnicalException(_("tutti.attachmentEditor.fileNotFound", file.getAbsolutePath())); @@ -275,34 +256,6 @@ this, SaveAttachmentAction.class); action.setAttachment(attachment); getContext().getActionEngine().runAction(action); - -// boolean hackDialog = ui.isAlwaysOnTop(); -// if (hackDialog) { -// ui.setAlwaysOnTop(false); -// } -// try { -// File attachmentFile = persistenceService.getAttachmentFile(attachment.getId()); -// File file = TuttiUIUtil.saveFile( -// attachment.getName(), -// ui, -// _("tutti.attachmentEditor.saveAttachment.title"), -// _("tutti.attachmentEditor.saveAttachment.button")); -// -// if (file != null) { -// boolean checkOverwrite = askOverwriteFile(file); -// if (checkOverwrite) { -// TuttiIOUtil.copyFile(attachmentFile, file, -// _("tutti.attachmentEditor.saveAttachment.error.message", attachmentFile, file.getName())); -// context.showInformationMessage( -// _("tutti.attachmentEditor.saveAttachment.success.message", file.getName())); -// } -// } -// -// } finally { -// if (hackDialog) { -// ui.setAlwaysOnTop(true); -// } -// } } public void removeAttachment(AttachmentItem attachmentItem) { @@ -322,7 +275,7 @@ if (answer == JOptionPane.YES_OPTION) { AttachmentModelAware bean = ui.getBean(); - persistenceService.deleteAttachment(attachment.getId()); + getPersistenceService().deleteAttachment(attachment.getId()); bean.removeAttachment(attachment); ui.getAttachments().remove(attachmentItem); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -25,6 +25,7 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Caracteristic fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable @@ -32,9 +33,13 @@ java.awt.Color </import> - <CaracteristicMapEditorUIHandler id='handler' - initializer='getContextValue(CaracteristicMapEditorUIHandler.class)'/> + <script><![CDATA[ +public CaracteristicMapEditorUI(TuttiUI parentUI) { + TuttiUIUtil.setParentUI(this, parentUI); +} + ]]></script> + <CaracteristicMapEditorUIModel id='model' initializer='getContextValue(CaracteristicMapEditorUIModel.class)'/> @@ -71,19 +76,4 @@ </JPanel> </cell> </row> - <script><![CDATA[ - -public CaracteristicMapEditorUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - CaracteristicMapEditorUIHandler handler = new CaracteristicMapEditorUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); -} - -protected void $afterCompleteSetup() { - handler.afterInitUI(); -} - - ]]></script> - </Table> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,12 +26,11 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; @@ -61,9 +60,8 @@ protected CaracteristicMapCellEditor caracteristicMapCellEditor; - public CaracteristicMapEditorUIHandler(TuttiUI parentUi, - CaracteristicMapEditorUI ui) { - super(parentUi.getHandler().getContext(), ui, CaracteristicMapEditorRowModel.PROPERTY_VALUE); + public CaracteristicMapEditorUIHandler() { + super(CaracteristicMapEditorRowModel.PROPERTY_VALUE); } //------------------------------------------------------------------------// @@ -124,14 +122,15 @@ //------------------------------------------------------------------------// @Override - public void beforeInitUI() { + public void beforeInit(CaracteristicMapEditorUI ui) { + super.beforeInit(ui); CaracteristicMapEditorUIModel model = new CaracteristicMapEditorUIModel(); - getUI().setContextValue(model); + ui.setContextValue(model); } @Override - public void afterInitUI() { - initUI(getUI()); + public void afterInit(CaracteristicMapEditorUI ui) { + initUI(ui); initBeanFilterableComboBox(getKeyCombo(), Lists.<Caracteristic>newArrayList(), null); getModel().setAvailableCaracteristics(Lists.newArrayList(getDataContext().getCaracteristicWithProtected())); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,6 +26,7 @@ <import> fr.ifremer.tutti.persistence.entities.CommentAware fr.ifremer.tutti.ui.swing.TuttiUIContext + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil org.jdesktop.swingx.JXTitledPanel javax.swing.JComponent @@ -35,16 +36,9 @@ public CommentEditorUI(TuttiUIContext context) { super(context.getMainUI()); - setContextValue(context); - CommentEditorUIHandler handler = new CommentEditorUIHandler(context, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setApplicationContext(this, context); } -protected void $afterCompleteSetup() { - getHandler().afterInitUI(); -} - public void openEditor(JComponent component) { handler.openEditor(component); } @@ -57,9 +51,6 @@ <!-- bean property --> <CommentAware id='bean' javaBean='null'/> - <CommentEditorUIHandler id='handler' - initializer='getContextValue(CommentEditorUIHandler.class)'/> - <JXTitledPanel id='commentEditorTopPanel' constraints='BorderLayout.CENTER'> <JScrollPane> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,7 +26,9 @@ import fr.ifremer.tutti.persistence.entities.CommentAware; import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.ComponentMover; import jaxx.runtime.swing.ComponentResizer; @@ -48,7 +50,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.1 */ -public class CommentEditorUIHandler { +public class CommentEditorUIHandler implements UIHandler<CommentEditorUI> { private static final int DEFAULT_EDITOR_WIDTH = 400; @@ -58,20 +60,19 @@ public static final String SHOW_DIALOG_ACTION = "showDialog"; - protected final TuttiUIContext context; + protected TuttiUIContext context; - private final CommentEditorUI ui; + private CommentEditorUI ui; - public CommentEditorUIHandler(TuttiUIContext context, CommentEditorUI ui) { - this.context = context; + @Override + public void beforeInit(CommentEditorUI ui) { this.ui = ui; + this.context = TuttiUIUtil.getApplicationContext(ui); } - protected void beforeInitUI() { - } + @Override + public void afterInit(CommentEditorUI ui) { - protected void afterInitUI() { - ui.pack(); ui.setResizable(true); // ui.setSize(800, 300); @@ -97,8 +98,8 @@ @Override public void actionPerformed(ActionEvent e) { - ui.dispose(); - ui.setVisible(false); + CommentEditorUIHandler.this.ui.dispose(); + CommentEditorUIHandler.this.ui.setVisible(false); } }; @@ -108,7 +109,7 @@ @Override public void actionPerformed(ActionEvent e) { - ui.setVisible(true); + CommentEditorUIHandler.this.ui.setVisible(true); } }; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx 2013-11-28 17:55:19 UTC (rev 1410) @@ -27,24 +27,17 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Species fr.ifremer.tutti.ui.swing.util.TuttiUI + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> <script><![CDATA[ public SelectSpeciesUI(TuttiUI parentUI) { - JAXXUtil.initContext(this, parentUI); - SelectSpeciesUIHandler handler = new SelectSpeciesUIHandler(parentUI, this); - setContextValue(handler); - handler.beforeInitUI(); + TuttiUIUtil.setParentUI(this, parentUI); } - -protected void $afterCompleteSetup() { handler.afterInitUI(); } ]]></script> - <SelectSpeciesUIHandler id='handler' - initializer='getContextValue(SelectSpeciesUIHandler.class)'/> - <SelectSpeciesUIModel id='model' initializer='getContextValue(SelectSpeciesUIModel.class)'/> @@ -52,10 +45,8 @@ constructorParams='this' genericType='Species'/> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> - <JButton id='cancelButton' - onActionPerformed='handler.cancel()'/> - <JButton id='validateButton' - onActionPerformed='handler.validate()'/> + <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> + <JButton id='validateButton' onActionPerformed='handler.validate()'/> </JPanel> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -28,7 +28,6 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,18 +45,15 @@ private static final Log log = LogFactory.getLog(SelectSpeciesUIHandler.class); - public SelectSpeciesUIHandler(TuttiUI parentUI, SelectSpeciesUI ui) { - super(parentUI.getHandler().getContext(), ui); - } - @Override - public void beforeInitUI() { + public void beforeInit(SelectSpeciesUI ui) { + super.beforeInit(ui); SelectSpeciesUIModel model = new SelectSpeciesUIModel(); ui.setContextValue(model); } @Override - public void afterInitUI() { + public void afterInit(SelectSpeciesUI ui) { initUI(ui); initBeanFilterableComboBox(ui.getSpeciesCombo(), @@ -69,7 +65,7 @@ new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - ui.getSpeciesCombo().getHandler().sortData(); + SelectSpeciesUIHandler.this.ui.getSpeciesCombo().getHandler().sortData(); } }); } @@ -92,11 +88,11 @@ } public void validate() { - closeDialog(ui); + closeDialog(); } public void cancel() { getModel().setSelectedSpecies(null); - closeDialog(ui); + closeDialog(); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-11-28 17:46:39 UTC (rev 1409) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-11-28 17:55:19 UTC (rev 1410) @@ -26,19 +26,17 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; +import fr.ifremer.shared.application.swing.computable.ComputableDataTableCell.TuttiComputedOrNotDataTableCellEditor; import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.shared.application.swing.table.MoveToNextEditableCellAction; import fr.ifremer.shared.application.swing.table.MoveToNextEditableRowAction; import fr.ifremer.shared.application.swing.table.MoveToPreviousEditableCellAction; import fr.ifremer.shared.application.swing.table.MoveToPreviousEditableRowAction; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryComponent.SampleCategoryEditor; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.shared.application.swing.computable.ComputableDataTableCell.TuttiComputedOrNotDataTableCellEditor; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import org.apache.commons.collections.CollectionUtils; @@ -132,20 +130,8 @@ */ private final TuttiBeanMonitor<R> rowMonitor; - /** - * Persistence service. - * - * @since 0.2 - */ - protected final PersistenceService persistenceService; + protected AbstractTuttiTableUIHandler(String... properties) { - protected AbstractTuttiTableUIHandler(TuttiUIContext context, - UI ui, - String... properties) { - super(context, ui); - - this.persistenceService = context.getPersistenceService(); - rowMonitor = new TuttiBeanMonitor<R>(properties); // listen when bean is changed