September 2013 - Tutti-commits - mailman.cloud.codelutin.com

r1177 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 12:24:35 +0200 (Tue, 17 Sep 2013) New Revision: 1177 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1177 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/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 2013-09-17 10:24:26 UTC (rev 1176) +++ trunk/pom.xml 2013-09-17 10:24:35 UTC (rev 1177) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-17 10:24:26 UTC (rev 1176) +++ trunk/tutti-persistence/pom.xml 2013-09-17 10:24:35 UTC (rev 1177) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-17 10:24:26 UTC (rev 1176) +++ trunk/tutti-service/pom.xml 2013-09-17 10:24:35 UTC (rev 1177) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-17 10:24:26 UTC (rev 1176) +++ trunk/tutti-ui-swing/pom.xml 2013-09-17 10:24:35 UTC (rev 1177) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1176 - tags
by maven-release＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 12:24:26 +0200 (Tue, 17 Sep 2013) New Revision: 1176 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1176 Log: [maven-release-plugin] copy for tag tutti-2.4 Added: tags/tutti-2.4/

1 0

r1175 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 12:24:18 +0200 (Tue, 17 Sep 2013) New Revision: 1175 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1175 Log: [maven-release-plugin] prepare release tutti-2.4 Modified: trunk/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 2013-09-17 10:21:38 UTC (rev 1174) +++ trunk/pom.xml 2013-09-17 10:24:18 UTC (rev 1175) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-17 10:21:38 UTC (rev 1174) +++ trunk/tutti-persistence/pom.xml 2013-09-17 10:24:18 UTC (rev 1175) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-17 10:21:38 UTC (rev 1174) +++ trunk/tutti-service/pom.xml 2013-09-17 10:24:18 UTC (rev 1175) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-17 10:21:38 UTC (rev 1174) +++ trunk/tutti-ui-swing/pom.xml 2013-09-17 10:24:18 UTC (rev 1175) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1174 - trunk
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 12:21:38 +0200 (Tue, 17 Sep 2013) New Revision: 1174 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1174 Log: fix misnamed property jdkVersion to jreVersion Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 10:18:49 UTC (rev 1173) +++ trunk/pom.xml 2013-09-17 10:21:38 UTC (rev 1174) @@ -549,8 +549,8 @@ <configuration> <rules> <requireProperty> - <property>jdkVersion</property> - <message>You must set a jdkVersion property!</message> + <property>jreVersion</property> + <message>You must set a jreVersion property!</message> </requireProperty> <requireProperty> <property>dbVersion</property>

1 0

r1173 - in trunk: src/update tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 12:18:49 +0200 (Tue, 17 Sep 2013) New Revision: 1173 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1173 Log: add missing license headers = svn properties refs #3259: [TECH] Utiliser deux fichiers de configuration pour les mises ?\195?\160 jour (applicatif / base de donn?\195?\169es) (do it on showAbout screen) Modified: trunk/src/update/tutti-db.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/src/update/tutti-db.properties =================================================================== --- trunk/src/update/tutti-db.properties 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/src/update/tutti-db.properties 2013-09-17 10:18:49 UTC (rev 1173) @@ -2,7 +2,7 @@ # #%L # Tutti # $Id$ -# $HeadURL: http://svn.forge.codelutin.com/svn/tutti/trunk/src/update/tutti-application… $ +# $HeadURL$ # %% # Copyright (C) 2012 - 2013 Ifremer # %% Property changes on: trunk/src/update/tutti-db.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-17 10:18:49 UTC (rev 1173) @@ -194,15 +194,16 @@ protected void addUpdateTab(TuttiApplicationConfig config) { File current = config.getTuttiBasedir(); - String url = config.getUpdateApplicationUrl(); + String urlApplication = config.getUpdateApplicationUrl(); + String urlDb = config.getUpdateDbUrl(); ApplicationUpdater up = new ApplicationUpdater(); // get application updates - Map<String, ApplicationInfo> applicationVersions = up.getVersions(url, current); + Map<String, ApplicationInfo> applicationVersions = up.getVersions(urlApplication, current); // get db updates - Map<String, ApplicationInfo> dbVersions = up.getVersions(url, config.getDataDirectory()); + Map<String, ApplicationInfo> dbVersions = up.getVersions(urlDb, config.getDataDirectory()); // create final update map final Map<String, ApplicationInfo> versions = Maps.newTreeMap(); @@ -242,7 +243,7 @@ params.add(_("tutti.about.update.app.up.detail", appLabel, oldVersion, newVersion, appName)); } } - String updateText = _("tutti.about.update.content", url, Joiner.on("\n").join(params)); + String updateText = _("tutti.about.update.content", urlApplication, urlDb, Joiner.on("\n").join(params)); updateArea.setText(updateText); updatePane.getViewport().add(updateArea); updateArea.addHyperlinkListener(new HyperlinkListener() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java 2013-09-17 10:18:49 UTC (rev 1173) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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 fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.ui.swing.content.db.ImportDbAction; import fr.ifremer.tutti.ui.swing.content.db.InstallDbAction; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java 2013-09-17 10:18:49 UTC (rev 1173) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.db; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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 fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java 2013-09-17 10:18:49 UTC (rev 1173) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.db; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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 fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-17 10:18:49 UTC (rev 1173) @@ -11,7 +11,7 @@ tutti.about.translate.title=Traduire Tutti tutti.about.update.app.noup.detail=<tr><td>%1$s</td><td>%2$s</td><td>%2$s<td><td></td></tr> tutti.about.update.app.up.detail=<tr><td>%1$s</td><td>%2$s</td><td><strong>%3$s</strong></td><td><a href\="%4$s">Mettre à jour</a><td></tr> -tutti.about.update.content=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <a href\="%1$s">%1$s</a></p><br/><hr/><br/><table><CAPTION><EM>Mises à jour des modules</EM></CAPTION><tr><th>Module</th><th>Version installée</th><th>Dernière version</th><th></th></tr>%2$s</table> +tutti.about.update.content=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <ul><li>Applicatif \: <a href\="%1$s">%1$s</a></li><li>Base de données \: <a href\="%2$s">%2$s</a></li></ul></p><br/><hr/><br/><table><CAPTION><EM>Mises à jour des modules</EM></CAPTION><tr><th>Module</th><th>Version installée</th><th>Dernière version</th><th></th></tr>%3$s</table> tutti.about.update.title=Mise à jour Tutti tutti.action.create.error=Erreur à l'instanciation de l'action %s tutti.applicationUpdater.prepareFirstDB.copyDirectory.error=Erreur lors de la copie du contenu du dossier %1s vers %2s

1 0

r1172 - trunk
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 12:14:56 +0200 (Tue, 17 Sep 2013) New Revision: 1172 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1172 Log: add default build goals to some profiles Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 09:25:46 UTC (rev 1171) +++ trunk/pom.xml 2013-09-17 10:14:56 UTC (rev 1172) @@ -618,6 +618,7 @@ </activation> <build> + <defaultGoal>deploy</defaultGoal> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> @@ -686,6 +687,7 @@ </activation> <build> + <defaultGoal>deploy</defaultGoal> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId>

1 0

r1171 - in trunk: . src/update tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 11:25:46 +0200 (Tue, 17 Sep 2013) New Revision: 1171 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1171 Log: fixes #3259: [TECH] Utiliser deux fichiers de configuration pour les mises ?\195?\160 jour (applicatif / base de donn?\195?\169es) Added: trunk/src/update/tutti-application.properties trunk/src/update/tutti-db.properties Removed: trunk/src/update/update-tutti.properties Modified: trunk/README.txt trunk/pom.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/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.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/README.txt =================================================================== --- trunk/README.txt 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/README.txt 2013-09-17 09:25:46 UTC (rev 1171) @@ -1,16 +1,21 @@ -Faire une nouvelle version --------------------------- +Faire une nouvelle version mineure +---------------------------------- -Fournir la version de la base à utiliser, renseigner la propriété *dbVersion* +Cette release va juste déployer sur le dépot nexus les artifacts + mettre à jour +le fichier de mises à jour sur http://appup.forge.codelutin.com/tutti. -mvn release:prepare -Darguments="-DdbVersion=2013.08.22" -mvn release:perform -Darguments="-DdbVersion=2013.08.22" +mvn release:prepare +mvn release:perform -Pour préparer une release complête, lancer la commande : +Faire une nouvelle version majeure +---------------------------------- -mvn release:prepare -Darguments="-DperformFullRelease -DdbVersion=2013.08.22" -mvn release:perform -Darguments="-DperformFullRelease -DdbVersion=2013.08.22" +Cette release va en plus générer et deployer sur forge.codelutin.com les zip +incluant la jre + l'application. +mvn release:prepare -Darguments="-DperformFullRelease" +mvn release:perform -Darguments="-DperformFullRelease" + Historique des versions de base ------------------------------- @@ -19,5 +24,7 @@ +=====================+============+===========================+ + 2.3 + 2013.06.04 + 3.2.1.01 + +---------------------+------------+---------------------------+ -+ 2.4 + 2013.08.22 + 3.2.3 + ++ 2.4 + 2013.06.04 + 3.2.3 + +---------------------+------------+---------------------------+ ++ 2.5 + 2013.08.22 + 3.2.3 + ++---------------------+------------+---------------------------+ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/pom.xml 2013-09-17 09:25:46 UTC (rev 1171) @@ -164,8 +164,10 @@ <jreVersion>1.7.40</jreVersion>  + <dbVersion>2013.06.04</dbVersion> +   - + </properties> <repositories> @@ -547,6 +549,10 @@ <configuration> <rules> <requireProperty> + <property>jdkVersion</property> + <message>You must set a jdkVersion property!</message> + </requireProperty> + <requireProperty> <property>dbVersion</property> <message>You must set a dbVersion property!</message> </requireProperty> @@ -603,7 +609,7 @@ </profile> <profile> - <id>deploy-update</id> + <id>deploy-tutti-application-update</id> <activation> <property> <name>performRelease</name> @@ -617,20 +623,86 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>copy update-properties to site</id> + <id>copy tutti-application.properties to site</id> <phase>package</phase> <inherited>false</inherited> <configuration> <tasks> - <echo message="Copy model to site" /> + <echo message="copy tutti-application.properties to site" /> <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> <filterset> <filter value="${project.version}" token="projectVersion" /> <filter value="${jreVersion}" token="jreVersion" /> + </filterset> + <fileset dir="${basedir}/src/update/"> + <include name="tutti-application.properties" /> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <version>1.0-beta-4</version> + <executions> + <execution> + <phase>deploy</phase> + <inherited>false</inherited> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>forge.codelutin.com</serverId> + <fromFile> + ${project.build.directory}/update/tutti-application.properties + </fromFile> + <url> + scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti + </url> + </configuration> + </execution> + </executions> + + </plugin> + </plugins> + </build> + + </profile> + + <profile> + <id>deploy-tutti-db-update</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy tutti-db.properties to site</id> + <phase>package</phase> + <inherited>false</inherited> + <configuration> + <tasks> + <echo message="copy tutti-db.properties to site" /> + <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> + <filterset> <filter value="${dbVersion}" token="dbVersion" /> </filterset> <fileset dir="${basedir}/src/update/"> - <include name="update-tutti.properties" /> + <include name="tutti-db.properties" /> </fileset> </copy> </tasks> @@ -656,7 +728,7 @@ <configuration> <serverId>forge.codelutin.com</serverId> <fromFile> - ${project.build.directory}/update/update-tutti.properties + ${project.build.directory}/update/tutti-db.properties </fromFile> <url> scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti Copied: trunk/src/update/tutti-application.properties (from rev 1169, trunk/src/update/update-tutti.properties) =================================================================== --- trunk/src/update/tutti-application.properties (rev 0) +++ trunk/src/update/tutti-application.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -0,0 +1,55 @@ +### +# #%L +# Tutti +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 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% +### + +################################################################################ +### JRE Updates ################################################################ +################################################################################ + +jre.version=@jreVersion@ +linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-i586.zip +windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +#linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-x64.zip +#windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-x64.zip + +################################################################################ +### Tutti Updates ############################################################## +################################################################################ + +tutti.version=@projectVersion@ +tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip + +################################################################################ +### I18n Updates ############################################################### +################################################################################ + +i18n.version=@projectVersion@ +i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip + +################################################################################ +### Help Updates ############################################################### +################################################################################ + +help.version=@projectVersion@ +help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip Added: trunk/src/update/tutti-db.properties =================================================================== --- trunk/src/update/tutti-db.properties (rev 0) +++ trunk/src/update/tutti-db.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -0,0 +1,31 @@ +### +# #%L +# Tutti +# $Id$ +# $HeadURL: http://svn.forge.codelutin.com/svn/tutti/trunk/src/update/tutti-application… $ +# %% +# Copyright (C) 2012 - 2013 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% +### + +################################################################################ +### DB Updates ################################################################# +################################################################################ + +db.version=@dbVersion@ +db.url=zip:http://appup.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip +db.auth=true \ No newline at end of file Property changes on: trunk/src/update/tutti-db.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/src/update/update-tutti.properties =================================================================== --- trunk/src/update/update-tutti.properties 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/src/update/update-tutti.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -1,63 +0,0 @@ -### -# #%L -# Tutti -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 - 2013 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% -### - -################################################################################ -### JRE Updates ################################################################ -################################################################################ - -jre.version=@jreVersion@ -linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-i586.zip -windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip -windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip -#linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-x64.zip -#windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-x64.zip - -################################################################################ -### Tutti Updates ############################################################## -################################################################################ - -tutti.version=@projectVersion@ -tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip - -################################################################################ -### I18n Updates ############################################################### -################################################################################ - -i18n.version=@projectVersion@ -i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip - -################################################################################ -### Help Updates ############################################################### -################################################################################ - -help.version=@projectVersion@ -help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip - -################################################################################ -### DB Updates ################################################################# -################################################################################ - -db.version=@dbVersion@ -db.url=zip:http://appup.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip -db.auth=true \ No newline at end of file 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-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -24,14 +24,12 @@ * #L% */ -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.content.StartAction; import fr.ifremer.tutti.ui.swing.content.UpdateApplicationAction; import fr.ifremer.tutti.ui.swing.util.TuttiExceptionHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; @@ -43,8 +41,6 @@ import java.awt.Color; import java.util.Arrays; -import static org.nuiton.i18n.I18n.n_; - /** * To start Tutti application. * @@ -104,16 +100,17 @@ log.info("Full launch mode, try to update."); } - boolean canUpdate = true; - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - config.getUpdateUrl(), - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - canUpdate = false; - } + // check application url is reachable + boolean canUpdate = context.checkUpdateApplicationReachable(); +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// config.getUpdateApplicationUrl(), +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// canUpdate = false; +// } if (canUpdate) { // try to update jre - i18n - application - help and exit if so 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-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -28,6 +28,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.tutti.PropagatePropertyChangeListener; +import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.RessourceClassLoader; @@ -87,6 +88,7 @@ import java.util.Set; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; /** * UI application context. @@ -867,4 +869,44 @@ setScreen(TuttiScreen.MANAGE_DB); } } + + public boolean checkUpdateApplicationReachable() { + + boolean result = true; + TuttiApplicationConfig 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 (TuttiBusinessException e) { + TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); + result = false; + } + return result; + } + + public boolean checkUpdateDbReachable() { + + boolean result = true; + TuttiApplicationConfig config = getConfig(); + String url = config.getUpdateDbUrl(); + + 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 (TuttiBusinessException e) { + TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); + result = false; + } + return result; + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -347,10 +347,14 @@ return serviceConfig.getBasedir(); } - public String getUpdateUrl() { - return applicationConfig.getOption(TuttiApplicationConfigOption.TUTTI_UPDATE_URL.getKey()); + public String getUpdateApplicationUrl() { + return applicationConfig.getOption(TuttiApplicationConfigOption.TUTTI_UPDATE_APPLICATION_URL.getKey()); } + public String getUpdateDbUrl() { + return applicationConfig.getOption(TuttiApplicationConfigOption.TUTTI_UPDATE_DB_URL.getKey()); + } + public String getAdminPassword() { return applicationConfig.getOption(TuttiApplicationConfigOption.ADMIN_PASSWORD.getKey()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -84,12 +84,18 @@ Locale.class ), - TUTTI_UPDATE_URL( + TUTTI_UPDATE_APPLICATION_URL( "tutti.update.application.url", - n_("tutti.config.option.update.url.description"), - "http://appup.forge.codelutin.com/tutti/update-tutti.properties", + n_("tutti.config.option.update.application.url.description"), + "http://appup.forge.codelutin.com/tutti/tutti-application.properties", String.class ), + TUTTI_UPDATE_DB_URL( + "tutti.update.db.url", + n_("tutti.config.option.update.db.url.description"), + "http://appup.forge.codelutin.com/tutti/tutti-db.properties", + String.class + ), UI_CONFIG_FILE( "tutti.ui.config.file", Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -27,7 +27,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; @@ -51,7 +50,6 @@ import java.util.Map; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To show about panel. @@ -74,21 +72,27 @@ @Override public boolean prepareAction() throws Exception { - TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); + boolean doAction = super.prepareAction(); - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.about.could.not.reach.url")); - canUpdate = true; - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - canUpdate = false; + if (doAction) { + // check db url is reachable + TuttiUIContext context = getContext(); + canUpdate = context.checkUpdateApplicationReachable(); } +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateApplicationUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.about.could.not.reach.url")); +// canUpdate = true; +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// canUpdate = false; +// } - return super.prepareAction(); + return doAction; } @Override @@ -190,7 +194,7 @@ protected void addUpdateTab(TuttiApplicationConfig config) { File current = config.getTuttiBasedir(); - String url = config.getUpdateUrl(); + String url = config.getUpdateApplicationUrl(); ApplicationUpdater up = new ApplicationUpdater(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -24,13 +24,11 @@ * #L% */ -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import org.apache.commons.logging.Log; @@ -40,7 +38,6 @@ import java.io.File; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To update jre / i18n or tutti using the {@link ApplicationUpdater} mecanism. @@ -73,21 +70,26 @@ @Override public boolean prepareAction() throws Exception { - TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); + boolean doAction = super.prepareAction(); - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - return false; + if (doAction) { + // check application url is reachable + TuttiUIContext context = getContext(); + doAction = context.checkUpdateApplicationReachable(); +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateApplicationUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// doAction = false; +// } } - - return super.prepareAction(); + return doAction; } @Override @@ -113,7 +115,7 @@ } } else { - String url = config.getUpdateUrl(); + String url = config.getUpdateApplicationUrl(); File dest = new File(config.getTuttiBasedir(), "NEW"); if (log.isInfoEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -24,13 +24,11 @@ * #L% */ -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.db.OpenDbAction; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,7 +37,6 @@ import java.io.File; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To update - install database. @@ -63,19 +60,21 @@ boolean doAction = super.prepareAction(); if (doAction) { + // check db url is reachable TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); - - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - return false; - } + doAction = context.checkUpdateDbReachable(); +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateDbUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// doAction = false; +// } } return doAction; @@ -87,7 +86,7 @@ TuttiApplicationConfig config = context.getConfig(); File current = config.getDataDirectory(); - String url = config.getUpdateUrl(); + String url = config.getUpdateDbUrl(); if (log.isInfoEnabled()) { log.info(String.format("Try to install / update db (current data location: %s), using update url: %s", current, url)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -173,7 +173,8 @@ .addOption(TuttiPersistenceConfigOption.DB_ENUMERATION_PATH) .addOption(TuttiPersistenceConfigOption.JDBC_URL) .addOption(TuttiServiceConfigOption.SITE_URL) - .addOption(TuttiApplicationConfigOption.TUTTI_UPDATE_URL); + .addOption(TuttiApplicationConfigOption.TUTTI_UPDATE_APPLICATION_URL) + .addOption(TuttiApplicationConfigOption.TUTTI_UPDATE_DB_URL); helper.setFinalizer(new MainCallBackFinalizer(CALLBACK_APPLICATION)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -25,14 +25,12 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,7 +39,6 @@ import java.io.File; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To install (or reinstall) a db from last network one. @@ -71,19 +68,23 @@ boolean doAction = super.prepareAction(); if (doAction) { + + // check db url is reachable TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); + doAction = context.checkUpdateDbReachable(); - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - doAction = false; - } +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateDbUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// doAction = false; +// } } if (doAction) { @@ -108,7 +109,7 @@ TuttiApplicationConfig config = context.getConfig(); File current = config.getDataDirectory(); - String url = config.getUpdateUrl(); + String url = config.getUpdateDbUrl(); if (log.isInfoEnabled()) { log.info(String.format("Try to install / update db (current data location: %s), using update url: %s", current, url)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -25,16 +25,13 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfig; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +39,6 @@ import java.util.Date; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To install (or reinstall) a db from last network one. @@ -73,19 +69,21 @@ // check we can connect to remote install server + // check db url is reachable TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); - - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - doAction = false; - } + doAction = context.checkUpdateDbReachable(); +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateApplicationUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// doAction = false; +// } } if (doAction) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -28,6 +28,7 @@ import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiTechnicalException; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.decorator.HighlightPredicate; @@ -35,6 +36,8 @@ import java.awt.Color; import java.awt.Desktop; +import java.io.InputStream; +import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -226,18 +229,49 @@ } } - public static void tryToConnectToUpdateUrl(String url, String i18nKey) { + public static void tryToConnectToUpdateUrl(String urlAsString, + String badUrlFormatI18nKey, + String notReachI18nKey, + String notFoundI18nKey) { + URL url; + // get url try { - URLConnection urlConnection = new URL(url).openConnection(); + url = new URL(urlAsString); + } catch (MalformedURLException e) { + if (log.isDebugEnabled()) { + log.debug("Bad url syntax at " + urlAsString, e); + } + throw new TuttiBusinessException(_(badUrlFormatI18nKey, urlAsString)); + } + + URLConnection urlConnection; + // try to connect (fail if network or remote host does not exists) + try { + urlConnection = url.openConnection(); urlConnection.setConnectTimeout(10000); urlConnection.connect(); } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Could not connect to " + url, e); + if (log.isDebugEnabled()) { + log.debug("Could not connect to " + urlAsString, e); } - // could not connect to - throw new TuttiBusinessException(_(i18nKey, url)); + throw new TuttiBusinessException(_(notReachI18nKey, urlAsString)); } + + // try to open the resource (fail if resources does not exist) + try { + urlConnection.setReadTimeout(1000); + InputStream inputStream = null; + try { + inputStream = urlConnection.getInputStream(); + } finally { + IOUtils.closeQuietly(inputStream); + } + } catch (Exception e) { + if (log.isDebugEnabled()) { + log.debug("Could not found file at to " + urlAsString, e); + } + throw new TuttiBusinessException(_(notFoundI18nKey, urlAsString)); + } } public static float getRoundedLengthStep(float lengthStep, boolean aroundUp) { 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-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -128,6 +128,8 @@ tutti.config.option.ui.dateFormat.description= tutti.config.option.ui.shortcut.closePopup.description= tutti.config.option.ui.showNumberEditorButton.description= +tutti.config.option.update.application.url.description= +tutti.config.option.update.db.url.description= tutti.config.option.update.url.description= tutti.config.option.weights.rate.difference.totalAndSorted.description= tutti.config.parse.error= @@ -980,6 +982,8 @@ tutti.error.ui.business.error= tutti.error.ui.business.warning= tutti.error.ui.other.error= +tutti.error.update.bad.url.syntax= +tutti.error.update.could.not.found.url= tutti.error.update.could.not.reach.url= tutti.error.write.startActionFile=could not write action content to file %s tutti.exportCruise.action.success= 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-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -124,7 +124,8 @@ tutti.config.option.ui.dateFormat.description=Format de dates tutti.config.option.ui.shortcut.closePopup.description=Fermer une popup tutti.config.option.ui.showNumberEditorButton.description=Afficher le pavé numérique de saisie -tutti.config.option.update.url.description=URL de mise à jour +tutti.config.option.update.application.url.description=URL de mise à jour des applicatifs +tutti.config.option.update.db.url.description=URL de mise à jour de la base de données tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie tutti.config.parse.error=Erreur de parsing du fichier de configuration tutti.config.sampleOrder.title=Catégorie d'échantillonnage @@ -968,6 +969,8 @@ tutti.error.ui.business.error=Erreur tutti.error.ui.business.warning=Avertissement tutti.error.ui.other.error=Erreur +tutti.error.update.bad.url.syntax=Mise à jour impossible (le format de l'url <strong>%s</strong> n'est pas valide) +tutti.error.update.could.not.found.url=Mise à jour impossible (l'url <strong>%s</strong> n'existe pas) tutti.error.update.could.not.reach.url=Mise à jour impossible (l'url <strong>%s</strong> n'est pas joignable) tutti.error.write.startActionFile=impossible d'écrire dans le fichier %s tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>.

1 0

r1170 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db tutti-ui-swing/src/main/java/fr/ifremer/t
by tchemit＠users.forge.codelutin.com Sept. 13, 2013

Sept. 13, 2013

Author: tchemit Date: 2013-09-13 18:21:34 +0200 (Fri, 13 Sep 2013) New Revision: 1170 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1170 Log: refs #3106: [TECH] Faciliter l'import d'une nouvelle base mise en publique de m?\195?\169thodes TuttiAction Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReimportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java 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/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeScreenAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/CloseApplicationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSampleCategoryModelAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ValidateSelectedCruiseCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/SaveSampleCategoryModelAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportCruiseValidationMessagesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportOperationValidationMessagesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ViewGearCaracteristicsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/DeleteFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SaveCatchBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/RemoveAccidentalBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RenameBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/SelectSpeciesForBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/SelectSpeciesForIndividualObservationBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ExportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/SelectSpeciesForSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddBenthosProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolBenthosAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveBenthosProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherBenthosAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.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/attachment/SaveAttachmentAction.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-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -219,8 +219,27 @@ try { ZipUtil.uncompress(file, tempDir); } catch (IOException e) { - throw new TuttiTechnicalException(_(errorMessage, file)); + throw new TuttiTechnicalException(_(errorMessage, file), e); } return tempDir; } + + public static String readContent(File file, String errorMessage) { + + try { + return Files.readFirstLine(file, Charsets.UTF_8); + + } catch (IOException e) { + throw new TuttiTechnicalException(errorMessage, e); + } + } + + public static void writeContent(File file, String content, String errorMessage) { + try { + FileUtils.write(file, content, Charsets.UTF_8); + } catch (IOException e) { + throw new TuttiTechnicalException(errorMessage, e); + } + + } } 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-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -28,6 +28,7 @@ import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.content.StartAction; import fr.ifremer.tutti.ui.swing.content.UpdateApplicationAction; import fr.ifremer.tutti.ui.swing.util.TuttiExceptionHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -36,6 +37,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; @@ -137,9 +139,20 @@ context.open(); } - MainUI mainUI = new MainUI(context); + final MainUI mainUI = new MainUI(context); context.addMessageNotifier(mainUI.getHandler()); - mainUI.setVisible(true); + + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + mainUI.setVisible(true); + } + }); + + // launch start action (use the tutti-start-action file) + StartAction uiAction = TuttiActionHelper.createLogicAction( + mainUI.getHandler(), StartAction.class); + TuttiActionHelper.runAction(uiAction); } public static void closeTutti(MainUIHandler handler, Integer exitCode) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -33,11 +33,11 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.Version; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ApplicationConfigHelper; import org.nuiton.config.ApplicationConfigProvider; import org.nuiton.config.ArgumentsParserException; +import org.nuiton.util.Version; import javax.swing.KeyStroke; import java.awt.Color; @@ -189,6 +189,11 @@ return applicationConfig.getOptionAsFile(TuttiApplicationConfigOption.UI_CONFIG_FILE.getKey()); } + /** @return {@link TuttiApplicationConfigOption#START_ACTION_FILE} value */ + public File getStartActionFile() { + return applicationConfig.getOptionAsFile(TuttiApplicationConfigOption.START_ACTION_FILE.getKey()); + } + public Float getDifferenceRateBetweenSortedAndTotalWeights() { return applicationConfig.getOptionAsFloat(TuttiApplicationConfigOption.TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE.getKey()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -69,6 +69,14 @@ true ), + START_ACTION_FILE( + "tutti.startActionFile", + n_("tutti.config.option.startActionFile.description"), + "${tutti.basedir}/tutti-start-action", + File.class, + true, + true + ), TUTTI_I18N_LOCALE( "tutti.i18n.locale", n_("tutti.config.option.i18n.locale.description"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -42,7 +42,7 @@ protected abstract Locale getLocale(); @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { getHandler().changeLocale(getLocale()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeScreenAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeScreenAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeScreenAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -79,14 +79,14 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); result &= skipCheckCurrentScreen || getHandler().quitCurrentScreen(); return result; } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiUIContext context = getContext(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/CloseApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/CloseApplicationAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/CloseApplicationAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -49,7 +49,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { super.doAction(); @@ -58,7 +58,7 @@ @Override - protected void releaseAction() { + public void releaseAction() { exitCode = RunTutti.NORMAL_EXIT_CODE; super.releaseAction(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSampleCategoryModelAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSampleCategoryModelAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSampleCategoryModelAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -41,7 +41,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { result = askAdminPassword( Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -46,7 +46,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isCruiseFilled()); if (log.isInfoEnabled()) { log.info("Edit cruise: " + getContext().getCruiseId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseCatchesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedCruiseCatchesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -47,7 +47,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isCruiseFilled()); if (log.isInfoEnabled()) { log.info("Edit operations of cruise: " + getContext().getCruiseId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedProgramAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedProgramAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -45,7 +45,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isProgramFilled()); if (log.isInfoEnabled()) { log.info("Edit program: " + getContext().getProgramId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/EditSelectedProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -45,7 +45,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isProtocolFilled()); if (log.isInfoEnabled()) { log.info("Edit protocol: " + getContext().getProtocolId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -43,7 +43,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { result = askAdminPassword( @@ -57,7 +57,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { super.doAction(); SwingUtilities.invokeLater(new Runnable() { @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -42,7 +42,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { // Close the application, will exit and restart application RunTutti.closeTutti(getHandler(), RunTutti.UPATE_EXIT_CODE); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -73,7 +73,7 @@ protected boolean canUpdate; @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { TuttiUIContext context = getContext(); TuttiApplicationConfig config = context.getConfig(); String url = config.getUpdateUrl(); @@ -102,7 +102,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { about = null; Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -0,0 +1,95 @@ +package fr.ifremer.tutti.ui.swing.content; + +import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.ui.swing.content.db.ImportDbAction; +import fr.ifremer.tutti.ui.swing.content.db.InstallDbAction; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +import static org.nuiton.i18n.I18n._; + +/** + * Start action (when the start action file is present when + * starting application). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class StartAction extends AbstractMainUITuttiAction { + + /** Logger. */ + private static final Log log = LogFactory.getLog(StartAction.class); + + protected AbstractMainUITuttiAction delegateAction; + + public StartAction(MainUIHandler handler) { + super(handler, true); + } + + @Override + public boolean prepareAction() throws Exception { + + File actionfile = getConfig().getStartActionFile(); + boolean doAction = actionfile.exists(); + + if (doAction) { + + try { + // get action to execute + String content = TuttiIOUtil.readContent(actionfile, _("tutti.error.read.startActionFile", actionfile)); + content = content.trim(); + + if (InstallDbAction.class.getName().equals(content)) { + + // install db + delegateAction = TuttiActionHelper.createLogicAction(getHandler(), InstallDbAction.class); + + if (log.isInfoEnabled()) { + log.info("Found install db action"); + } + } else if (content.startsWith(ImportDbAction.class.getName())) { + + // import db + ImportDbAction action = TuttiActionHelper.createLogicAction(getHandler(), ImportDbAction.class); + File importFile = new File(content.substring(ImportDbAction.class.getName().length() + 1)); + action.setImportFile(importFile); + delegateAction = action; + if (log.isInfoEnabled()) { + log.info("Found import db action (with file " + importFile + ")"); + } + } else { + doAction = false; + } + + } finally { + + // delete start action file + TuttiIOUtil.deleteFile( + actionfile, + _("tutti.error.delete.startActionFile", actionfile)); + } + } + + + if (doAction) { + setActionDescription(delegateAction.getActionDescription()); + doAction = delegateAction.prepareAction(); + } + return doAction; + } + + @Override + public void doAction() throws Exception { + + TuttiActionHelper.runInternalAction(delegateAction); + } + + @Override + protected void releaseAction() { + delegateAction = null; + super.releaseAction(); + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -72,7 +72,7 @@ protected boolean reload; @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { TuttiUIContext context = getContext(); TuttiApplicationConfig config = context.getConfig(); String url = config.getUpdateUrl(); @@ -91,13 +91,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { super.releaseAction(); types = ALL_APPLICATION_TYPES; } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { reload = false; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -59,7 +59,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); if (doAction) { @@ -82,7 +82,7 @@ } @Override - protected void doAction() { + public void doAction() { TuttiUIContext context = getContext(); TuttiApplicationConfig config = context.getConfig(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ValidateSelectedCruiseCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ValidateSelectedCruiseCatchesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ValidateSelectedCruiseCatchesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -47,7 +47,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isCruiseFilled()); getContext().setValidationContext(ValidationService.VALIDATION_CONTEXT_VALIDATE); // getContext().setScreen(null); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/SaveSampleCategoryModelAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/SaveSampleCategoryModelAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/SaveSampleCategoryModelAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -46,7 +46,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { EditSampleCategoryModelUIModel model = getModel(); SampleCategoryModel bean = model.toBean(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseFishingOperationAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -151,7 +151,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { FishingOperationsUI operationPanel = getUI().getOperationPanel(); operationPanel.getFishingOperationTabContent().getModel(). removePropertyChangeListener(editFishingOperationModelListener); @@ -162,7 +162,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { getUI().getOperationPanel().getModel().setSelectedFishingOperation(fishingOperation); } @@ -176,7 +176,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { super.releaseAction(); fishingOperation = null; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditGearCaracteristicsAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -42,7 +42,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { GearCaracteristicsEditorUI editor = getUI().getGearCaracteristicsEditor(); editor.getModel().setEditable(true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportCruiseValidationMessagesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportCruiseValidationMessagesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportCruiseValidationMessagesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -48,7 +48,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); if (doAction) { @@ -65,13 +65,13 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { ValidateCruiseUIModel uiModel = getModel(); validationService.exportValidationResults(file, uiModel.getValidator()); } @Override - protected void releaseAction() { + public void releaseAction() { super.releaseAction(); file = null; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportOperationValidationMessagesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportOperationValidationMessagesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ExportOperationValidationMessagesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -50,7 +50,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); if (doAction) { @@ -69,14 +69,14 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { ValidateCruiseUIModel uiModel = getModel(); FishingOperation operation = getModel().getSelectedFishingOperation(); validationService.exportValidationResult(file, operation, uiModel.getValidator().get(operation)); } @Override - protected void releaseAction() { + public void releaseAction() { super.releaseAction(); file = null; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -51,7 +51,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); Cruise bean = getModel().toBean(); @@ -77,7 +77,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiUIContext context = getContext(); EditCruiseUIModel model = getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ViewGearCaracteristicsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ViewGearCaracteristicsAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ViewGearCaracteristicsAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -42,7 +42,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { GearCaracteristicsEditorUI editor = getUI().getGearCaracteristicsEditor(); editor.getModel().setEditable(false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/CloseDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -51,7 +51,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean canContinue = super.prepareAction(); if (canContinue) { @@ -61,7 +61,7 @@ } @Override - protected void doAction() { + public void doAction() { // close db getContext().getPersistenceService().clearAllCaches(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 2013-09-13 16:21:34 UTC (rev 1170) @@ -39,12 +39,12 @@ text: {handler.updateMessage(model.isDbExist(), model.isDbLoaded())}; } -#installDbButton { +#installOrReinstallDbButton { actionIcon: install-db; text: {handler.getInstallButtonText(model.isDbExist())}; toolTipText: {handler.getInstallButtonTip(model.isDbExist())}; i18nMnemonic: {handler.getInstallButtonMnemonic(model.isDbExist())}; - _tuttiAction: {InstallDbAction.class}; + _tuttiAction: {InstallOrReinstallDbAction.class}; _help: {"tutti.dbManager.action.installDb.help"}; } @@ -52,7 +52,7 @@ actionIcon: import-db; text: "tutti.dbManager.action.importDb"; i18nMnemonic: "tutti.dbManager.action.importDb.mnemonic"; - _tuttiAction: {ImportDbAction.class}; + _tuttiAction: {ImportOrReimportDbAction.class}; toolTipText: "tutti.dbManager.action.importDb.tip"; _help: {"tutti.dbManager.action.importDb.help"}; } @@ -67,7 +67,7 @@ _help: {"tutti.dbManager.action.openDb.help"}; } -#closeDbButton { +/*#closeDbButton { actionIcon: close-db; text: "tutti.dbManager.action.closeDb"; i18nMnemonic: "tutti.dbManager.action.closeDb.mnemonic"; @@ -75,7 +75,7 @@ _tuttiAction: {CloseDbAction.class}; toolTipText: "tutti.dbManager.action.closeDb.tip"; _help: {"tutti.dbManager.action.closeDb.help"}; -} +}*/ #upgradeDbButton { actionIcon: update-referential; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2013-09-13 16:21:34 UTC (rev 1170) @@ -65,9 +65,9 @@ <JPanel id='actions' layout='{new GridLayout(0, 1)}' constraints='BorderLayout.SOUTH'> - <JButton id='closeDbButton'/> +  <JButton id='openDbButton'/> - <JButton id='installDbButton'/> + <JButton id='installOrReinstallDbButton'/> <JButton id='importDbButton'/> <JButton id='upgradeDbButton'/> <JButton id='exportDbButton'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -60,7 +60,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { file = null; boolean doAction = super.prepareAction(); @@ -82,7 +82,7 @@ } @Override - protected void doAction() { + public void doAction() { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export db to " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -64,7 +64,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { file = null; boolean doAction = super.prepareAction(); @@ -91,7 +91,7 @@ } @Override - protected void doAction() { + public void doAction() { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export db to " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -39,7 +39,6 @@ import javax.swing.JOptionPane; import java.io.File; -import java.util.Date; import static org.nuiton.i18n.I18n._; @@ -54,14 +53,10 @@ /** Logger. */ private static final Log log = LogFactory.getLog(ImportDbAction.class); - protected File backupFile; - protected File importFile; protected String jdbcUrl; - protected boolean doBackup; - protected boolean updateSchema; protected boolean closeDb; @@ -72,15 +67,19 @@ public ImportDbAction(MainUIHandler handler) { super(handler, true); + setActionDescription(_("tutti.dbManager.action.importDb.tip")); } + public void setImportFile(File importFile) { + this.importFile = importFile; + } + @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { jdbcUrl = null; dbVersion = applicationVersion = null; - backupFile = importFile = null; - doBackup = closeDb = updateSchema = false; + closeDb = updateSchema = false; boolean doAction = super.prepareAction(); @@ -88,37 +87,8 @@ jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); - if (getModel().isDbExist()) { + if (importFile == null) { - displayInfoMessage( - _("tutti.dbManager.title.backup.db"), - _("tutti.dbManager.action.importDb.backup.db") - ); - - // do backup - - backupFile = saveFile( - getConfig().getServiceConfig().getPersistenceConfig().getDbBackupDirectory(), - "tutti-db-" + ExportDbAction.df.format(new Date()), - "zip", - _("tutti.dbManager.title.choose.dbExportFile"), - _("tutti.dbManager.action.chooseDbExportFile"), - "^.*\\.zip", _("tutti.common.file.zip") - ); - - if (backupFile == null) { - - displayWarningMessage( - _("tutti.dbManager.title.backup.db"), - _("tutti.dbManager.action.importdb.no.backup.db.choosen") - ); - - doAction = false; - } - } - - if (doAction) { - // choose file to import importFile = chooseFile( _("tutti.dbManager.title.choose.dbImportFile"), @@ -137,12 +107,10 @@ } } - doBackup = backupFile != null; - if (doAction) { ProgressionModel progressionModel = new ProgressionModel(); - progressionModel.setTotal(3 + (doBackup ? 2 : 0)); + progressionModel.setTotal(3); setProgressionModel(progressionModel); getContext().getPersistenceService().checkImportStructure(importFile); @@ -152,13 +120,13 @@ } @Override - protected void releaseAction() { - importFile = backupFile = null; + public void releaseAction() { + importFile = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(importFile); if (log.isInfoEnabled()) { @@ -166,20 +134,7 @@ } ProgressionModel progressionModel = getProgressionModel(); - if (doBackup) { - // ------------------------------------------------------------------ // - // --- backup current db // - // ------------------------------------------------------------------ // - - progressionModel.increments(_("tutti.importDb.step.backupDb", backupFile)); - getContext().getPersistenceService().exportDb(backupFile); - - // close current db - getContext().setDbLoaded(false); - getHandler().reloadPersistenceService(); - } - // ------------------------------------------------------------------ // // --- import db // // ------------------------------------------------------------------ // @@ -194,6 +149,7 @@ progressionModel.increments(_("tutti.importDb.step.openDb", jdbcUrl)); try { + getContext().setDbExist(true); getContext().setDbLoaded(true); getHandler().reloadPersistenceService(); } catch (Exception e) { @@ -334,7 +290,7 @@ String message = _("tutti.importDb.step.check.dbContext", dbVersion, applicationVersion); - getProgressionModel().increments(message); + progressionModel.increments(message); if (log.isDebugEnabled()) { log.debug("Check db context"); Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -0,0 +1,50 @@ +package fr.ifremer.tutti.ui.swing.content.db; + +import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; + +/** + * To import or reimport a db (will delegate to correct action). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class ImportOrReimportDbAction extends AbstractMainUITuttiAction { + + protected AbstractMainUITuttiAction delegateAction; + + public ImportOrReimportDbAction(MainUIHandler handler) { + super(handler, true); + } + + @Override + public boolean prepareAction() throws Exception { + + if (getContext().isDbExist()) { + + // reimport action + delegateAction = TuttiActionHelper.createLogicAction(getHandler(), ReimportDbAction.class); + } else { + + // import action + delegateAction = TuttiActionHelper.createLogicAction(getHandler(), ImportDbAction.class); + } + + setActionDescription(delegateAction.getActionDescription()); + + return delegateAction.prepareAction(); + } + + @Override + public void doAction() throws Exception { + + TuttiActionHelper.runInternalAction(delegateAction); + } + + @Override + protected void releaseAction() { + delegateAction = null; + super.releaseAction(); + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -27,7 +27,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; -import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfig; import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; @@ -40,7 +39,6 @@ import org.nuiton.updater.ApplicationUpdater; import java.io.File; -import java.util.Date; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -69,50 +67,10 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); if (doAction) { - - jdbcUrl = null; - backupFile = null; - doBackup = false; - - jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); - - if (getModel().isDbExist()) { - - displayInfoMessage( - _("tutti.dbManager.title.backup.db"), - _("tutti.dbManager.action.installDb.backup.db") - ); - - // do backup - - backupFile = saveFile( - getConfig().getServiceConfig().getPersistenceConfig().getDbBackupDirectory(), - "tutti-db-" + ExportDbAction.df.format(new Date()), - "zip", - _("tutti.dbManager.title.choose.dbExportFile"), - _("tutti.dbManager.action.chooseDbExportFile"), - "^.*\\.zip", _("tutti.common.file.zip") - ); - - if (backupFile == null) { - - displayWarningMessage( - _("tutti.dbManager.title.backup.db"), - _("tutti.dbManager.action.installDb.no.backup.db.choosen") - ); - - doAction = false; - } else { - doBackup = true; - } - } - } - - if (doAction) { TuttiUIContext context = getContext(); TuttiApplicationConfig config = context.getConfig(); String url = config.getUpdateUrl(); @@ -131,30 +89,17 @@ if (doAction) { ProgressionModel progressionModel = new ProgressionModel(); - progressionModel.setTotal(1 + (doBackup ? 2 : 0)); + progressionModel.setTotal(2); setProgressionModel(progressionModel); } return doAction; } @Override - protected void doAction() { + public void doAction() { ProgressionModel progressionModel = getProgressionModel(); - if (doBackup) { - // ------------------------------------------------------------------ // - // --- backup current db // - // ------------------------------------------------------------------ // - - progressionModel.increments(_("tutti.installDb.step.backupDb", backupFile)); - getContext().getPersistenceService().exportDb(backupFile); - - // close current db - getContext().setDbLoaded(false); - getHandler().reloadPersistenceService(); - } - // ------------------------------------------------------------------ // // --- install db // // ------------------------------------------------------------------ // @@ -189,8 +134,10 @@ getContext().setDbExist(true); - // open db - TuttiActionHelper.runInternalAction(getHandler(), OpenDbAction.class); + // ------------------------------------------------------------------ // + // --- open db // + // ------------------------------------------------------------------ // + TuttiActionHelper.runInternalAction(getHandler(), OpenDbAction.class); } } \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -0,0 +1,51 @@ +package fr.ifremer.tutti.ui.swing.content.db; + +import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; + +/** + * To install or reinstall a db (will delegate to correct action). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class InstallOrReinstallDbAction extends AbstractMainUITuttiAction { + + protected AbstractMainUITuttiAction delegateAction; + + public InstallOrReinstallDbAction(MainUIHandler handler) { + super(handler, true); + } + + @Override + public boolean prepareAction() throws Exception { + + if (getContext().isDbExist()) { + + // reinstall action + delegateAction = TuttiActionHelper.createLogicAction(getHandler(), ReinstallDbAction.class); + } else { + + // install action + delegateAction = TuttiActionHelper.createLogicAction(getHandler(), InstallDbAction.class); + } + + setActionDescription(delegateAction.getActionDescription()); + + return delegateAction.prepareAction(); + } + + @Override + public void doAction() throws Exception { + + TuttiActionHelper.runInternalAction(delegateAction); + } + + @Override + protected void releaseAction() { + delegateAction = null; + super.releaseAction(); + } + +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/OpenDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -73,11 +73,11 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean canContinue = super.prepareAction(); if (canContinue) { - jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); + jdbcUrl = null; dbVersion = applicationVersion = null; file = null; closeDb = updateSchema = false; @@ -92,6 +92,8 @@ log.debug("Will open db..."); } + jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); + // at the beginning 3 steps (open db + check version + check db context) ProgressionModel progressionModel = new ProgressionModel(); setProgressionModel(progressionModel); @@ -209,7 +211,7 @@ if (closeDb) { // ------------------------------------------------------------------ // - // --- backup current db // + // --- close current db // // ------------------------------------------------------------------ // progressionModel.increments(_("tutti.importDb.step.closeDb")); Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReimportDbAction.java (from rev 1169, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReimportDbAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReimportDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -0,0 +1,168 @@ +package fr.ifremer.tutti.ui.swing.content.db; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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 fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfig; +import fr.ifremer.tutti.ui.swing.RunTutti; +import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; + +import java.io.File; +import java.util.Date; + +import static org.nuiton.i18n.I18n._; + +/** + * To import a db after restart application. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public class ReimportDbAction extends AbstractMainUITuttiAction { + + protected File backupFile; + + protected File importFile; + + protected String jdbcUrl; + + public ReimportDbAction(MainUIHandler handler) { + super(handler, true); + setActionDescription(_("tutti.dbManager.action.importDb.tip")); + } + + @Override + public boolean prepareAction() throws Exception { + + jdbcUrl = null; + backupFile = importFile = null; + + boolean doAction = super.prepareAction(); + + if (doAction) { + + jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); + + if (getModel().isDbExist()) { + + displayInfoMessage( + _("tutti.dbManager.title.backup.db"), + _("tutti.dbManager.action.importDb.backup.db") + ); + + // choose backup file + backupFile = saveFile( + getConfig().getServiceConfig().getPersistenceConfig().getDbBackupDirectory(), + "tutti-db-" + ExportDbAction.df.format(new Date()), + "zip", + _("tutti.dbManager.title.choose.dbExportFile"), + _("tutti.dbManager.action.chooseDbExportFile"), + "^.*\\.zip", _("tutti.common.file.zip") + ); + + if (backupFile == null) { + + displayWarningMessage( + _("tutti.dbManager.title.backup.db"), + _("tutti.dbManager.action.importdb.no.backup.db.choosen") + ); + + doAction = false; + } + } + + if (doAction && importFile == null) { + + // choose file to import + importFile = chooseFile( + _("tutti.dbManager.title.choose.dbImportFile"), + _("tutti.dbManager.action.chooseDbFile"), + "^.*\\.zip", _("tutti.common.file.zip") + ); + + if (importFile == null) { + + displayWarningMessage( + _("tutti.dbManager.title.choose.dbImportFile"), + _("tutti.dbManager.action.importdb.no.import.file.choosen") + ); + + doAction = false; + } + } + + if (doAction) { + + ProgressionModel progressionModel = new ProgressionModel(); + progressionModel.setTotal(3); + setProgressionModel(progressionModel); + + getContext().getPersistenceService().checkImportStructure(importFile); + } + } + return doAction; + } + + @Override + public void releaseAction() { + importFile = backupFile = null; + super.releaseAction(); + } + + @Override + public void doAction() throws Exception { + Preconditions.checkNotNull(importFile); + Preconditions.checkNotNull(backupFile); + + ProgressionModel progressionModel = getProgressionModel(); + + // close db + progressionModel.increments(_("tutti.reimport.step.closeDb", jdbcUrl)); + getContext().setDbLoaded(false); + getHandler().reloadPersistenceService(); + + // backup db + progressionModel.increments(_("tutti.reimport.step.backupDb", backupFile)); + getContext().getPersistenceService().exportDb(backupFile); + + // clean db context + getContext().clearDbContext(); + + // write restart action file (will be load at restart) + String actionContent = ImportDbAction.class.getName() + ":" + importFile.getAbsolutePath(); + + File startActionFile = getConfig().getStartActionFile(); + TuttiIOUtil.writeContent(startActionFile, actionContent, _("tutti.error.write.startActionFile", startActionFile)); + + // restart application + progressionModel.increments(_("tutti.reimport.step.reloadApplication")); + + RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); + } + +} \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java (from rev 1169, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -0,0 +1,167 @@ +package fr.ifremer.tutti.ui.swing.content.db; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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 fr.ifremer.tutti.TuttiBusinessException; +import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfig; +import fr.ifremer.tutti.ui.swing.RunTutti; +import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; +import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.util.Date; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +/** + * To install (or reinstall) a db from last network one. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class ReinstallDbAction extends AbstractMainUITuttiAction { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ReinstallDbAction.class); + + protected File backupFile; + + protected String jdbcUrl; + + public ReinstallDbAction(MainUIHandler handler) { + super(handler, true); + setActionDescription(_("tutti.dbManager.action.installDb.tip")); + } + + @Override + public boolean prepareAction() throws Exception { + boolean doAction = super.prepareAction(); + + if (doAction) { + + // check we can connect to remote install server + + TuttiUIContext context = getContext(); + TuttiApplicationConfig config = context.getConfig(); + String url = config.getUpdateUrl(); + + try { + TuttiUIUtil.tryToConnectToUpdateUrl( + url, + n_("tutti.error.update.could.not.reach.url") + ); + } catch (TuttiBusinessException e) { + TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); + doAction = false; + } + } + + if (doAction) { + + jdbcUrl = null; + backupFile = null; + + jdbcUrl = TuttiPersistenceConfig.getInstance().getJdbcUrl(); + + if (getModel().isDbExist()) { + + displayInfoMessage( + _("tutti.dbManager.title.backup.db"), + _("tutti.dbManager.action.installDb.backup.db") + ); + + // choose backup file + backupFile = saveFile( + getConfig().getServiceConfig().getPersistenceConfig().getDbBackupDirectory(), + "tutti-db-" + ExportDbAction.df.format(new Date()), + "zip", + _("tutti.dbManager.title.choose.dbExportFile"), + _("tutti.dbManager.action.chooseDbExportFile"), + "^.*\\.zip", _("tutti.common.file.zip") + ); + + if (backupFile == null) { + + displayWarningMessage( + _("tutti.dbManager.title.backup.db"), + _("tutti.dbManager.action.installDb.no.backup.db.choosen") + ); + + doAction = false; + } + } + } + + if (doAction) { + + ProgressionModel progressionModel = new ProgressionModel(); + progressionModel.setTotal(3); + setProgressionModel(progressionModel); + } + return doAction; + } + + @Override + public void doAction() { + + Preconditions.checkNotNull(backupFile); + + ProgressionModel progressionModel = getProgressionModel(); + + // close db + progressionModel.increments(_("tutti.reinstallDb.step.closeDb", jdbcUrl)); + + getContext().setDbLoaded(false); + getHandler().reloadPersistenceService(); + + // backup db + progressionModel.increments(_("tutti.reinstallDb.step.backupDb", backupFile)); + getContext().getPersistenceService().exportDb(backupFile); + + // clean db context + getContext().clearDbContext(); + + // write restart action file (will be loaded at restart) + String actionContent = InstallDbAction.class.getName(); + + File startActionFile = getConfig().getStartActionFile(); + TuttiIOUtil.writeContent(startActionFile, actionContent, _("tutti.error.write.startActionFile", startActionFile)); + + // restart application + progressionModel.increments(_("tutti.reinstallDb.step.reloadApplication")); + + RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); + } +} \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -64,7 +64,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { CLONE_PROTOCOL_ENTRY.removeContextValue(getContext().getMainUI()); @@ -144,7 +144,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(protocol); // store protocol in context Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -51,7 +51,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); TuttiProtocol protocol = getHandler().getModel().getProtocol(); @@ -66,7 +66,7 @@ } @Override - protected void doAction() { + public void doAction() { TuttiProtocol protocol = getModel().getProtocol(); Preconditions.checkNotNull(protocol); String id = protocol.getId(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -48,7 +48,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isProgramFilled()); Preconditions.checkState(getContext().isCruiseFilled()); if (log.isInfoEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -42,7 +42,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isProgramFilled()); Preconditions.checkState(getContext().isCruiseFilled()); super.doAction(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -47,7 +47,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isProgramFilled()); if (log.isInfoEnabled()) { log.info("Edit program: " + getContext().getProgramId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -62,7 +62,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { CLEAN_PROTOCOL_ENTRY.removeContextValue(getContext().getMainUI()); @@ -143,7 +143,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isProtocolFilled()); if (log.isInfoEnabled()) { log.info("Edit protocol: " + getContext().getProtocolId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -55,7 +55,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -77,13 +77,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Cruise cruise = getModel().getCruise(); Preconditions.checkNotNull(cruise); Preconditions.checkNotNull(file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -77,13 +77,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Cruise cruise = getModel().getCruise(); Preconditions.checkNotNull(cruise); Preconditions.checkNotNull(file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -57,7 +57,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -77,13 +77,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Program program = getModel().getProgram(); Preconditions.checkNotNull(program); Preconditions.checkNotNull(file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -75,13 +75,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiProtocol protocol = getModel().getProtocol(); Preconditions.checkNotNull(protocol); Preconditions.checkNotNull(file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -67,7 +67,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { IMPORT_PROTOCOL_ENTRY.removeContextValue(getContext().getMainUI()); @@ -166,7 +166,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(protocol); // store protocol in context Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -41,7 +41,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { getContext().setCruiseId(null); super.doAction(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -41,7 +41,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { getContext().setProgramId(null); getContext().setCruiseId(null); super.doAction(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -41,7 +41,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { getContext().setProtocolId(null); super.doAction(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -57,7 +57,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -78,13 +78,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Cruise cruise = getModel().getCruise(); Preconditions.checkNotNull(cruise); Preconditions.checkNotNull(file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -49,7 +49,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkState(getContext().isProgramFilled()); Preconditions.checkState(getContext().isCruiseFilled()); getContext().setValidationContext(ValidationService.VALIDATION_CONTEXT_VALIDATE); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -62,7 +62,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { EditFishingOperationAction action = getEditAction(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/DeleteFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/DeleteFishingOperationAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/DeleteFishingOperationAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -51,7 +51,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean canContinue = super.prepareAction(); FishingOperation fishingOperation = getModel().getSelectedFishingOperation(); canContinue &= fishingOperation != null && @@ -64,7 +64,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { FishingOperation fishingOperation = getModel().getSelectedFishingOperation(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -179,7 +179,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { fishingOperation = null; checkPreviousEdit = true; internalAction = false; @@ -208,7 +208,7 @@ } @Override - protected boolean prepareAction() { + public boolean prepareAction() { boolean canContinue = true; if (checkPreviousEdit) { @@ -329,7 +329,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { errorMessages.clear(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -37,7 +37,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { //TODO } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -44,7 +44,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { FishingOperationsUIModel model = getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -70,13 +70,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { updateUI = true; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiBeanMonitor<EditFishingOperationUIModel> monitor = handler.getFishingOperationMonitor(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractExportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -53,7 +53,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -86,7 +86,7 @@ protected abstract String getFileChooserButton(); @Override - protected void releaseAction() { + public void releaseAction() { file = null; currentOperation = null; super.releaseAction(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -64,7 +64,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -91,13 +91,13 @@ protected abstract String getFileChooserButton(); @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { EditCatchesUI editCatchesUI = getUI().getParentContainer(EditCatchesUI.class); EditCatchesUIModel editCatchesUIModel = editCatchesUI.getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -67,7 +67,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { // cancel to create a catch batch ? // Should never happen ? Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -58,7 +58,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { PersistenceService persistenceService = getContext().getPersistenceService(); TuttiWeightComputingService tuttiWeightComputingService = getContext().getTuttiWeightComputingService(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SaveCatchBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SaveCatchBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SaveCatchBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -59,7 +59,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { updateUI = true; super.releaseAction(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ExportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ExportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -60,7 +60,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { multiPostImportExportService.exportAccidentalCatch(file, currentOperation); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/RemoveAccidentalBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/RemoveAccidentalBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/RemoveAccidentalBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -51,7 +51,7 @@ int rowIndex; @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { @@ -66,7 +66,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { JXTable table = handler.getTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); int[] selectedRowIndexes = handler.getTable().getSelectedRows(); @@ -141,7 +141,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { String melagComment = _("tutti.createBenthosMelag.comment.part1"); for (BenthosBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); @@ -168,7 +168,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { super.releaseAction(); //FIXME-TC No release action is not design to refresh ui... // getHandler().getTable().repaint(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ExportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ExportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -59,7 +59,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { multiPostImportExportService.exportBenthos(file, currentOperation); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ImportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -71,7 +71,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { notImportedData = null; super.releaseAction(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { @@ -71,7 +71,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiPersistence persistenceService = getContext().getPersistenceService(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -50,7 +50,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { @@ -65,7 +65,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiPersistence persistenceService = getContext().getPersistenceService(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RenameBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RenameBenthosBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RenameBenthosBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); BenthosBatchTableModel tableModel = handler.getTableModel(); @@ -80,13 +80,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { selectedSpecies = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { BenthosBatchTableModel tableModel = handler.getTableModel(); JXTable table = handler.getTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/SelectSpeciesForBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/SelectSpeciesForBenthosBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/SelectSpeciesForBenthosBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -57,7 +57,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean canContinue = super.prepareAction(); if (canContinue) { @@ -74,7 +74,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { CreateBenthosBatchUIModel model = getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ExportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -60,7 +60,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { multiPostImportExportService.exportIndividualObservation(file, currentOperation); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/RemoveIndividualObservationBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -52,7 +52,7 @@ int rowIndex; @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { @@ -67,7 +67,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { JXTable table = handler.getTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/SelectSpeciesForIndividualObservationBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/SelectSpeciesForIndividualObservationBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/SelectSpeciesForIndividualObservationBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -59,7 +59,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean canContinue = super.prepareAction(); if (canContinue) { @@ -76,7 +76,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { CreateIndividualObservationBatchUIModel model = getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ExportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -59,7 +59,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { multiPostImportExportService.exportMarineLitter(file, currentOperation); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/ImportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -71,7 +71,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { notImportedData = null; super.releaseAction(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/RemoveMarineLitterBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -59,7 +59,7 @@ int rowIndex; @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { @@ -74,7 +74,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { JXTable table = handler.getTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); int[] selectedRowIndexes = handler.getTable().getSelectedRows(); @@ -141,7 +141,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { String melagComment = _("tutti.createSpeciesMelag.comment.part1"); for (SpeciesBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); @@ -168,7 +168,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { super.releaseAction(); //FIXME-TC No release action is not design to refresh ui... // getHandler().getTable().repaint(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ExportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ExportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ExportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -59,7 +59,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { multiPostImportExportService.exportSpecies(file, currentOperation); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportMultiPostAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -71,7 +71,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { notImportedData = null; super.releaseAction(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -79,7 +79,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = true; // must check that sample category model is compatible for pupitri import @@ -137,7 +137,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiPupitriImportExportService pupitriImportExportService = getContext().getTuttiPupitriImportExportService(); @@ -160,7 +160,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { super.releaseAction(); importedTrunkFile = null; importedCarrouselFile = null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { @@ -71,7 +71,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiPersistence persistenceService = getContext().getPersistenceService(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -50,7 +50,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { @@ -65,7 +65,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiPersistence persistenceService = getContext().getPersistenceService(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); SpeciesBatchTableModel tableModel = handler.getTableModel(); @@ -79,13 +79,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { selectedSpecies = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { SpeciesBatchTableModel tableModel = handler.getTableModel(); JXTable table = handler.getTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/SelectSpeciesForSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/SelectSpeciesForSpeciesBatchAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/SelectSpeciesForSpeciesBatchAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -57,7 +57,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean canContinue = super.prepareAction(); if (canContinue) { @@ -74,7 +74,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { CreateSpeciesBatchUIModel model = getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -45,7 +45,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { TuttiUIContext context = getContext(); PersistenceService persistenceService = getContext().getPersistenceService(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddBenthosProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddBenthosProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddBenthosProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -48,7 +48,7 @@ protected Species species; @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { species = null; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -48,7 +48,7 @@ protected Species species; @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { EditProtocolUI ui = getUI(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -53,7 +53,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -73,13 +73,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export all caracteristic to file: " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -76,13 +76,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export protocol benthos to file: " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -74,13 +74,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export protocol caracteristic to file: " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -76,13 +76,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export protocol species to file: " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -75,13 +75,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export protocol species to file: " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolBenthosAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolBenthosAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolBenthosAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -75,13 +75,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will import protocol benthos file: " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -73,13 +73,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will import protocol caracteristic file: " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -56,7 +56,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -75,13 +75,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will import protocol species file: " + file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveBenthosProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveBenthosProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveBenthosProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -49,7 +49,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { JXTable table = handler.getBenthosTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -49,7 +49,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { JTable table = handler.getSpeciesTable(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -59,7 +59,7 @@ * Otherwise, the screen changes to the home. */ @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { EditProtocolUIModel model = getModel(); TuttiUIContext context = getContext(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherBenthosAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherBenthosAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherBenthosAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { EditProtocolUIModel model = getModel(); @@ -73,13 +73,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { selectedSpecies = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { String decoratedSynonym = decorate(selectedSpecies); String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = getModel().getAllReferentSpeciesByTaxonId().get(taxonId); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherSpeciesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SelectOtherSpeciesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { EditProtocolUIModel model = getModel(); @@ -73,13 +73,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { selectedSpecies = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { String decoratedSynonym = decorate(selectedSpecies); String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = getModel().getAllReferentSpeciesByTaxonId().get(taxonId); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -74,13 +74,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export example gears temporary " + Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -55,7 +55,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -75,13 +75,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export example persons temporary " + Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -74,13 +74,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export example species temporary " + Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -74,13 +74,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will export example vessels temporary " + Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -72,13 +72,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will import gear temporary " + Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -72,13 +72,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will import person temporary " + Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -71,13 +71,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will import species temporary " + Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -54,7 +54,7 @@ } @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); @@ -71,13 +71,13 @@ } @Override - protected void releaseAction() { + public void releaseAction() { file = null; super.releaseAction(); } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { log.info("Will import vessel temporary " + 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-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -67,14 +67,14 @@ protected final Object lock = new Object(); - protected abstract void doAction() throws Exception; + public abstract void doAction() throws Exception; protected AbstractTuttiAction(H handler, boolean hideBody) { this.handler = handler; this.hideBody = hideBody; } - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { // by default nothing to prepare return true; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2013-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2013-09-13 16:21:34 UTC (rev 1170) @@ -52,7 +52,7 @@ protected File attachmentFile; @Override - protected boolean prepareAction() throws Exception { + public boolean prepareAction() throws Exception { boolean doAction = super.prepareAction(); if (doAction) { @@ -69,7 +69,7 @@ } @Override - protected void doAction() throws Exception { + public void doAction() throws Exception { AttachmentEditorUI ui = getUI(); @@ -96,7 +96,7 @@ } @Override - protected void releaseAction() { + public void releaseAction() { super.releaseAction(); attachmentFile = null; attachment = null; 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-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-13 16:21:34 UTC (rev 1170) @@ -114,6 +114,7 @@ tutti.config.option.launch.mode.description= tutti.config.option.programId.description= tutti.config.option.protocolId.description= +tutti.config.option.startActionFile.description= tutti.config.option.tremieCarousselVessel.description= tutti.config.option.ui.autoPopupNumberEditor.description= tutti.config.option.ui.color.blockingLayer.description= @@ -973,11 +974,14 @@ tutti.editSpeciesFrequencies.table.header.weight= tutti.editSpeciesFrequencies.title= tutti.error.about.could.not.reach.url= +tutti.error.delete.startActionFile=Could not delete start action file %s tutti.error.errorpane.htmlmessage= +tutti.error.read.startActionFile=Could not read start action file content %s tutti.error.ui.business.error= tutti.error.ui.business.warning= tutti.error.ui.other.error= tutti.error.update.could.not.reach.url= +tutti.error.write.startActionFile=could not write action content to file %s tutti.exportCruise.action.success= tutti.exportCruiseForSumatra.action.chooseFile= tutti.exportCruiseForSumatra.action.success= @@ -1053,6 +1057,9 @@ tutti.importDb.step.unzipArchive= tutti.importDb.step.will.migrateSchema= tutti.importDb.unzipArchive= +tutti.importDbAtNextStart.step.backupDb= +tutti.importDbAtNextStart.step.closeDb= +tutti.importDbAtNextStart.step.reloadApplication= tutti.importProtocol.action.success= tutti.importPupitri.carrouselFile.extension= tutti.importPupitri.carrouselFile.extension.description= @@ -1064,6 +1071,8 @@ tutti.importPupitri.trunkFile.extension= tutti.importPupitri.trunkFile.extension.description= tutti.installDb.step.backupDb= +tutti.installDb.step.closeDb= +tutti.installDb.step.destroyDb= tutti.label.tab.accidental= tutti.label.tab.benthos= tutti.label.tab.catches= @@ -1227,6 +1236,12 @@ tutti.option.import= tutti.property.get.error= tutti.property.set.error= +tutti.reimport.step.backupDb= +tutti.reimport.step.closeDb= +tutti.reimport.step.reloadApplication= +tutti.reinstallDb.step.backupDb= +tutti.reinstallDb.step.closeDb= +tutti.reinstallDb.step.reloadApplication= tutti.sampleCategoryModel.passwordDialog.error.message= tutti.sampleCategoryModel.passwordDialog.error.title= tutti.sampleCategoryModel.passwordDialog.message= 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-09-11 21:57:40 UTC (rev 1169) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-13 16:21:34 UTC (rev 1170) @@ -110,6 +110,7 @@ tutti.config.option.launch.mode.description=Mode de démarrage de l'application tutti.config.option.programId.description=Identifiant de la dernière série de campagne utilisée tutti.config.option.protocolId.description=Identifiant du dernier protocole utilisé +tutti.config.option.startActionFile.description=Fichier tutti.config.option.tremieCarousselVessel.description=Navire ayant un carrousel et une trémie (ex. Thalassa) tutti.config.option.ui.autoPopupNumberEditor.description=Toujours afficher le pavé numérique lors de l'édition d'un nombre tutti.config.option.ui.color.blockingLayer.description=Couleur utilisée pour bloquer l'interface lors d'une action longue @@ -244,11 +245,11 @@ tutti.dbManager.action.exportDb.mnemonic=x tutti.dbManager.action.exportDb.tip=Exporter la base de données au format zip tutti.dbManager.action.importDb=Importer une base -tutti.dbManager.action.importDb.backup.db= +tutti.dbManager.action.importDb.backup.db=Avant de pouvoir importer une nouvelle base, vous devez sauvegarder la base courante. tutti.dbManager.action.importDb.mnemonic=i tutti.dbManager.action.importDb.tip=Importer la base de données au format zip tutti.dbManager.action.importdb.backup.db=Avant de pouvoir importer une nouvelle base, vous devez sauvegarder la base courante. -tutti.dbManager.action.importdb.couldNotOpen= +tutti.dbManager.action.importdb.couldNotOpen=Impossible d'ouvrir la base importée tutti.dbManager.action.importdb.no.backup.db.choosen=Import annulé (vous n'avez pas choisi de fichier de sauvegarde). tutti.dbManager.action.importdb.no.import.file.choosen=Import annulé (vous n'avez pas choisi de fichier d'import). tutti.dbManager.action.installDb=Installer @@ -961,11 +962,14 @@ tutti.editSpeciesFrequencies.table.header.weight=Poids observé (kg) tutti.editSpeciesFrequencies.title=Mensuration tutti.error.about.could.not.reach.url=Récupération des versions de mises à jour impossible (l'url <strong>%s</strong> n'est pas joignable) +tutti.error.delete.startActionFile=Impossible de supprimer le fichier %s tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> +tutti.error.read.startActionFile=Impossible de lire le contenu du fichier %s tutti.error.ui.business.error=Erreur tutti.error.ui.business.warning=Avertissement tutti.error.ui.other.error=Erreur tutti.error.update.could.not.reach.url=Mise à jour impossible (l'url <strong>%s</strong> n'est pas joignable) +tutti.error.write.startActionFile=impossible d'écrire dans le fichier %s tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>. tutti.exportCruiseForSumatra.action.chooseFile=Choisir le fichier d'export tutti.exportCruiseForSumatra.action.success=Les captures ont correctement été exporté dans le fichier %s @@ -1030,11 +1034,10 @@ tutti.help.mkDir.error=Erreur à la création du dossier d'aide tutti.i18n.deleteCache.error=Erreur à la suppression du cache de l'internationalisation tutti.i18n.mkDir.error=Erreur à la création du dossier d'internationalisation -tutti.importDb.step.backupDb=Sauvegarde de la base dans l'archive %s tutti.importDb.step.check.dbContext=Vérification du context de saisie tutti.importDb.step.checkSchemaVersion=Vérification de la version de la base tutti.importDb.step.closeDb=Fermeture de la base -tutti.importDb.step.openDb=Ouverture de la base de données %s +tutti.importDb.step.openDb=Ouverture de la base de données <strong>%s</strong> tutti.importDb.step.unzipArchive=Décompression de l'archive tutti.importDb.step.will.migrateSchema=Démarrage de la mise à jour du schéma de la base depuis la version %s vers la version %s tutti.importProtocol.action.success=Protocole [%s] lu depuis le fichier. @@ -1047,7 +1050,7 @@ tutti.importPupitri.title=Import Pupitri tutti.importPupitri.trunkFile.extension=tnk tutti.importPupitri.trunkFile.extension.description=Fichier du trémie (.tnk) -tutti.installDb.step.backupDb=Sauvegarde de la base dans l'archive %s +tutti.installDb.step.closeDb=Fermeture de la base <strong>%s</strong> tutti.label.tab.accidental=Captures accidentelles tutti.label.tab.benthos=Benthos tutti.label.tab.catches=Captures @@ -1211,6 +1214,12 @@ tutti.option.import=Importer tutti.property.get.error=Propriété %1s non trouvée sur l'objet de type %2s tutti.property.set.error=Propriété %1s non trouvée sur l'objet de type %2s +tutti.reimport.step.backupDb=Sauvegarde de la base dans l'archive %s +tutti.reimport.step.closeDb=Fermeture de la base +tutti.reimport.step.reloadApplication=Redémarrage de l'application... +tutti.reinstallDb.step.backupDb=Sauvegarde de la base dans l'archive %s +tutti.reinstallDb.step.closeDb=Fermeture de la base <strong>%s</strong> +tutti.reinstallDb.step.reloadApplication=Redémarrage de l'application... tutti.selectBenthos.title=Choisissez une espèce du benthos tutti.selectCruise.action.chooseCruiseExportFile=Exporter tutti.selectCruise.action.chooseProgramExportFile=Exporter

1 0

r1169 - trunk
by tchemit＠users.forge.codelutin.com Sept. 11, 2013

Sept. 11, 2013

Author: tchemit Date: 2013-09-11 23:57:40 +0200 (Wed, 11 Sep 2013) New Revision: 1169 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1169 Log: fixes #3219: Mise ?\195?\160 jour jre en 1.7u40 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-10 16:33:34 UTC (rev 1168) +++ trunk/pom.xml 2013-09-11 21:57:40 UTC (rev 1169) @@ -161,7 +161,7 @@ <jdbc.hsqldb.version>1.8.0.10</jdbc.hsqldb.version>  - <jreVersion>1.7.25</jreVersion> + <jreVersion>1.7.40</jreVersion>

1 0

r1168 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . benthos benthos/frequency species species/frequency
by tchemit＠users.forge.codelutin.com Sept. 10, 2013

Sept. 10, 2013

Author: tchemit Date: 2013-09-10 18:33:34 +0200 (Tue, 10 Sep 2013) New Revision: 1168 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1168 Log: fixes #3213: [MENSURATION] manque information sur l'esp?\195?\168ce en cours de saisie Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -25,9 +25,16 @@ */ import com.google.common.collect.Sets; +import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIHandler; +import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyCellComponent; +import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -280,6 +287,32 @@ ); } + public void editSpeciesFrequencies(SpeciesBatchRowModel editRow, + SpeciesFrequencyCellComponent.FrequencyCellEditor editor) { + + SpeciesFrequencyUI frequencyEditor = ui.getSpeciesTabFrequencyEditor(); + + frequencyEditor.getHandler().editBatch(editRow, editor); + + // open frequency editor + setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); + + // update title + StringBuilder title = new StringBuilder(ui.getSpeciesTabFishingOperationReminderLabel().getTitle()); + + title.append(" - ").append(decorate(editRow.getSpecies())); + + for (SampleCategory<?> sampleCategory : editRow) { + if (sampleCategory.getCategoryValue() != null) { + title.append(" - "); + title.append(decorate(sampleCategory.getCategoryValue())); + } + } + + title.append(" - ").append(_("tutti.editSpeciesFrequencies.title")); + ui.getSpeciesTabFrequencyEditorReminderLabel().setTitle(title.toString()); + } + public void setSpeciesSelectedCard(String card) { JPanel panel = ui.getSpeciesTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); @@ -309,8 +342,8 @@ } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabFrequencyEditor(); - titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); - title = n_("tutti.editSpeciesFrequencies.title"); +// titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); +// title = _("tutti.editSpeciesFrequencies.title"); } if (tuttiUi != null) { @@ -323,6 +356,32 @@ } } + public void editBenthosFrequencies(BenthosBatchRowModel editRow, + BenthosFrequencyCellComponent.FrequencyCellEditor editor) { + + BenthosFrequencyUI frequencyEditor = ui.getBenthosTabFrequencyEditor(); + + frequencyEditor.getHandler().editBatch(editRow, editor); + + // open frequency editor + setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); + + // update title + StringBuilder title = new StringBuilder(ui.getBenthosTabFishingOperationReminderLabel().getTitle()); + + title.append(" - ").append(decorate(editRow.getSpecies())); + + for (SampleCategory<?> sampleCategory : editRow) { + if (sampleCategory.getCategoryValue() != null) { + title.append(" - "); + title.append(decorate(sampleCategory.getCategoryValue())); + } + } + + title.append(" - ").append(_("tutti.editBenthosFrequencies.title")); + ui.getBenthosTabFrequencyEditorReminderLabel().setTitle(title.toString()); + } + public void setBenthosSelectedCard(String card) { JPanel panel = ui.getBenthosTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); @@ -352,8 +411,8 @@ } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getBenthosTabFrequencyEditor(); - titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel(); - title = n_("tutti.editBenthosFrequencies.title"); +// titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel(); +// title = n_("tutti.editBenthosFrequencies.title"); } if (tuttiUi != null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryAble.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -32,7 +32,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.4 */ -public interface SampleCategoryAble<E extends SampleCategoryAble> { +public interface SampleCategoryAble<E extends SampleCategoryAble> extends Iterable<SampleCategory<?>> { Integer getCategoryIndex(Integer id); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -47,8 +47,10 @@ import org.nuiton.util.beans.BinderFactory; import java.io.Serializable; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.Set; @@ -289,6 +291,11 @@ return result; } + @Override + public Iterator<SampleCategory<?>> iterator() { + return Arrays.asList(categories).iterator(); + } + //------------------------------------------------------------------------// //-- Species category --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -100,8 +100,8 @@ } // collect of rows to remove from model - Set<BenthosBatchRowModel> rowToRemove = - Sets.newHashSet(selectedBatch); + Set<BenthosBatchRowModel> rowToRemove = Sets.newHashSet(); + rowToRemove.add(selectedBatch); handler.collectChildren(selectedBatch, rowToRemove); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -27,7 +27,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; @@ -155,13 +154,17 @@ log.debug("Will edit frequencies for row: " + rowIndex); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); - BenthosFrequencyUI frequencyEditor = parent.getBenthosTabFrequencyEditor(); + EditCatchesUI parent = + SwingUtil.getParentContainer(ui, EditCatchesUI.class); - frequencyEditor.getHandler().editBatch(editRow, this); + parent.getHandler().editBenthosFrequencies(editRow, this); - // open frequency editor - parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); +// BenthosFrequencyUI frequencyEditor = parent.getBenthosTabFrequencyEditor(); +// +// frequencyEditor.getHandler().editBatch(editRow, this); +// +// // open frequency editor +// parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } public void validateEdition(BenthosFrequencyUIModel frequencyModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-09-10 16:33:34 UTC (rev 1168) @@ -37,26 +37,6 @@ _help: {"tutti.editBenthosFrequencies.help"}; } -#batchSpeciesLabel { - text: "tutti.editBenthosFrequencies.batchSpecies"; -} - -#batchSpecies { - text: { handler.decorateSpecies(model.getBatch()) }; - editable: false; - enabled: false; -} - -#batchCategoryLabel { - text: "tutti.editBenthosFrequencies.batchCategory"; -} - -#batchCategory { - text: { handler.decorateCategory(model.getBatch()) }; - editable: false; - enabled: false; -} - #stepLabel { text: "tutti.editBenthosFrequencies.field.step"; toolTipText: "tutti.editBenthosFrequencies.field.step.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-09-10 16:33:34 UTC (rev 1168) @@ -91,31 +91,6 @@ <JPanel id='configurationPanel' layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> - <Table constraints='BorderLayout.NORTH' fill='both'> - <row> - <cell anchor='west'> - <JLabel id='batchSpeciesLabel'/> - </cell> - <cell weightx='1'> - <JTextField id='batchSpecies'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='batchCategoryLabel'/> - </cell> - <cell weightx='1'> - <JTextField id='batchCategory'/> - </cell> - </row> - <row> - <cell columns='2'> - <JSeparator/> - </cell> - </row> - </Table> - - <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <VBox id='modePanel' constraints='BorderLayout.WEST' verticalAlignment='{SwingConstants.CENTER}'> <JRadioButton id='simpleModeButton' @@ -185,8 +160,8 @@ <JLabel id='simpleCountingModeLabel' constraints='BorderLayout.CENTER'/> </JPanel> - </JPanel> </JPanel> + <Table id="lengthstepSettingsBlock" fill='both' constraints='BorderLayout.SOUTH'> <row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -639,15 +639,6 @@ closeUI(ui); } - public String decorateSpecies(BenthosBatchRowModel object) { - return object == null ? "" : decorate(object.getSpecies()); - } - - public String decorateCategory(BenthosBatchRowModel object) { - return object == null ? "" : - decorate(object.getFinestCategory().getCategoryDef()) + " / " + decorate(object.getFinestCategory().getCategoryValue()); - } - //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -100,8 +100,8 @@ } // collect of rows to remove from model - Set<SpeciesBatchRowModel> rowToRemove = - Sets.newHashSet(selectedBatch); + Set<SpeciesBatchRowModel> rowToRemove = Sets.newHashSet(); + rowToRemove.add(selectedBatch); handler.collectChildren(selectedBatch, rowToRemove); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -47,8 +47,10 @@ import org.nuiton.util.beans.BinderFactory; import java.io.Serializable; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.Set; @@ -446,7 +448,7 @@ } @Override - public SpeciesBatchRowModel getFirstAncestor(SampleCategory<?> entrySampleCategory) { + public SpeciesBatchRowModel getFirstAncestor(SampleCategory<?> entrySampleCategory) { SpeciesBatchRowModel result = this; if (getParentBatch() != null) { SpeciesBatchRowModel parentBatch = getParentBatch(); @@ -459,6 +461,11 @@ return result; } + @Override + public Iterator<SampleCategory<?>> iterator() { + return Arrays.asList(categories).iterator(); + } + //------------------------------------------------------------------------// //-- AttachmentModelAware --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -27,7 +27,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; @@ -155,13 +154,17 @@ log.debug("Will edit frequencies for row: " + rowIndex); } - EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); - SpeciesFrequencyUI frequencyEditor = parent.getSpeciesTabFrequencyEditor(); + EditCatchesUI parent = + SwingUtil.getParentContainer(ui, EditCatchesUI.class); - frequencyEditor.getHandler().editBatch(editRow, this); + parent.getHandler().editSpeciesFrequencies(editRow, this); - // open frequency editor - parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); +// SpeciesFrequencyUI frequencyEditor = parent.getSpeciesTabFrequencyEditor(); +// +// frequencyEditor.getHandler().editBatch(editRow, this); +// +// // open frequency editor +// parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } public void validateEdition(SpeciesFrequencyUIModel frequencyModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-09-10 16:33:34 UTC (rev 1168) @@ -37,26 +37,6 @@ _help: {"tutti.editSpeciesFrequencies.help"}; } -#batchSpeciesLabel { - text: "tutti.editSpeciesFrequencies.batchSpecies"; -} - -#batchSpecies { - text: { handler.decorateSpecies(model.getBatch()) }; - editable: false; - enabled: false; -} - -#batchCategoryLabel { - text: "tutti.editSpeciesFrequencies.batchCategory"; -} - -#batchCategory { - text: { handler.decorateCategory(model.getBatch()) }; - editable: false; - enabled: false; -} - #stepLabel { text: "tutti.editSpeciesFrequencies.field.step"; toolTipText: "tutti.editSpeciesFrequencies.field.step.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-09-10 16:33:34 UTC (rev 1168) @@ -91,31 +91,6 @@ <JPanel id='configurationPanel' layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> - <Table constraints='BorderLayout.NORTH' fill='both'> - <row> - <cell anchor='west'> - <JLabel id='batchSpeciesLabel'/> - </cell> - <cell weightx='1'> - <JTextField id='batchSpecies'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='batchCategoryLabel'/> - </cell> - <cell weightx='1'> - <JTextField id='batchCategory'/> - </cell> - </row> - <row> - <cell columns='2'> - <JSeparator/> - </cell> - </row> - </Table> - - <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <VBox id='modePanel' constraints='BorderLayout.WEST' verticalAlignment='{SwingConstants.CENTER}'> <JRadioButton id='simpleModeButton' @@ -185,8 +160,8 @@ <JLabel id='simpleCountingModeLabel' constraints='BorderLayout.CENTER'/> </JPanel> - </JPanel> </JPanel> + <Table id="lengthstepSettingsBlock" fill='both' constraints='BorderLayout.SOUTH'> <row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-08-23 15:51:18 UTC (rev 1167) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-09-10 16:33:34 UTC (rev 1168) @@ -638,15 +638,6 @@ closeUI(ui); } - public String decorateSpecies(SpeciesBatchRowModel object) { - return object == null ? "" : decorate(object.getSpecies()); - } - - public String decorateCategory(SpeciesBatchRowModel object) { - return object == null ? "" : - decorate(object.getFinestCategory().getCategoryDef()) + " / " + decorate(object.getFinestCategory().getCategoryValue()); - } - //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------//

1 0