Author: tchemit Date: 2013-03-18 12:18:53 +0100 (Mon, 18 Mar 2013) New Revision: 642 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/642 Log: refs #2006: [TECH] - Am?\195?\169liorer la progression lors des mises ?\195?\160 jour (fix npe) fix help bundle Modified: trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 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/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java Modified: trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2013-03-18 10:05:04 UTC (rev 641) +++ trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2013-03-18 11:18:53 UTC (rev 642) @@ -124,7 +124,7 @@ <fileSet> <directory>src/main/help</directory> - <outputDirectory/> + <outputDirectory>help</outputDirectory> <includes> <include>**/*</include> </includes> 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-03-18 10:05:04 UTC (rev 641) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-03-18 11:18:53 UTC (rev 642) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; @@ -35,6 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.plaf.BorderUIResource; import java.awt.Color; @@ -74,38 +76,55 @@ // prepare context (mainly init configs, i18n) context.init(); + // Prepare ui look&feel and load ui properties + try { + SwingUtil.initNimbusLoookAndFeel(); + } catch (Exception e) { + // could not find nimbus look-and-feel + if (log.isWarnEnabled()) { + log.warn("Failed to init nimbus look and feel"); + } + } + + UIManager.put("Table.focusCellHighlightBorder", + new BorderUIResource.LineBorderUIResource(Color.BLACK)); + if (config.isFullLaunchMode()) { if (log.isInfoEnabled()) { log.info("Full launch mode, try to update."); } + // try to update jre - i18n - application - help and exit if so MainUIHandler handler = new MainUIHandler(context); + AbstractTuttiAction.runAction(new UpdateApplicationAction(handler)); - // try to update jre - i18n - application - help and exit if so - TuttiUIAction<UpdateApplicationAction> uiAction = - handler.createUIAction(null, UpdateApplicationAction.class); + //FIXME-TC Msut use this later (version 1.2) +// try { +// SwingUtilities.invokeAndWait( +// new Runnable() { +// @Override +// public void run() { +// +// TuttiUIAction<UpdateApplicationAction> uiAction = +// handler.createUIAction(null, UpdateApplicationAction.class); +// uiAction.actionPerformed(null); +// if (log.isInfoEnabled()) { +// log.info("After action."); +// } +// } +// } +// ); +// } catch (Exception e) { +// throw new TuttiTechnicalException("Could not update application", e); +// } - uiAction.actionPerformed(null); -// AbstractTuttiAction.runAction(new UpdateApplicationAction(handler)); - // try to update db -// new UpdateReferentialAction(handler).doAction(null); } - // Prepare ui look&feel and load ui properties - try { - SwingUtil.initNimbusLoookAndFeel(); - } catch (Exception e) { - // could not find nimbus look-and-feel - if (log.isWarnEnabled()) { - log.warn("Failed to init nimbus look and feel"); - } + if (log.isInfoEnabled()) { + log.info("Will start Tutti..."); } - - UIManager.put("Table.focusCellHighlightBorder", - new BorderUIResource.LineBorderUIResource(Color.BLACK)); - startTutti(context, true); } 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-03-18 10:05:04 UTC (rev 641) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-03-18 11:18:53 UTC (rev 642) @@ -101,6 +101,8 @@ public static final String PROPERTY_BUSY = "busy"; + public static final String PROPERTY_HIDE_BODY = "hideBody"; + public static final String PROPERTY_LOCALE = "locale"; public static final Set<String> PROPERTIES_TO_SAVE = Sets.newHashSet( @@ -211,6 +213,12 @@ */ protected boolean busy; + /** + * Flag to hide (or not) the body of application. + * + * @since 1.1 + */ + protected boolean hideBody; /** * Message notifiers. @@ -387,6 +395,15 @@ firePropertyChange(PROPERTY_BUSY, null, busy); } + public boolean isHideBody() { + return hideBody; + } + + public void setHideBody(boolean hideBody) { + this.hideBody = hideBody; + firePropertyChange(PROPERTY_HIDE_BODY, null, hideBody); + } + public Locale getLocale() { return locale; } 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-03-18 10:05:04 UTC (rev 641) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-18 11:18:53 UTC (rev 642) @@ -132,6 +132,16 @@ updateBusyState(newvalue != null && newvalue); } }); + + // ecoute des changements de l'état busy + context.addPropertyChangeListener(TuttiUIContext.PROPERTY_HIDE_BODY, new RemoveablePropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + Boolean newvalue = (Boolean) evt.getNewValue(); + getUI().getBody().setVisible(newvalue != null && newvalue); + } + }); } protected void updateBusyState(boolean busy) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java 2013-03-18 10:05:04 UTC (rev 641) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java 2013-03-18 11:18:53 UTC (rev 642) @@ -24,7 +24,6 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.content.MainUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -137,13 +136,12 @@ boolean hideBody = action.isHideBody(); - MainUI mainUI = action.getContext().getMainUI(); - action.getContext().setBusy(busy); if (hideBody) { - mainUI.getBody().setVisible(!busy); + action.getContext().setHideBody(!busy); } + } protected class TuttiActionTimerTask extends TimerTask { @@ -157,10 +155,8 @@ actionUI.close(); } - // we do NOt want the timer to wake up then the actionUI dialog + // we do NOT want the timer to wake up then the actionUI dialog cancel(); - - } }); }