Author: tchemit Date: 2013-02-06 11:54:11 +0100 (Wed, 06 Feb 2013) New Revision: 349 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/349 Log: add UI generic parameter in handler and in actions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractChangeScreenAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateApplicationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java 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/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java 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/ValidateCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 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/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SelectFishingOperationAction.java 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/ImportPupitriAction.java 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/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 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/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 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/CaracteristicTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java 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/SaveProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java 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/ExportAllCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 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/util/AbstractTuttiTabContainerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractChangeScreenAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractChangeScreenAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractChangeScreenAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -33,7 +33,7 @@ * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public abstract class AbstractChangeScreenAction extends AbstractTuttiAction<TuttiUIContext, MainUIHandler> { +public abstract class AbstractChangeScreenAction extends AbstractTuttiAction<TuttiUIContext, MainUI, MainUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -57,7 +57,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public abstract class AbstractTuttiAction<M extends AbstractBean, H extends AbstractTuttiUIHandler<M>> extends AbstractAction { +public abstract class AbstractTuttiAction<M extends AbstractBean, UI extends TuttiUI<M, ?>, H extends AbstractTuttiUIHandler<M, UI>> extends AbstractAction { private static final long serialVersionUID = 1L; @@ -92,6 +92,10 @@ putValue(SHORT_DESCRIPTION, tip); } + public final UI getUI() { + return handler.getUI(); + } + protected String getActionName() { return (String) getValue("actionName"); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -89,7 +89,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public abstract class AbstractTuttiUIHandler<M> implements UIMessageNotifier { +public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> implements UIMessageNotifier { /** Logger. */ private static final Log log = @@ -101,14 +101,25 @@ public abstract void onCloseUI(); - public abstract M getModel(); - public abstract SwingValidator<M> getValidator(); + /** + * Global application context. + * + * @since 0.1 + */ protected final TuttiUIContext context; - protected AbstractTuttiUIHandler(TuttiUIContext context) { + /** + * UI handled. + * + * @since 0.1 + */ + protected final UI ui; + + protected AbstractTuttiUIHandler(TuttiUIContext context, UI ui) { this.context = context; + this.ui = ui; } //------------------------------------------------------------------------// @@ -128,6 +139,14 @@ return new DefaultComboBoxModel(items.toArray()); } + public final M getModel() { + return ui.getModel(); + } + + public final UI getUI() { + return ui; + } + @Override public void showInformationMessage(String message) { context.showInformationMessage(message); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -60,22 +60,19 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext> { +public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, MainUI> { /** Logger. */ private static final Log log = LogFactory.getLog(MainUIHandler.class); public static final String CLONE_PROTOCOL = "cloneProtocol"; - protected MainUI ui; - protected JComponent currentBody; protected final PersistenceService persistenceService; protected MainUIHandler(TuttiUIContext context, MainUI ui) { - super(context); - this.ui = ui; + super(context, ui); this.persistenceService = context.getService(PersistenceService.class); context.addMessageNotifier(this); context.setMainUI(ui); @@ -139,11 +136,6 @@ } @Override - public TuttiUIContext getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<TuttiUIContext> getValidator() { return null; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java 2013-02-06 10:54:11 UTC (rev 349) @@ -32,7 +32,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public interface TuttiUI<M, H extends AbstractTuttiUIHandler<M>> extends JAXXObject { +public interface TuttiUI<M, H extends AbstractTuttiUIHandler<M, ?>> extends JAXXObject { M getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateApplicationAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateApplicationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -40,7 +40,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class UpdateApplicationAction extends AbstractTuttiAction<TuttiUIContext, MainUIHandler> { +public class UpdateApplicationAction extends AbstractTuttiAction<TuttiUIContext, MainUI, MainUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -40,7 +40,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class UpdateReferentialAction extends AbstractTuttiAction<TuttiUIContext, MainUIHandler> { +public class UpdateReferentialAction extends AbstractTuttiAction<TuttiUIContext, MainUI, MainUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class CancelEditCruiseAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUIHandler> { +public class CancelEditCruiseAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUI, EditCruiseUIHandler> { private static final long serialVersionUID = 1L; 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -54,19 +54,12 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public class EditCruiseUIHandler extends AbstractTuttiUIHandler<EditCruiseUIModel> { +public class EditCruiseUIHandler extends AbstractTuttiUIHandler<EditCruiseUIModel, EditCruiseUI> { /** Logger. */ private static final Log log = LogFactory.getLog(EditCruiseUIHandler.class); /** - * UI. - * - * @since 0.1 - */ - private final EditCruiseUI ui; - - /** * Persistence service. * * @since 0.1 @@ -74,8 +67,7 @@ private final PersistenceService persistenceService; public EditCruiseUIHandler(TuttiUI parentUi, EditCruiseUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); } @@ -279,11 +271,6 @@ } @Override - public EditCruiseUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditCruiseUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public class SaveCruiseAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUIHandler> { +public class SaveCruiseAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUI, EditCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class CloneProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class CloneProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class DeleteProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class DeleteProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class EditCatchesAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class EditCatchesAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class EditCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class EditCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class EditProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class EditProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class EditProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class EditProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -43,7 +43,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class ExportProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -44,7 +44,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class ImportProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class NewCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class NewCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class NewProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class NewProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class NewProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class NewProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -51,7 +51,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUIModel> { +public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUIModel, SelectCruiseUI> { /** Logger. */ private static final Log log = @@ -59,20 +59,12 @@ protected final PersistenceService persistenceService; - protected final SelectCruiseUI ui; - public SelectCruiseUIHandler(TuttiUI<?, ?> parentUI, SelectCruiseUI ui) { - super(parentUI.getHandler().getContext()); - this.ui = ui; + super(parentUI.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); } @Override - public SelectCruiseUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SelectCruiseUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ValidateCatchesAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class ValidateCatchesAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,7 +52,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.2 */ -public abstract class AbstractTuttiBatchTableUIHandler<R extends AbstractTuttiBeanUIModel, M extends AbstractTuttiBatchUIModel<R, M>> extends AbstractTuttiTableUIHandler<R, M> { +public abstract class AbstractTuttiBatchTableUIHandler<R extends AbstractTuttiBeanUIModel, M extends AbstractTuttiBatchUIModel<R, M>, UI extends TuttiUI<M, ?>> extends AbstractTuttiTableUIHandler<R, M, UI> { /** Logger. */ private static final Log log = @@ -61,8 +61,9 @@ public abstract void selectFishingOperation(FishingOperation bean); protected AbstractTuttiBatchTableUIHandler(TuttiUI<?, ?> parentUi, + UI ui, String... properties) { - super(parentUi.getHandler().getContext(), properties); + super(parentUi.getHandler().getContext(), ui, properties); } public final void saveSelectedRowIfRequired(FocusEvent event) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -34,7 +34,7 @@ * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public class AttachmentsAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUIHandler> { +public class AttachmentsAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public class CancelEditFishingOperationAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUIHandler> { +public class CancelEditFishingOperationAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { private static final long serialVersionUID = 1L; @@ -76,8 +76,11 @@ log.info("Cancel edition for fishingOperation "); } // cancel to create a new fishingOperation - parentUi.getFishingOperationTabContent().getHandler().selectFishingOperation(null); - parentUi.getCatchesTabContent().getHandler().selectFishingOperation(null, ""); + delegate.setFishingOperation(null); + delegate.doAction(event); + +// parentUi.getFishingOperationTabContent().getHandler().selectFishingOperation(null); +// parentUi.getCatchesTabContent().getHandler().selectFishingOperation(null, ""); // parentHandler.closeCurrentFishingOperation(); } else { 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -73,15 +73,13 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHandler<EditFishingOperationUIModel> +public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHandler<EditFishingOperationUIModel, EditFishingOperationUI> implements TabHandler { /** Logger. */ private static final Log log = LogFactory.getLog(EditFishingOperationUIHandler.class); - private final EditFishingOperationUI ui; - private final FishingOperationsUI parentUi; private final PersistenceService persistenceService; @@ -114,8 +112,7 @@ public EditFishingOperationUIHandler(FishingOperationsUI parentUi, EditFishingOperationUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); this.parentUi = parentUi; this.persistenceService = context.getService(PersistenceService.class); this.fishingOperationMonitor = new TuttiBeanMonitor<EditFishingOperationUIModel>( @@ -407,11 +404,6 @@ } @Override - public EditFishingOperationUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditFishingOperationUIModel> getValidator() { return ui.getValidator(); } 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -51,14 +51,12 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandler<FishingOperationsUIModel> { +public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandler<FishingOperationsUIModel, FishingOperationsUI> { /** Logger. */ private static final Log log = LogFactory.getLog(FishingOperationsUIHandler.class); - private final FishingOperationsUI ui; - private final PersistenceService persistenceService; private static final ExecutorService executorService = @@ -70,8 +68,7 @@ public FishingOperationsUIHandler(TuttiUI parentUI, FishingOperationsUI ui) { - super(parentUI.getHandler().getContext()); - this.ui = ui; + super(parentUI.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); } @@ -197,11 +194,6 @@ } @Override - public FishingOperationsUIModel getModel() { - return ui.getModel(); - } - - @Override public boolean canCloseUI(TuttiScreen nextScreen) { boolean result = super.canCloseUI(nextScreen); if (getTabPanel().getSelectedIndex() == 0) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -36,7 +36,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportCasinoAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUIHandler> { +public class ImportCasinoAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class NewFishingOperationAction extends AbstractTuttiAction<FishingOperationsUIModel, FishingOperationsUIHandler> { +public class NewFishingOperationAction extends AbstractTuttiAction<FishingOperationsUIModel, FishingOperationsUI, FishingOperationsUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -51,7 +51,7 @@ * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public class SaveFishingOperationAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUIHandler> { +public class SaveFishingOperationAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SelectFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SelectFishingOperationAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SelectFishingOperationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -32,6 +32,7 @@ import javax.swing.JLabel; import javax.swing.JTabbedPane; +import javax.swing.SwingUtilities; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -43,7 +44,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class SelectFishingOperationAction extends AbstractTuttiAction<FishingOperationsUIModel, FishingOperationsUIHandler> { +public class SelectFishingOperationAction extends AbstractTuttiAction<FishingOperationsUIModel, FishingOperationsUI, FishingOperationsUIHandler> { private static final long serialVersionUID = 1L; @@ -128,6 +129,12 @@ } - ui.repaint(); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + getHandler().getUi().repaint(); + } + }); + } } \ No newline at end of file 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -24,6 +24,8 @@ * #L% */ +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.PersistenceService; @@ -34,6 +36,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import jaxx.runtime.swing.CardLayout2Ext; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; @@ -47,7 +50,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ -public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<EditCatchesUIModel> +public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<EditCatchesUIModel, EditCatchesUI> implements TabHandler { public static final String MAIN_CARD = "main"; @@ -63,13 +66,6 @@ LogFactory.getLog(EditCatchesUIHandler.class); /** - * UI. - * - * @since 0.3 - */ - private final EditCatchesUI ui; - - /** * Persistence service. * * @since 0.3 @@ -84,8 +80,7 @@ private final TuttiBeanMonitor<EditCatchesUIModel> fishingOperationMonitor; public EditCatchesUIHandler(FishingOperationsUI parentUi, EditCatchesUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); this.persistenceService = context.getService(PersistenceService.class); this.fishingOperationMonitor = new TuttiBeanMonitor<EditCatchesUIModel>( EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_WEIGHT, @@ -141,11 +136,6 @@ } @Override - public EditCatchesUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditCatchesUIModel> getValidator() { return ui.getValidator(); } @@ -181,9 +171,14 @@ public void selectFishingOperation(FishingOperation bean, String fishingOperationText) { + boolean empty = bean == null; + Preconditions.checkState(!empty, "can not edit a null fishing operation."); + boolean newOperation = TuttiEntities.isNew(bean); + boolean wasModified = fishingOperationMonitor.wasModified(); + // 1) Save any modification of the current fishingOperation - if (fishingOperationMonitor.wasModified()) { + if (wasModified) { save(); } @@ -195,32 +190,43 @@ // 2) Use new selected fishingOperation - boolean empty = bean == null; - EditCatchesUIModel model = getModel(); - if (empty || !bean.equals(model.getFishingOperation()) || fishingOperationMonitor.wasModified()) { + boolean otherOperation = + ObjectUtils.notEqual(bean, model.getFishingOperation()); + if (empty || newOperation || otherOperation || wasModified) { + CatchBatch batch; - if (empty) { + if (empty || newOperation) { + + // create a new CatchBatch + if (log.isInfoEnabled()) { + log.info("Create a new CatchBatch"); + } batch = new CatchBatch(); - model.setCatchBatch(null); - model.setFishingOperation(null); + batch.setFishingOperation(bean); + } else { + String operationId = bean.getId(); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + - bean.getId() + " - " + fishingOperationText); + log.info("Load existing CatchBatch from operation id: " + + operationId); } - //TODO id can not be null - batch = persistenceService.getCatchBatchFromFishingOperation(bean.getId()); + batch = persistenceService.getCatchBatchFromFishingOperation( + operationId); - model.setCatchBatch(batch); - model.setFishingOperation(bean); +// model.setCatchBatch(batch); +// model.setFishingOperation(bean); } + model.setCatchBatch(batch); + model.setFishingOperation(bean); + model.fromBean(batch); model.setModify(false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -36,7 +36,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportPupitriAction extends AbstractTuttiAction<EditCatchesUIModel, EditCatchesUIHandler> { +public class ImportPupitriAction extends AbstractTuttiAction<EditCatchesUIModel, EditCatchesUI, EditCatchesUIHandler> { private static final long serialVersionUID = 1L; 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,26 +52,18 @@ * @author tchemit <chemit@codelutin.com> * @since 0.2 */ -public class AccidentalBatchUIHandler extends AbstractTuttiBatchTableUIHandler<AccidentalBatchRowModel, AccidentalBatchUIModel> { +public class AccidentalBatchUIHandler extends AbstractTuttiBatchTableUIHandler<AccidentalBatchRowModel, AccidentalBatchUIModel, AccidentalBatchUI> { /** Logger. */ private static final Log log = LogFactory.getLog(AccidentalBatchUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final AccidentalBatchUI ui; - public AccidentalBatchUIHandler(TuttiUI<?, ?> parentUi, AccidentalBatchUI ui) { - super(parentUi, + super(parentUi, ui, AccidentalBatchRowModel.PROPERTY_SPECIES, AccidentalBatchRowModel.PROPERTY_WEIGHT, AccidentalBatchRowModel.PROPERTY_COMMENT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -177,11 +169,6 @@ //------------------------------------------------------------------------// @Override - public AccidentalBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<AccidentalBatchUIModel> getValidator() { return null; } 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,29 +52,21 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<BenthosBatchRowModel, BenthosBatchUIModel> { +public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<BenthosBatchRowModel, BenthosBatchUIModel, BenthosBatchUI> { /** Logger. */ private static final Log log = LogFactory.getLog(BenthosBatchUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final BenthosBatchUI ui; - public BenthosBatchUIHandler(TuttiUI<?, ?> parentUi, BenthosBatchUI ui) { - super(parentUi, + super(parentUi, ui, BenthosBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, BenthosBatchRowModel.PROPERTY_SPECIES, BenthosBatchRowModel.PROPERTY_WEIGHT, BenthosBatchRowModel.PROPERTY_NUMBER, BenthosBatchRowModel.PROPERTY_SAMPLE_WEIGHT, BenthosBatchRowModel.PROPERTY_COMMENT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -180,11 +172,6 @@ //------------------------------------------------------------------------// @Override - public BenthosBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<BenthosBatchUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -51,27 +51,19 @@ * @author tchemit <chemit@codelutin.com> * @since 0.2 */ -public class MacroWasteBatchUIHandler extends AbstractTuttiBatchTableUIHandler<MacroWasteBatchRowModel, MacroWasteBatchUIModel> { +public class MacroWasteBatchUIHandler extends AbstractTuttiBatchTableUIHandler<MacroWasteBatchRowModel, MacroWasteBatchUIModel, MacroWasteBatchUI> { /** Logger. */ private static final Log log = LogFactory.getLog(MacroWasteBatchUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final MacroWasteBatchUI ui; - public MacroWasteBatchUIHandler(TuttiUI<?, ?> parentUi, MacroWasteBatchUI ui) { - super(parentUi, + super(parentUi, ui, MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_CATEGORY, MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_SIZE_CATEGORY, MacroWasteBatchRowModel.PROPERTY_WEIGHT, MacroWasteBatchRowModel.PROPERTY_NUMBER, MacroWasteBatchRowModel.PROPERTY_COMMENT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -182,11 +174,6 @@ //------------------------------------------------------------------------// @Override - public MacroWasteBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<MacroWasteBatchUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,26 +52,18 @@ * @author tchemit <chemit@codelutin.com> * @since 0.2 */ -public class PlanktonBatchUIHandler extends AbstractTuttiBatchTableUIHandler<PlanktonBatchRowModel, PlanktonBatchUIModel> { +public class PlanktonBatchUIHandler extends AbstractTuttiBatchTableUIHandler<PlanktonBatchRowModel, PlanktonBatchUIModel, PlanktonBatchUI> { /** Logger. */ private static final Log log = LogFactory.getLog(PlanktonBatchUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final PlanktonBatchUI ui; - public PlanktonBatchUIHandler(TuttiUI<?, ?> parentUi, PlanktonBatchUI ui) { - super(parentUi, + super(parentUi, ui, PlanktonBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, PlanktonBatchRowModel.PROPERTY_SPECIES, PlanktonBatchRowModel.PROPERTY_WEIGHT, PlanktonBatchRowModel.PROPERTY_COMMENT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -178,11 +170,6 @@ //------------------------------------------------------------------------// @Override - public PlanktonBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<PlanktonBatchUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -47,7 +47,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class RemoveSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUIHandler> { +public class RemoveSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -47,7 +47,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class RemoveSpeciesSubBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUIHandler> { +public class RemoveSpeciesSubBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -45,7 +45,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class RenameSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUIHandler> { +public class RenameSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,15 +37,12 @@ * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpeciesUIModel> { +public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpeciesUIModel, SelectSpeciesUI> { private static final Log log = LogFactory.getLog(SelectSpeciesUIHandler.class); - protected SelectSpeciesUI ui; - public SelectSpeciesUIHandler(TuttiUI parentUI, SelectSpeciesUI ui) { - super(parentUI.getHandler().getContext()); - this.ui = ui; + super(parentUI.getHandler().getContext(), ui); } @Override @@ -71,11 +68,6 @@ } @Override - public SelectSpeciesUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SelectSpeciesUIModel> getValidator() { return null; } 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -94,7 +94,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<SpeciesBatchRowModel, SpeciesBatchUIModel> { +public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<SpeciesBatchRowModel, SpeciesBatchUIModel, SpeciesBatchUI> { /** Logger. */ private static final Log log = @@ -120,18 +120,11 @@ SpeciesBatchRowModel.PROPERTY_MATURITY_CATEGORY_WEIGHT, SpeciesBatchRowModel.PROPERTY_AGE_CATEGORY_WEIGHT); - /** - * UI. - * - * @since 0.2 - */ - private final SpeciesBatchUI ui; - private final EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>> tableFilters; public SpeciesBatchUIHandler(TuttiUI<?, ?> parentUi, SpeciesBatchUI ui) { - super(parentUi, + super(parentUi, ui, SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, SpeciesBatchRowModel.PROPERTY_SPECIES, SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, @@ -149,7 +142,6 @@ SpeciesBatchRowModel.PROPERTY_COMMENT, SpeciesBatchRowModel.PROPERTY_ATTACHMENTS, SpeciesBatchRowModel.PROPERTY_FREQUENCY); - this.ui = ui; tableFilters = new EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>>(TableViewMode.class); tableFilters.put(TableViewMode.ALL, new RowFilter<SpeciesBatchTableModel, Integer>() { @@ -381,11 +373,6 @@ //------------------------------------------------------------------------// @Override - public SpeciesBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SpeciesBatchUIModel> getValidator() { return ui.getValidator(); } 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -64,19 +64,12 @@ * @author tchemit <chemit@codelutin.com> * @since 0.2 */ -public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<SpeciesFrequencyRowModel, SpeciesFrequencyUIModel> implements Cancelable { +public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<SpeciesFrequencyRowModel, SpeciesFrequencyUIModel, SpeciesFrequencyUI> implements Cancelable { /** Logger. */ private static final Log log = LogFactory.getLog(SpeciesFrequencyUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final SpeciesFrequencyUI ui; - private FrequencyCellEditor frequencyEditor; private TuttiProtocol protocol; @@ -87,11 +80,10 @@ public SpeciesFrequencyUIHandler(TuttiUIContext context, SpeciesFrequencyUI ui) { - super(context, + super(context, ui, SpeciesFrequencyRowModel.PROPERTY_LENGTH_STEP, SpeciesFrequencyRowModel.PROPERTY_NUMBER, SpeciesFrequencyRowModel.PROPERTY_WEIGHT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -144,11 +136,6 @@ //------------------------------------------------------------------------// @Override - public SpeciesFrequencyUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SpeciesFrequencyUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -44,7 +44,7 @@ * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public class AddSpeciesAction extends AbstractTuttiAction<CreateSpeciesBatchUIModel, CreateSpeciesBatchUIHandler> { +public class AddSpeciesAction extends AbstractTuttiAction<CreateSpeciesBatchUIModel, CreateSpeciesBatchUI, CreateSpeciesBatchUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -56,27 +56,19 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ -public class CreateSpeciesBatchUIHandler extends AbstractTuttiUIHandler<CreateSpeciesBatchUIModel> implements Cancelable { +public class CreateSpeciesBatchUIHandler extends AbstractTuttiUIHandler<CreateSpeciesBatchUIModel, CreateSpeciesBatchUI> implements Cancelable { /** Logger. */ private static final Log log = LogFactory.getLog(CreateSpeciesBatchUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - private final CreateSpeciesBatchUI ui; - private final TuttiPersistence persistenceService; private final CaracteristicQualitativeValue sortedValue; public CreateSpeciesBatchUIHandler(TuttiUI parentUi, CreateSpeciesBatchUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); Caracteristic caracteristic = @@ -187,11 +179,6 @@ } @Override - public CreateSpeciesBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<CreateSpeciesBatchUIModel> getValidator() { return ui.getValidator(); } 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -61,7 +61,7 @@ * @since 0.3 */ public class SplitSpeciesBatchUIHandler - extends AbstractTuttiTableUIHandler<SplitSpeciesBatchRowModel, SplitSpeciesBatchUIModel> implements Cancelable { + extends AbstractTuttiTableUIHandler<SplitSpeciesBatchRowModel, SplitSpeciesBatchUIModel, SplitSpeciesBatchUI> implements Cancelable { /** Logger. */ private static final Log log = @@ -74,20 +74,12 @@ */ private final SpeciesBatchUI parentUi; - /** - * UI. - * - * @since 0.3 - */ - private final SplitSpeciesBatchUI ui; - public SplitSpeciesBatchUIHandler(EditCatchesUI parentUi, SplitSpeciesBatchUI ui) { - super(parentUi.getHandler().getContext(), + super(parentUi.getHandler().getContext(), ui, SplitSpeciesBatchRowModel.PROPERTY_CATEGORY_VALUE, SplitSpeciesBatchRowModel.PROPERTY_WEIGHT); this.parentUi = parentUi.getSpeciesTabContent(); - this.ui = ui; } //------------------------------------------------------------------------// @@ -146,11 +138,6 @@ //------------------------------------------------------------------------// @Override - public SplitSpeciesBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SplitSpeciesBatchUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,13 +52,14 @@ public abstract class CaracteristicTabUIHandler <RM extends CaracteristicRowModel<RM>, M extends CaracteristicTabUIModel<RM, M>, - TM extends AbstractTuttiTableModel<RM>> - extends AbstractTuttiTableUIHandler<RM, M> { + TM extends AbstractTuttiTableModel<RM>, + UI extends TuttiUI<M, ?>> + extends AbstractTuttiTableUIHandler<RM, M, UI> { private static final Log log = LogFactory.getLog(CaracteristicTabUIHandler.class); - public CaracteristicTabUIHandler(EditFishingOperationUI parentUi, String... properties) { - super(parentUi.getHandler().getContext(), properties); + public CaracteristicTabUIHandler(EditFishingOperationUI parentUi, UI ui, String... properties) { + super(parentUi.getHandler().getContext(), ui, properties); } //------------------------------------------------------------------------// @@ -105,11 +106,6 @@ //------------------------------------------------------------------------// @Override - public M getModel() { - return (M) getUI().getModel(); - } - - @Override public SwingValidator<M> getValidator() { return null; } @@ -161,8 +157,6 @@ protected abstract M createModel(); - protected abstract TuttiUI getUI(); - protected abstract BeanComboBox<Caracteristic> getKeyCombo(); protected abstract CaracteristicMap getCaracteristics(FishingOperation operation); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -29,7 +29,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; @@ -46,22 +45,14 @@ * @author kmorin * @since 0.3 */ -public class EnvironmentTabUIHandler extends CaracteristicTabUIHandler<EnvironmentRowModel, EnvironmentTabUIModel, EnvironmentTableModel> { +public class EnvironmentTabUIHandler extends CaracteristicTabUIHandler<EnvironmentRowModel, EnvironmentTabUIModel, EnvironmentTableModel, EnvironmentTabUI> { private final static Log log = LogFactory.getLog(EnvironmentTabUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - protected final EnvironmentTabUI ui; - public EnvironmentTabUIHandler(EditFishingOperationUI parentUi, EnvironmentTabUI ui) { - super(parentUi, EnvironmentRowModel.PROPERTY_VALUE); - this.ui = ui; + super(parentUi, ui, EnvironmentRowModel.PROPERTY_VALUE); } //------------------------------------------------------------------------// @@ -69,11 +60,6 @@ //------------------------------------------------------------------------// @Override - protected TuttiUI getUI() { - return ui; - } - - @Override protected BeanComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; @@ -47,22 +46,14 @@ * @author kmorin * @since 0.3 */ -public class GearShootingTabUIHandler extends CaracteristicTabUIHandler<GearShootingRowModel, GearShootingTabUIModel, GearShootingTableModel> { +public class GearShootingTabUIHandler extends CaracteristicTabUIHandler<GearShootingRowModel, GearShootingTabUIModel, GearShootingTableModel, GearShootingTabUI> { private final static Log log = LogFactory.getLog(GearShootingTabUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - protected final GearShootingTabUI ui; - public GearShootingTabUIHandler(EditFishingOperationUI parentUi, GearShootingTabUI ui) { - super(parentUi, GearShootingRowModel.PROPERTY_VALUE); - this.ui = ui; + super(parentUi, ui, GearShootingRowModel.PROPERTY_VALUE); } //------------------------------------------------------------------------// @@ -70,11 +61,6 @@ //------------------------------------------------------------------------// @Override - protected TuttiUI getUI() { - return ui; - } - - @Override protected BeanComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; @@ -47,29 +46,21 @@ * @author kmorin * @since 0.3 */ -public class HydrologyTabUIHandler extends CaracteristicTabUIHandler<HydrologyRowModel, HydrologyTabUIModel, HydrologyTableModel> { +public class HydrologyTabUIHandler extends CaracteristicTabUIHandler<HydrologyRowModel, HydrologyTabUIModel, HydrologyTableModel, HydrologyTabUI> { private final static Log log = LogFactory.getLog(HydrologyTabUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - protected final HydrologyTabUI ui; - // protected Map<Caracteristic, Map<Type, Caracteristic>> availableGlobalCaracteristics; public HydrologyTabUIHandler(EditFishingOperationUI parentUi, HydrologyTabUI ui) { - super(parentUi, + super(parentUi, ui, HydrologyRowModel.PROPERTY_VALUE // HydrologyRowModel.PROPERTY_GEAR_SHOOTING_START_VALUE, // HydrologyRowModel.PROPERTY_AVERAGE_VALUE, // HydrologyRowModel.PROPERTY_GEAR_SHOOTING_END_VALUE ); - this.ui = ui; } @@ -78,11 +69,6 @@ //------------------------------------------------------------------------// @Override - protected TuttiUI getUI() { - return ui; - } - - @Override protected BeanComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class CancelEditProgramAction extends AbstractTuttiAction<EditProgramUIModel, EditProgramUIHandler> { +public class CancelEditProgramAction extends AbstractTuttiAction<EditProgramUIModel, EditProgramUI, EditProgramUIHandler> { private static final long serialVersionUID = 1L; 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,20 +42,13 @@ * @author tchemit <chemit@codelutin.com> * @since 0.1 */ -public class EditProgramUIHandler extends AbstractTuttiUIHandler<EditProgramUIModel> { +public class EditProgramUIHandler extends AbstractTuttiUIHandler<EditProgramUIModel, EditProgramUI> { /** Logger. */ private static final Log log = LogFactory.getLog(EditProgramUIHandler.class); /** - * UI. - * - * @since 0.1 - */ - private final EditProgramUI ui; - - /** * Persistence service. * * @since 0.1 @@ -63,8 +56,7 @@ private final PersistenceService persistenceService; public EditProgramUIHandler(TuttiUI parentUi, EditProgramUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); } @@ -137,11 +129,6 @@ } @Override - public EditProgramUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditProgramUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public class SaveProgramAction extends AbstractTuttiAction<EditProgramUIModel, EditProgramUIHandler> { +public class SaveProgramAction extends AbstractTuttiAction<EditProgramUIModel, EditProgramUI, EditProgramUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class CancelEditProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class CancelEditProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -66,30 +66,20 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ -public class EditProtocolUIHandler extends AbstractTuttiTableUIHandler<EditProtocolSpeciesRowModel, EditProtocolUIModel> { +public class EditProtocolUIHandler extends AbstractTuttiTableUIHandler<EditProtocolSpeciesRowModel, EditProtocolUIModel, EditProtocolUI> { /** Logger. */ private static final Log log = LogFactory.getLog(EditProtocolUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - private final EditProtocolUI ui; - protected Map<String, Species> allSpecies; protected List<Caracteristic> caracteristics; protected Map<String, Caracteristic> allCaracteristic; -// protected Multimap<String, String> hydroCaracteristics; - public EditProtocolUIHandler(TuttiUI parentUi, EditProtocolUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); } //------------------------------------------------------------------------// @@ -150,11 +140,6 @@ //------------------------------------------------------------------------// @Override - public EditProtocolUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditProtocolUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportAllCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ExportAllCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportProtocolCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ExportProtocolCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -45,7 +45,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportProtocolSpeciesAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ExportProtocolSpeciesAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportProtocolCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ImportProtocolCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -43,7 +43,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportProtocolSpeciesAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ImportProtocolSpeciesAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -47,7 +47,7 @@ * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ -public class SaveProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class SaveProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { /** Logger. */ private static final Log log = LogFactory.getLog(SaveProtocolAction.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportTemporaryGearExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ExportTemporaryGearExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,10 +41,10 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportTemporaryPersonExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { - +public class ExportTemporaryPersonExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; + /** Logger. */ private static final Log log = LogFactory.getLog(ExportTemporaryPersonExampleAction.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportTemporarySpeciesExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ExportTemporarySpeciesExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ExportTemporaryVesselExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ExportTemporaryVesselExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryGearAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryGearAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryPersonAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryPersonAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporarySpeciesAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ImportTemporarySpeciesAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryVesselAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryVesselAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,21 +37,19 @@ * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler<TuttiUIContext> { +public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, ManageTemporaryReferentialUI> { /** Logger. */ private static final Log log = LogFactory.getLog(ManageTemporaryReferentialUIHandler.class); - protected ManageTemporaryReferentialUI ui; - protected JComponent currentBody; protected final PersistenceService persistenceService; - protected ManageTemporaryReferentialUIHandler(TuttiUIContext context, ManageTemporaryReferentialUI ui) { - super(context); - this.ui = ui; + protected ManageTemporaryReferentialUIHandler(TuttiUIContext context, + ManageTemporaryReferentialUI ui) { + super(context, ui); this.persistenceService = context.getService(PersistenceService.class); } @@ -75,11 +73,6 @@ } @Override - public TuttiUIContext getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<TuttiUIContext> getValidator() { return null; } 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -43,12 +43,12 @@ * @author kmorin <kmorin@codelutin.com> * @since 0.3 */ -public abstract class AbstractTuttiTabContainerUIHandler<M> extends AbstractTuttiUIHandler<M> { +public abstract class AbstractTuttiTabContainerUIHandler<M, UI extends TuttiUI<M, ?>> extends AbstractTuttiUIHandler<M, UI> { private final static Log log = LogFactory.getLog(AbstractTuttiTabContainerUIHandler.class); - protected AbstractTuttiTabContainerUIHandler(TuttiUIContext context) { - super(context); + protected AbstractTuttiTabContainerUIHandler(TuttiUIContext context, UI ui) { + super(context, ui); } /** @return the tab panel of the UI */ 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-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; +import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -84,7 +85,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.2 */ -public abstract class AbstractTuttiTableUIHandler<R extends AbstractTuttiBeanUIModel, M extends AbstractTuttiTableUIModel<?, R, M>> extends AbstractTuttiUIHandler<M> { +public abstract class AbstractTuttiTableUIHandler<R extends AbstractTuttiBeanUIModel, M extends AbstractTuttiTableUIModel<?, R, M>, UI extends TuttiUI<M, ?>> extends AbstractTuttiUIHandler<M, UI> { /** Logger. */ private static final Log log = @@ -156,8 +157,9 @@ protected final PersistenceService persistenceService; protected AbstractTuttiTableUIHandler(TuttiUIContext context, + UI ui, String... properties) { - super(context); + super(context, ui); this.persistenceService = context.getService(PersistenceService.class); @@ -611,7 +613,6 @@ protected void uninstallTableKeyListener() { - if (keyAdapter != null) { if (log.isInfoEnabled()) {