August 2012 - Coser-commits - mailman.cloud.codelutin.com

r1071 - trunk
by tchemit＠users.forge.codelutin.com 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:45:59 +0200 (Thu, 30 Aug 2012) New Revision: 1071 Url: http://forge.codelutin.com/repositories/revision/coser/1071 Log: Update mavenpom4redmine to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 14:59:04 UTC (rev 1070) +++ trunk/pom.xml 2012-08-30 14:45:59 UTC (rev 1071) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.6</version> + <version>3.3.7</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1070 - in trunk: coser-business/src/site/en/rst coser-business/src/site/rst coser-ui/src/site/en/rst coser-ui/src/site/rst coser-web/src/site/en/rst coser-web/src/site/rst
by echatellier＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: echatellier Date: 2012-08-24 16:59:04 +0200 (Fri, 24 Aug 2012) New Revision: 1070 Url: http://forge.codelutin.com/repositories/revision/coser/1070 Log: Fix module index page parsing Modified: trunk/coser-business/src/site/en/rst/index.rst trunk/coser-business/src/site/rst/index.rst trunk/coser-ui/src/site/en/rst/index.rst trunk/coser-ui/src/site/rst/index.rst trunk/coser-web/src/site/en/rst/index.rst trunk/coser-web/src/site/rst/index.rst Modified: trunk/coser-business/src/site/en/rst/index.rst =================================================================== --- trunk/coser-business/src/site/en/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-business/src/site/en/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Lesser General Public License as @@ -22,5 +22,6 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Coser :: Business ================= \ No newline at end of file Modified: trunk/coser-business/src/site/rst/index.rst =================================================================== --- trunk/coser-business/src/site/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-business/src/site/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Lesser General Public License as @@ -22,5 +22,6 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Coser :: Business ================= \ No newline at end of file Modified: trunk/coser-ui/src/site/en/rst/index.rst =================================================================== --- trunk/coser-ui/src/site/en/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-ui/src/site/en/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as @@ -22,5 +22,6 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + Coser :: UI =========== \ No newline at end of file Modified: trunk/coser-ui/src/site/rst/index.rst =================================================================== --- trunk/coser-ui/src/site/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-ui/src/site/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as @@ -22,5 +22,6 @@ .. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - + Coser :: UI =========== \ No newline at end of file Modified: trunk/coser-web/src/site/en/rst/index.rst =================================================================== --- trunk/coser-web/src/site/en/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-web/src/site/en/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Affero General Public License as published by @@ -21,5 +21,6 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Coser :: Web ============ \ No newline at end of file Modified: trunk/coser-web/src/site/rst/index.rst =================================================================== --- trunk/coser-web/src/site/rst/index.rst 2012-08-24 14:32:41 UTC (rev 1069) +++ trunk/coser-web/src/site/rst/index.rst 2012-08-24 14:59:04 UTC (rev 1070) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin +.. * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Affero General Public License as published by @@ -21,5 +21,6 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Coser :: Web ============ \ No newline at end of file

1 0

r1069 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: maven-release Date: 2012-08-24 16:32:41 +0200 (Fri, 24 Aug 2012) New Revision: 1069 Url: http://forge.codelutin.com/repositories/revision/coser/1069 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2012-08-24 14:32:33 UTC (rev 1068) +++ trunk/coser-business/pom.xml 2012-08-24 14:32:41 UTC (rev 1069) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-08-24 14:32:33 UTC (rev 1068) +++ trunk/coser-ui/pom.xml 2012-08-24 14:32:41 UTC (rev 1069) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-08-24 14:32:33 UTC (rev 1068) +++ trunk/coser-web/pom.xml 2012-08-24 14:32:41 UTC (rev 1069) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 14:32:33 UTC (rev 1068) +++ trunk/pom.xml 2012-08-24 14:32:41 UTC (rev 1069) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> @@ -347,9 +347,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.3</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.3</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.3</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> </scm> <build>

1 0

r1068 - tags
by maven-release＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: maven-release Date: 2012-08-24 16:32:33 +0200 (Fri, 24 Aug 2012) New Revision: 1068 Url: http://forge.codelutin.com/repositories/revision/coser/1068 Log: [maven-release-plugin] copy for tag coser-1.3 Added: tags/coser-1.3/

1 0

r1067 - in trunk: . coser-business coser-ui coser-web
by maven-release＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: maven-release Date: 2012-08-24 16:26:36 +0200 (Fri, 24 Aug 2012) New Revision: 1067 Url: http://forge.codelutin.com/repositories/revision/coser/1067 Log: [maven-release-plugin] prepare release coser-1.3 Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2012-08-24 14:17:14 UTC (rev 1066) +++ trunk/coser-business/pom.xml 2012-08-24 14:26:36 UTC (rev 1067) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-08-24 14:17:14 UTC (rev 1066) +++ trunk/coser-ui/pom.xml 2012-08-24 14:26:36 UTC (rev 1067) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2012-08-24 14:17:14 UTC (rev 1066) +++ trunk/coser-web/pom.xml 2012-08-24 14:26:36 UTC (rev 1067) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 14:17:14 UTC (rev 1066) +++ trunk/pom.xml 2012-08-24 14:26:36 UTC (rev 1067) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <packaging>pom</packaging> <modules> @@ -347,9 +347,9 @@ </properties> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/coser/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.3</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/coser/tags/coser-1.3</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/coser/tags/coser-1.3</url> </scm> <build>

1 0

r1066 - in trunk/coser-web/src/main/webapp: WEB-INF/decorators styles
by echatellier＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: echatellier Date: 2012-08-24 16:17:14 +0200 (Fri, 24 Aug 2012) New Revision: 1066 Url: http://forge.codelutin.com/repositories/revision/coser/1066 Log: Comment in spanich locale Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2012-08-24 11:52:37 UTC (rev 1065) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2012-08-24 14:17:14 UTC (rev 1066) @@ -75,9 +75,9 @@ <a href="<s:url namespace="/" action="locale"> <s:param name="request_locale">fr</s:param> </s:url>" class="francais">Francais</a> - <a href="<s:url namespace="/" action="locale"> +  </div> <decorator:body/> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2012-08-24 11:52:37 UTC (rev 1065) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2012-08-24 14:17:14 UTC (rev 1066) @@ -71,9 +71,9 @@ <a href="<s:url namespace="/" action="locale"> <s:param name="request_locale">fr</s:param> </s:url>" class="francais">Francais</a> - <a href="<s:url namespace="/" action="locale"> +  </div> <div class="page"> Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2012-08-24 11:52:37 UTC (rev 1065) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2012-08-24 14:17:14 UTC (rev 1066) @@ -482,7 +482,7 @@ text-indent: -999999px; background: url(../images/gb.png) no-repeat; position: absolute; - right: 20px; + right: 0px; top: 10px; width: 16px; height: 11px; @@ -498,7 +498,7 @@ text-indent: -999999px; background: url(../images/fr.png) no-repeat; position: absolute; - right: 40px; + right: 20px; top: 10px; width: 16px; height: 11px; @@ -509,7 +509,7 @@ border: 2px solid #ffe600; } -#middle .top_content .espagnol { +/*#middle .top_content .espagnol { display: block; text-indent: -999999px; background: url(../images/es.png) no-repeat; @@ -523,7 +523,7 @@ #middle .top_content .espagnol:hover { border: 2px solid #ffe600; -} +}*/ #middle .page .degrade ul li { /*list-style: none;*/ @@ -613,20 +613,20 @@ #conteneur_int .top_content .anglais { position: absolute; top: 22px; - right: 40px; + right: 20px; } #conteneur_int .top_content .francais { position: absolute; top: 22px; - right: 60px; + right: 40px; } -#conteneur_int .top_content .espagnol { +/*#conteneur_int .top_content .espagnol { position: absolute; top: 22px; right: 20px; -} +}*/ #conteneur_int #middle .col_droite { margin: 0;

1 0

r1065 - in trunk/coser-business/src/main: java/fr/ifremer/coser/services resources/i18n
by echatellier＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: echatellier Date: 2012-08-24 13:52:37 +0200 (Fri, 24 Aug 2012) New Revision: 1065 Url: http://forge.codelutin.com/repositories/revision/coser/1065 Log: Fix update process and generated mail content Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-08-21 10:06:08 UTC (rev 1064) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-08-24 11:52:37 UTC (rev 1065) @@ -707,15 +707,21 @@ File projectsDirectory = config.getWebIndicatorsProjectsDirectory(); File mapsDirectory = config.getWebMapsProjectsDirectory(); + // recuperer les resultats actuels pour le mail de mise à jour + Map<String, String> indicatorResults = getZonesIds(projectsDirectory, true, null, null); + Map<String, String> mapsResults = getZonesIds(mapsDirectory, null, true, null); + Map<String, String> dataResults = getZonesIds(projectsDirectory, null, null, true); + // suppression des resultats qui ont été envoyé mais // ne sont ni maps result, ni indicator result - Map<String, String> noIndicatorsResultZoneIds = getZonesIds(tempDirectory, false, null); + Map<String, String> noIndicatorsResultZoneIds = getZonesIds(tempDirectory, false, null, null); cleanCurrentProjectDirectory(projectsDirectory, noIndicatorsResultZoneIds.keySet()); - Map<String, String> noMapsResultZoneIds = getZonesIds(tempDirectory, null, false); + Map<String, String> noMapsResultZoneIds = getZonesIds(tempDirectory, null, false, null); cleanCurrentProjectDirectory(mapsDirectory, noMapsResultZoneIds.keySet()); + Map<String, String> noDataResultZoneIds = getZonesIds(tempDirectory, null, null, false); // recuperation des noms zone des nouveau fichiers - Map<String, String> indicatorsResultZoneIds = getZonesIds(tempDirectory, true, false); + Map<String, String> indicatorsResultZoneIds = getZonesIds(tempDirectory, true, null, null); // suppression dans l'ancien répertoire des resultat deja present // dans le nouveau (pour les conflits) cleanCurrentProjectDirectory(projectsDirectory, indicatorsResultZoneIds.keySet()); @@ -725,7 +731,7 @@ customCopyDirectory(tempDirectory, projectsDirectory, indicatorsFileFilter); // recuperation des noms zone des nouveau fichiers - Map<String, String> mapsResultZoneIds = getZonesIds(tempDirectory, false, true); + Map<String, String> mapsResultZoneIds = getZonesIds(tempDirectory, null, true, null); // suppression dans l'ancien répertoire des resultat deja present // dans le nouveau (pour les conflits) cleanCurrentProjectDirectory(mapsDirectory, mapsResultZoneIds.keySet()); @@ -734,6 +740,9 @@ // copie (avec ecrasement) des nouveaux fichiers dans l'ancien répertoire customCopyDirectory(tempDirectory, mapsDirectory, mapsFileFilter); + // recuperation des nom de resultat data + Map<String, String> dataResultZoneIds = getZonesIds(tempDirectory, null, null, true); + FileUtils.deleteDirectory(tempDirectory); if (log.isInfoEnabled()) { @@ -741,40 +750,69 @@ } // generate email content - StringBuffer content = new StringBuffer(); - if (!noMapsResultZoneIds.isEmpty() || !mapsResultZoneIds.isEmpty()) { - content.append(_("coser.business.notificationmail.mapsresults") + "\n"); - for (Map.Entry<String, String> noMapsResultZoneId : noMapsResultZoneIds.entrySet()) { + StringBuilder content = new StringBuilder(); + + int count = 0; + content.append(_("coser.business.notificationmail.mapsresults") + "\n"); + for (Map.Entry<String, String> noMapsResultZoneId : noMapsResultZoneIds.entrySet()) { + if (mapsResults.containsValue(noMapsResultZoneId.getValue())) { content.append(" - " + _("coser.business.notificationmail.deleted", - getZoneFullName(noMapsResultZoneId.getKey()), - noMapsResultZoneId.getValue()) + "\n"); + getZoneFullName(noMapsResultZoneId.getKey()), + noMapsResultZoneId.getValue()) + "\n"); + count++; } - for (Map.Entry<String, String> mapsResultZoneId : mapsResultZoneIds.entrySet()) { + } + for (Map.Entry<String, String> mapsResultZoneId : mapsResultZoneIds.entrySet()) { + if (!mapsResults.containsValue(mapsResultZoneId.getValue())) { content.append(" - " + _("coser.business.notificationmail.added", - getZoneFullName(mapsResultZoneId.getKey()), - mapsResultZoneId.getValue()) + "\n"); + getZoneFullName(mapsResultZoneId.getKey()), + mapsResultZoneId.getValue()) + "\n"); + count++; } - content.append("\n"); } - - if (!noIndicatorsResultZoneIds.isEmpty() || !indicatorsResultZoneIds.isEmpty()) { - content.append(_("coser.business.notificationmail.indicatorsresults") + "\n"); - for (Map.Entry<String, String> noIndicatorsResultZoneId : noIndicatorsResultZoneIds.entrySet()) { + content.append("\n"); + + content.append(_("coser.business.notificationmail.indicatorsresults") + "\n"); + for (Map.Entry<String, String> noIndicatorsResultZoneId : noIndicatorsResultZoneIds.entrySet()) { + if (indicatorResults.containsValue(noIndicatorsResultZoneId.getValue())) { content.append(" - " + _("coser.business.notificationmail.deleted", - getZoneFullName(noIndicatorsResultZoneId.getKey()), - noIndicatorsResultZoneId.getValue()) + "\n"); + getZoneFullName(noIndicatorsResultZoneId.getKey()), + noIndicatorsResultZoneId.getValue()) + "\n"); + count++; } - for (Map.Entry<String, String> indicatorsResultZoneId : indicatorsResultZoneIds.entrySet()) { + + } + for (Map.Entry<String, String> indicatorsResultZoneId : indicatorsResultZoneIds.entrySet()) { + if (!indicatorResults.containsValue(indicatorsResultZoneId.getValue())) { content.append(" - " + _("coser.business.notificationmail.added", - getZoneFullName(indicatorsResultZoneId.getKey()), - indicatorsResultZoneId.getValue()) + "\n"); + getZoneFullName(indicatorsResultZoneId.getKey()), + indicatorsResultZoneId.getValue()) + "\n"); + count++; } - content.append("\n"); } + content.append("\n"); + content.append(_("coser.business.notificationmail.dataresults") + "\n"); + for (Map.Entry<String, String> noDataResultZoneId : noDataResultZoneIds.entrySet()) { + if (dataResults.containsValue(noDataResultZoneId.getValue())) { + content.append(" - " + _("coser.business.notificationmail.deleted", + getZoneFullName(noDataResultZoneId.getKey()), + noDataResultZoneId.getValue()) + "\n"); + count++; + } + + } + for (Map.Entry<String, String> dataResultZoneId : dataResultZoneIds.entrySet()) { + if (!dataResults.containsValue(dataResultZoneId.getValue())) { + content.append(" - " + _("coser.business.notificationmail.added", + getZoneFullName(dataResultZoneId.getKey()), + dataResultZoneId.getValue()) + "\n"); + count++; + } + } + content.append("\n"); + // send notification mails - int count = noMapsResultZoneIds.size() + mapsResultZoneIds.size() + - noIndicatorsResultZoneIds.size() + indicatorsResultZoneIds.size(); sendNewResultNotifications(login, count, content.toString()); // update data date @@ -892,10 +930,12 @@ * @param scanDirectory le repertoire a scanner * @param indicatorResults if true get indicator results * @param mapResults if true get map results + * @param dataResults if true get data allowed result * @return une map de resultid/nom visuel des projets * @throws CoserBusinessException */ - protected Map<String, String> getZonesIds(File scanDirectory, Boolean indicatorResults, Boolean mapResults) throws CoserBusinessException { + protected Map<String, String> getZonesIds(File scanDirectory, Boolean indicatorResults, + Boolean mapResults, Boolean dataResults) throws CoserBusinessException { Map<String, String> resultIds = new HashMap<String, String>(); File[] projectFiles = scanDirectory.listFiles(); @@ -918,8 +958,10 @@ // return result depending on result type if ( ( indicatorResults == null || rsufiResult.isIndicatorsResult() == indicatorResults ) - || - ( mapResults == null || rsufiResult.isMapsResult() == mapResults ) ) { + && + ( mapResults == null || rsufiResult.isMapsResult() == mapResults ) + && + ( dataResults == null || rsufiResult.isDataAllowed() == dataResults)) { String resultResultId = rsufiResult.getZone(); if (StringUtils.isNotBlank(resultResultId)) { String resultPath = projectFile.getName() + "/" + Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-21 10:06:08 UTC (rev 1064) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-24 11:52:37 UTC (rev 1065) @@ -114,6 +114,7 @@ coser.business.matrix.samplingeffort=Sampling effort coser.business.notificationmail.added=added \: %s (%s) coser.business.notificationmail.body=Data has been updated on website by %s.\n\n%s--\nCoser. +coser.business.notificationmail.dataresults=Data results \: coser.business.notificationmail.deleted=deleted \: %s (%s) coser.business.notificationmail.indicatorsresults=Indicator results \: coser.business.notificationmail.mapsresults=Map results \: Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-21 10:06:08 UTC (rev 1064) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-24 11:52:37 UTC (rev 1065) @@ -114,6 +114,7 @@ coser.business.matrix.samplingeffort=Effort d'échantillonnage coser.business.notificationmail.added=ajouté \: %s (%s) coser.business.notificationmail.body=Les données du site internet viennent d'être mises à jour par %s.\n\n%s--\nCoser. +coser.business.notificationmail.dataresults=Résultat de donnnées \: coser.business.notificationmail.deleted=supprimé \: %s (%s) coser.business.notificationmail.indicatorsresults=Résultats d'indicateur \: coser.business.notificationmail.mapsresults=Résultat de carte \:

1 0

r1064 - in trunk: coser-business/src/main/java/fr/ifremer/coser/command coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay
by echatellier＠users.forge.codelutin.com 21 Aug '12

21 Aug '12

Author: echatellier Date: 2012-08-21 12:06:08 +0200 (Tue, 21 Aug 2012) New Revision: 1064 Url: http://forge.codelutin.com/repositories/revision/coser/1064 Log: Dans l'?\195?\169tape de fusion/renommage d'esp?\195?\168ces : le commentaire n'est pas conserv?\195?\169 dans le rapport de s?\195?\169lection, ?\195?\160 corriger j'ai fait les fusions en nom scientifique et le rapport a enregistr?\195?\169 des fusions en code mn?\195?\169monique, ?\195?\160 corriger Dans l'?\195?\169tape de contr?\195?\180le des tailles, modifier le titre du warning "Longueurs aberrantes" en "Valeurs de longueurs ?\195?\160 contr?\195?\180ler" Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerRedoMenu.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerUndoMenu.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/Command.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -126,19 +126,21 @@ /** * Return human readable string for log output. * + * @param project used to convert species code * @param container rarement utile, mais dans certains cas, sert a avoir les * vrais valeur de champs au lieu des noms techniques * @return log representation */ - public abstract String getLogString(AbstractDataContainer container); + public abstract String getLogString(Project project, AbstractDataContainer container); /** * Return human readable string for ui display (used in selection replay, * and undo redo commands). * + * @param project used to convert species code * @param container rarement utile, mais dans certains cas, sert a avoir les * vrais valeur de champs au lieu des noms techniques * @return string description (i18n) */ - public abstract String getDescription(AbstractDataContainer container); + public abstract String getDescription(Project project, AbstractDataContainer container); } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -182,12 +182,12 @@ } @Override - public String getLogString(AbstractDataContainer container) { + public String getLogString(Project project, AbstractDataContainer container) { return _("coser.business.command.deleteline.log", _(category.getTranslationKey()), lineNumber); } @Override - public String getDescription(AbstractDataContainer container) { + public String getDescription(Project project, AbstractDataContainer container) { String desc = _("coser.business.command.deleteline.desc", _(category.getTranslationKey()), lineNumber); if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -374,25 +374,41 @@ } @Override - public String getLogString(AbstractDataContainer container) { - String speciesAsString = StringUtils.join(speciesNames, ", "); + public String getLogString(Project project, AbstractDataContainer container) { + StringBuilder speciesAsString = new StringBuilder(256); + String separator = ""; + for (String speciesName : speciesNames) { + speciesAsString.append(separator); + speciesAsString.append(project.getDisplaySpeciesText(speciesName)); + separator = ", "; + } String log = null; if (speciesNames.length == 1) { - log = _("coser.business.command.mergespecies.rename.log", newSpecyName, speciesAsString); + log = _("coser.business.command.mergespecies.rename.log", + project.getDisplaySpeciesText(newSpecyName), speciesAsString.toString()); } else { - log = _("coser.business.command.mergespecies.log", newSpecyName, speciesAsString); + log = _("coser.business.command.mergespecies.log", + project.getDisplaySpeciesText(newSpecyName), speciesAsString.toString()); } return log; } @Override - public String getDescription(AbstractDataContainer container) { - String speciesAsString = StringUtils.join(speciesNames, ", "); + public String getDescription(Project project, AbstractDataContainer container) { + StringBuilder speciesAsString = new StringBuilder(256); + String separator = ""; + for (String speciesName : speciesNames) { + speciesAsString.append(separator); + speciesAsString.append(project.getDisplaySpeciesText(speciesName)); + separator = ", "; + } String desc = null; if (speciesNames.length == 1) { - desc = _("coser.business.command.mergespecies.rename.desc", newSpecyName, speciesNames.length, speciesAsString); + desc = _("coser.business.command.mergespecies.rename.desc", + project.getDisplaySpeciesText(newSpecyName), speciesNames.length, speciesAsString.toString()); } else { - desc = _("coser.business.command.mergespecies.desc", newSpecyName, speciesNames.length, speciesAsString); + desc = _("coser.business.command.mergespecies.desc", + project.getDisplaySpeciesText(newSpecyName), speciesNames.length, speciesAsString.toString()); } if (StringUtils.isNotBlank(comment)) { desc += " (" + comment + ")"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -222,13 +222,13 @@ } @Override - public String getLogString(AbstractDataContainer container) { + public String getLogString(Project project, AbstractDataContainer container) { String realFieldName = getRealFieldName(container); return _("coser.business.command.modifyfield.log", _(category.getTranslationKey()), lineNumber, realFieldName, currentValue, newValue); } @Override - public String getDescription(AbstractDataContainer container) { + public String getDescription(Project project, AbstractDataContainer container) { String realFieldName = getRealFieldName(container); String desc = _("coser.business.command.modifyfield.desc", _(category.getTranslationKey()), lineNumber, realFieldName, currentValue, newValue); if (StringUtils.isNotBlank(comment)) { Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -631,7 +631,7 @@ for (String speciesCode : selection.getSelectedSpecies()) { speciesBuilder.append(separator); speciesBuilder.append(project.getDisplaySpeciesText(speciesCode)); - separator = ","; + separator = ", "; } // partie resumé de selection @@ -780,6 +780,7 @@ category = ((CategoryLineCommand)command).getCategory(); line = ((CategoryLineCommand)command).getLineNumber(); } + out.write("<li>"); if (category != null && line != null) { String[] data = null; switch (category) { @@ -796,12 +797,16 @@ data = strataContent.get(line); break; } - out.write("<li>" + command.getLogString(container) + "<br/>"); - out.write("<tt style='color:#5F5A59'>" + StringUtils.join(data, ", ") + "</tt><br /></li>"); + out.write(command.getLogString(project, container) + "<br/>"); + out.write("<tt style='color:#5F5A59'>" + StringUtils.join(data, ", ") + "</tt>"); + } else { + out.write(command.getLogString(project, container)); } - else { - out.write("<li>" + command.getLogString(container) + "</li>"); + // add comment if present + if (StringUtils.isNotEmpty(command.getComment())) { + out.write("<br /><i>" + command.getComment() + "</i>"); } + out.write("</li>"); } out.write("</ol>"); } Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-08-21 10:06:08 UTC (rev 1064) @@ -52,8 +52,8 @@ coser.business.control.error.invalidLengthLengthStep=Invalid length step (authorized centimeters and half-centimeters) coser.business.control.error.invalidLengthLengthStepDetail=Invalid length step %s for species %s coser.business.control.error.invalidLengthLengthStepTip=Length field must be in centimeters. -coser.business.control.error.lengthOutliers=Aberrants lengths -coser.business.control.error.lengthOutliersDetail=Species %s \: length %4$s aberrant (average\: %2$.2f, deviation\: %3$.2f) +coser.business.control.error.lengthOutliers=Lengths values to control +coser.business.control.error.lengthOutliersDetail=Species %s \: length %4$s to control (average\: %2$.2f, deviation\: %3$.2f) coser.business.control.error.minObservationCount=Minimum number of observation not reached coser.business.control.error.minObservationCountDetail=Minimum number of observation not reached (%s) \: %.2f coser.business.control.error.missingCatchHaulFromHaul=Missing haul file hauls in catch file Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-08-21 10:06:08 UTC (rev 1064) @@ -52,8 +52,8 @@ coser.business.control.error.invalidLengthLengthStep=Le pas de longueur est invalide (autorisé centimètre et demi-centimètre) coser.business.control.error.invalidLengthLengthStepDetail=Le pas longueur %s est invalide pour l'espèce %s coser.business.control.error.invalidLengthLengthStepTip=Le champs de longueur doit être en centimètre (ou demi centimètre) -coser.business.control.error.lengthOutliers=Longueurs aberrantes -coser.business.control.error.lengthOutliersDetail=Espèce %s \: longueur %4$s aberrantes (moyenne\: %2$.2f, écart\: %3$.2f) +coser.business.control.error.lengthOutliers=Valeurs de longueurs à contrôler +coser.business.control.error.lengthOutliersDetail=Espèce %s \: longueur %4$s à contrôler (moyenne\: %2$.2f, écart\: %3$.2f) coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f coser.business.control.error.missingCatchHaulFromHaul=Traits du fichier traits absents dans le fichier captures Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerRedoMenu.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerRedoMenu.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerRedoMenu.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -38,6 +38,7 @@ import fr.ifremer.coser.bean.AbstractDataContainer; import fr.ifremer.coser.bean.Control; +import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.command.Command; import fr.ifremer.coser.ui.control.ControlView; @@ -108,12 +109,13 @@ if (controlView != null && controlView.getControl() != null) { Control control = controlView.getControl(); + Project project = controlView.getContextValue(Project.class); menuEnabled = !redoableCommands.isEmpty(); // command in reverse order (only 10 last) for (int i = redoableCommands.size() - 1 ; i >= 0 && i > redoableCommands.size() - 10 ; i--) { Command command = redoableCommands.get(i); - JMenuItem commandMenu = new JMenuItem(command.getDescription(control)); + JMenuItem commandMenu = new JMenuItem(command.getDescription(project, control)); commandMenu.setActionCommand(String.valueOf(i)); commandMenu.addActionListener(this); add(commandMenu); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerUndoMenu.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerUndoMenu.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ContainerUndoMenu.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -38,6 +38,7 @@ import fr.ifremer.coser.bean.AbstractDataContainer; import fr.ifremer.coser.bean.Control; +import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.command.Command; import fr.ifremer.coser.ui.control.ControlView; @@ -98,13 +99,14 @@ if (controlView != null && controlView.getControl() != null) { Control control = controlView.getControl(); + Project project = controlView.getContextValue(Project.class); List<Command> commands = controlView.getControl().getHistoryCommands(); menuEnabled = !commands.isEmpty(); // command in reverse order (only 10 last) for (int i = commands.size() - 1 ; i >= 0 && i > commands.size() - 10 ; i--) { Command command = commands.get(i); - JMenuItem commandMenu = new JMenuItem(command.getDescription(control)); + JMenuItem commandMenu = new JMenuItem(command.getDescription(project, control)); commandMenu.setActionCommand(String.valueOf(i)); commandMenu.addActionListener(this); add(commandMenu); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/CommandListRenderer.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -28,6 +28,7 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.JList; +import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.command.Command; /** @@ -44,6 +45,12 @@ /** serialVersionUID. */ private static final long serialVersionUID = 6780656602646606040L; + protected Project project; + + public CommandListRenderer(Project project) { + this.project = project; + } + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -52,7 +59,7 @@ // can be null here. Renderer is currently used only un selection // replay where merge command don't use container to get desc - String commandDesc = command.getDescription(null); + String commandDesc = command.getDescription(project, null); // is selected is forced to "true", because user can't disable // command in replay selection as of coser version 1.2.x Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayHandler.java 2012-08-21 10:06:08 UTC (rev 1064) @@ -74,10 +74,14 @@ */ public void initReplayView(SelectionReplayView view) { ProjectService projectService = view.getContextValue(ProjectService.class); + Project project = view.getContextValue(Project.class); SortedMap<String, List<String>> selectionsByProject = projectService.getSelectionByProject(); SelectionByProjectTreeModel treeModel = new SelectionByProjectTreeModel(selectionsByProject); view.getSelectionByProjectTree().setModel(treeModel); + + // set list renderer with project to replace species code + view.getCommandList().setCellRenderer(new CommandListRenderer(project)); } /** @@ -268,7 +272,7 @@ for (String species : remaindSpecies) { speciesBuilder.append(separator); speciesBuilder.append(project.getDisplaySpeciesText(species)); - separator = ","; + separator = ", "; } String message = _("coser.ui.selection.replay.missingspecies", speciesBuilder.toString()); view.getMessageArea5().setText(message); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx 2012-08-20 16:57:24 UTC (rev 1063) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/replay/SelectionReplayView.jaxx 2012-08-21 10:06:08 UTC (rev 1064) @@ -183,8 +183,7 @@ <cell weightx="1" weighty="1" fill="both" columns="3"> <JScrollPane> <fr.ifremer.coser.ui.selection.replay.CommandListModel id="commandListModel" /> - <JList id="commandList" model="{commandListModel}" - cellRenderer="{new fr.ifremer.coser.ui.selection.replay.CommandListRenderer()}"/> + <JList id="commandList" model="{commandListModel}" /> </JScrollPane> </cell> </row>

1 0

r1063 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 20 Aug '12

20 Aug '12

Author: echatellier Date: 2012-08-20 18:57:24 +0200 (Mon, 20 Aug 2012) New Revision: 1063 Url: http://forge.codelutin.com/repositories/revision/coser/1063 Log: Fix test Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2012-08-20 16:57:05 UTC (rev 1062) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2012-08-20 16:57:24 UTC (rev 1063) @@ -136,9 +136,6 @@ Assert.assertTrue(fileContent.indexOf(_("coser.business.control.error.allCategories")) > 0); // clean all - File imagesDir = new File(htmlExport.getParentFile(), "images"); - Assert.assertTrue(imagesDir.isDirectory()); - FileUtils.deleteDirectory(imagesDir); htmlExport.delete(); }

1 0

r1062 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by echatellier＠users.forge.codelutin.com 20 Aug '12

20 Aug '12

Author: echatellier Date: 2012-08-20 18:57:05 +0200 (Mon, 20 Aug 2012) New Revision: 1062 Url: http://forge.codelutin.com/repositories/revision/coser/1062 Log: D?\195?\169placement dans la barre d'outils Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-08-20 16:38:27 UTC (rev 1061) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2012-08-20 16:57:05 UTC (rev 1062) @@ -80,7 +80,8 @@ </cell> </row> <row> - <cell columns="2"> + <cell /> + <cell /> <cell fill="horizontal" insets="0" columns="2"> <Table> <row> @@ -117,7 +118,10 @@ </row> </Table> </cell> - <cell columns="4"> + <cell /> + <cell /> + <cell /> + <cell /> </row> <row> <cell weighty="1" weightx="1" fill="both" columns="2">

1 0