June 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2328 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 5, 2009

June 5, 2009

Author: chatellier Date: 2009-06-05 13:33:16 +0000 (Fri, 05 Jun 2009) New Revision: 2328 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx Log: Improve Tab Swaping perfs. Add only one change listener per tab pane. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-05 13:20:47 UTC (rev 2327) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-05 13:33:16 UTC (rev 2328) @@ -20,19 +20,17 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; - // constructor code setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); @Override public void refresh() { - if (isSensitivity()) { - gearTab.addChangeListener(new SensitivityTabbedPaneListener()); - } else { - gearTab.addChangeListener(new InputTabbedPaneListener()); - } + + // install change listener + // (depends on sensitivity can't be done on constructor) + installChangeListener(gearTab); + getVerifier().addCurrentPanel(selectivityUI, gearTabUI); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-05 13:20:47 UTC (rev 2327) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-05 13:33:16 UTC (rev 2328) @@ -63,7 +63,10 @@ import fr.ifremer.isisfish.ui.util.UtilsUI; import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; +import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; +protected ChangeListener tabbedPaneChangeListener; + /** * This method is UI entry point. * @@ -150,6 +153,30 @@ } } +/** + * Install tabbed pane change listener depending on sensitivity. + * (init at first call) + * + * @param tabbedPane tabbed pane to install change listener + */ +protected void installChangeListener(JTabbedPane tabbedPane) { + + // remove already registred listeners + for (ChangeListener changeListener : tabbedPane.getChangeListeners()) { + tabbedPane.removeChangeListener(changeListener); + } + + if (tabbedPaneChangeListener == null) { + if (isSensitivity()) { + tabbedPaneChangeListener = new SensitivityTabbedPaneListener(); + } else { + tabbedPaneChangeListener = new InputTabbedPaneListener(); + } + } + + tabbedPane.addChangeListener(tabbedPaneChangeListener); +} + ]]></script> <JPanel id='body' constraints='BorderLayout.CENTER'/> <JButton id='next' text='{getButtonTitle()}' constraints='BorderLayout.SOUTH' visible='{getNextPath() != null}' onActionPerformed='goTo()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-06-05 13:20:47 UTC (rev 2327) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-06-05 13:33:16 UTC (rev 2328) @@ -20,20 +20,17 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; - -//getVerifier().addCurrentPanel(this); +// Constructor code setButtonTitle(_("isisfish.input.continueTripTypes")); setNextPath("$root/$tripTypes"); @Override public void refresh() { - if (isSensitivity()) { - metierTab.addChangeListener(new SensitivityTabbedPaneListener()); - } else { - metierTab.addChangeListener(new InputTabbedPaneListener()); - } - + + // install change listener + // (depends on sensitivity c'ant be done on constructor) + installChangeListener(metierTab); + // add tab in reverse order // metierTabUI at last, for this tab refresh at end, and save/cancel button linked to // entity change Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-05 13:20:47 UTC (rev 2327) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-05 13:33:16 UTC (rev 2328) @@ -26,23 +26,25 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; -//getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); @Override public void refresh() { - if (isSensitivity()) { - populationTab.addChangeListener(new SensitivityTabbedPaneListener()); - } else { - populationTab.addChangeListener(new InputTabbedPaneListener()); - } - getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); + + // install change listener + // (depends on sensitivity can't be done on constructor) + installChangeListener(populationTab); + + // reverse ordre is no more needed + getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, + populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); } @Override public void setActionButtons() { - + // active les bouton sur le premier onglet + populationBasicsUI.setActionButtons(); } ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-05 13:20:47 UTC (rev 2327) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-05 13:33:16 UTC (rev 2328) @@ -21,19 +21,17 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; - setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); //getVerifier().addCurrentPanel(this); @Override public void refresh() { - if (isSensitivity()) { - setOfVesselsTab.addChangeListener(new SensitivityTabbedPaneListener()); - } else { - setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); - } + + // install change listener + // (depends on sensitivity can't be done on constructor) + installChangeListener(setOfVesselsTab); + getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-05 13:20:47 UTC (rev 2327) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-05 13:33:16 UTC (rev 2328) @@ -20,18 +20,13 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; - -// is this add needed ? -//getVerifier().addCurrentPanel(this); - @Override public void refresh() { - if (isSensitivity()) { - strategyTab.addChangeListener(new SensitivityTabbedPaneListener()); - } else { - strategyTab.addChangeListener(new InputTabbedPaneListener()); - } + + // install change listener + // (depends on sensitivity can't be done on constructor) + installChangeListener(strategyTab); + getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI); }

1 0

r2327 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 5, 2009

June 5, 2009

Author: chatellier Date: 2009-06-05 13:20:47 +0000 (Fri, 05 Jun 2009) New Revision: 2327 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java Log: Fix ConcurrentModificationException. Evite de modifier la collection pendant son parcourt. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-05 12:18:16 UTC (rev 2326) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-05 13:20:47 UTC (rev 2327) @@ -123,7 +123,7 @@ /** * Map entity key to {@link TopiaEntity}. */ - protected Map<String, TopiaEntity> currentEntities = new HashMap<String, TopiaEntity>(); + protected HashMap<String, TopiaEntity> currentEntities = new HashMap<String, TopiaEntity>(); protected HashSet<InputContentUI> currentPanels = new HashSet<InputContentUI>(); protected InputUI rootUI; @@ -339,18 +339,17 @@ } /** - * Cancel all modification on entity (rollback), and force reload it and - * refresh all ui component that name match 'type'Tab + * Cancel all modification on entity (rollback), and force reload it. */ protected void topiaCancel() { try { noModif(); isisContext.rollbackTransaction(); - Map<String, TopiaEntity> canceledEntity = new HashMap<String, TopiaEntity>(); - for (Entry<String, TopiaEntity> currentEntity : currentEntities - .entrySet()) { - TopiaEntity t = isisContext.findByTopiaId(currentEntity - .getValue().getTopiaId()); + Map<String, TopiaEntity> canceledEntity = (Map<String, TopiaEntity>)currentEntities.clone(); + + currentEntities.clear(); + for (Entry<String, TopiaEntity> currentEntity : canceledEntity.entrySet()) { + TopiaEntity t = isisContext.findByTopiaId(currentEntity.getValue().getTopiaId()); // TODO a quoi ca sert de recharger les entités ? // desynchronise la précédente @@ -363,8 +362,7 @@ rootUI.setTreeSelection(currentNode.getContextPath()); String key = currentEntity.getKey(); - canceledEntity.put(key, t); - addCurrentEntity(t); + addCurrentEntity(t, key); } // refresh all registred panel

1 0

r2326 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org June 5, 2009

June 5, 2009

Author: chatellier Date: 2009-06-05 12:18:16 +0000 (Fri, 05 Jun 2009) New Revision: 2326 Modified: isis-fish/trunk/src/main/resources/log4j.properties Log: Back to info log level Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2009-06-05 12:17:28 UTC (rev 2325) +++ isis-fish/trunk/src/main/resources/log4j.properties 2009-06-05 12:18:16 UTC (rev 2326) @@ -6,7 +6,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.fr.ifremer.isisfish=DEBUG +log4j.logger.fr.ifremer.isisfish=INFO log4j.logger.org.codelutin=INFO log4j.logger.analyseplans=INFO log4j.logger.exports=INFO

1 0

r2325 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input resources resources/i18n
by chatellier＠users.labs.libre-entreprise.org June 5, 2009

June 5, 2009

Author: chatellier Date: 2009-06-05 12:17:28 +0000 (Fri, 05 Jun 2009) New Revision: 2325 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties isis-fish/trunk/src/main/resources/log4j.properties Log: Refactor save/cancel buttons activation. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -57,9 +57,8 @@ } }); + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); Cell cell = getVerifier().getEntity(Cell.class); // add null before, for second to be considered as a changed event @@ -72,6 +71,12 @@ cellChanged = true; } + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} + protected OpenMapEvents getMapListener() { if (mapListener == null){ mapListener = new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -59,9 +59,8 @@ } }); -public void refresh(){ - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); + at Override +public void refresh() { SetOfVessels setOfVessels = getVerifier().getEntity(SetOfVessels.class); setBean((SetOfVesselsImpl) setOfVessels); if (getBean() != null){ @@ -71,6 +70,13 @@ setEffortDescriptionEffortDescriptionList(); } } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} + protected void setEffortDescriptionEffortDescriptionList(){ if (getBean().getPossibleMetiers() != null){ java.util.List<Item> items = new ArrayList<Item>(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,25 @@ -<JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" -width="400" height="400"> + +<JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" width="400" height="400"> - <script> + <script><![CDATA[ import org.codelutin.widget.editor.Editor; import fr.ifremer.isisfish.util.CompileHelper; import org.codelutin.util.FileUtil; @@ -47,7 +65,7 @@ (HTMLFrameHyperlinkEvent)e); } else { try { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { Desktop.getDesktop().browse(e.getURL().toURI()); } else { doc.setPage(e.getURL()); @@ -90,7 +108,7 @@ } } - </script> + ]]></script> <Table weightx="1"> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  -  <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -64,9 +48,9 @@ } } }); -public void refresh(){ - getVerifier().setSaveButton(save, false); - getVerifier().setCancelButton(cancel); + + at Override +public void refresh() { setBean(null); FisheryRegion region = getVerifier().getEntity(FisheryRegion.class); setBean((FisheryRegionImpl)region); @@ -80,6 +64,13 @@ fieldCellLengthLongitude.init(); } } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save, false); + getVerifier().setCancelButton(cancel); +} + protected void setFieldMapfilesModel(FisheryRegion region){ DefaultListModel model = new DefaultListModel(); java.util.List<String> mapList = region.getMapFileList(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -42,11 +42,8 @@ } }); + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "Gear"); - getVerifier().setDeleteButton(remove); Gear gear = getVerifier().getEntity(Gear.class); // add null before, for second to be considered as a changed event @@ -61,8 +58,15 @@ fieldGearStandardisationFactor.init(); }*/ } - ]]> - </script> + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "Gear"); + getVerifier().setDeleteButton(remove); +} + ]]></script> <Table id='body'> <row> <cell fill='both' weightx='1.0' weighty='1.0'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -26,7 +26,7 @@ setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); -// refresh + at Override public void refresh() { if (isSensitivity()) { gearTab.addChangeListener(new SensitivityTabbedPaneListener()); @@ -35,6 +35,12 @@ } getVerifier().addCurrentPanel(selectivityUI, gearTabUI); } + + at Override +public void setActionButtons() { + // active les bouton sur le premier onglet + gearTabUI.setActionButtons(); +} ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab" name="Gear"> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -75,6 +75,15 @@ */ public abstract void refresh(); +/** + * This is a hack for tabbed UI. + * + * In this case of UI, they have multiples save/cancel + * buttons, they have to be manually activated + * on tab siwtching. + */ +public abstract void setActionButtons(); + public InputAction getAction() { return getContextValue(InputAction.class); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-06-05 12:17:28 UTC (rev 2325) @@ -127,6 +127,8 @@ verifier.removeAllPanels(); verifier.addCurrentPanel(currentUI); currentUI.refresh(); + // tabbed ui hack + currentUI.setActionButtons(); currentNode = node; } catch (Exception e) { if (log.isErrorEnabled()) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -113,6 +113,8 @@ } } } + + at Override public void refresh(){ editor.getCurrentEditor().removeDocumentListener(listener); try { @@ -130,7 +132,13 @@ setEditorText(); } editor.getCurrentEditor().addDocumentListener(listener); - } +} + + at Override +public void setActionButtons() { + +} + protected void setComboModel(){ if (getBean() != null){ TopiaContext isisContext = getBean().getTopiaContext(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-05 12:17:28 UTC (rev 2325) @@ -405,7 +405,11 @@ // and cause ConcurentModificationException. Set<InputContentUI> panelsToRefresh = (HashSet<InputContentUI>)currentPanels.clone(); for (InputContentUI panel : panelsToRefresh) { + if (log.isDebugEnabled()) { + log.debug("Verifier refresh ui : " + panel); + } panel.refresh(); + // do not call refresh action buttons here panel.setActif(editable); } } @@ -497,6 +501,7 @@ ui.setLayer(true); } ui.refresh(); + // do not call refresh action buttons here ui.setActif(editable); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-06-05 12:17:28 UTC (rev 2325) @@ -28,7 +28,9 @@ import org.apache.commons.logging.LogFactory; /** - * InputTabbedPaneListener. + * Listener used to control InputUI tab panel switching. + * + * Ask for * * @author letellier * @version $Revision: 1312 $ @@ -37,48 +39,53 @@ * by : $Author: sletellier $ */ public class InputTabbedPaneListener implements ChangeListener { - + /** Class logger. */ private static Log log = LogFactory.getLog(InputTabbedPaneListener.class); - + protected int cacheSelectedIndex = -1; @Override public void stateChanged(ChangeEvent e) { - try { - JTabbedPane pane = (JTabbedPane) e.getSource(); - pane.removeChangeListener(this); - int selectedIndex = pane.getSelectedIndex(); - if (cacheSelectedIndex != -1) { - pane.setSelectedIndex(cacheSelectedIndex); - } - InputContentUI ui = (InputContentUI) pane.getSelectedComponent(); - if (closeUI(ui)) { - pane.setSelectedIndex(selectedIndex); - } - ui = (InputContentUI) pane.getSelectedComponent(); - ui.refresh(); - cacheSelectedIndex = pane.getSelectedIndex(); - pane.addChangeListener(this); - } catch (Exception ex) { - if (log.isErrorEnabled()) { - log.error("Can't refresh", ex); - } + JTabbedPane pane = (JTabbedPane) e.getSource(); + pane.removeChangeListener(this); + int selectedIndex = pane.getSelectedIndex(); + if (cacheSelectedIndex != -1) { + pane.setSelectedIndex(cacheSelectedIndex); } + InputContentUI ui = (InputContentUI) pane.getSelectedComponent(); + if (closeUI(ui)) { + pane.setSelectedIndex(selectedIndex); + } + ui = (InputContentUI) pane.getSelectedComponent(); + if (log.isDebugEnabled()) { + log.debug("Final refresh " + ui); + } + ui.refresh(); + + // method only called for tabbed UI + // oterwize save.cancel buttons are active in last + // refreshed ui + ui.setActionButtons(); + + cacheSelectedIndex = pane.getSelectedIndex(); + pane.addChangeListener(this); } /** - * Ask you to save if modification are made - * @param context + * Ask you to save if modification are made. + * + * @param currentUI current displayed UI * @return true to change tab */ - protected boolean closeUI(InputContentUI context) throws Exception { + protected boolean closeUI(InputContentUI currentUI) { + // by default, we says that component was successfully closed boolean exit = true; - // by default, we says that component was succesfull closed - InputSaveVerifier verif = context + + InputSaveVerifier verif = currentUI .getContextValue(InputSaveVerifier.class); int responce = verif.checkEdit(); - //boolean exit = checkEdit(event, component); + if (responce == JOptionPane.CANCEL_OPTION) { exit = false; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -60,56 +47,39 @@ import org.codelutin.topia.TopiaContext; import javax.swing.table.TableCellEditor; -addPropertyChangeListener("bean", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); - } - if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text") - } - } -}); - -tableTargetSpecies.addMouseListener(new MouseListener() { - +tableTargetSpecies.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override public void mouseReleased(MouseEvent e) { remove.setEnabled(tableTargetSpecies.getSelectedRow() != -1); } +}); - @Override - public void mouseEntered(MouseEvent e) { + at Override +public void refresh() { + + if (log.isDebugEnabled()) { + log.debug("Refresh called in ui : " + this); } - - @Override - public void mouseExited(MouseEvent e) { - } -}); - public void refresh() { + getVerifier().addCurrentPanel(targetFactor); if (getBean() != null){ setTableTargetSpeciesModel(); - } - else{ + } + else{ setTargetSpeciesModel(); - } + } setTargetSpeciesModel(); remove.setEnabled(false); setAddButton(); } + + at Override +public void setActionButtons() { + +} + protected void setTargetSpeciesModel(){ - DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel(); + DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel(); java.util.List<Species> species = getRegion().getSpecies(); if (species != null){ fieldTargetSpeciesModel.addElement(new GenericCell(" ", null, null)); @@ -205,7 +175,7 @@ <InputOneEquationUI id='targetFactor' constructorParams='this' actif='{isActif()}' lblText='{_("isisfish.metierSeasonInfoSpecies.targetFactor")}' - bean='{getBean()}' nameEquation='TargetFactor' + bean='{getBean()}' nameEquation='TargetFactor' clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}' decorator='boxed' _bean='{MetierImpl.class}' _method='""'/> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -47,34 +34,31 @@ import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -addPropertyChangeListener("bean", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); - } - if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text") - } - } -}); - - public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); + at Override +public void refresh() { Metier metier = getVerifier().getEntity(Metier.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((MetierImpl) metier); - getVerifier().addCurrentPanel(editor); - if (getBean() != null){ + + getVerifier().addCurrentPanel(metierSeasonInfoSpeciesEditor); + if (getBean() != null) { setSeasonModel(); - } - else{ + } + else { DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); fieldMetierSeasonInfo.setModel(seasonModel); - } + } +} + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); } + protected void setSeasonModel(){ DefaultComboBoxModel seasonModel = new DefaultComboBoxModel(); java.util.List<MetierSeasonInfo> metierSeasonInfo = getBean().getMetierSeasonInfo(); @@ -96,7 +80,7 @@ setMetierInfo(msii); getVerifier().addCurrentEntity(getMetierInfo()); } - editor.refresh(); + metierSeasonInfoSpeciesEditor.refresh(); } ]]></script> <Table id='body'> @@ -113,8 +97,10 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <MetierSeasonInfoSpeciesEditorUI id='editor' constructorParams='this' bean='{getBean()}' metierInfo='{getMetierInfo()}' metierSeasonSelected='{getMetierSeasonSelected()}' actif='{isActif()}' - decorator='boxed' _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/> + <MetierSeasonInfoSpeciesEditorUI id='metierSeasonInfoSpeciesEditor' constructorParams='this' + bean='{getBean()}' metierInfo='{getMetierInfo()}' metierSeasonSelected='{getMetierSeasonSelected()}' + actif='{isActif()}' decorator='boxed' + _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -36,7 +23,7 @@  <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.MetierSeasonInfo id='metierSeasonInfo' javaBean='null'/> + <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id='metierSeasonInfo' javaBean='null'/> <Boolean id='metierSeasonInfoNotNull' javaBean='false'/> @@ -54,6 +41,7 @@ protected Interval interval = null; protected boolean init = false; + /* * Don't add both in same listener. * When first is set, last value from getPopulationSeasonInfo() @@ -62,7 +50,7 @@ ip.addPropertyChangeListener("first", new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (getMetierSeasonInfo() != null){ + if (getMetierSeasonInfo() != null) { getMetierSeasonInfo().setFirstMonth(new Month(interval.getFirst())); } } @@ -70,7 +58,7 @@ ip.addPropertyChangeListener("last", new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (getMetierSeasonInfo() != null){ + if (getMetierSeasonInfo() != null) { getMetierSeasonInfo().setLastMonth(new Month(interval.getLast())); } } @@ -80,7 +68,7 @@ @Override public void actionPerformed(ActionEvent e) { getVerifier().topiaSave(); - setCombo(); + setMetierSeasonInfoCombo(); } }); @@ -88,7 +76,7 @@ @Override public void actionPerformed(ActionEvent e) { getContextValue(InputAction.class).createMetierSeasonInfo(getBean()); - setCombo(); + setMetierSeasonInfoCombo(); } }); @@ -97,21 +85,26 @@ @Override public void actionPerformed(ActionEvent e) { getContextValue(InputAction.class).removeMetierSeasonInfo(getBean(), getMetierSeasonInfo()); - setCombo(); + setMetierSeasonInfoCombo(); } }); - public void refresh() { - if (!isActif()){ + @Override + public void refresh() { + + if (log.isDebugEnabled()) { + log.debug("Refresh called in ui : " + this); + } + + if (!isActif()) { setMetierSeasonInfoNotNull(false); } - getVerifier().setSaveButton(save, false); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "MetierSeasonInfo", false); - getVerifier().setDeleteButton(remove, false); + Metier metier = getVerifier().getEntity(Metier.class); + // don't add setBean(null) here : useless setBean((MetierImpl) metier); - if (getBean() != null){ + + if (getBean() != null) { // Model instanciation interval = new Interval(); interval.setMin(0); @@ -119,7 +112,7 @@ interval.setFirst(0); interval.setLast(2); - setCombo(); + setMetierSeasonInfoCombo(); setSeason(); setMetierZone(); @@ -127,8 +120,17 @@ ip.setModel(interval); } } - protected void setSeason() { - if (getMetierSeasonInfo() != null) { + + @Override + public void setActionButtons() { + getVerifier().setSaveButton(save, false); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "MetierSeasonInfo", false); + getVerifier().setDeleteButton(remove, false); + } + + protected void setSeason() { + if (getMetierSeasonInfo() != null) { try { if (log.isDebugEnabled()) { log.debug("Refresh interval : "); @@ -157,31 +159,32 @@ log.error("Can't display season", e); } } - } - } - protected void setMetierZone() { - if (getMetierSeasonInfo() != null){ - ListSelectionListener[] listeners = metierZones.getListSelectionListeners(); - for (ListSelectionListener listener : listeners) { - metierZones.removeListSelectionListener(listener); - } - metierZones.fillList(getRegion().getZone(), getMetierSeasonInfo().getZone()); - for (ListSelectionListener listener : listeners) { - metierZones.addListSelectionListener(listener); - } - } - } - protected void setCombo(){ + } + } + protected void setMetierZone() { + if (getMetierSeasonInfo() != null) { + ListSelectionListener[] listeners = metierZones.getListSelectionListeners(); + for (ListSelectionListener listener : listeners) { + metierZones.removeListSelectionListener(listener); + } + metierZones.fillList(getRegion().getZone(), getMetierSeasonInfo().getZone()); + for (ListSelectionListener listener : listeners) { + metierZones.addListSelectionListener(listener); + } + } + } + + protected void setMetierSeasonInfoCombo() { java.util.List<Item> items = new ArrayList<Item>(); java.util.List<MetierSeasonInfo> metierSeasonInfoList = getBean().getMetierSeasonInfo(); items.add(new Item("null", " ", null, false)); - if (metierSeasonInfoList != null){ - for (MetierSeasonInfo m : metierSeasonInfoList){ + if (metierSeasonInfoList != null) { + for (MetierSeasonInfo m : metierSeasonInfoList) { items.add(new Item(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, (m == getMetierSeasonInfo()))); } } - fieldMetierSeasonChoice.setItems(items); - } + metierSeasonInfoCombo.setItems(items); + } protected void metierZonesChanged(){ Object[] selected = metierZones.getSelectedValues(); java.util.List<Zone> zones = new ArrayList<Zone>(); @@ -190,9 +193,9 @@ } getMetierSeasonInfo().setZone(zones); } - protected void seasonChanged(){ + protected void seasonChanged() { init = true; - setMetierSeasonInfo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem()); + setMetierSeasonInfo((MetierSeasonInfoImpl)metierSeasonInfoCombo.getSelectedItem()); getVerifier().addCurrentEntity(getMetierSeasonInfo()); setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null); setSeason(); @@ -209,9 +212,7 @@ <JLabel text="isisfish.metierSeasonInfoZone.selectSeason" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldMetierSeasonChoice" - onActionPerformed='seasonChanged()' - enabled='{isActif()}'/> + <JComboBox id="metierSeasonInfoCombo" onActionPerformed='seasonChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -238,7 +239,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed'/> + <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo().getSeasonZoneComment()}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -16,18 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/* * - * MetierTabUI. - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -41,17 +29,25 @@ import fr.ifremer.isisfish.entities.MetierImpl; protected boolean init = false; + + @Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "Metier"); - getVerifier().setDeleteButton(remove); + + if (log.isDebugEnabled()) { + log.debug("Refresh called in ui : " + this); + } + Metier metier = getVerifier().getEntity(Metier.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((MetierImpl) metier); + try { - if (getBean() != null){ + if (getBean() != null) { init = true; - jaxx.runtime.SwingUtil.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear(),true); + jaxx.runtime.SwingUtil.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear(), true); init = false; } } catch (Exception e) { @@ -60,13 +56,22 @@ } } } - protected void gearChanged(){ + + @Override + public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "Metier"); + getVerifier().setDeleteButton(remove); + } + + protected void gearChanged() { if (!init) { getBean().setGear((Gear)fieldMetierGear.getSelectedItem()); } } ]]></script> - <Table id='bady'> + <Table> <row> <cell fill='both' weightx='1.0' weighty='1.0'> <Table> @@ -84,7 +89,7 @@ <cell fill='horizontal' anchor='east'> <JLabel text="isisfish.common.gear" enabled='{isActif()}'/> </cell> - <cell fill='horizontal' weightx='1.0'> + <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' enabled='{isActif()}' decorator='boxed'/> </cell> @@ -94,7 +99,7 @@ <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' + <JTextField id="fieldMetierParam" text='{getBean().getGearParameterValue()}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> @@ -102,9 +107,9 @@ <cell fill='horizontal' anchor='east'> <JLabel text="isisfish.metier.comments" enabled='{isActif()}'/> </cell> - <cell fill='both' weightx='1.0' weighty='1.0'> + <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' + <JTextArea id="fieldMetierComment" text='{getBean().getComment()}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> @@ -116,18 +121,18 @@ <cell fill='both' weightx='1.0'> <Table> <row> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='0.5'> <JButton id='save' decorator='boxed'/> </cell> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='0.5'> <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='0.5'> <JButton id='create' decorator='boxed'/> </cell> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='0.5'> <JButton id='remove' decorator='boxed'/> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -16,49 +16,47 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/* * - * MetierUI. - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> -  <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -import fr.ifremer.isisfish.entities.TripType; -import fr.ifremer.isisfish.entities.MetierImpl; -import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; -import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; -getVerifier().addCurrentPanel(this); +//getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueTripTypes")); setNextPath("$root/$tripTypes"); + at Override public void refresh() { - if (isSensitivity()){ + if (isSensitivity()) { metierTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { metierTab.addChangeListener(new InputTabbedPaneListener()); } + + // add tab in reverse order + // metierTabUI at last, for this tab refresh at end, and save/cancel button linked to + // entity change getVerifier().addCurrentPanel(metierSeasonSpeciesUI, metierSeasonInfoUI, metierTabUI); } + + at Override +public void setActionButtons() { + // active les bouton sur le premier onglet + metierTabUI.setActionButtons(); +} ]]></script> - <JPanel id='body' layout='{new BorderLayout()}'> - <JTabbedPane id="metierTab" name="Metier" constraints='BorderLayout.CENTER' > - <tab title='{_("isisfish.metier.title")}'><MetierTabUI id="metierTabUI" constructorParams='this'/></tab> - <tab title='{_("isisfish.metierSeasonInfoZone.title")}'><MetierSeasonInfoZoneUI id="metierSeasonInfoUI" constructorParams='this'/></tab> - <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'/></tab> + <JPanel layout='{new BorderLayout()}'> + <JTabbedPane id="metierTab" constraints='BorderLayout.CENTER'> + <tab title='{_("isisfish.metier.title")}'> + <MetierTabUI id="metierTabUI" constructorParams='this'/> + </tab> + <tab title='{_("isisfish.metierSeasonInfoZone.title")}'> + <MetierSeasonInfoZoneUI id="metierSeasonInfoUI" constructorParams='this'/> + </tab> + <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'> + <MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'/> + </tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -66,15 +53,12 @@ } }); -public void refresh(){ - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "Population", false); - getVerifier().setDeleteButton(remove); + at Override +public void refresh() { Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - if (getBean() != null){ -// TODO : Selection equation + if (getBean() != null) { + // TODO : Selection equation if (getBean() != null){ if (getBean().getPopulationGroup() != null){ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true); @@ -84,6 +68,15 @@ } getVerifier().addCurrentPanel(growthEquation, growthReverseEquation); } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "Population", false); + getVerifier().setDeleteButton(remove); +} + protected void createClasses(){ JFrame wizardFrame = new JFrame(); wizardFrame.setLayout(new BorderLayout()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  - <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -68,8 +54,8 @@ } }); - -public void refresh(){ + at Override +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); Population population = getVerifier().getEntity(Population.class); @@ -82,6 +68,12 @@ } fieldPopulationCapturability.addMatrixListener(listener); } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} ]]> </script> <Table id='body'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  - <fr.ifremer.isisfish.ui.input.InputContentUI> -  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> @@ -43,25 +28,18 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -addPropertyChangeListener("bean", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); - } - if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text") - } - } -}); -public void refresh(){ - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); + at Override +public void refresh() { Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); getVerifier().addCurrentPanel(naturalDeathRate, meanWeight, price); } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} ]]> </script> <Table id='body'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -54,12 +54,11 @@ } }); + at Override public void refresh() { if (!isActif()) { setPopGroupNotNull(false); } - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); if (getBean() != null) { @@ -69,6 +68,12 @@ } } + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} + protected void setNaturalDeathRateMatrix() { Population population = getBean(); AbstractMatrixND naturalDeathRateMatrix = (AbstractMatrixND)population.getNaturalDeathRateMatrix(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  - - <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> <Boolean id='gPopSelected' javaBean='false'/> @@ -71,38 +55,26 @@ } } }); -populationMigrationEmigrationTable.getTable().addMouseListener(new MouseListener() { - +populationMigrationEmigrationTable.getTable().addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override public void mouseReleased(MouseEvent e) { remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } }); public void init(PopulationSeasonInfo pi){ setPopInfo((PopulationSeasonInfoImpl)pi); populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().clone()); } + @Override public void refresh(){ Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); refreshPanel(); } + @Override + public void setActionButtons() { + + } public void refreshPanel(){ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -48,11 +48,17 @@ setPopInfo((PopulationSeasonInfoImpl)pi); } + at Override public void refresh() { Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation); } + + at Override +public void setActionButtons() { + +} ]]> </script> <Table id='body'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  - + *##%*/ +--> <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> <Boolean id='gPopSelected' javaBean='false'/> @@ -57,31 +55,13 @@ } }); -populationMigrationImmigrationTable.getTable().addMouseListener(new MouseListener() { - +populationMigrationImmigrationTable.getTable().addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override public void mouseReleased(MouseEvent e) { remove.setEnabled(populationMigrationImmigrationTable.getTable().getSelectedRow() != -1); } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } }); populationMigrationImmigrationTable.addMatrixListener(new MatrixPanelListener() { - @Override public void matrixChanged(MatrixPanelEvent arg0) { if (getPopInfo() != null){ @@ -94,12 +74,20 @@ setPopInfo((PopulationSeasonInfoImpl)pi); populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().clone()); } + + at Override public void refresh(){ Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); refreshPanel(); } + + at Override +public void setActionButtons() { + +} + public void refreshPanel(){ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  - <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> <Boolean id='gPopSelected' javaBean='false'/> @@ -70,31 +55,13 @@ } }); -populationMigrationMigrationTable.getTable().addMouseListener(new MouseListener() { - +populationMigrationMigrationTable.getTable().addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override public void mouseReleased(MouseEvent e) { remove.setEnabled(populationMigrationMigrationTable.getTable().getSelectedRow() != -1); } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } }); MatrixPanelListener listener = new MatrixPanelListener() { - @Override public void matrixChanged(MatrixPanelEvent arg0) { if (getPopInfo() != null){ @@ -104,14 +71,22 @@ }; public void init(PopulationSeasonInfo pi){ - setPopInfo((PopulationSeasonInfoImpl)pi); + setPopInfo((PopulationSeasonInfoImpl)pi); populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().clone()); } -public void refresh(){ + + at Override +public void refresh() { Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); refreshPanel(); } + + at Override +public void setActionButtons() { + +} + public void refreshPanel(){ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -21,7 +21,6 @@  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> <script><![CDATA[ @@ -47,9 +46,8 @@ } }); + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); @@ -58,6 +56,13 @@ } useEquationChanged(); } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} + protected void seasonChanged() { setPopInfo((PopulationSeasonInfoImpl)getPopulationSeasonInfo()); if (getPopInfo() != null) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -49,7 +49,7 @@ MatrixPanelListener listener = new MatrixPanelListener() { @Override - public void matrixChanged(MatrixPanelEvent arg0) { + public void matrixChanged(MatrixPanelEvent event) { if (getBean() != null){ if (fieldPopulationRecruitmentDistribution.getMatrix() != null){ getBean().setRecruitmentDistribution(fieldPopulationRecruitmentDistribution.getMatrix().copy()); @@ -58,20 +58,25 @@ } }; + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); getVerifier().addCurrentPanel(reproductionEquation); - if(getBean() != null && getBean().getRecruitmentDistribution() != null){ + if (getBean() != null && getBean().getRecruitmentDistribution() != null) { fieldPopulationRecruitmentDistribution.setMatrix(getBean().getRecruitmentDistribution().copy()); fieldPopulationMonthGapBetweenReproRecrutement.init(); } fieldPopulationRecruitmentDistribution.addMatrixListener(listener); } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} ]]> </script> <Table id='body'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -49,10 +49,16 @@ } }; + at Override public void refresh() { matrixPanelPopulationSeasonLengthChange.addMatrixListener(matrixPanelListener); } + at Override +public void setActionButtons() { + +} + /** * Called on spacialized radio button change. */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -114,14 +114,12 @@ } }; + at Override public void refresh() { if (!isActif()) { setPopSeasonInfoNotNull(false); } - getVerifier().setSaveButton(save, false); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "PopulationSeasonInfo", false); - getVerifier().setDeleteButton(remove, false); + Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); @@ -149,6 +147,14 @@ getVerifier().addCurrentPanel(populationSeasonSpecializedUI); } + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save, false); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "PopulationSeasonInfo", false); + getVerifier().setDeleteButton(remove, false); +} + protected void setSeasonInterval() { if(getPopulationSeasonInfo() != null) { try { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -26,18 +26,24 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; -getVerifier().addCurrentPanel(this); +//getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); -public void refresh(){ - if (isSensitivity()){ + at Override +public void refresh() { + if (isSensitivity()) { populationTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { populationTab.addChangeListener(new InputTabbedPaneListener()); } getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); } + + at Override +public void setActionButtons() { + +} ]]> </script> <JPanel id='body' layout='{new BorderLayout()}'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -37,6 +37,7 @@ } }); + at Override public void refresh(){ setPopulationZonesPresenceModel(); setFieldPopulationZonesReproductionModel(getSelectedValue(populationZonesPresence)); @@ -45,6 +46,12 @@ setFieldPopulationMappingZoneReproZoneRecru(); fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener); } + + at Override +public void setActionButtons() { + +} + protected void fieldPopulationMappingZoneReproZoneRecruChanged(){ getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix()); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -41,13 +28,18 @@ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; -public void refresh(){ - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); + at Override +public void refresh() { Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); getVerifier().addCurrentPanel(popZones); } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} ]]> </script> <Table id='body'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -57,11 +57,8 @@ } }); + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "Port"); - getVerifier().setDeleteButton(remove); Port port = getVerifier().getEntity(Port.class); // add null before, for second to be considered as a changed event @@ -71,6 +68,15 @@ fillList(); } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "Port"); + getVerifier().setDeleteButton(remove); +} + protected void fillList() { if (getBean() != null) { portChanged = false; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -23,6 +23,8 @@ }); boolean init = false; + + at Override public void refresh() { Gear gear = getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); @@ -38,6 +40,12 @@ } } } + + at Override +public void setActionButtons() { + +} + protected void paramChanged() { if (fieldGearParamType.getSelectedItem() != null) { if (!init) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -59,6 +59,7 @@ } }); + at Override public void refresh() { Gear gear = (Gear)getVerifier().getEntity(Gear.class); @@ -77,6 +78,11 @@ removeSelectivityButton.setEnabled(false); } + at Override +public void setActionButtons() { + +} + protected void setSelectivityTableModel() { DefaultTableModel model = new DefaultTableModel() { @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -25,11 +25,8 @@ import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.GearImpl; -// refresh + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - Gear gear = (Gear)getVerifier().getEntity(Gear.class); // add null before, for second to be considered as a changed event @@ -39,6 +36,13 @@ getVerifier().addCurrentPanel(editor); } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} + ]]></script> <Table id='body'> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -48,11 +48,8 @@ } }); + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "SetOfVessels"); - getVerifier().setDeleteButton(remove); SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); setBean((SetOfVesselsImpl) setOfVessels); if (getBean() != null) { @@ -65,6 +62,15 @@ fieldSetOfVesselsFixedCosts.init(); } } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "SetOfVessels"); + getVerifier().setDeleteButton(remove); +} + protected void portChanged(){ if (!init) { getBean().setPort((Port)fieldSetOfVesselsPort.getSelectedItem()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -21,26 +21,36 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ - import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); -getVerifier().addCurrentPanel(this); +//getVerifier().addCurrentPanel(this); + at Override public void refresh() { - if (isSensitivity()){ + if (isSensitivity()) { setOfVesselsTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); } getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI); } + + at Override +public void setActionButtons() { + // active les bouton sur le premier onglet + setOfVesselsTabsUI.setActionButtons(); +} ]]></script> - <JPanel id='body' layout='{new BorderLayout()}'> + <JPanel layout='{new BorderLayout()}'> <JTabbedPane id="setOfVesselsTab" name="SetOfVessels" constraints='BorderLayout.CENTER'> - <tab title='{_("isisfish.setOfVessels.title")}'><SetOfVesselsTabsUI id='setOfVesselsTabsUI' constructorParams='this'/></tab> - <tab title='{_("isisfish.effortDescription.title")}'><EffortDescriptionUI id='effortDescriptionUI' constructorParams='this'/></tab> + <tab title='{_("isisfish.setOfVessels.title")}'> + <SetOfVesselsTabsUI id='setOfVesselsTabsUI' constructorParams='this'/> + </tab> + <tab title='{_("isisfish.effortDescription.title")}'> + <EffortDescriptionUI id='effortDescriptionUI' constructorParams='this'/> + </tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,3 +1,23 @@ + +<fr.ifremer.isisfish.ui.input.InputContentUI> <Table> <fr.ifremer.isisfish.entities.SpeciesImpl id='bean' javaBean='null'/> <Boolean id='actif' javaBean='false'/> @@ -2,4 +22,15 @@ <script><![CDATA[ - protected void dynamicChanged(){ - if (getBean() != null){ + + @Override + public void refresh() { + + } + + @Override + public void setActionButtons() { + + } + + protected void dynamicChanged() { + if (getBean() != null) { getBean().setAgeGroupType(fieldSpeciesDynamicAge.isSelected()); @@ -11,10 +42,13 @@ </script> <row> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean() == null ? true : getBean().getAgeGroupType()}' buttonGroup="structuredGroup" onItemStateChanged='dynamicChanged()' enabled='{isActif()}'/> + <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean().getAgeGroupType()}' + buttonGroup="structuredGroup" onItemStateChanged='dynamicChanged()' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{getBean() == null ? false : !getBean().getAgeGroupType()}' buttonGroup="structuredGroup" enabled='{isActif()}'/> + <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{!getBean().getAgeGroupType()}' + buttonGroup="structuredGroup" enabled='{isActif()}'/> </cell> </row> -</Table> \ No newline at end of file +</Table> +</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  - - -  <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -63,11 +45,8 @@ } } }); + public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "Species"); - getVerifier().setDeleteButton(delete); Species species = (Species)getVerifier().getEntity(Species.class); setBean((SpeciesImpl) species); if (getBean() != null){ @@ -76,6 +55,14 @@ } } + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "Species"); + getVerifier().setDeleteButton(delete); +} + ]]> </script> <Table id='body'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -17,15 +17,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ --> - <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ import org.apache.commons.lang.StringUtils; + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); strategyJanuary.init(0); strategyFebuary.init(1); strategyMarch.init(2); @@ -43,6 +41,12 @@ strategyJuly, strategyAugust, strategySeptember, strategyOctober, strategyNovember, strategyDecember); } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); +} ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <Table constraints='BorderLayout.CENTER'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -50,6 +50,7 @@ } }); + at Override public void refresh() { Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); @@ -98,6 +99,11 @@ fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener); } + at Override +public void setActionButtons() { + +} + public void init(int m) { month = m; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -33,11 +33,8 @@ import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "Strategy"); - getVerifier().setDeleteButton(remove); Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); // add null before, for second to be considered as a changed event @@ -65,6 +62,15 @@ strategyInactivity.setActif(isActif()); } } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "Strategy"); + getVerifier().setDeleteButton(remove); +} + protected void setSetOfVesselsModel() { ActionListener[] listeners = fieldStrategySetOfVessels.getActionListeners(); for (ActionListener listener : listeners) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -23,17 +23,23 @@ import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; // is this add needed ? -getVerifier().addCurrentPanel(this); - +//getVerifier().addCurrentPanel(this); + + at Override public void refresh() { - if (isSensitivity()){ + if (isSensitivity()) { strategyTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { strategyTab.addChangeListener(new InputTabbedPaneListener()); } - getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI); } + + at Override +public void setActionButtons() { + // active les bouton sur le premier onglet + strategyTabUI.setActionButtons(); +} ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <JTabbedPane id="strategyTab" constraints='BorderLayout.CENTER'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  -  <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -62,13 +46,18 @@ } }); + at Override public void refresh() { + TripType tripType = (TripType)getVerifier().getEntity(TripType.class); + setBean((TripTypeImpl) tripType); +} + + at Override +public void setActionButtons() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "TripType"); getVerifier().setDeleteButton(delete); - TripType tripType = (TripType)getVerifier().getEntity(TripType.class); - setBean((TripTypeImpl) tripType); } ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -67,14 +54,12 @@ } } }); + + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "VesselType"); - getVerifier().setDeleteButton(delete); VesselType vesselType = getVerifier().getEntity(VesselType.class); setBean((VesselTypeImpl) vesselType); - if (getBean() != null){ + if (getBean() != null) { setListModel(); fieldVesselTypeLength.init(); fieldVesselTypeLength.init(); @@ -85,7 +70,16 @@ fieldVesselTypeUnitFuelCostOfTravel.init(); } } -protected void setListModel(){ + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "VesselType"); + getVerifier().setDeleteButton(delete); +} + +protected void setListModel() { java.util.List<Item> items = new java.util.ArrayList<Item>(); for (TripType tt : getRegion().getTripType()){ items.add(new Item(tt.getTopiaId(), tt.getName(), tt, false)); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -1,7 +1,6 @@  <JPanel id="wizardGroup" layout='{new BorderLayout()}'> <script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-06-05 12:17:28 UTC (rev 2325) @@ -55,13 +55,10 @@ } }); + at Override public void refresh() { - getVerifier().setSaveButton(save); - getVerifier().setCancelButton(cancel); - getVerifier().setNewButton(create, "Zone"); - getVerifier().setDeleteButton(remove); Zone zone = getVerifier().getEntity(Zone.class); - + // add null before, for second to be considered as a changed event // otherwize, setBean has no effect setBean(null); @@ -72,6 +69,15 @@ zoneMap.setSelectedCells(getBean().getCell()); } } + + at Override +public void setActionButtons() { + getVerifier().setSaveButton(save); + getVerifier().setCancelButton(cancel); + getVerifier().setNewButton(create, "Zone"); + getVerifier().setDeleteButton(remove); +} + protected void setZoneCells(){ if (getBean() != null){ DefaultListModel model = new DefaultListModel(); Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-06-05 12:17:28 UTC (rev 2325) @@ -112,6 +112,7 @@ isisfish.common.ellipsis=ellipsis isisfish.common.emigration=emigration isisfish.common.empty=vide +isisfish.common.equation=Equation isisfish.common.error=error isisfish.common.finish=finish isisfish.common.gear=gear @@ -125,6 +126,7 @@ isisfish.common.next=next isisfish.common.ok=ok isisfish.common.openEditor=openEditor +isisfish.common.population=Population isisfish.common.populationGroup=populationGroup isisfish.common.populations=populations isisfish.common.port=port Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-06-05 12:17:28 UTC (rev 2325) @@ -112,6 +112,7 @@ isisfish.common.ellipsis=... isisfish.common.emigration=\u00E9migration isisfish.common.empty=vide +isisfish.common.equation=Equation isisfish.common.error=Erreur isisfish.common.finish=Terminer isisfish.common.gear=Engin @@ -125,6 +126,7 @@ isisfish.common.next=Suivant isisfish.common.ok=Ok isisfish.common.openEditor=Ouvrir l'\u00E9diteur +isisfish.common.population=Population isisfish.common.populationGroup=Groupe de population isisfish.common.populations=Populations isisfish.common.port=port Modified: isis-fish/trunk/src/main/resources/log4j.properties =================================================================== --- isis-fish/trunk/src/main/resources/log4j.properties 2009-06-04 16:55:42 UTC (rev 2324) +++ isis-fish/trunk/src/main/resources/log4j.properties 2009-06-05 12:17:28 UTC (rev 2325) @@ -6,7 +6,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.fr.ifremer.isisfish=INFO +log4j.logger.fr.ifremer.isisfish=DEBUG log4j.logger.org.codelutin=INFO log4j.logger.analyseplans=INFO log4j.logger.exports=INFO

1 0

r2324 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 4, 2009

June 4, 2009

Author: chatellier Date: 2009-06-04 16:55:42 +0000 (Thu, 04 Jun 2009) New Revision: 2324 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx Log: Refactor UI (comments, etc...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-06-04 16:29:09 UTC (rev 2323) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-06-04 16:55:42 UTC (rev 2324) @@ -1,7 +1,6 @@  <JPanel id="input" layout='{new BorderLayout()}'> @@ -43,13 +31,6 @@ <fr.ifremer.isisfish.entities.FisheryRegionImpl id='region' javaBean='null'/> <script><![CDATA[ -import fr.ifremer.isisfish.ui.input.*; -import java.awt.*; -import java.awt.event.*; -import java.lang.*; -import java.util.*; -import javax.swing.*; -import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.ui.Common; import fr.ifremer.isisfish.ui.WelcomeSaveVerifier; import fr.ifremer.isisfish.ui.WelcomePanelUI; @@ -62,33 +43,29 @@ import jaxx.runtime.swing.navigation.NavigationTreeModel; import org.codelutin.topia.TopiaContext; import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.ui.RegionMonitor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; getContextValue(WelcomeSaveVerifier.class).addSaveVerifier(getVerifier()); new fr.ifremer.isisfish.ui.input.InputNavigationTreeSelectionAdapter(this); getContextValue(RegionMonitor.class).addRegionPropertyChangeListener(new PropertyChangeListener() { - @Override public void propertyChange(PropertyChangeEvent evt) { setFieldCurrentRegionModel(); } }); -protected InputAction getAction(){ +protected InputAction getAction() { return getContextValue(InputAction.class); } -protected InputSaveVerifier getVerifier(){ +protected InputSaveVerifier getVerifier() { return getContextValue(InputSaveVerifier.class); } -protected RegionStorage getRegionStorage(){ +protected RegionStorage getRegionStorage() { return getContextValue(RegionStorage.class); } -protected void setFieldCurrentRegionModel(){ +protected void setFieldCurrentRegionModel() { fieldCurrentRegion.setModel(getFieldCurrentRegionModel()); } -protected DefaultComboBoxModel getFieldCurrentRegionModel(){ +protected DefaultComboBoxModel getFieldCurrentRegionModel() { return new DefaultComboBoxModel(Common.getRegionItem()); } protected void regionChange(ItemEvent e) { @@ -122,7 +99,7 @@ getCardlayoutPrincipal().show(inputPanePrincipal,"normale"); } } -protected void setTreeModel(){ +protected void setTreeModel() { if (getRegion() != null) { String regionName = getRegion().getName(); setContextValue(getRegion()); @@ -149,7 +126,7 @@ WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); root.setInfoText(s); } -protected void regionChange(){ +protected void regionChange() { getContextValue(RegionMonitor.class).changeRegion(); } protected void newRegion() {

1 0

r2323 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 4, 2009

June 4, 2009

Author: chatellier Date: 2009-06-04 16:29:09 +0000 (Thu, 04 Jun 2009) New Revision: 2323 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx Log: Fix gear refresh UI Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-06-04 15:28:45 UTC (rev 2322) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-06-04 16:29:09 UTC (rev 2323) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.GearImpl id='bean' javaBean='null'/> - - <script><![CDATA[ -import fr.ifremer.isisfish.types.RangeOfValues; + <script><![CDATA[ import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.GearImpl; -import fr.ifremer.isisfish.ui.WelcomePanelUI; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.topia.TopiaException; import jaxx.runtime.swing.editor.NumberEditor; -import jaxx.runtime.swing.navigation.NavigationTreeModel; -import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText(""); fieldGearName.setText(""); fieldGearEffortUnit.setText(""); - fieldGearStandardisationFactor.setModelText(""); + fieldGearStandardisationFactor.setText(""); fieldGearParamName.setText(""); fieldGearComment.setText(""); } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } } }); + public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Gear"); getVerifier().setDeleteButton(remove); Gear gear = getVerifier().getEntity(Gear.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((GearImpl) gear); + getVerifier().addCurrentPanel(rangeOfValues); - if (getBean() != null){ + + /* chatellier commented since number editor is not working + if (getBean() != null) { fieldGearStandardisationFactor.init(); - } + }*/ } ]]> </script> @@ -104,13 +89,13 @@ <JLabel text="isisfish.gear.standardisationFactor" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <NumberEditor id='fieldGearStandardisationFactor' constructorParams='this' +  + <JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"StandardisationFactor"'/--> + enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"StandardisationFactor"'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-04 15:28:45 UTC (rev 2322) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-04 16:29:09 UTC (rev 2323) @@ -23,7 +23,6 @@ import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; // constructor code -getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); @@ -39,8 +38,12 @@ ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab" name="Gear"> - <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab> - <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab> + <tab title='{_("isisfish.gear.title")}'> + <GearTabUI id="gearTabUI" constructorParams='this'/> + </tab> + <tab title='{_("isisfish.selectivity.title")}'> + <SelectivityUI id="selectivityUI" constructorParams='this'/> + </tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-06-04 15:28:45 UTC (rev 2322) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2009-06-04 16:29:09 UTC (rev 2323) @@ -15,7 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ --> + *##%*/ +--> <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -26,13 +27,15 @@ <Boolean id='selectivityPopulationSelected' javaBean='false'/> <script><![CDATA[ +import javax.swing.table.DefaultTableModel; +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.GearImpl; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; +import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; -import javax.swing.table.DefaultTableModel; -import fr.ifremer.isisfish.entities.Selectivity; -import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; // TODO why it's commented ? to remove ? @@ -49,38 +52,29 @@ } }); -selectivityTable.addMouseListener(new MouseListener() { - +selectivityTable.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mousePressed(MouseEvent e) { - } - - @Override public void mouseReleased(MouseEvent e) { - remove.setEnabled(selectivityTable.getSelectedRow() != -1); + removeSelectivityButton.setEnabled(selectivityTable.getSelectedRow() != -1); } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } }); public void refresh() { + + Gear gear = (Gear)getVerifier().getEntity(Gear.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); + setBean((GearImpl) gear); + if (getBean() != null) { setSelectivityTableModel(); fieldSelectivityPopulation.setModel(getSelectivityPopulationModel()); } getVerifier().addCurrentPanel(selectivityEquation); - remove.setEnabled(false); + removeSelectivityButton.setEnabled(false); } protected void setSelectivityTableModel() { @@ -89,7 +83,7 @@ public boolean isCellEditable(int row, int column) { boolean result = false; if (column > 0) { - result =true; + result = true; } return result; } @@ -106,22 +100,25 @@ equations.add(equation); } } - model.addColumn("Population", populations.toArray()); - model.addColumn("Equation", equations.toArray()); + model.addColumn(_("isisfish.common.population"), populations.toArray()); + model.addColumn(_("isisfish.common.equation"), equations.toArray()); selectivityTable.setModel(model); EquationTableEditor cellEditor = new EquationTableEditor(); selectivityTable.getColumnModel().getColumn(1).setCellEditor(cellEditor); } -protected void add() { +protected void addSelectivity() { getAction().addSelectivity((Population)getPopulation(), selectivityEquation.getEditor().getText(), getBean()); setSelectivityTableModel(); } -protected void remove() { - getAction().removeSelectivity(getBean(), (Selectivity) getBean().getPopulationSelectivity((Population) selectivityTable.getValueAt(selectivityTable.getSelectedRow(), 0))); +protected void removeSelectivity() { + Population selectedPopulation = (Population)selectivityTable.getValueAt(selectivityTable.getSelectedRow(), 0); + Selectivity selectedSelectivity = (Selectivity)getBean().getPopulationSelectivity(selectedPopulation); + getAction().removeSelectivity(getBean(), selectedSelectivity); setSelectivityTableModel(); + removeSelectivityButton.setEnabled(false); } protected DefaultComboBoxModel getSelectivityPopulationModel() { @@ -130,8 +127,8 @@ if (species != null) { selectivityPopulationModel.addElement(new GenericCell(" ", null, null)); for (Species s : species) { - if (s.getPopulation() != null){ - for (Population p : s.getPopulation()){ + if (s.getPopulation() != null) { + for (Population p : s.getPopulation()) { selectivityPopulationModel.addElement(new GenericCell(p.getName(), p, Population.class)); } } @@ -143,7 +140,7 @@ protected void selectivityChanged() { setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null); setPopulation((PopulationImpl) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue()); - add.setEnabled(isSelectivityPopulationSelected()); + addSelectivityButton.setEnabled(isSelectivityPopulationSelected()); } ]]></script> <Table id='body'> @@ -162,7 +159,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='selectivityEquation' constructorParams='this' lblText='{_("isisfish.selectivity.equation")}' - bean='{getBean()}' nameEquation='Selectivity' actif='{isActif()}' + bean='{getBean()}' nameEquation='Selectivity' actif='{isActif()}' clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}'/> </cell> </row> @@ -174,7 +171,7 @@ <Table> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> + <JButton id="addSelectivityButton" text="isisfish.common.add" onActionPerformed='addSelectivity()' enabled='{isActif()}'/> </cell> </row> <row> @@ -186,7 +183,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> + <JButton id="removeSelectivityButton" text="isisfish.common.remove" onActionPerformed='removeSelectivity()' enabled='{isActif()}'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-06-04 15:28:45 UTC (rev 2322) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-06-04 16:29:09 UTC (rev 2323) @@ -25,27 +25,18 @@ import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.GearImpl; -// TODO why it's commented ? to remove ? -addPropertyChangeListener("bean", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - } - if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - } - } -}); - // refresh -public void refresh(){ +public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - setBean(null); + Gear gear = (Gear)getVerifier().getEntity(Gear.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((GearImpl) gear); + getVerifier().addCurrentPanel(editor); } ]]></script>

1 0

r2322 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 4, 2009

June 4, 2009

Author: chatellier Date: 2009-06-04 15:28:45 +0000 (Thu, 04 Jun 2009) New Revision: 2322 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx Log: Recommit multiple return (performance code, but multiple returns ;() Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-06-04 15:20:47 UTC (rev 2321) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-06-04 15:28:45 UTC (rev 2322) @@ -89,10 +89,12 @@ if (getBean().getCell() != null) { if (getBean().getCell().getTopiaId().equals(c.getTopiaId())){ getBean().setCell(c); + return true; } } else { getBean().setCell(c); + return true; } } }

1 0

r2321 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 4, 2009

June 4, 2009

Author: chatellier Date: 2009-06-04 15:20:47 +0000 (Thu, 04 Jun 2009) New Revision: 2321 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx Log: Make cancel refresh work Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-06-04 14:58:55 UTC (rev 2320) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-06-04 15:20:47 UTC (rev 2321) @@ -1,7 +1,6 @@  - - -  <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.PortImpl id='bean' javaBean='null'/> <script><![CDATA[ - import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.entities.Port; import fr.ifremer.isisfish.entities.PortImpl; import fr.ifremer.isisfish.entities.Cell; -import fr.ifremer.isisfish.map.IsisMapBean; -import fr.ifremer.isisfish.map.OpenMapToolPanel; import com.bbn.openmap.gui.OMToolSet; -import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.map.CellSelectionLayer; import com.bbn.openmap.event.SelectMouseMode; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.topia.TopiaException; protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; @@ -68,54 +44,55 @@ setMapListener(); setButtonTitle(_("isisfish.input.continueSpecies")); setNextPath("$root/$species"); + addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldPortName.setText(""); fieldPortComment.setText(""); } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } } }); + public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); getVerifier().setNewButton(create, "Port"); getVerifier().setDeleteButton(remove); Port port = getVerifier().getEntity(Port.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((PortImpl) port); + fillList(); } -protected void fillList(){ - if (getBean() != null){ +protected void fillList() { + if (getBean() != null) { portChanged = false; portCell.fillList(getRegion().getCell(), getBean().getCell()); portCell.setSelectedValue(getBean().getCell()); portChanged = true; } } -protected void setMapListener(){ - if (mapListener == null){ +protected void setMapListener() { + if (mapListener == null) { mapListener = new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { - @Override public boolean onMouseClicked() { - for (Cell c : portMap.getSelectedCells()){ - if (getBean() != null){ - if (getBean().getCell() != null){ + for (Cell c : portMap.getSelectedCells()) { + if (getBean() != null) { + if (getBean().getCell() != null) { if (getBean().getCell().getTopiaId().equals(c.getTopiaId())){ getBean().setCell(c); - return true; } } - else{ + else { getBean().setCell(c); - return true; } } } @@ -124,16 +101,16 @@ }; } } -protected void portChanged(){ - if (portChanged){ + +protected void portChanged() { + if (portChanged) { getBean().setCell((Cell)portCell.getSelectedValue()); } } - ]]> - </script> + ]]></script> <Table id='body'> <row> - <cell fill='both' weightx='1.0' weighty='1.0'> + <cell fill='both' weightx='1.0' weighty='1.0'> <JSplitPane id="PortTab" name="Ports" oneTouchExpandable="true" dividerLocation="270" orientation="horizontal"> <Table> @@ -144,7 +121,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0' > - <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed'/> + <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' /> </cell> </row> <row> @@ -156,7 +133,7 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}' decorator='boxed'/> + <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}' decorator='boxed' /> </JScrollPane> </cell> </row> @@ -174,10 +151,10 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' decorator='boxed'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' decorator='boxed'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> @@ -190,7 +167,7 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> + <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed'/> </JPanel> </JSplitPane>

1 0

r2320 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 4, 2009

June 4, 2009

Author: chatellier Date: 2009-06-04 14:58:55 +0000 (Thu, 04 Jun 2009) New Revision: 2320 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Remove useless commented code Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-06-04 14:55:49 UTC (rev 2319) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-06-04 14:58:55 UTC (rev 2320) @@ -45,15 +45,12 @@ log.debug("bean changed " + evt.getOldValue() + " : " + evt.getNewValue()); } if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() -// jaxx.runtime.SwingUtil.removeDataBinding($InputContentUI0, "fieldZoneName.text", "fieldZoneComment.text"); fieldZoneName.setText(""); fieldZoneComment.setText(""); zoneMap.setSelectedCells((Cell)null); } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } } }); @@ -86,8 +83,8 @@ } } } -protected OpenMapEvents getMapListener(){ - if (mapListener == null){ +protected OpenMapEvents getMapListener() { + if (mapListener == null) { mapListener = new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean onMouseClicked() { @@ -98,9 +95,10 @@ } return mapListener; } + protected void zoneCellsChange() { java.util.List<Cell> cells = new ArrayList<Cell>(); - for (Object o : zoneCells.getSelectedValues()){ + for (Object o : zoneCells.getSelectedValues()) { cells.add((Cell) o); } getBean().setCell(cells);

1 0

r2319 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org June 4, 2009

June 4, 2009

Author: chatellier Date: 2009-06-04 14:55:49 +0000 (Thu, 04 Jun 2009) New Revision: 2319 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Make cancel refresh work Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-06-04 14:50:05 UTC (rev 2318) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-06-04 14:55:49 UTC (rev 2319) @@ -1,7 +1,6 @@  - - -  <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -46,9 +28,7 @@ import fr.ifremer.isisfish.entities.ZoneImpl; import fr.ifremer.isisfish.map.CellSelectionLayer; import com.bbn.openmap.event.SelectMouseMode; -import com.bbn.openmap.event.MapMouseListener; import com.bbn.openmap.gui.OMToolSet; -import jaxx.runtime.swing.Item; protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; @@ -58,6 +38,7 @@ zoneMap.addMapMouseListener(getMapListener()); setButtonTitle(_("isisfish.input.continuePorts")); setNextPath("$root/$ports"); + addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (log.isDebugEnabled()) { @@ -83,8 +64,13 @@ getVerifier().setNewButton(create, "Zone"); getVerifier().setDeleteButton(remove); Zone zone = getVerifier().getEntity(Zone.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((ZoneImpl) zone); - if (getBean() != null){ + + if (getBean() != null) { setZoneCells(); zoneMap.setSelectedCells(getBean().getCell()); }

1 0