Author: tchemit Date: 2014-06-03 10:51:44 +0200 (Tue, 03 Jun 2014) New Revision: 1175 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1175 Log: update mavenpom, and other nuiton libs Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserUIApplicationContext.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/pom.xml Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserUIApplicationContext.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserUIApplicationContext.java 2014-04-22 20:44:44 UTC (rev 1174) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserUIApplicationContext.java 2014-06-03 08:51:44 UTC (rev 1175) @@ -120,7 +120,7 @@ } File mainFrameFile = new File(coserConfigDirectory, "session.xml"); - context.session = new SwingSession(mainFrameFile, true); + context.session = SwingSession.newSession(mainFrameFile, true); // catch wall application exception // catch uncaught exceptions Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2014-04-22 20:44:44 UTC (rev 1174) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2014-06-03 08:51:44 UTC (rev 1175) @@ -76,10 +76,10 @@ /** * Coser handler for main frame. - * + * * @author chatellier * @version $Revision$ - * + * * Last update : $Date$ * By : $Author$ */ @@ -95,7 +95,7 @@ /** * Switch application locale. - * + * * @param frame frame * @param newLocale new locale */ @@ -147,7 +147,7 @@ /** * Replace window main component. - * + * * @param component new component */ protected void setMainComponent(Component component) { @@ -176,7 +176,13 @@ */ public void quit() { SwingSession session = view.getContextValue(SwingSession.class); - session.save(); + try { + session.save(); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Could not save user ui session", e); + } + } System.exit(0); } @@ -208,7 +214,7 @@ throw new CoserException("Can't open system browser", ex); } } - + /** * Open default system browser to coser website. */ @@ -306,7 +312,7 @@ /** * Do some operation when a new project is loaded into application. - * + * * @param project loaded project (can be null) */ public void projectLoaded(Project project) { @@ -322,7 +328,7 @@ /** * Do some operation when a new selection is loaded into application. - * + * * @param selection loaded selection (can be null) */ public void selectionLoaded(Selection selection) { @@ -352,10 +358,10 @@ } projectSummaryView.getProjectSelectionCount().setText(String.valueOf(selectionCount)); projectSummaryView.getProjectResultCount().setText(String.valueOf(resultCount)); - + setMainComponent(projectSummaryView); } - + /** * Charge les données de control et affiche la vue de control. */ @@ -365,7 +371,7 @@ /** * Charge les données de control et affiche la vue de control. - * + * * @param reloadData reload data (a {@code false} dans le cas d'une creation, * les données sont deja chargées) */ @@ -409,7 +415,7 @@ /** * Show selection view to create new selection. - * + * * TODO echatellier 20101217 revoir les 3 méthodes de selection (code dupliqués) */ public void showSelectionView() { @@ -417,7 +423,7 @@ // create new selection ProjectService projectService = view.getContextValue(ProjectService.class); Project project = view.getContextValue(Project.class); - + setWaitCursor(view); try { Selection selection = projectService.initProjectSelection(project); @@ -452,7 +458,7 @@ /** * Show selection view to open selection. - * + * * @param selectionName selection name to open */ public void showSelectionView(String selectionName) { @@ -480,10 +486,10 @@ /** * Show selection view to open selection. - * + * * Used in selection replay. Selection already exists and is already loaded * into memory. - * + * * @param selection selection to open * @param selectedTab onglet a selectionner apres l'ouverture */ @@ -532,7 +538,7 @@ public String getDescription() { return t("coser.ui.selection.selectionFilterDescription"); } - + } /** @@ -559,7 +565,7 @@ /** * Called by {@link LookAndFeelViewMenuItem} when look and feel selection * change. - * + * * @param event change event */ public void saveLookAndFeelConfiguration(PropertyChangeEvent event) { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-22 20:44:44 UTC (rev 1174) +++ trunk/pom.xml 2014-06-03 08:51:44 UTC (rev 1175) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.6</version> + <version>5.0.8</version> </parent> <groupId>fr.ifremer</groupId> @@ -61,7 +61,7 @@ <scm> <connection>scm:svn:https://svn.codelutin.com/coser/trunk</connection> <developerConnection>scm:svn:https://svn.codelutin.com/coser/trunk</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/coser/trunk</url> + <url>https://forge.codelutin.com/projects/coser/repository/show/trunk</url> </scm> <distributionManagement> <site> @@ -87,11 +87,11 @@ <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> <!-- Versions --> - <jaxxVersion>2.8.4</jaxxVersion> - <nuitonI18nVersion>3.0</nuitonI18nVersion> + <jaxxVersion>2.8.6</jaxxVersion> + <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonMatrixVersion>2.3.3</nuitonMatrixVersion> <strutsVersion>2.3.16.1</strutsVersion> - <nuitonReportPluginVersion>3.0-rc-1</nuitonReportPluginVersion> + <nuitonReportPluginVersion>3.0</nuitonReportPluginVersion> </properties>