Author: chatellier Date: 2011-02-18 08:57:53 +0000 (Fri, 18 Feb 2011) New Revision: 753 Log: Update sampling effort table after year / strata modification Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-02-18 08:57:25 UTC (rev 752) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-02-18 08:57:53 UTC (rev 753) @@ -76,7 +76,6 @@ import fr.ifremer.coser.ui.common.DataHandler; import fr.ifremer.coser.ui.control.ControlGraphFrame; import fr.ifremer.coser.ui.control.ControlHandler; -import fr.ifremer.coser.ui.control.ControlView; import fr.ifremer.coser.ui.result.SelectionAddResultDialog; import fr.ifremer.coser.ui.result.SelectionEditResultDialog; import fr.ifremer.coser.ui.selection.model.OccurrenceDensitySpeciesListModel; @@ -216,6 +215,9 @@ view.getFilteredSpeciesList().clearSelection(); view.getSelectedSpeciesListModel().setSpecies(new ArrayList<String>()); view.getSelectedSpeciesList().clearSelection(); + + // update sampling effort data table + showSamplingEffort(view); } /** @@ -256,6 +258,9 @@ detailView.setStrataValidated(!selectedStrata.isEmpty()); detailView.setSpeciesValidated(!selectedSpecies.isEmpty()); view.setEnabledAt(2, selection.isValidated()); // rsufi + + // update sampling effort data table + showSamplingEffort(detailView); } /** @@ -282,13 +287,13 @@ try { projectService.loadControlDataToSelection(project, selection); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.controldatareloaded"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); - // affiche les années initSelectionYears(view); view.getValidDatesButton().setEnabled(true); view.getDetailAccordionPane().setSelected(1); + + JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.controldatareloaded"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } catch (CoserBusinessException ex) { throw new CoserException("Can't reload control data", ex); @@ -355,9 +360,12 @@ updateSelectionYearsData(view); + // update sampling effort data table + showSamplingEffort(view); + JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.yearsvalidated"), _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); - + // auto select strata accordion pane view.getDetailAccordionPane().setSelected(2); } finally { @@ -380,9 +388,6 @@ OMToolSet toolSet = new OMToolSet(); toolSet.setupListeners(view.getStrataMap()); view.getStrataMapToolBar().add((Tool)toolSet); - - // default show sampling effort - showSamplingEffort(view); } /** @@ -430,6 +435,9 @@ updateSelectionStrataData(view); + // update sampling effort data table + showSamplingEffort(view); + JOptionPane.showMessageDialog(view, _("coser.ui.selection.detail.stratavalidated"), _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE);