January 2014 - Tutti-commits - mailman.cloud.codelutin.com

r1556 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: maven-release Date: 2014-01-30 20:14:13 +0100 (Thu, 30 Jan 2014) New Revision: 1556 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1556 Log: [maven-release-plugin] prepare release tutti-3.1 Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) +++ trunk/pom.xml 2014-01-30 19:14:13 UTC (rev 1556) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:14:13 UTC (rev 1556) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) +++ trunk/tutti-persistence/pom.xml 2014-01-30 19:14:13 UTC (rev 1556) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) +++ trunk/tutti-service/pom.xml 2014-01-30 19:14:13 UTC (rev 1556) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) +++ trunk/tutti-ui-swing/pom.xml 2014-01-30 19:14:13 UTC (rev 1556) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1555 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: tchemit Date: 2014-01-30 20:12:07 +0100 (Thu, 30 Jan 2014) New Revision: 1555 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1555 Log: fix scm \! :( Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) +++ trunk/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tags/tutti-3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) +++ trunk/tutti-persistence/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) +++ trunk/tutti-service/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) +++ trunk/tutti-ui-swing/pom.xml 2014-01-30 19:12:07 UTC (rev 1555) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1554 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: maven-release Date: 2014-01-30 20:07:17 +0100 (Thu, 30 Jan 2014) New Revision: 1554 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1554 Log: [maven-release-plugin] prepare release tutti-3.1 Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) +++ trunk/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tags/tutti-3.1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) +++ trunk/tutti-persistence/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) +++ trunk/tutti-service/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) +++ trunk/tutti-ui-swing/pom.xml 2014-01-30 19:07:17 UTC (rev 1554) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1553 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: tchemit Date: 2014-01-30 20:05:49 +0100 (Thu, 30 Jan 2014) New Revision: 1553 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1553 Log: fix scm Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 19:04:26 UTC (rev 1552) +++ trunk/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:04:26 UTC (rev 1552) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-30 19:04:26 UTC (rev 1552) +++ trunk/tutti-persistence/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-30 19:04:26 UTC (rev 1552) +++ trunk/tutti-service/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-30 19:04:26 UTC (rev 1552) +++ trunk/tutti-ui-swing/pom.xml 2014-01-30 19:05:49 UTC (rev 1553) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1552 - trunk
by tchemit＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: tchemit Date: 2014-01-30 20:04:26 +0100 (Thu, 30 Jan 2014) New Revision: 1552 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1552 Log: fix scm Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 19:01:21 UTC (rev 1551) +++ trunk/pom.xml 2014-01-30 19:04:26 UTC (rev 1552) @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/trunk </developerConnection> </scm> <distributionManagement>

1 0

r1551 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: maven-release Date: 2014-01-30 20:01:21 +0100 (Thu, 30 Jan 2014) New Revision: 1551 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1551 Log: [maven-release-plugin] prepare release tutti-3.1 Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 18:58:24 UTC (rev 1550) +++ trunk/pom.xml 2014-01-30 19:01:21 UTC (rev 1551) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 18:58:24 UTC (rev 1550) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:01:21 UTC (rev 1551) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-30 18:58:24 UTC (rev 1550) +++ trunk/tutti-persistence/pom.xml 2014-01-30 19:01:21 UTC (rev 1551) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-30 18:58:24 UTC (rev 1550) +++ trunk/tutti-service/pom.xml 2014-01-30 19:01:21 UTC (rev 1551) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-30 18:58:24 UTC (rev 1550) +++ trunk/tutti-ui-swing/pom.xml 2014-01-30 19:01:21 UTC (rev 1551) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1550 - tags/tutti-3.1/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing
by tchemit＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: tchemit Date: 2014-01-30 19:58:24 +0100 (Thu, 30 Jan 2014) New Revision: 1550 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1550 Log: remove bad release Removed: tags/tutti-3.1/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java Deleted: tags/tutti-3.1/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- tags/tutti-3.1/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-30 18:42:58 UTC (rev 1549) +++ tags/tutti-3.1/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-30 18:58:24 UTC (rev 1550) @@ -1,1089 +0,0 @@ -package fr.ifremer.tutti.ui.swing; - -/* - * #%L - * Tutti :: UI - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationBusinessException; -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.tutti.TuttiConfiguration; -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; -import fr.ifremer.tutti.persistence.RessourceClassLoader; -import fr.ifremer.tutti.service.ClosedPersistenceService; -import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.TuttiDataContext; -import fr.ifremer.tutti.service.TuttiServiceContext; -import fr.ifremer.tutti.service.ValidationService; -import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; -import fr.ifremer.tutti.service.catches.WeightCleaningService; -import fr.ifremer.tutti.service.catches.WeightComputingService; -import fr.ifremer.tutti.service.catches.multipost.MultiPostExportService; -import fr.ifremer.tutti.service.catches.multipost.MultiPostImportService; -import fr.ifremer.tutti.service.export.generic.TuttiExportService; -import fr.ifremer.tutti.service.export.pdf.CatchesPdfExportService; -import fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportService; -import fr.ifremer.tutti.service.protocol.ProtocolImportExportService; -import fr.ifremer.tutti.service.psionimport.PsionImportService; -import fr.ifremer.tutti.service.pupitri.PupitriImportExportService; -import fr.ifremer.tutti.service.referential.ReferentialImportExportService; -import fr.ifremer.tutti.service.referential.TuttiReferentialSynchronizeService; -import fr.ifremer.tutti.service.report.ReportService; -import fr.ifremer.tutti.ui.swing.content.MainUI; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; -import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; -import fr.ifremer.tutti.ui.swing.util.auth.LoginUI; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.swing.editor.bean.BeanDoubleList; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.swing.help.JAXXHelpBroker; -import jaxx.runtime.swing.help.JAXXHelpUIHandler; -import jaxx.runtime.swing.session.BeanDoubleListState; -import jaxx.runtime.swing.session.BeanFilterableComboBoxState; -import jaxx.runtime.swing.session.State; -import jaxx.runtime.swing.session.SwingSession; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.beans.AbstractBean; -import org.nuiton.i18n.I18n; -import org.nuiton.i18n.init.DefaultI18nInitializer; -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; -import java.beans.PropertyChangeListener; -import java.io.Closeable; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; - -/** - * UI application context. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 - */ -public class TuttiUIContext extends AbstractBean implements Closeable, UIMessageNotifier, JAXXHelpUIHandler, PropagatePropertyChangeListener.PropagatePropertyChange, ApplicationUIContext { - - /** Logger. */ - private static final Log log = LogFactory.getLog(TuttiUIContext.class); - - public static final String PROPERTY_PROGRAM_ID = "programId"; - - public static final String PROPERTY_CRUISE_ID = "cruiseId"; - - public static final String PROPERTY_PROTOCOL_ID = "protocolId"; - - public static final String PROPERTY_SCREEN = "screen"; - - public static final String PROPERTY_PROGRAM_FILLED = "programFilled"; - - public static final String PROPERTY_CRUISE__FILLED = "cruiseFilled"; - - public static final String PROPERTY_PROTOCOL_FILLED = "protocolFilled"; - - public static final String PROPERTY_VALIDATION_CONTEXT = "validationContext"; - - public static final String PROPERTY_ICHTYOMETER_CONNECTED = "ichtyometerConnected"; - - 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( - PROPERTY_PROGRAM_ID, - PROPERTY_CRUISE_ID, - PROPERTY_PROTOCOL_ID, - PROPERTY_LOCALE); - - public static final String PROPERTY_DB_EXIST = "dbExist"; - - public static final String PROPERTY_DB_LOADED = "dbLoaded"; - - /** - * Application context (only one for all the application). - * - * @since 0.1 - */ - private static TuttiUIContext applicationContext; - - /** - * Application global configuration. - * - * @since 0.1 - */ - protected final TuttiConfiguration config; - - /** - * ClassLoader ressource. - * - * @since 0.3 - */ - protected final RessourceClassLoader resourceLoader; - - /** - * Service context used by any service. - * - * @since 0.1 - */ - protected final TuttiServiceContext serviceContext; - - /** - * Swing session used to save ui states. - * - * @since 0.1 - */ - protected final SwingSession swingSession; - - /** - * Erro helper. - * - * @since 1.0 - */ - protected final ApplicationErrorHelper errorHelper; - - /** - * Shared data context. - * - * @since 1.0.2 - */ - protected TuttiDataContext dataContext; - - /** - * Tutti help broker. - * - * @since 1.1 - */ - protected TuttiHelpBroker helpBroker; - - /** - * Current screen displayed in ui. - * - * @since 0.1 - */ - protected TuttiScreen screen; - - /** - * Current locale used in application. - * - * @since 1.0.3 - */ - protected Locale locale; - - /** - * Busy state ({@code true} when a blocking action is running). - * - * @since 1.0.3 - */ - protected boolean busy; - - /** - * Flag to hide (or not) the body of application. - * - * @since 1.1 - */ - protected boolean hideBody; - - /** - * Message notifiers. - * - * @since 0.3 - */ - protected final Set<UIMessageNotifier> messageNotifiers; - - /** - * Validation context (used by fishingOperation screens). - * - * @since 0.3 - */ - private String validationContext; - - private MainUI mainUI; - - private ApplicationActionUI actionUI; - - /** - * Flag to know if there is an exsiting db. - * - * @since 1.0 - */ - private boolean dbExist; - - /** - * Flag to know if there is a loaded db. - * - * @since 1.0 - */ - private boolean dbLoaded; - - private Properties helpMapping; - - private final ApplicationActionFactory tuttiActionFactory; - - private final ApplicationActionEngine tuttiActionEngine; - - /** - * To keep authentication credential in memory. - * - * @since 3.1 - */ - private final Map<String, AuthenticationInfo> updateAuthenticationStore; - - /** - * Ichtyometer Reader. - * - * @since 3.1 - */ - private FeedReader ichtyometerReader; - - public static TuttiUIContext newContext(TuttiConfiguration config) { - Preconditions.checkNotNull(config); - Preconditions.checkState(applicationContext == null, - "Application context was already opened!"); - applicationContext = new TuttiUIContext(config); - return applicationContext; - } - - public static TuttiUIContext getApplicationContext() { - return applicationContext; - } - - public ApplicationErrorHelper getErrorHelper() { - return applicationContext.errorHelper; - } - - @Override - public String getI18nPrefix() { - return "tutti.property."; - } - - @Override - public String getDateFormat() { - return getConfig().getDateFormat(); - } - - protected TuttiUIContext(TuttiConfiguration config) { - this.config = config; - this.resourceLoader = new RessourceClassLoader(Thread.currentThread().getContextClassLoader()); - this.serviceContext = new TuttiServiceContext(resourceLoader, config); - - Map<Class, State> additionalStates = Maps.newHashMap(); - additionalStates.put(BeanFilterableComboBox.class, new BeanFilterableComboBoxState()); - additionalStates.put(BeanDoubleList.class, new BeanDoubleListState()); - this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false, additionalStates); - - //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() { - - @Override - public void showInformationMessage(String message) { - if (StringUtils.isNotBlank(message)) { - message = message.replaceAll("\\<strong\\>", ""); - message = message.replaceAll("\\<.strong\\>", ""); - message = message.replaceAll("\\<li\\>", ""); - message = message.replaceAll("\\<.li\\>", ""); - message = message.replaceAll("\\<ul\\>", ""); - message = message.replaceAll("\\<.ul\\>", ""); - if (log.isInfoEnabled()) { - log.info(message); - } - } - } - }; - this.messageNotifiers = Sets.newHashSet(); - addMessageNotifier(logMessageNotifier); - tuttiActionFactory = new TuttiActionFactory(); - tuttiActionEngine = new ApplicationActionEngine(tuttiActionFactory); - this.updateAuthenticationStore = Maps.newTreeMap(); - } - - @Override - public ApplicationConfiguration getConfiguration() { - return config; - } - - @Override - public Component getBodyUI() { - MainUI mainUI = getMainUI(); - return mainUI == null ? null : mainUI.getBody(); - } - - @Override - public Component getStatusUI() { - MainUI mainUI = getMainUI(); - return mainUI == null ? null : mainUI.getStatus(); - } - - //------------------------------------------------------------------------// - //-- Open / close methods --// - //------------------------------------------------------------------------// - - public void init() { - - config.prepareDirectories(); - - // use our special classLoader (which will read some files from resources from a configuration directory) - Thread.currentThread().setContextClassLoader(getResourceLoader()); - - // converters are stored in current classloader, we need then to rescan them - // each time we change current classloader - ConverterUtil.deregister(); - ConverterUtil.initConverters(); - - // Use shutdownHook to close context on System.exit - Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { - - @Override - public void run() { - if (log.isInfoEnabled()) { - log.info("Close context on shutdown"); - } - close(); - } - })); - - //--------------------------------------------------------------------// - // init db configuration - //--------------------------------------------------------------------// - - config.initConfig(getResourceLoader()); - -// // clean db cache (avoid a lots of headache :( -// File cacheDirectory = config.getServiceConfig().getPersistenceConfig().getCacheDirectory(); -// if (cacheDirectory.exists()) { -// // clean cache directory (fix soem headaches...) -// TuttiIOUtil.cleanDirectory( -// cacheDirectory, -// _("tutti.db.deleteCache.error", cacheDirectory)); -// } - - //--------------------------------------------------------------------// - // init i18n - //--------------------------------------------------------------------// - File i18nDirectory = config.getI18nDirectory(); - if (!config.isFullLaunchMode()) { - - i18nDirectory = new File(config.getDataDirectory(), "i18n"); - - if (i18nDirectory.exists()) { - // clean i18n cache - ApplicationIOUtil.cleanDirectory( - i18nDirectory, - _("tutti.i18n.deleteCache.error", i18nDirectory)); - } - } - - ApplicationIOUtil.forceMkdir(i18nDirectory, - _("tutti.i18n.mkDir.error", i18nDirectory)); - - if (log.isDebugEnabled()) { - log.debug("I18N directory: " + i18nDirectory); - } - - Locale i18nLocale = config.getI18nLocale(); - - if (log.isInfoEnabled()) { - log.info(String.format("Starts i18n with locale [%s] at [%s]", - i18nLocale, i18nDirectory)); - } - I18n.init(new UserI18nInitializer( - i18nDirectory, new DefaultI18nInitializer("tutti-i18n")), - i18nLocale); - - //--------------------------------------------------------------------// - // init help - //--------------------------------------------------------------------// - - File helpDirectory = config.getHelpDirectory(); - - if (!config.isFullLaunchMode()) { - - if (!helpDirectory.exists()) { - helpDirectory = new File(config.getDataDirectory(), "help"); - } - } - - if (log.isDebugEnabled()) { - log.debug("Help directory: " + helpDirectory); - } - ApplicationIOUtil.forceMkdir( - helpDirectory, - _("tutti.help.mkDir.error", helpDirectory)); - - // load help mapping - String mappingProperties = "/tutti-help-fr.properties"; - try { - - InputStream resourceAsStream = - getClass().getResourceAsStream(mappingProperties); - helpMapping = new Properties(); - helpMapping.load(resourceAsStream); - - } catch (Exception eee) { - log.error("Failed to load help mapping file at '" + - mappingProperties + "'", eee); - } - if (log.isInfoEnabled()) { - log.info(String.format("Starts help with locale at [%s]", - helpDirectory)); - } - - //--------------------------------------------------------------------// - // init action UI - //--------------------------------------------------------------------// - setActionUI(new ApplicationActionUI(null, this)); - } - - public void open() { - - setLocale(config.getI18nLocale()); - - if (getProgramId() == null) { - - // load it from config - setProgramId(config.getProgramId()); - } - - if (getCruiseId() == null) { - - // load it from config - setCruiseId(config.getCruiseId()); - } - - if (getProtocolId() == null) { - - // load it from config - setProtocolId(config.getProtocolId()); - } - - boolean dbExists = config.isDbExists(); - - setDbExist(dbExists); - - if (!dbExists) { - - setProtocolId(null); - setProgramId(null); - setCruiseId(null); - setDbLoaded(false); - } - - // save back to config - saveContextToConfig(); - - // list when programId or campaingId change to save the configuration - addPropertyChangeListener(new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - - if (PROPERTIES_TO_SAVE.contains(evt.getPropertyName())) { - saveContextToConfig(); - } - } - }); - } - - @Override - public void close() { - - // Clear data references - messageNotifiers.clear(); - validationContext = null; - IOUtils.closeQuietly(dataContext); - - setScreen(null); - - IOUtils.closeQuietly(serviceContext); - IOUtils.closeQuietly(ichtyometerReader); - - // remove listeners - PropertyChangeListener[] listeners = getPropertyChangeListeners(); - for (PropertyChangeListener listener : listeners) { - if (log.isDebugEnabled()) { - log.debug("Remove listener: " + listener); - } - removePropertyChangeListener(listener); - } - setMainUI(null); - if (actionUI != null) { - - // close action ui - actionUI.getModel().clear(); - } - setActionUI(null); - } - - //------------------------------------------------------------------------// - //-- Service methods --// - //------------------------------------------------------------------------// - - public PersistenceService getPersistenceService() { - - PersistenceService service; - - if (useRealPersistenceService()) { - service = dataContext.getService(); - if (service == null) { - - // use real service - service = serviceContext.getService(PersistenceService.class); - - dataContext.open(config, service); - } - } else { - service = serviceContext.getService(ClosedPersistenceService.class); - } - return service; - } - - public DecoratorService getDecoratorService() { - return serviceContext.getService(DecoratorService.class); - } - - public TuttiReferentialSynchronizeService getTuttiReferentialSynchronizeService() { - return serviceContext.getService(TuttiReferentialSynchronizeService.class); - } - - public ProtocolImportExportService getTuttiProtocolImportExportService() { - return serviceContext.getService(ProtocolImportExportService.class); - } - - public PupitriImportExportService getTuttiPupitriImportExportService() { - return serviceContext.getService(PupitriImportExportService.class); - } - - public PsionImportService getTuttiPsionImportExportService() { - return serviceContext.getService(PsionImportService.class); - } - - public ReferentialImportExportService getTuttiReferentialImportExportService() { - return serviceContext.getService(ReferentialImportExportService.class); - } - - public WeightComputingService getWeightComputingService() { - return serviceContext.getService(WeightComputingService.class); - } - - public WeightCleaningService getWeightCleaningService() { - return serviceContext.getService(WeightCleaningService.class); - } - - public ValidateCruiseOperationsService getValidateCruiseOperationsService() { - return serviceContext.getService(ValidateCruiseOperationsService.class); - } - - public ValidationService getValidationService() { - return serviceContext.getService(ValidationService.class); - } - - public CatchesPdfExportService getGeneratePDFService() { - return serviceContext.getService(CatchesPdfExportService.class); - } - - public TuttiExportService getTuttiExportService() { - return serviceContext.getService(TuttiExportService.class); - } - - public CatchesSumatraExportService getCatchesSumatraExportService() { - return serviceContext.getService(CatchesSumatraExportService.class); - } - - public MultiPostImportService getMultiPostImportService() { - return serviceContext.getService(MultiPostImportService.class); - } - - public MultiPostExportService getMultiPostExportService() { - return serviceContext.getService(MultiPostExportService.class); - } - - public ReportService getReportService() { - return serviceContext.getService(ReportService.class); - } - - public boolean useRealPersistenceService() { - return isDbExist() && isDbLoaded(); - } - - public PersistenceService reloadPersistenceService() { - - try { - serviceContext.close(); - } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.context.service.close.error"), e); - } - dataContext.close(); - - return getPersistenceService(); - } - - public void reloadDecoratorService() { - serviceContext.reloadService(DecoratorService.class); - } - - //------------------------------------------------------------------------// - //-- DataContext methods --// - //------------------------------------------------------------------------// - - public TuttiDataContext getDataContext() { - return dataContext; - } - - public boolean isCruiseFilled() { - return dataContext.isCruiseFilled(); - } - - public String getProgramId() { - return dataContext.getProgramId(); - } - - public boolean isProtocolFilled() { - return dataContext.isProtocolFilled(); - } - - public String getProtocolId() { - return dataContext.getProtocolId(); - } - - public String getCruiseId() { - return dataContext.getCruiseId(); - } - - public boolean isProgramFilled() { - return dataContext.isProgramFilled(); - } - - public void setProgramId(String programId) { - dataContext.setProgramId(programId); - } - - public void setCruiseId(String cruiseId) { - dataContext.setCruiseId(cruiseId); - } - - public void setProtocolId(String protocolId) { - dataContext.setProtocolId(protocolId); - } - - public void clearDbContext() { - dataContext.clearContext(); - } - - public void checkDbContext() { - - // make sure persistence serivce is loaded - getPersistenceService(); - - // ask data context to check his ids - dataContext.checkDbContext(); - - // save config - saveContextToConfig(); - } - - //------------------------------------------------------------------------// - //-- Db methods --// - //------------------------------------------------------------------------// - - public boolean isDbExist() { - return dbExist; - } - - public void setDbExist(boolean dbExist) { - this.dbExist = dbExist; - firePropertyChange(PROPERTY_DB_EXIST, null, dbExist); - } - - public boolean isDbLoaded() { - return dbLoaded; - } - - public void setDbLoaded(boolean dbLoaded) { - this.dbLoaded = dbLoaded; - firePropertyChange(PROPERTY_DB_LOADED, null, dbLoaded); - } - - //------------------------------------------------------------------------// - //-- Config methods --// - //------------------------------------------------------------------------// - - public TuttiConfiguration getConfig() { - return config; - } - - protected void saveContextToConfig() { - if (log.isInfoEnabled()) { - log.info("Save config (programId: " + getProgramId() + ", cruiseId: " + - getCruiseId() + ", protocolId: " + getProtocolId() + ", locale: " + - getLocale() + ")"); - } - config.setProgramId(getProgramId()); - config.setCruiseId(getCruiseId()); - config.setProtocolId(getProtocolId()); - config.setI18nLocale(getLocale()); - config.save(); - } - - //------------------------------------------------------------------------// - //-- UI methods --// - //------------------------------------------------------------------------// - - @Override - public MainUI getMainUI() { - return mainUI; - } - - public void setMainUI(MainUI mainUI) { - this.mainUI = mainUI; - } - - @Override - public ApplicationActionUI getActionUI() { - return actionUI; - } - - public ApplicationActionUI getExistingActionUI() { - while (actionUI == null) { - - try { - Thread.sleep(50); - } catch (InterruptedException e) { - // ignore this one - } - } - return actionUI; - } - - public ApplicationActionUI getExistingActionUIWhenMainUINotNull() { - ApplicationActionUI result = null; - if (mainUI != null) { - result = getExistingActionUI(); - } - return result; - } - - - public void setActionUI(ApplicationActionUI actionUI) { - this.actionUI = actionUI; - } - - public SwingSession getSwingSession() { - return swingSession; - } - - public TuttiScreen getScreen() { - return screen; - } - - public void setScreen(TuttiScreen screen) { - Object oldValue = getScreen(); - this.screen = screen; - firePropertyChange(PROPERTY_SCREEN, oldValue, screen); - } - - @Override - public boolean isBusy() { - return busy; - } - - @Override - public void setBusy(boolean busy) { - this.busy = busy; - firePropertyChange(PROPERTY_BUSY, null, busy); - } - - @Override - public boolean isHideBody() { - return hideBody; - } - - @Override - public void setHideBody(boolean hideBody) { - this.hideBody = hideBody; - firePropertyChange(PROPERTY_HIDE_BODY, null, hideBody); - } - - @Override - public Color getColorBlockingLayer() { - return getConfig().getColorBlockingLayer(); - } - - @Override - public ApplicationActionFactory getActionFactory() { - return tuttiActionFactory; - } - - @Override - public ApplicationActionEngine getActionEngine() { - return tuttiActionEngine; - } - - //------------------------------------------------------------------------// - //-- UIMessageNotifier methods --// - //------------------------------------------------------------------------// - - public void addMessageNotifier(UIMessageNotifier messageNotifier) { - this.messageNotifiers.add(messageNotifier); - } - - public void removeMessageNotifier(UIMessageNotifier messageNotifier) { - this.messageNotifiers.remove(messageNotifier); - } - - @Override - public void showInformationMessage(String message) { - for (UIMessageNotifier messageNotifier : messageNotifiers) { - messageNotifier.showInformationMessage(message); - } - } - - public RessourceClassLoader getResourceLoader() { - return resourceLoader; - } - - //------------------------------------------------------------------------// - //-- Help methods --// - //------------------------------------------------------------------------// - - public TuttiHelpBroker getHelpBroker() { - return helpBroker; - } - - public void setHelpBroker(TuttiHelpBroker helpBroker) { - this.helpBroker = helpBroker; - } - - @Override - public void showHelp(JAXXContext context, - JAXXHelpBroker broker, - String helpId) { - if (helpId == null) { - helpId = broker.getDefaultID(); - } - - if (log.isInfoEnabled()) { - log.info("show help " + helpId); - } - - String value = (String) helpMapping.get(helpId); - - if (value == null) { - throw new ApplicationTechnicalException(_("tutti.context.helpPage.notFound", helpId)); - } - - String helpDirectory = getConfig().getHelpResourceWithLocale(value); - boolean withFragment = helpDirectory.contains("#"); - - String fragment = null; - if (withFragment) { - fragment = StringUtils.substringAfter(helpDirectory, "#"); - helpDirectory = StringUtils.substringBefore(helpDirectory, "#"); - } - - URI resolvedUri = new File(helpDirectory).toURI(); - try { - - if (withFragment) { - resolvedUri = new URI(resolvedUri.toString() + "#" + fragment); - } - if (log.isInfoEnabled()) { - log.info("help uri = " + resolvedUri); - } - TuttiUIUtil.openLink(resolvedUri); - } catch (URISyntaxException e) { - throw new ApplicationTechnicalException(_("tutti.context.helpPage.notFound", resolvedUri)); - } - - } - - //------------------------------------------------------------------------// - //-- Authentication methods --// - //------------------------------------------------------------------------// - - public AuthenticationInfo getAuthenticationInfo(String url) { - - // get existing info - AuthenticationInfo authentication = updateAuthenticationStore.get(url); - - // ask user authentication - authentication = new LoginUI(this).open(url, authentication).getAuthenticationInfo(); - - if (authentication != null) { - - // store it back in authentication store - updateAuthenticationStore.put(url, authentication); - } - - return authentication; - } - - //------------------------------------------------------------------------// - //-- Ichtyometer methods --// - //------------------------------------------------------------------------// - - public FeedReader getIchtyometerReader() { - return ichtyometerReader; - } - - public void setIchtyometerReader(FeedReader ichtyometerReader) { - this.ichtyometerReader = ichtyometerReader; - firePropertyChange(PROPERTY_ICHTYOMETER_CONNECTED, null, isIchtyometerConnected()); - } - - public boolean isIchtyometerConnected() { - return ichtyometerReader != null; - } - - //------------------------------------------------------------------------// - //-- Other methods --// - //------------------------------------------------------------------------// - - public Locale getLocale() { - return locale; - } - - public void setLocale(Locale locale) { - this.locale = locale; - firePropertyChange(PROPERTY_LOCALE, null, locale); - } - - public void setValidationContext(String validationContext) { - Object oldValue = getValidationContext(); - this.validationContext = validationContext; - firePropertyChange(PROPERTY_VALIDATION_CONTEXT, oldValue, validationContext); - } - - public String getValidationContext() { - return validationContext; - } - - @Override - public void firePropertyChanged(String propertyName, - Object oldValue, - Object newValue) { - firePropertyChange(propertyName, oldValue, newValue); - } - - public void setFallBackScreen() { - if (isDbLoaded()) { - setScreen(TuttiScreen.SELECT_CRUISE); - } else { - setScreen(TuttiScreen.MANAGE_DB); - } - } - - public boolean checkUpdateApplicationReachable(boolean showErrorInPopup) { - - boolean result = true; - TuttiConfiguration config = getConfig(); - String url = config.getUpdateApplicationUrl(); - - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.bad.url.syntax"), - n_("tutti.error.update.could.not.reach.url"), - n_("tutti.error.update.could.not.found.url") - ); - } catch (ApplicationBusinessException e) { - if (showErrorInPopup) { - - getErrorHelper().showWarningDialog(e.getMessage()); - } else { - showInformationMessage(e.getMessage()); - } - result = false; - } - return result; - } - - public boolean checkUpdateDataReachable(boolean showErrorInPopup) { - - boolean result = true; - TuttiConfiguration config = getConfig(); - String url = config.getUpdateDataUrl(); - - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.bad.url.syntax"), - n_("tutti.error.update.could.not.reach.url"), - n_("tutti.error.update.could.not.found.url") - ); - } catch (ApplicationBusinessException e) { - if (showErrorInPopup) { - - getErrorHelper().showWarningDialog(e.getMessage()); - } else { - showInformationMessage(e.getMessage()); - } - result = false; - } - return result; - } -}

1 0

[ANN] - Tutti 3.1 released
by forge.codelutin.com Release Notification 30 Jan '14

30 Jan '14

The Tutti team is pleased to announce the tutti-3.1 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [IMPORT GENERIQUE] faire quotation pour import dans TUTTI du format générique Issue: 2505. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Requête d'accès au référentiel Personne Issue: 4196. Thanks to Christian BONNET. Resolved by tchemit. o Import de données depuis un ichtyomètre (par lot) Issue: 3876. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT GENERIQUE] demande d'évolutions Issue: 4135. Thanks to Vincent BADTS. Resolved by tchemit. o Ajout de message d'erreur si une mise à jour ne se déroule pas bien Issue: 4257. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Sécuriser les accès au site de données Issue: 4130. Thanks to Tony Chemit. Resolved by tchemit. o Import des mensurations en continue depuis un ichtyomètre Issue: 3875. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [CAPTURE] Mauvais focus suite à une élévation de poids Issue: 4151. Thanks to Tony Chemit. Resolved by tchemit. o [AIDE] Manque aide pour Action + ou - sur l'écran Issue: 4150. Thanks to Tony Chemit. Resolved by tchemit. o [PROTOCOLE] erreur après import protocole (d'avant 3.0), changement nom, et enregistrement. Urgent car bloque création protocole Issue: 4145. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Mise à jour de référentiel - Erreur sur les données suite à la mise à jour Issue: 4149. Thanks to Christian BONNET. Resolved by tchemit. o [REFERENTIEL] plus de code rubin associé au référentiel des espèces Issue: 4146. Thanks to Vincent BADTS. Resolved by tchemit. o [REFERENTIEL] Problème si des espèces sont supprimés Issue: 4154. Thanks to Tony Chemit. Resolved by tchemit. Changes: o [SPECS] Fournir la documentation sur le format générique Issue: 3939. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-3.1-full-linux-i586.zip - http://forge.codelutin.com/attachments/download/1388 * tutti-3.1-full-windows-i586.zip - http://forge.codelutin.com/attachments/download/1389 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1549 - in trunk: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: maven-release Date: 2014-01-30 19:42:58 +0100 (Thu, 30 Jan 2014) New Revision: 1549 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1549 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-ichtyometer/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-30 18:42:40 UTC (rev 1548) +++ trunk/pom.xml 2014-01-30 18:42:58 UTC (rev 1549) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 18:42:40 UTC (rev 1548) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 18:42:58 UTC (rev 1549) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-30 18:42:40 UTC (rev 1548) +++ trunk/tutti-persistence/pom.xml 2014-01-30 18:42:58 UTC (rev 1549) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-30 18:42:40 UTC (rev 1548) +++ trunk/tutti-service/pom.xml 2014-01-30 18:42:58 UTC (rev 1549) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-30 18:42:40 UTC (rev 1548) +++ trunk/tutti-ui-swing/pom.xml 2014-01-30 18:42:58 UTC (rev 1549) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.1</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1548 - tags/tutti-3.1
by maven-release＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: maven-release Date: 2014-01-30 19:42:40 +0100 (Thu, 30 Jan 2014) New Revision: 1548 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1548 Log: [maven-release-plugin] copy for tag tutti-3.1 Added: tags/tutti-3.1/trunk/

1 0