Author: tchemit Date: 2013-11-29 10:19:25 +0100 (Fri, 29 Nov 2013) New Revision: 1412 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1412 Log: fixes #3894: [TECH] Impossible d'exporter en mode d?\195?\169connect?\195?\169 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -97,7 +97,7 @@ } // check application url is reachable - boolean canUpdateApplication = context.checkUpdateApplicationReachable(); + boolean canUpdateApplication = context.checkUpdateApplicationReachable(true); if (canUpdateApplication) { // try to update jre - i18n - application - help and exit if so @@ -107,15 +107,14 @@ public TuttiUIContext getContext() { return context; } - }, - UpdateApplicationAction.class); + }, UpdateApplicationAction.class); context.getActionEngine().runActionAndWait(logicAction); reload = logicAction.isReload(); } // check data url is reachable - boolean canUpdateData = context.checkUpdateDataReachable(); + boolean canUpdateData = context.checkUpdateDataReachable(true); if (canUpdateData) { // try to update report and exit if so @@ -125,8 +124,7 @@ public TuttiUIContext getContext() { return context; } - }, - UpdateReportAction.class); + }, UpdateReportAction.class); context.getActionEngine().runActionAndWait(logicAction); reload |= logicAction.isReload(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -31,12 +31,12 @@ import fr.ifremer.shared.application.ApplicationConfiguration; import fr.ifremer.shared.application.ApplicationIOUtil; import fr.ifremer.shared.application.ApplicationTechnicalException; +import fr.ifremer.shared.application.listener.PropagatePropertyChangeListener; import fr.ifremer.shared.application.swing.ApplicationUIContext; import fr.ifremer.shared.application.swing.action.ApplicationActionEngine; import fr.ifremer.shared.application.swing.action.ApplicationActionFactory; import fr.ifremer.shared.application.swing.action.ApplicationActionUI; import fr.ifremer.shared.application.swing.util.ApplicationErrorHelper; -import fr.ifremer.shared.application.listener.PropagatePropertyChangeListener; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.RessourceClassLoader; import fr.ifremer.tutti.service.ClosedPersistenceService; @@ -80,6 +80,7 @@ import org.nuiton.i18n.init.UserI18nInitializer; import org.nuiton.util.converter.ConverterUtil; +import javax.swing.JOptionPane; import java.awt.Color; import java.awt.Component; import java.beans.PropertyChangeEvent; @@ -299,7 +300,22 @@ additionalStates.put(BeanDoubleList.class, new BeanDoubleListState()); this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false, additionalStates); - this.errorHelper = new ApplicationErrorHelper(this); + //FIXME Push this to ifremer-shared + this.errorHelper = new ApplicationErrorHelper(this) { + + @Override + public void showWarningDialog(String message) { + + JOptionPane.showMessageDialog(context.getActionUI(), "<html><body>" + message + "</body></html>", + _("application.error.ui.business.warning"), + JOptionPane.WARNING_MESSAGE); + } + + @Override + public void showErrorDialog(String message, Throwable cause) { + super.showErrorDialog(message, cause); + } + }; this.dataContext = serviceContext.getDataContext(); PropagatePropertyChangeListener.listenAndPropagateAll(dataContext, this); UIMessageNotifier logMessageNotifier = new UIMessageNotifier() { @@ -939,7 +955,7 @@ } } - public boolean checkUpdateApplicationReachable() { + public boolean checkUpdateApplicationReachable(boolean showErrorInPopup) { boolean result = true; TuttiConfiguration config = getConfig(); @@ -953,13 +969,18 @@ n_("tutti.error.update.could.not.found.url") ); } catch (ApplicationBusinessException e) { - getErrorHelper().showWarningDialog(e.getMessage()); + if (showErrorInPopup) { + + getErrorHelper().showWarningDialog(e.getMessage()); + } else { + showInformationMessage(e.getMessage()); + } result = false; } return result; } - public boolean checkUpdateDataReachable() { + public boolean checkUpdateDataReachable(boolean showErrorInPopup) { boolean result = true; TuttiConfiguration config = getConfig(); @@ -973,7 +994,12 @@ n_("tutti.error.update.could.not.found.url") ); } catch (ApplicationBusinessException e) { - getErrorHelper().showWarningDialog(e.getMessage()); + if (showErrorInPopup) { + + getErrorHelper().showWarningDialog(e.getMessage()); + } else { + showInformationMessage(e.getMessage()); + } result = false; } return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -67,7 +67,7 @@ if (doAction) { // check db url is reachable - doAction = getContext().checkUpdateDataReachable(); + doAction = getContext().checkUpdateDataReachable(true); } if (doAction) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -93,7 +93,7 @@ closeDb = updateSchema = false; updateDbVersion = null; - updateReferentiel &= getContext().checkUpdateDataReachable(); + updateReferentiel &= getContext().checkUpdateDataReachable(false); if (updateReferentiel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -63,7 +63,7 @@ // check db url is reachable TuttiUIContext context = getContext(); - doAction = context.checkUpdateDataReachable(); + doAction = context.checkUpdateDataReachable(true); } if (doAction) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -80,8 +80,8 @@ if (doAction) { // check db url is reachable TuttiUIContext context = getContext(); - canUpdateApplication = context.checkUpdateApplicationReachable(); - canUpdateData = context.checkUpdateDataReachable(); + canUpdateApplication = context.checkUpdateApplicationReachable(false); + canUpdateData = context.checkUpdateDataReachable(false); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -68,7 +68,7 @@ if (doAction) { // check application url is reachable TuttiUIContext context = getContext(); - doAction = context.checkUpdateApplicationReachable(); + doAction = context.checkUpdateApplicationReachable(true); } return doAction; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -67,7 +67,7 @@ if (doAction) { // check db url is reachable - doAction = getContext().checkUpdateDataReachable(); + doAction = getContext().checkUpdateDataReachable(true); } if (doAction) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -65,7 +65,7 @@ if (doAction) { // check data url is reachable TuttiUIContext context = getContext(); - doAction = context.checkUpdateDataReachable(); + doAction = context.checkUpdateDataReachable(true); } return doAction; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -103,6 +103,7 @@ public void beforeInit(MainUI ui) { super.beforeInit(ui); TuttiUIContext context = getContext(); + ui.setContextValue(context); context.setMainUI(ui); context.setActionUI(new ApplicationActionUI(ui, context)); context.addPropertyChangeListener(new RemoveablePropertyChangeListener() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-11-29 09:19:25 UTC (rev 1412) @@ -97,7 +97,7 @@ // get referential version - if (getContext().checkUpdateDataReachable()) { + if (getContext().checkUpdateDataReachable(false)) { String urlDb = config.getUpdateDataUrl(); ApplicationUpdater up = new ApplicationUpdater(); @@ -136,9 +136,15 @@ } @Override + public void beforeInit(DbManagerUI ui) { + super.beforeInit(ui); + ui.setContextValue(getContext()); + } + + @Override public void afterInit(DbManagerUI ui) { - initUI(this.ui); + initUI(ui); getModel().addPropertyChangeListener(TuttiUIContext.PROPERTY_DB_EXIST, new PropertyChangeListener() { @Override Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-11-29 09:19:25 UTC (rev 1412) @@ -5,6 +5,7 @@ application.error.desktop.browse.not.supported= application.error.desktop.mail.not.supported= application.error.desktop.not.supported= +application.error.ui.business.warning= coordinate.action.reset.tip= observe.common.quadrant1= observe.common.quadrant2= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-11-28 18:54:12 UTC (rev 1411) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-11-29 09:19:25 UTC (rev 1412) @@ -4,6 +4,7 @@ application.error.desktop.browse.not.supported= application.error.desktop.mail.not.supported= application.error.desktop.not.supported= +application.error.ui.business.warning= swing.error.cannot.mail=Erreur lors de l'ouverture du client mail swing.error.cannot.open.file=Aucun programme n'est défini pour ouvrir ce type de fichier. Enregistrez le fichier et ouvrez le en dehors de l'application swing.error.cannot.open.link=Impossible d'ouvrir le fichier %s