[Isis-fish-commits] r4237 - in trunk/src/main/java/fr/ifremer/isisfish/ui: input input/cell input/equation input/fisheryregion input/gear input/metier input/observation input/population input/port input/setofvessels input/species input/strategy input/triptype input/variable input/vesseltype input/zone queue

Author: echatellier Date: 2015-05-27 13:00:56 +0000 (Wed, 27 May 2015) New Revision: 4237 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4237 Log: Move script code to dedicated handler (all) Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -45,7 +45,7 @@ protected T inputContentUI; - protected void init(final T inputContentUI) { + protected InputContentHandler(T inputContentUI) { this.inputContentUI = inputContentUI; } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -84,10 +84,7 @@ */ public abstract B getBean(); -public <U extends InputContentHandler<? extends InputContentUI<B>>> U getHandler() { - // FIXME remove this and set it abstract - return (U)new InputContentHandler<InputContentUI<B>>(); -} +public abstract <U extends InputContentHandler<? extends InputContentUI<B>>> U getHandler(); /** * Pas très safe, le bean doit s'appeler changeModel dans l'heritage "FORCEMENT" Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -92,13 +92,17 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(InputHandler.class); + protected InputUI inputUI; + + public InputHandler(InputUI inputUI) { + this.inputUI = inputUI; + } + /** * Post init ui. - * - * @param ui ui */ - public void init(InputUI ui) { - PromptSupport.setPrompt(t("isisfish.input.newRegion"), ui.getFieldNewRegion()); + public void afterInit() { + PromptSupport.setPrompt(t("isisfish.input.newRegion"), inputUI.getFieldNewRegion()); } /** @@ -106,10 +110,9 @@ * * Before loading region, try to close old one. * - * @param inputUI input ui * @param name region name to load */ - protected void loadRegion(InputUI inputUI, String name) { + protected void loadRegion(String name) { if (log.isDebugEnabled()) { log.debug("Load region " + name); } @@ -165,10 +168,8 @@ /** * Reload current loaded fishery tree. - * - * @param inputUI inputUI */ - public void reloadFisheryTree(InputUI inputUI) { + public void reloadFisheryTree() { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); TreeModel fisheryTreeModel = inputUI.getContextValue(TreeModel.class); fisheryTreeHelper.refreshNode((FisheryTreeNode)fisheryTreeModel.getRoot(), true); @@ -177,10 +178,9 @@ /** * Main ui fishery region selection changed. * - * @param inputUI inputUI * @param e event */ - public void regionChange(final InputUI inputUI, ItemEvent e) { + public void regionChange(ItemEvent e) { // event launched twice with itemchange listener if (e.getStateChange() == ItemEvent.SELECTED) { final String name = (String)inputUI.getFieldCurrentRegion().getSelectedItem(); @@ -194,7 +194,7 @@ SwingUtilities.invokeLater(new Runnable() { public void run() { - loadRegion(inputUI, name); + loadRegion(name); setStatusMessage(inputUI, t("isisfish.message.load.finished")); inputUI.setCursor(Cursor.getDefaultCursor()); } @@ -204,24 +204,21 @@ /** * Create new region (called if region name is not empty). - * - * @param inputUI inputUI */ - public void createNewRegion(InputUI inputUI) { + public void createNewRegion() { String name = inputUI.getFieldNewRegion().getText(); setStatusMessage(inputUI, t("isisfish.message.creating.region", name), true); if (RegionStorage.getRegionNames().contains(name)) { JOptionPane.showMessageDialog(inputUI, t("isisfish.error.region.already.exists")); - } - else { + } else { try { RegionStorage.create(name); } catch (StorageException ex) { throw new IsisFishRuntimeException("Can't create region", ex); } inputUI.getFieldNewRegion().setText(""); - refreshRegionList(inputUI, name); + refreshRegionList(name); } setStatusMessage(inputUI, t("isisfish.message.creation.finished")); @@ -230,28 +227,24 @@ /** * Rafraichit la liste des regions. * - * @param inputUI inputUI * @param selectedItem region to select */ - protected void refreshRegionList(InputUI inputUI, String selectedItem) { + protected void refreshRegionList(String selectedItem) { // refresh region list GenericComboModel<String> regionsModel = new GenericComboModel<>(RegionStorage.getRegionNames()); inputUI.getFieldCurrentRegion().setModel(regionsModel); // event is fired by setSelectedItem to call #regionChange if (selectedItem != null) { inputUI.getFieldCurrentRegion().setSelectedItem(selectedItem); + } else { + loadRegion(null); } - else { - loadRegion(inputUI, null); - } } /** * Exporter la region dans un zip. - * - * @param inputUI inputUI */ - public void importRegion(InputUI inputUI) { + public void importRegion() { setStatusMessage(inputUI, t("isisfish.message.import.zip"), true); try { @@ -260,7 +253,7 @@ if (file != null) { RegionStorage.importZip(file); - refreshRegionList(inputUI, null); + refreshRegionList(null); } } catch (Exception eee) { @@ -272,10 +265,8 @@ /** * Exporter la region dans un zip. - * - * @param inputUI inputUI */ - public void importRegionAndRename(InputUI inputUI) { + public void importRegionAndRename() { setStatusMessage(inputUI, t("isisfish.message.import.zip"), true); try { @@ -287,7 +278,7 @@ .showInputDialog(t("isisfish.message.name.imported.region")); RegionStorage.importAndRenameZip(file, newName); - refreshRegionList(inputUI, null); + refreshRegionList(null); } } catch (Exception eee) { throw new IsisFishRuntimeException(t("isisfish.error.region.import"), eee); @@ -302,7 +293,7 @@ * * @param inputUI inputUI */ - public void importRegionFromSimulation(InputUI inputUI) { + public void importRegionFromSimulation() { /*setStatusMessage(inputUI, t("isisfish.message.import"), true); @@ -342,10 +333,8 @@ * Exporter la region dans un zip * * Call only if region is loaded. - * - * @param inputUI inputUI */ - public void exportRegion(InputUI inputUI) { + public void exportRegion() { try { File file = FileUtil.getFile(".*.zip$", t("isisfish.message.import.region.zipped")); @@ -374,17 +363,16 @@ /** * Remove region. * - * @param inputUI input ui * @param vcsDelete if true delete region in CVS too */ - public void removeRegion(InputUI inputUI, boolean vcsDelete) { + public void removeRegion(boolean vcsDelete) { try { RegionStorage regionStorage = inputUI.getContextValue(RegionStorage.class); int resp = JOptionPane.showConfirmDialog(inputUI, t("isisfish.message.confirm.remove.region", regionStorage.getName())); if (resp == JOptionPane.YES_OPTION) { regionStorage.delete(vcsDelete); - refreshRegionList(inputUI, null); + refreshRegionList(null); } } catch (StorageException eee) { throw new IsisFishRuntimeException("Can't delete region", eee); @@ -393,10 +381,8 @@ /** * Copy la region avec un autre nom. - * - * @param inputUI input ui */ - public void copyRegion(InputUI inputUI) { + public void copyRegion() { try { String newName = JOptionPane .showInputDialog(t("isisfish.message.new.region.name")); @@ -416,10 +402,8 @@ /** * Commit region. - * - * @param inputUI input ui */ - public void commitRegionInCVS(InputUI inputUI) { + public void commitRegionInCVS() { try { RegionStorage regionStorage = inputUI.getContextValue(RegionStorage.class); setStatusMessage(inputUI, t("isisfish.message.commiting.region", regionStorage.getName()), true); @@ -447,10 +431,8 @@ /** * Explore region and export any enabled sensitivity factor name with value. - * - * @param inputUI input ui */ - public void exportRegionSensitivityFactors(InputUI inputUI) { + public void exportRegionSensitivityFactors() { try { File exportFile = FileUtil.getFile(t("isisfish.input.sensitivity.export.title"), @@ -480,10 +462,9 @@ /** * Changement de selection dans l'arbre de la pecherie. * - * @param inputUI * @param event */ - public void nodeSelectionChanged(InputUI inputUI, TreeSelectionEvent event) { + public void nodeSelectionChanged(TreeSelectionEvent event) { TreePath newTreePath = event.getNewLeadSelectionPath(); if (newTreePath != null) { @@ -531,10 +512,9 @@ /** * Delete tree node referenced by parent, and auto select parent node. * - * @param inputUI ui containing tree * @param topiaId node id to delete */ - public void deleteTreeNode(InputUI inputUI, String topiaId) { + public void deleteTreeNode(String topiaId) { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); TreeModel fisheryTreeModel = inputUI.getContextValue(TreeModel.class); FisheryTreeNode newSelectNode = fisheryTreeHelper.findNode((FisheryTreeNode)fisheryTreeModel.getRoot(), topiaId); @@ -546,11 +526,10 @@ /** * Insert new tree node and select it. * - * @param inputUI ui containing tree * @param nodeClass node type to create * @param topiaEntity node to insert */ - public void insertTreeNode(InputUI inputUI, Class nodeClass, TopiaEntityContextable topiaEntity) { + public void insertTreeNode(Class nodeClass, TopiaEntityContextable topiaEntity) { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); // on part du principe que pour ne pas compliquer les ui est les lier @@ -588,10 +567,9 @@ /** * Update tree node for topiaId. * - * @param inputUI ui containing tree * @param topiaId node id to update */ - public void updateTreeNode(InputUI inputUI, String topiaId) { + public void updateTreeNode(String topiaId) { FisheryTreeHelper fisheryTreeHelper = inputUI.getContextValue(FisheryTreeHelper.class); TreeModel fisheryTreeModel = inputUI.getContextValue(TreeModel.class); FisheryTreeNode newSelectNode = fisheryTreeHelper.findNode((FisheryTreeNode)fisheryTreeModel.getRoot(), topiaId); @@ -602,10 +580,9 @@ * Dans le cas d'une creation de population, on doit la creer dans * une espèce. On doit rechercher celle qui est sélectionnée dans l'arbre. * - * @param inputUI input ui * @return selected species */ - public Species findSpecies(InputUI inputUI) { + public Species findSpecies() { // get selected node FisheryTreeHelper treeHelper = inputUI.getContextValue(FisheryTreeHelper.class); FisheryTreeNode selectedNode = treeHelper.getSelectedNode(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -181,7 +181,7 @@ noModif(); InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); - inputUI.getHandler().deleteTreeNode(inputUI, topiaEntity.getTopiaId()); + inputUI.getHandler().deleteTreeNode(topiaEntity.getTopiaId()); } } catch (TopiaException eee) { throw new IsisFishRuntimeException("Can't remove entity: " + currentEntities.get(0), eee); @@ -233,7 +233,7 @@ topiaContext.commitTransaction(); InputUI inputUI = inputContentUI.getContextValue(InputUI.class, JAXXUtil.PARENT); - inputUI.getHandler().insertTreeNode(inputUI, type, topiaEntity); + inputUI.getHandler().insertTreeNode(type, topiaEntity); //rootUI.setStatusMessage(t("isisfish.message.creation.finished")); } catch (Exception eee) { @@ -261,7 +261,7 @@ topiaContext.commitTransaction(); InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); - inputUI.getHandler().updateTreeNode(inputUI, topiaEntity.getTopiaId()); + inputUI.getHandler().updateTreeNode(topiaEntity.getTopiaId()); // FIXME echatellier 20111201 small fix because save // button has to reset internal ui change model state @@ -306,7 +306,7 @@ } InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); - inputUI.getHandler().updateTreeNode(inputUI, topiaEntity.getTopiaId()); + inputUI.getHandler().updateTreeNode(topiaEntity.getTopiaId()); // FIXME echatellier 20111201 small fix because save // button has to reset internal ui change model state Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -24,40 +24,40 @@ --> <fr.ifremer.isisfish.ui.NavigationUI> - <InputHandler id="handler" /> + <InputHandler id="handler" constructorParams="this" /> <Boolean id="regionLoaded" javaBean="false" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> <JMenuBar id="menu" constraints='BorderLayout.NORTH'> <JMenu text="isisfish.common.region" id="menuRegion"> - <JMenuItem id="menuRegionImport" text="isisfish.input.menu.importRegion" onActionPerformed="handler.importRegion(this)" /> - <JMenuItem id="menuRegionImportRename" text="isisfish.input.menu.importRenameRegion" onActionPerformed="handler.importRegionAndRename(this)" /> - <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="handler.importRegionFromSimulation(this)" enabled="false"/> - <JMenuItem id="menuRegionExport" text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportRegion(this)" /> - <JMenuItem id="menuRegionCopy" text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.copyRegion(this)" /> + <JMenuItem id="menuRegionImport" text="isisfish.input.menu.importRegion" onActionPerformed="handler.importRegion()" /> + <JMenuItem id="menuRegionImportRename" text="isisfish.input.menu.importRenameRegion" onActionPerformed="handler.importRegionAndRename()" /> + <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="handler.importRegionFromSimulation()" enabled="false"/> + <JMenuItem id="menuRegionExport" text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportRegion()" /> + <JMenuItem id="menuRegionCopy" text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.copyRegion()" /> <JSeparator/> - <JMenuItem text="isisfish.input.menu.removeLocaly" enabled='{isRegionLoaded()}' onActionPerformed="handler.removeRegion(this, false)" /> + <JMenuItem text="isisfish.input.menu.removeLocaly" enabled='{isRegionLoaded()}' onActionPerformed="handler.removeRegion(false)" /> </JMenu> <JMenu text="isisfish.input.menu.server"> - <JMenuItem text="isisfish.input.menu.addRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.commitRegionInCVS(this)" /> - <JMenuItem text="isisfish.input.menu.commit" enabled='{isRegionLoaded()}' onActionPerformed="handler.commitRegionInCVS(this)" /> + <JMenuItem text="isisfish.input.menu.addRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.commitRegionInCVS()" /> + <JMenuItem text="isisfish.input.menu.commit" enabled='{isRegionLoaded()}' onActionPerformed="handler.commitRegionInCVS()" /> <JSeparator/> - <JMenuItem text="isisfish.input.menu.removeLocalyRemotely" enabled='{isRegionLoaded()}' onActionPerformed="handler.removeRegion(this, true)" /> + <JMenuItem text="isisfish.input.menu.removeLocalyRemotely" enabled='{isRegionLoaded()}' onActionPerformed="handler.removeRegion(true)" /> </JMenu> <JMenu text="isisfish.input.menu.sensitivity"> - <JMenuItem text="isisfish.input.menu.sensitivity.export" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportRegionSensitivityFactors(this)" /> + <JMenuItem text="isisfish.input.menu.sensitivity.export" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportRegionSensitivityFactors()" /> </JMenu> </JMenuBar> <JSplitPane oneTouchExpandable="true" dividerLocation="200" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> <JPanel layout='{new BorderLayout()}' minimumSize="{new java.awt.Dimension(0,0)}"> <org.jdesktop.swingx.JXComboBox id="fieldCurrentRegion" constraints='BorderLayout.NORTH' - onItemStateChanged='handler.regionChange(this, event)' + onItemStateChanged='handler.regionChange(event)' model='{new fr.ifremer.isisfish.ui.models.common.GenericComboModel<String>(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames())}'/> <JPanel id="treePanel" name="treePanel" layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JScrollPane constraints='BorderLayout.CENTER'> @@ -65,7 +65,7 @@ selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> <JTree id="fisheryRegionTree" selectionModel='{fisheryRegionTreeSelectionModel}' rootVisible="true" selectionRow='0' model='{new javax.swing.tree.DefaultTreeModel(null)}' rowHeight="0" - onValueChanged="handler.nodeSelectionChanged(this, event)" /> + onValueChanged="handler.nodeSelectionChanged(event)" /> </JScrollPane> </JPanel> <Table constraints='BorderLayout.SOUTH'> @@ -75,7 +75,7 @@ </cell> <cell fill='horizontal'> <JButton id="buttonNewRegion" text="isisfish.input.createNewRegion" - onActionPerformed='handler.createNewRegion(this)' enabled='{getFieldNewRegion().getText().length() > 0}'/> + onActionPerformed='handler.createNewRegion()' enabled='{getFieldNewRegion().getText().length() > 0}'/> </cell> </row> </Table> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -48,24 +48,27 @@ protected boolean init; - protected void init(final CellUI cellUI) { - super.init(cellUI); + protected CellHandler(CellUI inputContentUI) { + super(inputContentUI); + } - cellUI.setButtonTitle(t("isisfish.input.continueZones")); - cellUI.setNextPath(n("isisfish.input.tree.zones")); + protected void afterInit() { + inputContentUI.setButtonTitle(t("isisfish.input.continueZones")); + inputContentUI.setNextPath(n("isisfish.input.tree.zones")); + //cellMap.init(cellMapInfo); - new OpenMapEvents(cellUI.getCellMap(), new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { + new OpenMapEvents(inputContentUI.getCellMap(), new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { boolean result = false; // TODO a fixer, le clic droit du menu contextuel // passe aussi par ici et change la selection //if (e.getButton() == MouseEvent.BUTTON1) { - if (cellUI.getBean() != null) { // impossible de desactiver la carte :( - for (Cell c : cellUI.getCellMap().getSelectedCells()) { - if (!c.getTopiaId().equals(cellUI.getBean().getTopiaId())) { - cellUI.getFieldCell().setSelectedItem(c); + if (inputContentUI.getBean() != null) { // impossible de desactiver la carte :( + for (Cell c : inputContentUI.getCellMap().getSelectedCells()) { + if (!c.getTopiaId().equals(inputContentUI.getBean().getTopiaId())) { + inputContentUI.getFieldCell().setSelectedItem(c); result = true; } } @@ -75,23 +78,23 @@ } }; - cellUI.addPropertyChangeListener(CellUI.PROPERTY_BEAN, new PropertyChangeListener() { + inputContentUI.addPropertyChangeListener(CellUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { init = true; GenericComboModel<Cell> cellModel = new GenericComboModel<>(); if (evt.getNewValue() == null) { - cellUI.fieldCellName.setText(""); - cellUI.fieldCellLatitude.setText(""); - cellUI.fieldCellLongitude.setText(""); - cellUI.fieldCellComment.setText(""); - cellUI.fieldCellLand.setSelected(false); + inputContentUI.fieldCellName.setText(""); + inputContentUI.fieldCellLatitude.setText(""); + inputContentUI.fieldCellLongitude.setText(""); + inputContentUI.fieldCellComment.setText(""); + inputContentUI.fieldCellLand.setSelected(false); } if (evt.getNewValue() != null) { //jaxx.runtime.SwingUtil.fillComboBox(cellUI.fieldCell, cellUI.getFisheryRegion().getCell(), cellUI.getBean()); - cellModel.setElementList(cellUI.getFisheryRegion().getCell()); - cellModel.setSelectedItem(cellUI.getBean()); + cellModel.setElementList(inputContentUI.getFisheryRegion().getCell()); + cellModel.setSelectedItem(inputContentUI.getBean()); } - cellUI.fieldCell.setModel(cellModel); + inputContentUI.fieldCell.setModel(cellModel); init = false; } }); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Cell id='bean' javaBean='null'/> - <CellHandler id="handler" /> + <CellHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Cell' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -51,9 +51,11 @@ protected Class javaInterface = null; - protected void init(final EquationEditorPaneUI equationUI) { + public EquationEditorPaneHandler(EquationEditorPaneUI equationUI) { this.equationUI = equationUI; + } + protected void afterInit() { equationUI.split.setDividerLocation(0.8); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -28,11 +28,11 @@ <Boolean id="resultOk" javaBean="false" /> - <EquationEditorPaneHandler id="handler" /> + <EquationEditorPaneHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -61,9 +61,12 @@ protected DocumentListener listener = null; - protected void init(final InputOneEquationUI inputContentUI) { - super.init(inputContentUI); + protected InputOneEquationHandler(InputOneEquationUI inputContentUI) { + super(inputContentUI); + // TODO Auto-generated constructor stub + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(InputOneEquationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -42,11 +42,11 @@ <Boolean id="autoSaveModification" javaBean="true" /> - <InputOneEquationHandler id="handler" /> + <InputOneEquationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -63,21 +63,23 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(FisheryRegionHandler.class); - protected void init(final FisheryRegionUI fisheryRegionUI) { - super.init(fisheryRegionUI); + protected FisheryRegionHandler(FisheryRegionUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { //cellMap.init(cellMapInfo); - fisheryRegionUI.setButtonTitle(t("isisfish.input.continueCells")); - fisheryRegionUI.setNextPath(n("isisfish.input.tree.cells")); + inputContentUI.setButtonTitle(t("isisfish.input.continueCells")); + inputContentUI.setNextPath(n("isisfish.input.tree.cells")); - fisheryRegionUI.addPropertyChangeListener(FisheryRegionUI.PROPERTY_BEAN, new PropertyChangeListener() { + inputContentUI.addPropertyChangeListener(FisheryRegionUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { } if (evt.getNewValue() != null) { - setFieldMapfilesModel(fisheryRegionUI.getBean()); + setFieldMapfilesModel(inputContentUI.getBean()); /* numberEditor is not working fieldLatMin.init(); fieldLatMax.init(); @@ -272,7 +274,7 @@ // reload tree InputUI inputUI = inputContentUI.getParentContainer(InputUI.class); - inputUI.getHandler().reloadFisheryTree(inputUI); + inputUI.getHandler().reloadFisheryTree(); inputContentUI.setInfoText(t("isisfish.message.save.finished")); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.FisheryRegion id='bean' javaBean='null'/> - <FisheryRegionHandler id="handler" /> + <FisheryRegionHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.FisheryRegion' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,13 +36,15 @@ */ public class GearHandler extends InputContentHandler<GearUI> { - protected void init(final GearUI gearUI) { - super.init(gearUI); + protected GearHandler(GearUI inputContentUI) { + super(inputContentUI); + } - gearUI.setButtonTitle(t("isisfish.input.continueMetiers")); - gearUI.setNextPath(n("isisfish.input.tree.metiers")); + protected void afterInit() { + inputContentUI.setButtonTitle(t("isisfish.input.continueMetiers")); + inputContentUI.setNextPath(n("isisfish.input.tree.metiers")); - gearUI.addPropertyChangeListener(GearUI.PROPERTY_BEAN, new PropertyChangeListener() { + inputContentUI.addPropertyChangeListener(GearUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { @@ -55,6 +57,6 @@ // install change listener // (depends on sensitivity can't be done on constructor) - gearUI.installChangeListener(gearUI.gearTab); + inputContentUI.installChangeListener(inputContentUI.gearTab); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,17 +33,20 @@ */ public class GearTabHandler extends InputContentHandler<GearTabUI> { - protected void init(final GearTabUI gearTabUI) { - super.init(gearTabUI); + protected GearTabHandler(GearTabUI inputContentUI) { + super(inputContentUI); + } - gearTabUI.addPropertyChangeListener(GearTabUI.PROPERTY_BEAN, new PropertyChangeListener() { + protected void afterInit() { + + inputContentUI.addPropertyChangeListener(GearTabUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { - gearTabUI.fieldGearName.setText(""); - gearTabUI.fieldGearEffortUnit.setText(""); - gearTabUI.fieldGearStandardisationFactor.setText(""); - gearTabUI.fieldGearParamName.setText(""); - gearTabUI.fieldGearComment.setText(""); + inputContentUI.fieldGearName.setText(""); + inputContentUI.fieldGearEffortUnit.setText(""); + inputContentUI.fieldGearStandardisationFactor.setText(""); + inputContentUI.fieldGearParamName.setText(""); + inputContentUI.fieldGearComment.setText(""); } if (evt.getNewValue() != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearTabUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> - <GearTabHandler id="handler" /> + <GearTabHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="gear" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Gear' @@ -38,7 +38,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> - <GearHandler id="handler" /> + <GearHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -45,9 +45,12 @@ protected boolean init; - protected void init(final RangeOfValuesUI inputContentUI) { - super.init(inputContentUI); + protected RangeOfValuesHandler(RangeOfValuesUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(RangeOfValuesUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,11 +27,11 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> - <RangeOfValuesHandler id="handler" /> + <RangeOfValuesHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> <JPanel id='body'> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -53,14 +53,16 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(SelectivityHandler.class); - protected void init(final SelectivityUI selectivityUI) { - super.init(selectivityUI); + protected SelectivityHandler(SelectivityUI inputContentUI) { + super(inputContentUI); + } - selectivityUI.addPropertyChangeListener(SelectivityUI.PROPERTY_BEAN, new PropertyChangeListener() { + protected void afterInit() { + inputContentUI.addPropertyChangeListener(SelectivityUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { - selectivityUI.setPopulation(null); - selectivityUI.selectivityTable.setModel(new GearPopulationSelectivityModel()); + inputContentUI.setPopulation(null); + inputContentUI.selectivityTable.setModel(new GearPopulationSelectivityModel()); } if (evt.getNewValue() != null) { refresh(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.Population id='population' javaBean='null'/> - <SelectivityHandler id="handler" /> + <SelectivityHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="selectivity" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Gear' @@ -41,7 +41,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,14 +33,16 @@ */ public class MetierHandler extends InputContentHandler<MetierUI> { - protected void init(final MetierUI metierUI) { - super.init(metierUI); + protected MetierHandler(MetierUI inputContentUI) { + super(inputContentUI); + } - metierUI.setButtonTitle(t("isisfish.input.continueTripTypes")); - metierUI.setNextPath(n("isisfish.input.tree.triptypes")); + protected void afterInit() { + inputContentUI.setButtonTitle(t("isisfish.input.continueTripTypes")); + inputContentUI.setNextPath(n("isisfish.input.tree.triptypes")); // install change listener // (depends on sensitivity can't be done on constructor) - metierUI.installChangeListener(metierUI.metierTab); + inputContentUI.installChangeListener(inputContentUI.metierTab); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -53,9 +53,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(MetierSeasonInfoSpeciesHandler.class); - protected void init(final MetierSeasonInfoSpeciesUI inputContentUI) { - super.init(inputContentUI); + protected MetierSeasonInfoSpeciesHandler(MetierSeasonInfoSpeciesUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(MetierSeasonInfoSpeciesUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { setSeasonModel(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoSpeciesUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -31,7 +31,7 @@ <fr.ifremer.isisfish.entities.Species id='species' javaBean='null'/> - <MetierSeasonInfoSpeciesHandler id="handler" /> + <MetierSeasonInfoSpeciesHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="metier" bean='{getMetierSeasonInfo()}' beanClass='fr.ifremer.isisfish.entities.MetierSeasonInfo' @@ -47,7 +47,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -60,9 +60,11 @@ protected Interval interval = null; protected boolean init = false; - protected void init(final MetierSeasonInfoZoneUI inputContentUI) { - super.init(inputContentUI); + protected MetierSeasonInfoZoneHandler(MetierSeasonInfoZoneUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { /* * Don't add both in same listener. * When first is set, last value from getPopulationSeasonInfo() Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.MetierSeasonInfo id='metierSeasonInfo' javaBean='null'/> - <MetierSeasonInfoZoneHandler id="handler" /> + <MetierSeasonInfoZoneHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="metier" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Metier' @@ -50,7 +50,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,21 +37,23 @@ protected boolean init; - protected void init(final MetierTabUI metierTabUI) { - super.init(metierTabUI); + protected MetierTabHandler(MetierTabUI inputContentUI) { + super(inputContentUI); + } - metierTabUI.addPropertyChangeListener(MetierTabUI.PROPERTY_BEAN, new PropertyChangeListener() { + protected void afterInit() { + inputContentUI.addPropertyChangeListener(MetierTabUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - GenericComboModel<Gear> model = new GenericComboModel<>(metierTabUI.getFisheryRegion().getGear()); + GenericComboModel<Gear> model = new GenericComboModel<>(inputContentUI.getFisheryRegion().getGear()); if (evt.getNewValue() == null) { } if (evt.getNewValue() != null) { init = true; - model.setSelectedItem(metierTabUI.bean.getGear()); + model.setSelectedItem(inputContentUI.bean.getGear()); init = false; } - metierTabUI.fieldMetierGear.setModel(model); + inputContentUI.fieldMetierGear.setModel(model); } }); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierTabUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> - <MetierTabHandler id="handler" /> + <MetierTabHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="metier" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Metier' @@ -41,7 +41,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> - <MetierHandler id="handler" /> + <MetierHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -41,7 +41,6 @@ import fr.ifremer.isisfish.entities.Observation; import fr.ifremer.isisfish.ui.input.InputContentHandler; -import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoSpeciesHandler; import fr.ifremer.isisfish.ui.util.ErrorHelper; /** @@ -52,9 +51,11 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(ObservationHandler.class); - protected void init(final ObservationUI inputContentUI) { - super.init(inputContentUI); + protected ObservationHandler(ObservationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(ObservationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -28,7 +28,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Observation id='bean' javaBean='null' /> - <ObservationHandler id="handler" /> + <ObservationHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Observation' @@ -38,7 +38,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -57,9 +57,11 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationBasicsHandler.class); - protected void init(final PopulationBasicsUI inputContentUI) { - super.init(inputContentUI); + protected PopulationBasicsHandler(PopulationBasicsUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(PopulationBasicsUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { @@ -138,10 +140,10 @@ protected void create() { // find species node InputUI inputUI = inputContentUI.getContextValue(InputUI.class, JAXXUtil.PARENT); - Species species = inputUI.getHandler().findSpecies(inputUI); + Species species = inputUI.getHandler().findSpecies(); // create node and select it Population population = createPopulation(inputContentUI.getTopiaContext(), species); - inputUI.getHandler().insertTreeNode(inputUI, Population.class, population); + inputUI.getHandler().insertTreeNode(Population.class, population); inputContentUI.setInfoText(t("isisfish.message.creation.finished")); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationBasicsHandler id="handler" /> + <PopulationBasicsHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="basics" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,9 +36,11 @@ */ public class PopulationCapturabilityHandler extends InputContentHandler<PopulationCapturabilityUI> { - protected void init(final PopulationCapturabilityUI inputContentUI) { - super.init(inputContentUI); + protected PopulationCapturabilityHandler(PopulationCapturabilityUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(PopulationCapturabilityUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationCapturabilityUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationCapturabilityHandler id="handler" /> + <PopulationCapturabilityHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="capturability" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -30,7 +30,11 @@ */ public class PopulationEquationHandler extends InputContentHandler<PopulationEquationUI> { - protected void init(final PopulationEquationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationEquationHandler(PopulationEquationUI inputContentUI) { + super(inputContentUI); } + + protected void afterInit() { + + } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationEquationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationEquationHandler id="handler" /> + <PopulationEquationHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="equation" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -43,9 +43,11 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationGroupHandler.class); - protected void init(final PopulationGroupUI inputContentUI) { - super.init(inputContentUI); + protected PopulationGroupHandler(PopulationGroupUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(PopulationGroupUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationGroupUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -39,7 +39,7 @@ <fr.ifremer.isisfish.entities.PopulationGroup id='populationGroup' javaBean='null'/> - <PopulationGroupHandler id="handler" /> + <PopulationGroupHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="group" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -57,7 +57,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,9 +33,12 @@ */ public class PopulationHandler extends InputContentHandler<PopulationUI> { - protected void init(final PopulationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationHandler(PopulationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.setButtonTitle(t("isisfish.input.continueGears")); inputContentUI.setNextPath(n("isisfish.input.tree.gears")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -48,9 +48,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationMigrationEmigrationHandler.class); - protected void init(final PopulationMigrationEmigrationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationEmigrationHandler(PopulationMigrationEmigrationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationMigrationEmigrationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEmigrationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -28,11 +28,11 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> - <PopulationMigrationEmigrationHandler id="handler" /> + <PopulationMigrationEmigrationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -31,9 +31,13 @@ */ public class PopulationMigrationEquationHandler extends InputContentHandler<PopulationMigrationEquationUI> { - protected void init(final PopulationMigrationEquationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationEquationHandler(PopulationMigrationEquationUI inputContentUI) { + super(inputContentUI); } + + protected void afterInit() { + + } public void init(PopulationSeasonInfo pi) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationEquationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,18 +29,12 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> - <PopulationMigrationEquationHandler id="handler" /> + <PopulationMigrationEquationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } - /*public void init(PopulationSeasonInfo populationSeasonInfo) { - // add null before, for second to be considered as a changed event - // otherwize, setBean has no effect - //setPopInfo(null); - //setPopInfo(populationSeasonInfo); - }*/ ]]></script> <JPanel id="body"> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,9 +36,12 @@ */ public class PopulationMigrationHandler extends InputContentHandler<PopulationMigrationUI> { - protected void init(final PopulationMigrationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationHandler(PopulationMigrationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationMigrationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -48,9 +48,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationMigrationImmigrationHandler.class); - protected void init(final PopulationMigrationImmigrationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationImmigrationHandler(PopulationMigrationImmigrationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationMigrationImmigrationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationImmigrationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -28,11 +28,11 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> - <PopulationMigrationImmigrationHandler id="handler" /> + <PopulationMigrationImmigrationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -48,9 +48,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationMigrationMigrationHandler.class); - protected void init(final PopulationMigrationMigrationUI inputContentUI) { - super.init(inputContentUI); + protected PopulationMigrationMigrationHandler(PopulationMigrationMigrationUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationMigrationMigrationUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationMigrationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,11 +33,11 @@ <Boolean id='zoneArrivalSelected' javaBean='false'/> <Boolean id='coefNonVide' javaBean='false'/> - <PopulationMigrationMigrationHandler id="handler" /> + <PopulationMigrationMigrationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationMigrationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> - <PopulationMigrationHandler id="handler" /> + <PopulationMigrationHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="migration" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -46,7 +46,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -30,7 +30,11 @@ */ public class PopulationPriceHandler extends InputContentHandler<PopulationPriceUI> { - protected void init(final PopulationPriceUI inputContentUI) { - super.init(inputContentUI); + protected PopulationPriceHandler(PopulationPriceUI inputContentUI) { + super(inputContentUI); } + + protected void afterInit() { + + } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationPriceUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationPriceHandler id="handler" /> + <PopulationPriceHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="equation" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -50,9 +50,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationRecruitmentHandler.class); - protected void init(final PopulationRecruitmentUI inputContentUI) { - super.init(inputContentUI); + protected PopulationRecruitmentHandler(PopulationRecruitmentUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationRecruitmentUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationRecruitmentHandler id="handler" /> + <PopulationRecruitmentHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="recruitement" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -45,9 +45,14 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(PopulationSeasonsHandler.class); - protected void init(final PopulationSeasonSpacializedUI inputContentUI) { - super.init(inputContentUI); + protected PopulationSeasonSpacializedHandler(PopulationSeasonSpacializedUI inputContentUI) { + super(inputContentUI); + // TODO Auto-generated constructor stub } + + protected void afterInit() { + + } protected void populationSeasonLengthMatrixChanged(MatrixPanelEvent event) { if (inputContentUI.getPopulationSeasonInfo() != null && inputContentUI.matrixPanelPopulationSeasonLengthChange.getMatrix() != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonSpacializedUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -31,11 +31,11 @@ <Boolean id='ageGroupType' javaBean='false'/> - <PopulationSeasonSpacializedHandler id="handler" /> + <PopulationSeasonSpacializedHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -55,8 +55,11 @@ protected boolean init = false; - protected void init(final PopulationSeasonsUI inputContentUI) { - super.init(inputContentUI); + protected PopulationSeasonsHandler(PopulationSeasonsUI inputContentUI) { + super(inputContentUI); + } + + protected void afterInit() { inputContentUI.addPropertyChangeListener(PopulationSeasonsUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='populationSeasonInfo' javaBean='null'/> - <PopulationSeasonsHandler id="handler" /> + <PopulationSeasonsHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="seasons" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -47,7 +47,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,11 +27,11 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationHandler id="handler" /> + <PopulationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -43,9 +43,12 @@ protected boolean init = false; - protected void init(final PopulationZonesEditorUI inputContentUI) { - super.init(inputContentUI); + protected PopulationZonesEditorHandler(PopulationZonesEditorUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(PopulationZonesEditorUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesEditorUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationZonesEditorHandler id="handler" /> + <PopulationZonesEditorHandler id="handler" constructorParams="this" /> <import> java.awt.Dimension @@ -35,7 +35,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -30,8 +30,11 @@ */ public class PopulationZonesHandler extends InputContentHandler<PopulationZonesUI> { - protected void init(final PopulationZonesUI inputContentUI) { - super.init(inputContentUI); + protected PopulationZonesHandler(PopulationZonesUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationZonesUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <PopulationZonesHandler id="handler" /> + <PopulationZonesHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="zones" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -63,10 +63,14 @@ protected double step = 1; protected PopulationBasicsUI popBasic; - protected void init(final WizardGroupCreationUI wizardUI) { + public WizardGroupCreationHandler(WizardGroupCreationUI wizardUI) { this.wizardUI = wizardUI; } + protected void afterInit() { + + } + public void initParent(PopulationBasicsUI popBasic) { this.popBasic = popBasic; } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/WizardGroupCreationUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -24,11 +24,11 @@ --> <JPanel id="wizardGroup" layout='{new BorderLayout()}'> - <WizardGroupCreationHandler id="handler" /> + <WizardGroupCreationHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -45,9 +45,11 @@ protected boolean init = false; - protected void init(final PortUI inputContentUI) { - super.init(inputContentUI); + protected PortHandler(PortUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { new OpenMapEvents(inputContentUI.portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Port id='bean' javaBean='null'/> - <PortHandler id="handler" /> + <PortHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Port' @@ -38,7 +38,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -50,9 +50,12 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(EffortDescriptionHandler.class); - protected void init(final EffortDescriptionUI inputContentUI) { - super.init(inputContentUI); + protected EffortDescriptionHandler(EffortDescriptionUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(EffortDescriptionUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { GenericListModel<Metier> metierModel = (GenericListModel<Metier>)inputContentUI.fieldEffortDescriptionMetierList.getModel(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,9 +37,12 @@ */ public class EffortDescriptionParametersHandler extends InputContentHandler<EffortDescriptionParametersUI> { - protected void init(final EffortDescriptionParametersUI inputContentUI) { - super.init(inputContentUI); + protected EffortDescriptionParametersHandler(EffortDescriptionParametersUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(EffortDescriptionParametersUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,7 +29,7 @@ <fr.ifremer.isisfish.entities.EffortDescription id='effortDescription' javaBean='null'/> - <EffortDescriptionParametersHandler id="handler" /> + <EffortDescriptionParametersHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="effortdescriptionparameters" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.SetOfVessels' @@ -50,7 +50,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> - <EffortDescriptionHandler id="handler" /> + <EffortDescriptionHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="effortdescription" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.SetOfVessels' @@ -36,7 +36,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -38,9 +38,12 @@ protected boolean init; - protected void init(final SetOfVesselsBasicsUI inputContentUI) { - super.init(inputContentUI); + protected SetOfVesselsBasicsHandler(SetOfVesselsBasicsUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(SetOfVesselsBasicsUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsBasicsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> - <SetOfVesselsBasicsHandler id="handler" /> + <SetOfVesselsBasicsHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="basics" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.SetOfVessels' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,9 +33,11 @@ */ public class SetOfVesselsHandler extends InputContentHandler<SetOfVesselsUI> { - protected void init(final SetOfVesselsUI inputContentUI) { - super.init(inputContentUI); + protected SetOfVesselsHandler(SetOfVesselsUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continueStrategies")); inputContentUI.setNextPath(n("isisfish.input.tree.strategies")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/SetOfVesselsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> - <SetOfVesselsHandler id="handler" /> + <SetOfVesselsHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,9 +37,11 @@ */ public class SpeciesHandler extends InputContentHandler<SpeciesUI> { - protected void init(final SpeciesUI inputContentUI) { - super.init(inputContentUI); - + protected SpeciesHandler(SpeciesUI inputContentUI) { + super(inputContentUI); + } + + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continuePopulations")); inputContentUI.addPropertyChangeListener(SpeciesUI.PROPERTY_BEAN, new PropertyChangeListener() { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -30,10 +30,14 @@ */ public class SpeciesStructuredHandler extends InputContentHandler<SpeciesStructuredUI> { - protected void init(final SpeciesStructuredUI inputContentUI) { - super.init(inputContentUI); + protected SpeciesStructuredHandler(SpeciesStructuredUI inputContentUI) { + super(inputContentUI); } + protected void afterInit() { + + } + protected void dynamicChanged() { if (inputContentUI.getBean() != null) { inputContentUI.getBean().setAgeGroupType(inputContentUI.fieldSpeciesDynamicAge.isSelected()); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesStructuredUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/> - <SpeciesStructuredHandler id="handler" /> + <SpeciesStructuredHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/> - <SpeciesHandler id="handler" /> + <SpeciesHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Species' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,9 +33,11 @@ */ public class StrategyHandler extends InputContentHandler<StrategyUI> { - protected void init(final StrategyUI inputContentUI) { - super.init(inputContentUI); + protected StrategyHandler(StrategyUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continueObservations")); inputContentUI.setNextPath(n("isisfish.input.tree.observations")); // install change listener Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,9 +36,12 @@ */ public class StrategyMonthInfoHandler extends InputContentHandler<StrategyMonthInfoUI> { - protected void init(final StrategyMonthInfoUI inputContentUI) { - super.init(inputContentUI); + protected StrategyMonthInfoHandler(StrategyMonthInfoUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { + inputContentUI.addPropertyChangeListener(StrategyMonthInfoUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyMonthInfoUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -39,7 +39,7 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo10' javaBean='null'/> <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo11' javaBean='null'/> - <StrategyMonthInfoHandler id="handler" /> + <StrategyMonthInfoHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="month" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Strategy' @@ -104,7 +104,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,9 +37,11 @@ protected boolean init; - protected void init(final StrategyOneMonthInfoUI inputContentUI) { - super.init(inputContentUI); + protected StrategyOneMonthInfoHandler(StrategyOneMonthInfoUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(StrategyOneMonthInfoUI.PROPERTY_STRATEGY_MONTH_INFO, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyOneMonthInfoUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -31,11 +31,11 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo' javaBean='null'/> - <StrategyOneMonthInfoHandler id="handler" /> + <StrategyOneMonthInfoHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -37,9 +37,11 @@ protected boolean init; - protected void init(final StrategyTabUI inputContentUI) { - super.init(inputContentUI); + protected StrategyTabHandler(StrategyTabUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.addPropertyChangeListener(StrategyTabUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyTabUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> - <StrategyTabHandler id="handler" /> + <StrategyTabHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' context="basics" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Strategy' @@ -37,7 +37,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/strategy/StrategyUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> - <StrategyHandler id="handler" /> + <StrategyHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -36,9 +36,11 @@ */ public class TripTypeHandler extends InputContentHandler<TripTypeUI> { - protected void init(final TripTypeUI inputContentUI) { - super.init(inputContentUI); + protected TripTypeHandler(TripTypeUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continueVesselTypes")); inputContentUI.setNextPath(n("isisfish.input.tree.vesseltypes")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.TripType id='bean' javaBean='null'/> - <TripTypeHandler id="handler" /> + <TripTypeHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.TripType' @@ -41,7 +41,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -60,9 +60,11 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(EntityVariableHandler.class); - protected void init(final EntityVariableUI inputContentUI) { - super.init(inputContentUI); - + protected EntityVariableHandler(EntityVariableUI inputContentUI) { + super(inputContentUI); + } + + protected void afterInit() { inputContentUI.addPropertyChangeListener(EntityVariableUI.PROPERTY_BEAN, new java.beans.PropertyChangeListener() { public void propertyChange(java.beans.PropertyChangeEvent evt) { reloadVariables(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -29,11 +29,11 @@ <fr.ifremer.isisfish.entities.Variable id="variable" javaBean='null' /> - <EntityVariableHandler id="handler" /> + <EntityVariableHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -42,9 +42,11 @@ protected boolean init; - protected void init(final VesselTypeUI inputContentUI) { - super.init(inputContentUI); + protected VesselTypeHandler(VesselTypeUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continueSetOfVessels")); inputContentUI.setNextPath(n("isisfish.input.tree.setofvessels")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/vesseltype/VesselTypeUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.VesselType id='bean' javaBean='null'/> - <VesselTypeHandler id="handler" /> + <VesselTypeHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.VesselType' @@ -41,7 +41,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -50,27 +50,29 @@ /** Class logger. */ private static final Log log = LogFactory.getLog(ZoneBasicsHandler.class); - protected void init(final ZoneBasicsUI zoneBasicsUI) { - super.init(zoneBasicsUI); + public ZoneBasicsHandler(ZoneBasicsUI inputContentUI) { + super(inputContentUI); + } - new OpenMapEvents(zoneBasicsUI.zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { + protected void afterInit() { + new OpenMapEvents(inputContentUI.zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { boolean result = false; - if (zoneBasicsUI.getBean() != null) { // impossible de desactiver la carte :( - zoneBasicsUI.getBean().setCell(zoneBasicsUI.zoneMap.getSelectedCells()); + if (inputContentUI.getBean() != null) { // impossible de desactiver la carte :( + inputContentUI.getBean().setCell(inputContentUI.zoneMap.getSelectedCells()); setZoneCells(); } return result; } }; - zoneBasicsUI.addPropertyChangeListener(ZoneBasicsUI.PROPERTY_BEAN, new PropertyChangeListener() { + inputContentUI.addPropertyChangeListener(ZoneBasicsUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { - zoneBasicsUI.fieldZoneName.setText(""); - zoneBasicsUI.fieldZoneComment.setText(""); - zoneBasicsUI.zoneMap.setSelectedCells(); + inputContentUI.fieldZoneName.setText(""); + inputContentUI.fieldZoneComment.setText(""); + inputContentUI.zoneMap.setSelectedCells(); } if (evt.getNewValue() != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -27,7 +27,7 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/> - <ZoneBasicsHandler id="handler" /> + <ZoneBasicsHandler id="handler" constructorParams="this" /> <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Zone' @@ -38,7 +38,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -33,9 +33,11 @@ */ public class ZoneHandler extends InputContentHandler<ZoneUI> { - protected void init(final ZoneUI inputContentUI) { - super.init(inputContentUI); + protected ZoneHandler(ZoneUI inputContentUI) { + super(inputContentUI); + } + protected void afterInit() { inputContentUI.setButtonTitle(t("isisfish.input.continuePorts")); inputContentUI.setNextPath(n("isisfish.input.tree.ports")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -26,11 +26,11 @@ <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/> - <ZoneHandler id="handler" /> + <ZoneHandler id="handler" constructorParams="this" /> <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueHandler.java 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueHandler.java 2015-05-27 13:00:56 UTC (rev 4237) @@ -53,15 +53,16 @@ /** queue ui to manage. */ protected QueueUI queueUI; - + /** - * Queue action. * * @param queueUI queue ui to manage */ - public void init(QueueUI queueUI) { + public QueueHandler(QueueUI queueUI) { this.queueUI = queueUI; - + } + + public void afterInit() { queueUI.queueTable.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); queueUI.queueTableDone.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2015-05-27 12:59:59 UTC (rev 4236) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2015-05-27 13:00:56 UTC (rev 4237) @@ -23,6 +23,8 @@ #L% --> <Table> + <QueueHandler id="handler" constructorParams="this" /> + <import> fr.ifremer.isisfish.simulator.launcher.SimulationService fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel @@ -30,7 +32,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - handler.init(this); + handler.afterInit(); } ]]></script> @@ -39,7 +41,7 @@ <Boolean id='canClear' javaBean='false'/> <Boolean id='canRestart' javaBean='false'/> - <QueueHandler id="handler" /> + <SimulationServiceTableModel id="newSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), true)'/> <SimulationServiceTableModel id="doneSimulationModel" javaBean='new SimulationServiceTableModel(SimulationService.getService(), false)' onTableChanged='handler.updateActions()' />