Author: tchemit Date: 2013-01-02 11:07:34 +0100 (Wed, 02 Jan 2013) New Revision: 138 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/138 Log: add close on ui (for the moment just log, but you never know) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -403,4 +403,8 @@ } combo.setSelectedItem(selectedItem); } + + protected void closeUI(TuttiUI ui) { + ui.getHandler().onCloseUI(); + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-01-02 10:07:34 UTC (rev 138) @@ -27,6 +27,7 @@ import fr.ifremer.tutti.service.config.TuttiServiceConfigOption; import fr.ifremer.tutti.ui.swing.MainUI; import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; import jaxx.runtime.swing.editor.config.model.MainCallBackFinalizer; @@ -116,9 +117,13 @@ helper.setFinalizer(new MainCallBackFinalizer(CALLBACK_APPLICATION)); - helper.buildUI(mainUI, "tutti.config.category.applications"); + ConfigUI configUI = helper.buildUI( + mainUI, + "tutti.config.category.applications"); helper.displayUI(mainUI, false); + + mainUI.getHandler().getContext().getSwingSession().add(configUI); } protected void reloadApplication() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -147,6 +147,9 @@ @Override public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -222,6 +222,9 @@ @Override public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } PropertyChangeListener[] listeners = getModel().getPropertyChangeListeners(); for (PropertyChangeListener listener : listeners) { getModel().removePropertyChangeListener(listener); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -287,6 +287,14 @@ @Override public void onCloseUI() { + + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } + + closeUI(ui.getGearShootingTabContent()); + closeUI(ui.getEnvironmentTabContent()); + closeUI(ui.getHydrologyTabContent()); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -107,6 +107,11 @@ } // close batches tabs, then general tab + closeUI(ui.getSpeciesTabContent()); + closeUI(ui.getBenthosTabContent()); + closeUI(ui.getPlanktonTabContent()); + closeUI(ui.getMacroWasteTabContent()); + closeUI(ui.getAccidentalTabContent()); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-01-02 10:07:34 UTC (rev 138) @@ -27,9 +27,6 @@ <import> fr.ifremer.tutti.ui.swing.TuttiUI - fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI - fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.CreateSpeciesBatchUI - fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUI fr.ifremer.tutti.ui.swing.util.editor.LongTextEditorUI fr.ifremer.tutti.ui.swing.util.editor.AttachmentEditorUI @@ -79,11 +76,6 @@ component='speciesTotalUnsortedWeightField'/> </BeanValidator> - <SpeciesFrequencyUI id='frequencyEditor' constructorParams='this'/> - - <CreateSpeciesBatchUI id='createSpeciesBatchUI' constructorParams='this'/> - <SplitSpeciesBatchUI id='splitSpeciesBatchUI' constructorParams='this'/> - <LongTextEditorUI id='longTextEditor'/> <AttachmentEditorUI id='attachmentEditor'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -45,6 +45,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.FrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.CreateSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.CreateSpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchRowModel; @@ -102,6 +103,12 @@ */ private final SpeciesBatchUI ui; + private SplitSpeciesBatchUI splitSpeciesBatchEditor; + + private CreateSpeciesBatchUI createSpeciesBatchEditor; + + private SpeciesFrequencyUI speciesFrequencyEditor; + public SpeciesBatchUIHandler(TuttiUI<?, ?> parentUi, SpeciesBatchUI ui) { super(parentUi, @@ -529,8 +536,23 @@ @Override public void onCloseUI() { if (log.isInfoEnabled()) { - log.info("closing: " + ui); + log.info("Closing: " + ui); } + + if (splitSpeciesBatchEditor != null) { + getContext().getSwingSession().add(splitSpeciesBatchEditor); + closeUI(splitSpeciesBatchEditor); + } + + if (createSpeciesBatchEditor != null) { + getContext().getSwingSession().add(createSpeciesBatchEditor); + closeUI(createSpeciesBatchEditor); + } + + if (speciesFrequencyEditor != null) { + getContext().getSwingSession().add(speciesFrequencyEditor); + closeUI(speciesFrequencyEditor); + } } //------------------------------------------------------------------------// @@ -573,7 +595,7 @@ public void createSpeciesBatch() { CreateSpeciesBatchUI createBatchEditor = - ui.getCreateSpeciesBatchUI(); + getCreateSpeciesBatchEditor(); createBatchEditor.getHandler().openUI(getModel()); @@ -626,7 +648,7 @@ if (log.isInfoEnabled()) { log.info("Open split batch ui for row [" + rowIndex + "]"); } - SplitSpeciesBatchUI splitBatchEditor = ui.getSplitSpeciesBatchUI(); + SplitSpeciesBatchUI splitBatchEditor = getSplitSpeciesBatchEditor(); splitBatchEditor.getHandler().editBatch(parentBatch); openDialog(ui, @@ -744,6 +766,27 @@ getTableModel().getRowCount() - 1); } + public SplitSpeciesBatchUI getSplitSpeciesBatchEditor() { + if (splitSpeciesBatchEditor == null) { + splitSpeciesBatchEditor = new SplitSpeciesBatchUI(ui); + } + return splitSpeciesBatchEditor; + } + + public CreateSpeciesBatchUI getCreateSpeciesBatchEditor() { + if (createSpeciesBatchEditor == null) { + createSpeciesBatchEditor = new CreateSpeciesBatchUI(ui); + } + return createSpeciesBatchEditor; + } + + public SpeciesFrequencyUI getSpeciesFrequencyEditor() { + if (speciesFrequencyEditor == null) { + speciesFrequencyEditor = new SpeciesFrequencyUI(ui); + } + return speciesFrequencyEditor; + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// @@ -897,8 +940,7 @@ columnIdentifier); } - -// protected void recomputeSuperSamplingRatio(SpeciesBatchTreeModel samplingTreeModel, + // protected void recomputeSuperSamplingRatio(SpeciesBatchTreeModel samplingTreeModel, // SpeciesBatchTreeNode node) { // // SpeciesBatchTreeNode superSamplingNode = node.getParent(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-01-02 10:07:34 UTC (rev 138) @@ -137,7 +137,8 @@ log.info("Will edit frequencies for row: " + rowIndex); } - SpeciesFrequencyUI frequencyEditor = ui.getFrequencyEditor(); + SpeciesFrequencyUI frequencyEditor = + ui.getHandler().getSpeciesFrequencyEditor(); frequencyEditor.editBatch(editRow); // open frequency dialog Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -250,6 +250,9 @@ @Override public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-01-02 10:07:34 UTC (rev 138) @@ -113,8 +113,7 @@ <!-- Messages report --> <JPanel id='messagePanel' layout='{new GridLayout()}'> - <JScrollPane id='errorTableScrollPane' - columnHeaderView='{errorTable.getTableHeader()}'> + <JScrollPane columnHeaderView='{errorTable.getTableHeader()}'> <JTable id='errorTable'/> </JScrollPane> </JPanel> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -208,6 +208,9 @@ @Override public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } } //------------------------------------------------------------------------// @@ -373,8 +376,8 @@ if (data != null) { - if (log.isInfoEnabled()) { - log.info("Got " + data.sizeQualitativeValue() + " qualitative data to add"); + if (log.isDebugEnabled()) { + log.debug("Got " + data.sizeQualitativeValue() + " qualitative data to add"); } addColumnToModel(columnModel, null, @@ -401,8 +404,8 @@ uninstallTableSaveOnRowChangedSelectionListener(); uninstallTableKeyListener(); - if (log.isInfoEnabled()) { - log.info("Install new table model " + tableModel); + if (log.isDebugEnabled()) { + log.debug("Install new table model " + tableModel); } table.setModel(tableModel); table.setColumnModel(columnModel); @@ -419,8 +422,8 @@ // add a row for each qualitive value for (CaracteristicQualitativeValue qualitativeValue : data.getQualitativeValue()) { - if (log.isInfoEnabled()) { - log.info("Add QV: " + qualitativeValue); + if (log.isDebugEnabled()) { + log.debug("Add QV: " + qualitativeValue); } SplitSpeciesBatchRowModel newRow = tableModel.createNewRow(); newRow.setCategoryValue(qualitativeValue); @@ -428,8 +431,8 @@ } } - if (log.isInfoEnabled()) { - log.info("Will add " + rows.size() + " rows in table model " + + if (log.isDebugEnabled()) { + log.debug("Will add " + rows.size() + " rows in table model " + "(can add a first empty row? " + editableCategoryValue + ")."); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -154,6 +154,9 @@ @Override public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -158,6 +158,9 @@ @Override public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -226,6 +226,9 @@ @Override public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -113,6 +113,9 @@ @Override public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } ui.getValidator().setBean(null); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-01 23:04:02 UTC (rev 137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-02 10:07:34 UTC (rev 138) @@ -346,6 +346,9 @@ @Override public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } } //------------------------------------------------------------------------//