Author: tchemit Date: 2013-03-07 14:27:32 +0100 (Thu, 07 Mar 2013) New Revision: 562 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/562 Log: fix some loading + try to improve the dialog open api 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/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java 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-03-07 10:40:39 UTC (rev 561) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-03-07 13:27:32 UTC (rev 562) @@ -110,8 +110,7 @@ } List<TuttiProtocol> protocols = - persistenceService.getAllProtocol(); -// Lists.newArrayList(persistenceService.getAllProtocol()); + Lists.newArrayList(persistenceService.getAllProtocol()); model.setProtocols(protocols); if (protocols.isEmpty()) { 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-03-07 10:40:39 UTC (rev 561) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-07 13:27:32 UTC (rev 562) @@ -1188,12 +1188,12 @@ } public Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialog = new SelectSpeciesUI(ui); - SelectSpeciesUIModel model = dialog.getModel(); + SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); + SelectSpeciesUIModel model = dialogContent.getModel(); model.setSelectedSpecies(null); model.setSpecies(species); - openDialog(ui, dialog, title, new Dimension(400, 130)); + openDialog(dialogContent, title, new Dimension(400, 130)); return model.getSelectedSpecies(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-07 10:40:39 UTC (rev 561) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-07 13:27:32 UTC (rev 562) @@ -39,7 +39,6 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -244,13 +243,12 @@ } public Species openAddSpeciesDialog(String title, List<Species> species) { - SelectSpeciesUI dialog = new SelectSpeciesUI(ui); - SelectSpeciesUIModel model = dialog.getModel(); + SelectSpeciesUI dialogContent = new SelectSpeciesUI(ui); + SelectSpeciesUIModel model = dialogContent.getModel(); model.setSelectedSpecies(null); model.setSpecies(species); - TuttiActionUI actionUI = context.getActionUI(); - openDialog(actionUI, dialog, title, new Dimension(400, 130)); + openDialog(dialogContent, title, new Dimension(400, 130)); return model.getSelectedSpecies(); } 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-03-07 10:40:39 UTC (rev 561) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-03-07 13:27:32 UTC (rev 562) @@ -65,8 +65,7 @@ @Override public void beforeInitUI() { - EditProgramUIModel model = null; -// EditProgramUIModel model = new EditProgramUIModel(); + EditProgramUIModel model = new EditProgramUIModel(); List<Program> programs = Lists.newArrayList(persistenceService.getAllProgram()); 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-03-07 10:40:39 UTC (rev 561) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-03-07 13:27:32 UTC (rev 562) @@ -484,7 +484,7 @@ model.setSpecies(species); model.setSelectedSpecies(null); - openDialog(ui, dialog, title, new Dimension(400, 130)); + openDialog(dialog, title, new Dimension(400, 130)); return model.getSelectedSpecies(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-07 10:40:39 UTC (rev 561) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-07 13:27:32 UTC (rev 562) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachmentEditor; import fr.ifremer.tutti.ui.swing.util.editor.SimpleTimeEditor; @@ -76,7 +77,6 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.Frame; -import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; @@ -214,20 +214,15 @@ } } - public void openDialog(TuttiUI ui, - TuttiUI dialogContent, + public void openDialog(TuttiUI dialogContent, String title, Dimension dim) { - Window window; - if (Window.class.isAssignableFrom(ui.getClass())) { - window = (Window) ui; - } else { - window = SwingUtil.getParentContainer(ui, Window.class); - } + Component topestUI = getTopestUI(); + JDialog result; - if (window instanceof Frame) { - result = new JDialog((Frame) window, title, true); + if (topestUI instanceof Frame) { + result = new JDialog((Frame) topestUI, title, true); } else { - result = new JDialog((Dialog) window, title, true); + result = new JDialog((Dialog) topestUI, title, true); } result.add((Component) dialogContent); @@ -283,10 +278,11 @@ message, _("tutti.dialog.askSaveBeforeLeaving.help")); int result = JOptionPane.showConfirmDialog( - getContext().getMainUI(), + getTopestUI(), htmlMessage, _("tutti.dialog.askSaveBeforeLeaving.title"), - JOptionPane.YES_NO_CANCEL_OPTION); + JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); return result; } @@ -296,11 +292,11 @@ message, _("tutti.dialog.askCancelEditBeforeLeaving.help")); int i = JOptionPane.showConfirmDialog( - getContext().getMainUI(), + getTopestUI(), htmlMessage, _("tutti.dialog.askCancelEditBeforeLeaving.title"), JOptionPane.OK_CANCEL_OPTION, - JOptionPane.WARNING_MESSAGE); + JOptionPane.QUESTION_MESSAGE); boolean result = i == JOptionPane.OK_OPTION; return result; @@ -317,17 +313,27 @@ _("tutti.dialog.askOverwriteFile.help")); result = JOptionPane.showConfirmDialog( - getContext().getMainUI(), + getTopestUI(), htmlMessage, _("tutti.dialog.askOverwriteFile.title"), JOptionPane.OK_CANCEL_OPTION, - JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION; + JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION; } else { // file does not exist result = true; } + return result; + } + protected Component getTopestUI() { + Component result; + TuttiActionUI actionUI = getContext().getActionUI(); + if (actionUI.isVisible()) { + result = actionUI; + } else { + result = getContext().getMainUI(); + } return result; } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java 2013-03-07 10:40:39 UTC (rev 561) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java 2013-03-07 13:27:32 UTC (rev 562) @@ -85,7 +85,7 @@ // by default nothing to clean } - public void doAfterAction(Throwable error) { + public void postAction(Throwable error) { // by default nothing to do after action } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java 2013-03-07 10:40:39 UTC (rev 561) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java 2013-03-07 13:27:32 UTC (rev 562) @@ -263,7 +263,7 @@ } // user after action call - action.doAfterAction(error); + action.postAction(error); if (timer != null) {