Tutti-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
May 2013
- 4 participants
- 180 discussions
Author: tchemit
Date: 2013-05-23 10:14:40 +0200 (Thu, 23 May 2013)
New Revision: 985
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/985
Log:
downgrades swingx to 1.6.4
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-05-22 13:37:31 UTC (rev 984)
+++ trunk/pom.xml 2013-05-23 08:14:40 UTC (rev 985)
@@ -133,7 +133,7 @@
<hibernateVersion>3.6.10.Final</hibernateVersion>
<jaxxVersion>2.5.20-SNAPSHOT</jaxxVersion>
- <swingXVersion>1.6.5-1</swingXVersion>
+ <swingXVersion>1.6.4</swingXVersion>
<xworkVersion>2.3.14.1</xworkVersion>
<slf4jVersion>1.7.5</slf4jVersion>
1
0
r984 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri
by kmorin@users.forge.codelutin.com 22 May '13
by kmorin@users.forge.codelutin.com 22 May '13
22 May '13
Author: kmorin
Date: 2013-05-22 15:37:31 +0200 (Wed, 22 May 2013)
New Revision: 984
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/984
Log:
fixes #2483 [IMPORT PUPITRI] ambiguit?\195?\169 sur la clef de lecture
Modified:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2013-05-22 12:28:46 UTC (rev 983)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2013-05-22 13:37:31 UTC (rev 984)
@@ -58,7 +58,7 @@
public static final String PROPERTY_WEIGHT = "weight";
- protected Integer operationCode;
+ protected String operationCode;
protected String rigNumber;
@@ -73,11 +73,11 @@
public CarrouselRow() {
}
- public Integer getOperationCode() {
+ public String getOperationCode() {
return operationCode;
}
- public void setOperationCode(Integer operationCode) {
+ public void setOperationCode(String operationCode) {
this.operationCode = operationCode;
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2013-05-22 12:28:46 UTC (rev 983)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2013-05-22 13:37:31 UTC (rev 984)
@@ -41,15 +41,7 @@
// import definition
- newMandatoryColumn(CarrouselRow.PROPERTY_OPERATION_CODE, new ValueParser<Integer>() {
-
- public Integer parse(String string) throws ParseException {
- String number = string.substring(1);
- Integer i = Integer.parseInt(number);
- return i;
- }
-
- });
+ newMandatoryColumn(CarrouselRow.PROPERTY_OPERATION_CODE);
newMandatoryColumn(CarrouselRow.PROPERTY_RIG_NUMBER);
newMandatoryColumn(CarrouselRow.PROPERTY_SPECIES_ID, new ValueParser<String>() {
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2013-05-22 12:28:46 UTC (rev 983)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2013-05-22 13:37:31 UTC (rev 984)
@@ -54,7 +54,7 @@
public static final String PROPERTY_EMPTY = "";
- protected Integer operationCode;
+ protected String operationCode;
protected String rigNumber;
@@ -65,11 +65,11 @@
public TrunkRow() {
}
- public Integer getOperationCode() {
+ public String getOperationCode() {
return operationCode;
}
- public void setOperationCode(Integer operationCode) {
+ public void setOperationCode(String operationCode) {
this.operationCode = operationCode;
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2013-05-22 12:28:46 UTC (rev 983)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2013-05-22 13:37:31 UTC (rev 984)
@@ -40,15 +40,7 @@
// import definition
- newMandatoryColumn(TrunkRow.PROPERTY_OPERATION_CODE, new ValueParser<Integer>() {
-
- public Integer parse(String string) throws ParseException {
- String number = string.substring(1);
- Integer i = Integer.parseInt(number);
- return i;
- }
-
- });
+ newMandatoryColumn(TrunkRow.PROPERTY_OPERATION_CODE);
newMandatoryColumn(TrunkRow.PROPERTY_RIG_NUMBER);
newMandatoryColumn(TrunkRow.PROPERTY_DIRECTION, new ValueParser<Directions>() {
@@ -70,7 +62,6 @@
newIgnoredColumn(TrunkRow.PROPERTY_DATE);
newIgnoredColumn(TrunkRow.PROPERTY_TIME);
newIgnoredColumn(TrunkRow.PROPERTY_BALANCE_ID);
- newIgnoredColumn(TrunkRow.PROPERTY_EMPTY);
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-22 12:28:46 UTC (rev 983)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-22 13:37:31 UTC (rev 984)
@@ -177,8 +177,7 @@
TrunkRow.PROPERTY_OPERATION_CODE + separator +
TrunkRow.PROPERTY_RIG_NUMBER + separator +
TrunkRow.PROPERTY_DIRECTION + separator +
- TrunkRow.PROPERTY_WEIGHT + separator +
- TrunkRow.PROPERTY_EMPTY;
+ TrunkRow.PROPERTY_WEIGHT;
FileUtils.writeLines(fileWithHeaders, Collections.singletonList(headers));
log.info(FileUtils.readFileToString(fileWithHeaders));
@@ -191,7 +190,7 @@
Float sortedWeight = 0f;
Float rejectedWeight = 0f;
- Integer operationNumber = operation.getFishingOperationNumber();
+ String operationNumber = operation.getStationNumber();
String rigNumber = operation.getMultirigAggregation();
for (TrunkRow bean : importer) {
@@ -280,7 +279,7 @@
reader = Files.newReader(fileWithHeaders, Charsets.UTF_8);
carrouselImporter = Import.newImport(carrouselCsvModel, reader);
- Integer operationNumber = operation.getFishingOperationNumber();
+ String operationNumber = operation.getStationNumber();
String rigNumber = operation.getMultirigAggregation();
Float carrouselSortedWeight = 0f;
1
0
22 May '13
Author: tchemit
Date: 2013-05-22 14:28:46 +0200 (Wed, 22 May 2013)
New Revision: 983
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/983
Log:
fixes #2474: [TECHN] Gestion des logs : info trac?\195?\169es
updates to mavenpom, jaxx and adagio snapshots
Modified:
trunk/pom.xml
trunk/tutti-persistence/pom.xml
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelper.java
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java
trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java
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/split/SplitBenthosBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java
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/split/SplitSpeciesBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/pom.xml 2013-05-22 12:28:46 UTC (rev 983)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmine</artifactId>
- <version>3.4.10</version>
+ <version>3.4.11-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer</groupId>
@@ -127,18 +127,18 @@
<!-- libraries version -->
<nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>
- <nuitonI18nVersion>2.5</nuitonI18nVersion>
+ <nuitonI18nVersion>2.5.1</nuitonI18nVersion>
<eugenePluginVersion>2.6.2</eugenePluginVersion>
<hibernateVersion>3.6.10.Final</hibernateVersion>
<jaxxVersion>2.5.20-SNAPSHOT</jaxxVersion>
- <swingXVersion>1.6.4</swingXVersion>
- <xworkVersion>2.3.7</xworkVersion>
+ <swingXVersion>1.6.5-1</swingXVersion>
+ <xworkVersion>2.3.14.1</xworkVersion>
<slf4jVersion>1.7.5</slf4jVersion>
- <adagioVersion>3.3.6</adagioVersion>
+ <adagioVersion>3.3.7-SNAPSHOT</adagioVersion>
<i18n.bundles>fr_FR,en_GB</i18n.bundles>
<i18n.silent>true</i18n.silent>
@@ -154,13 +154,12 @@
<license.licenseName>gpl_v3</license.licenseName>
<aspectj.version>1.6.6</aspectj.version>
- <spring.version>3.1.3.RELEASE</spring.version>
+ <spring.version>3.2.3.RELEASE</spring.version>
<slf4j.version>1.6.1</slf4j.version>
<ehcache.version>2.3.0</ehcache.version>
<javassist.version>3.12.1.GA</javassist.version>
<hsqldb.version>2.2.9</hsqldb.version>
- <jdbc.hsqldb.version>1.8.0.7</jdbc.hsqldb.version>
- <jMockVersion>2.5.1</jMockVersion>
+ <jdbc.hsqldb.version>1.8.0.10</jdbc.hsqldb.version>
<!-- Last JRE version to use -->
<jreVersion>1.7.21</jreVersion>
@@ -386,24 +385,11 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.9.0</version>
+ <version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>${jMockVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>${jMockVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
<version>5.4.1</version>
@@ -413,7 +399,7 @@
<dependency>
<groupId>org.xhtmlrenderer</groupId>
<artifactId>flying-saucer-pdf-itext5</artifactId>
- <version>9.0.1</version>
+ <version>9.0.2</version>
<scope>compile</scope>
</dependency>
Modified: trunk/tutti-persistence/pom.xml
===================================================================
--- trunk/tutti-persistence/pom.xml 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-persistence/pom.xml 2013-05-22 12:28:46 UTC (rev 983)
@@ -173,16 +173,6 @@
</dependency>
<dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -81,8 +81,8 @@
super.init();
dbAttachmentDirectory = config.getDbAttachmentDirectory();
- if (log.isInfoEnabled()) {
- log.info("Db Attachment storage: " + dbAttachmentDirectory);
+ if (log.isDebugEnabled()) {
+ log.debug("Db Attachment storage: " + dbAttachmentDirectory);
}
}
@@ -172,8 +172,8 @@
attachment.setPath(filePath);
measurementFile.setPath(filePath);
- if (log.isInfoEnabled()) {
- log.info("Created attachment: " + attachment.getId() +
+ if (log.isDebugEnabled()) {
+ log.debug("Created attachment: " + attachment.getId() +
", path: " + filePath);
}
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -214,8 +214,8 @@
// delete this child and all his children
Integer childBatchId = childBatch.getId();
- if (log.isInfoEnabled()) {
- log.info("Delete child [" + childBatchId + "] of species batch: " + id);
+ if (log.isDebugEnabled()) {
+ log.debug("Delete child [" + childBatchId + "] of species batch: " + id);
}
batchHelper.removeWithChildren(childBatchId);
}
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -90,8 +90,8 @@
result.setId(source.getId());
result.setCatchTotalWeight(source.getWeight());
- if (log.isInfoEnabled()) {
- log.info("Loaded CatchBatch: " + result.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("Loaded CatchBatch: " + result.getId());
}
// Vrac
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -183,8 +183,8 @@
Integer batchId = Integer.valueOf(id);
- if (log.isInfoEnabled()) {
- log.info("Will delete individual observation batch: " +
+ if (log.isDebugEnabled()) {
+ log.debug("Will delete individual observation batch: " +
batchId);
}
samplePersistenceHelper.deleteSample(batchId);
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -109,8 +109,8 @@
entityToMarineLitterBatch(source, target);
result.addChildren(target);
- if (log.isInfoEnabled()) {
- log.info("Loaded CatchBatch Hors Vrac > MarineLetter > " +
+ if (log.isDebugEnabled()) {
+ log.debug("Loaded CatchBatch Hors Vrac > MarineLetter > " +
target.getMarineLitterCategory().getName() + " / " +
target.getMarineLitterSizeCategory().getName() + ": " +
target.getId());
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -224,8 +224,8 @@
// delete this child and all his children
Integer childBatchId = childBatch.getId();
- if (log.isInfoEnabled()) {
- log.info("Delete child [" + childBatchId + "] of species batch: " + id);
+ if (log.isDebugEnabled()) {
+ log.debug("Delete child [" + childBatchId + "] of species batch: " + id);
}
batchHelper.removeWithChildren(childBatchId);
}
@@ -327,8 +327,8 @@
// push back id of created sortingBatch
source.setId(target.getId());
- if (log.isInfoEnabled()) {
- log.info("Create frequency sortingBatch(" + rankOrder + "): " + target.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("Create frequency sortingBatch(" + rankOrder + "): " + target.getId());
}
} else {
@@ -344,8 +344,8 @@
// Remove id from id to remove
notUpdatedChildIds.remove(target.getId());
- if (log.isInfoEnabled()) {
- log.info("Update frequency sortingBatch(" + rankOrder + "): " + target.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("Update frequency sortingBatch(" + rankOrder + "): " + target.getId());
}
}
}
@@ -361,8 +361,8 @@
// Remove obsolete frequencies
for (Integer batchId : notUpdatedChildIds) {
- if (log.isInfoEnabled()) {
- log.info("Remove obsolete frequency sortingBatch: " + batchId);
+ if (log.isDebugEnabled()) {
+ log.debug("Remove obsolete frequency sortingBatch: " + batchId);
}
batchHelper.removeWithChildren(batchId, catchBatch);
}
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelper.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelper.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/ReferentialSynchronizeHelper.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -609,8 +609,8 @@
// gets existing ids in the target db
Set<List<String>> existingIds = getExistingPrimaryKeys(localConnection, table);
- if (log.isInfoEnabled()) {
- log.info(tablePrefix + " existingIds: " + existingIds.size());
+ if (log.isDebugEnabled()) {
+ log.debug(tablePrefix + " existingIds: " + existingIds.size());
}
// update table content
Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/TuttiExportServiceTest.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -75,7 +75,7 @@
public static final String SURVEY_CONTENT =
"Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Id_Sismer;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Chef_Mission;Resp_Salle_Tri;Commentaire\n" +
- "2013;Campagne CGFS;;GWEN DREZ;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;Vincent AURECHE;;;";
+ "2013;Campagne CGFS;;GWEN DREZ;FRA;CGFS - Manche Est / Sud Mer du Nord;Campagne CGFS_2013;01/05/2013 00:00:00;La Barbotière (Gujan-Mestras);31/05/2013 00:00:00;Etang de Palo;AURECHE Vincent;;;";
public static final String OPERATION_CONTENT =
"Annee;Serie;Serie_Partielle;Id_Operation;NumOrdre_Station;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Commentaire\n" +
Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-22 12:28:46 UTC (rev 983)
@@ -27,17 +27,19 @@
# Console output
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p [%20t] (%c:%L) - %m%n
+#log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p [%20t] (%c:%L) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n
# tutti levels
log4j.logger.fr.ifremer.tutti=INFO
-log4j.logger.fr.ifremer.tutti.ui.swing.util=WARN
-log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO
-log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO
+#log4j.logger.fr.ifremer.tutti.ui.swing.util=WARN
+#log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO
+#log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO
log4j.appender.file=org.apache.log4j.RollingFileAppender
log4j.appender.file.file=${tutti.log.file}
log4j.appender.file.MaxFileSize=10MB
log4j.appender.file.MaxBackupIndex=4
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%20t] %c - %m%n
+#log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%20t] %c - %m%n
+log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p %c - %m%n
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -118,8 +118,8 @@
Point point = event.getPoint();
Component component = GetCompopentAtPointVisitor.get(tree, point);
- if (log.isInfoEnabled()) {
- log.info("Component at (" + point + "): " + component);
+ if (log.isDebugEnabled()) {
+ log.debug("Component at (" + point + "): " + component);
}
return component;
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -107,8 +107,8 @@
if (rowMonitor.wasModified()) {
// monitored bean was modified, save it
- if (log.isInfoEnabled()) {
- log.info("Row " + row + " was modified, will save it");
+ if (log.isDebugEnabled()) {
+ log.debug("Row " + row + " was modified, will save it");
}
saveRow(row);
@@ -197,8 +197,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
// close dialog
@@ -281,8 +281,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
Gear gear = getModel().getGear();
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -76,8 +76,8 @@
@Override
public void beforeInitUI() {
- if (log.isInfoEnabled()) {
- log.info("for " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("for " + ui);
}
FishingOperationsUIModel model = new FishingOperationsUIModel();
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -115,8 +115,8 @@
rows = null;
} else {
- if (log.isInfoEnabled()) {
- log.info("Get accidental batch for fishingOperation: " +
+ if (log.isDebugEnabled()) {
+ log.debug("Get accidental batch for fishingOperation: " +
bean.getId());
}
rows = Lists.newArrayList();
@@ -277,8 +277,8 @@
@Override
public void beforeInitUI() {
- if (log.isInfoEnabled()) {
- log.info("beforeInit: " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("beforeInit: " + ui);
}
EditCatchesUIModel catchesUIModel =
@@ -291,8 +291,8 @@
@Override
public void afterInitUI() {
- if (log.isInfoEnabled()) {
- log.info("afterInit: " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("afterInit: " + ui);
}
initUI(ui);
@@ -489,8 +489,8 @@
FishingOperation fishingOperation = getModel().getFishingOperation();
catchBean.setFishingOperation(fishingOperation);
- if (log.isInfoEnabled()) {
- log.info("Selected fishingOperation: " + fishingOperation.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("Selected fishingOperation: " + fishingOperation.getId());
}
if (TuttiEntities.isNew(catchBean)) {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -123,8 +123,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
closeUI(ui);
}
@@ -146,8 +146,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -755,8 +755,8 @@
}
if (split) {
- if (log.isInfoEnabled()) {
- log.info("Open split batch ui for row [" + rowIndex + ']');
+ if (log.isDebugEnabled()) {
+ log.debug("Open split batch ui for row [" + rowIndex + ']');
}
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -181,8 +181,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
closeUI(ui);
}
@@ -225,8 +225,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
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-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -359,8 +359,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
// close dialog
@@ -402,8 +402,8 @@
public void applyRafaleStep(Float step) {
- if (log.isInfoEnabled()) {
- log.info("Will apply rafale step: " + step);
+ if (log.isDebugEnabled()) {
+ log.debug("Will apply rafale step: " + step);
}
BenthosFrequencyUIModel model = getModel();
BenthosFrequencyTableModel tableModel = getTableModel();
@@ -457,7 +457,7 @@
frequencyEditor = editor;
Caracteristic lengthStepCaracteristic = null;
- Float lengthStep = 1f;
+ Float lengthStep;
List<BenthosFrequencyRowModel> editFrequency = Lists.newArrayList();
@@ -567,8 +567,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
frequencyEditor.validateEdition(getModel());
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -239,8 +239,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
closeUI(ui);
}
@@ -317,8 +317,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
@@ -334,8 +334,8 @@
protected void computeSampleWeight(SplitBenthosBatchRowModel row) {
- if (log.isInfoEnabled()) {
- log.info("Will recompute sample weight from row: " + row);
+ if (log.isDebugEnabled()) {
+ log.debug("Will recompute sample weight from row: " + row);
}
Float result = null;
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -273,8 +273,8 @@
@Override
public void beforeInitUI() {
- if (log.isInfoEnabled()) {
- log.info("beforeInit: " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("beforeInit: " + ui);
}
EditCatchesUIModel catchesUIModel =
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -158,8 +158,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
closeUI(ui);
}
@@ -186,8 +186,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -275,8 +275,8 @@
@Override
public void beforeInitUI() {
- if (log.isInfoEnabled()) {
- log.info("beforeInit: " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("beforeInit: " + ui);
}
EditCatchesUIModel catchesUIModel =
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -130,8 +130,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
closeUI(ui);
}
@@ -161,8 +161,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -181,8 +181,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
closeUI(ui);
}
@@ -224,8 +224,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
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-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -356,8 +356,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
// close dialog
@@ -565,8 +565,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
frequencyEditor.validateEdition(getModel());
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -241,8 +241,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
closeUI(ui);
}
@@ -319,8 +319,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -276,8 +276,8 @@
@Override
public void windowClosed(WindowEvent e) {
Component ui = (Component) e.getSource();
- if (log.isInfoEnabled()) {
- log.info("Destroy ui " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Destroy ui " + ui);
}
JAXXUtil.destroy(ui);
}
@@ -524,8 +524,8 @@
data = Lists.newArrayList();
}
- if (log.isInfoEnabled()) {
- log.info("entity comboBox list [" + beanType.getName() + "] : " +
+ if (log.isDebugEnabled()) {
+ log.debug("entity comboBox list [" + beanType.getName() + "] : " +
(data == null ? 0 : data.size()));
}
@@ -562,8 +562,8 @@
context.getDecoratorService();
Decorator<E> decorator = decoratorService.getDecoratorByType(beanType);
- if (log.isInfoEnabled()) {
- log.info("entity list [" + beanType.getName() + "] : " +
+ if (log.isDebugEnabled()) {
+ log.debug("entity list [" + beanType.getName() + "] : " +
(data == null ? 0 : data.size()));
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionSwingWorker.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -94,8 +94,8 @@
}
error = e;
} finally {
- if (log.isInfoEnabled()) {
- log.info("Task [" + this + "] done");
+ if (log.isDebugEnabled()) {
+ log.debug("Task [" + this + "] done");
}
}
}
@@ -106,8 +106,8 @@
protected void done() {
super.done();
- if (log.isInfoEnabled()) {
- log.info("Task [" + this + "] execute done method after all");
+ if (log.isDebugEnabled()) {
+ log.debug("Task [" + this + "] execute done method after all");
}
if (error == null) {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiUIAction.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -84,7 +84,7 @@
public final void actionPerformed(final ActionEvent event) {
if (log.isInfoEnabled()) {
- log.info("Task [" + this + "] starting");
+ log.info("Task [" + getLogicAction() + "] starting");
}
// prepare action
@@ -117,8 +117,8 @@
}
});
- if (log.isInfoEnabled()) {
- log.info("Before execute of action " + action);
+ if (log.isDebugEnabled()) {
+ log.debug("Before execute of action " + action);
}
// perform and release action
@@ -141,8 +141,8 @@
} catch (InterruptedException e) {
// don't care ?
}
- if (log.isInfoEnabled()) {
- log.info("After execute of action " + action + " (worker done? " + worker.isDone() + ")");
+ if (log.isDebugEnabled()) {
+ log.debug("After execute of action " + action + " (worker done? " + worker.isDone() + ")");
}
if (worker.isFailed()) {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -120,8 +120,8 @@
Preconditions.checkNotNull(model, "No model found in editor.");
Object result = model.getAttachment();
- if (log.isInfoEnabled()) {
- log.info("editor value: " + result);
+ if (log.isDebugEnabled()) {
+ log.debug("editor value: " + result);
}
return result;
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -184,8 +184,8 @@
Preconditions.checkNotNull(editRow, "No editRow found.");
- if (log.isInfoEnabled()) {
- log.info("Will edit frequencies for row: " + rowIndex);
+ if (log.isDebugEnabled()) {
+ log.debug("Will edit frequencies for row: " + rowIndex);
}
// get the caracteristics set to the other rows
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -187,8 +187,8 @@
@Override
public void cancel() {
- if (log.isInfoEnabled()) {
- log.info("Cancel UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Cancel UI " + ui);
}
// close dialog
@@ -325,8 +325,8 @@
public void save() {
- if (log.isInfoEnabled()) {
- log.info("Save UI " + ui);
+ if (log.isDebugEnabled()) {
+ log.debug("Save UI " + ui);
}
caracteristicMapCellEditor.validateEdition(getModel());
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -119,8 +119,8 @@
Preconditions.checkNotNull(model, "No model found in editor.");
Object result = model.getComment();
- if (log.isInfoEnabled()) {
- log.info("editor value: " + result);
+ if (log.isDebugEnabled()) {
+ log.debug("editor value: " + result);
}
return result;
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -111,14 +111,14 @@
this.rows = null;
if (createEmptyRowIsEmpty && data.isEmpty()) {
- if (log.isInfoEnabled()) {
- log.info("Creates a first empty row on tableModel " + this);
+ if (log.isDebugEnabled()) {
+ log.debug("Creates a first empty row on tableModel " + this);
}
// add a first edit line
data.add(createNewRow());
}
- if (log.isInfoEnabled()) {
- log.info("Set " + data.size() + " row(s) in table model " + this);
+ if (log.isDebugEnabled()) {
+ log.debug("Set " + data.size() + " row(s) in table model " + this);
}
this.rows = data;
onRowsChanged(data);
@@ -217,8 +217,8 @@
public final Object getValueAt(int rowIndex, int columnIndex) {
R entry = getEntry(rowIndex);
ColumnIdentifier<R> identifier = getIdentifier(columnIndex);
- if (log.isInfoEnabled()) {
- log.info("columnIndex: " + columnIndex + " :: " + identifier.getPropertyName());
+ if (log.isDebugEnabled()) {
+ log.debug("columnIndex: " + columnIndex + " :: " + identifier.getPropertyName());
}
Object result = identifier.getValue(entry);
return result;
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-22 09:51:40 UTC (rev 982)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-05-22 12:28:46 UTC (rev 983)
@@ -174,8 +174,8 @@
(Boolean) newValue);
} else if (!propertiesToSkip.contains(propertyName)) {
- if (log.isInfoEnabled()) {
- log.info("row [" + rowIndex + "] property " +
+ if (log.isDebugEnabled()) {
+ log.debug("row [" + rowIndex + "] property " +
propertyName + " changed from " + oldValue +
" to " + newValue);
}
@@ -191,8 +191,8 @@
public void propertyChange(PropertyChangeEvent evt) {
R oldValue = (R) evt.getOldValue();
R newValue = (R) evt.getNewValue();
- if (log.isInfoEnabled()) {
- log.info("Monitor row changed from " +
+ if (log.isDebugEnabled()) {
+ log.debug("Monitor row changed from " +
oldValue + " to " + newValue);
}
if (oldValue != null) {
@@ -214,8 +214,8 @@
}
protected void onModelRowsChanged(List<R> rows) {
- if (log.isInfoEnabled()) {
- log.info("Will set " + (rows == null ? 0 : rows.size()) +
+ if (log.isDebugEnabled()) {
+ log.debug("Will set " + (rows == null ? 0 : rows.size()) +
" rows on model.");
}
if (CollectionUtils.isNotEmpty(rows)) {
@@ -232,8 +232,8 @@
R row,
Boolean oldValue,
Boolean newValue) {
- if (log.isInfoEnabled()) {
- log.info("row [" + rowIndex + "] modify state changed from " +
+ if (log.isDebugEnabled()) {
+ log.debug("row [" + rowIndex + "] modify state changed from " +
oldValue + " to " + newValue);
}
}
@@ -243,8 +243,8 @@
Boolean oldValue,
Boolean newValue) {
- if (log.isInfoEnabled()) {
- log.info("row [" + rowIndex + "] valid state changed from " +
+ if (log.isDebugEnabled()) {
+ log.debug("row [" + rowIndex + "] valid state changed from " +
oldValue + " to " + newValue);
}
@@ -257,8 +257,8 @@
R oldRow,
int newRowIndex,
R newRow) {
- if (log.isInfoEnabled()) {
- log.info("Selected row changed from [" + oldRowIndex + "] to [" +
+ if (log.isDebugEnabled()) {
+ log.debug("Selected row changed from [" + oldRowIndex + "] to [" +
newRowIndex + "]");
}
}
@@ -379,8 +379,8 @@
}
};
- if (log.isInfoEnabled()) {
- log.info("Intall " + tableSelectionListener + " on tableModel " + getTableModel());
+ if (log.isDebugEnabled()) {
+ log.debug("Intall " + tableSelectionListener + " on tableModel " + getTableModel());
}
getTable().getSelectionModel().addListSelectionListener(tableSelectionListener);
@@ -390,8 +390,8 @@
if (tableSelectionListener != null) {
- if (log.isInfoEnabled()) {
- log.info("Desintall " + tableSelectionListener);
+ if (log.isDebugEnabled()) {
+ log.debug("Desintall " + tableSelectionListener);
}
// there was a previous selection listener, remove it
@@ -460,8 +460,8 @@
}
};
- if (log.isInfoEnabled()) {
- log.info("Intall " + keyAdapter);
+ if (log.isDebugEnabled()) {
+ log.debug("Intall " + keyAdapter);
}
table.addKeyListener(keyAdapter);
@@ -481,8 +481,8 @@
if (keyAdapter != null) {
- if (log.isInfoEnabled()) {
- log.info("Desintall " + keyAdapter);
+ if (log.isDebugEnabled()) {
+ log.debug("Desintall " + keyAdapter);
}
getTable().removeKeyListener(keyAdapter);
@@ -530,59 +530,4 @@
}
}
- //------------------------------------------------------------------------//
- //-- Public methods --//
- //------------------------------------------------------------------------//
-
-// public void autoSelectRowInTable(MouseEvent e, JPopupMenu popup) {
-//
-// boolean rightClick = SwingUtilities.isRightMouseButton(e);
-//
-// if (rightClick || SwingUtilities.isLeftMouseButton(e)) {
-//
-// // get the coordinates of the mouse click
-// Point p = e.getPoint();
-//
-// JXTable source = (JXTable) e.getSource();
-//
-// int[] selectedRows = source.getSelectedRows();
-//
-// // get the row index at this point
-// int rowIndex = source.rowAtPoint(p);
-//
-// if (log.isDebugEnabled()) {
-// log.debug("At point [" + p + "] found Row " + rowIndex);
-// }
-//
-// boolean canContinue = true;
-//
-// if (source.isEditing()) {
-//
-// // stop editing
-// boolean stopEdit = source.getCellEditor().stopCellEditing();
-// if (!stopEdit) {
-// if (log.isWarnEnabled()) {
-// log.warn("Could not stop edit cell...");
-// }
-// canContinue = false;
-// }
-// }
-//
-// if (canContinue) {
-//
-// // select row (could empty selection)
-// if (rowIndex == -1) {
-// source.clearSelection();
-// } else if (!ArrayUtils.contains(selectedRows, rowIndex)) {
-// source.setRowSelectionInterval(rowIndex, rowIndex);
-// }
-//
-// if (rightClick) {
-//
-// // on right click show popup
-// popup.show(source, e.getX(), e.getY());
-// }
-// }
-// }
-// }
}
1
0
r982 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit@users.forge.codelutin.com 22 May '13
by tchemit@users.forge.codelutin.com 22 May '13
22 May '13
Author: tchemit
Date: 2013-05-22 11:51:40 +0200 (Wed, 22 May 2013)
New Revision: 982
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/982
Log:
remove unused dao
Modified:
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-05-22 09:19:40 UTC (rev 981)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-05-22 09:51:40 UTC (rev 982)
@@ -29,14 +29,12 @@
import fr.ifremer.adagio.core.dao.data.operation.FishingOperation;
import fr.ifremer.adagio.core.dao.data.survey.fishingTrip.FishingTrip;
import fr.ifremer.adagio.core.dao.data.vessel.feature.person.VesselPersonFeatures;
-import fr.ifremer.adagio.core.dao.data.vessel.feature.person.VesselPersonFeaturesDao;
import fr.ifremer.adagio.core.dao.referential.VesselPersonRole;
import fr.ifremer.adagio.core.dao.referential.VesselPersonRoleImpl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;
@@ -53,9 +51,6 @@
private static final Log log =
LogFactory.getLog(VesselPersonFeaturesPersistenceHelper.class);
- @Resource(name = "vesselPersonFeaturesDao")
- protected VesselPersonFeaturesDao vesselPersonFeaturesDao;
-
public VesselPersonFeaturesPersistenceHelper() {
}
@@ -99,7 +94,6 @@
vesselPersonFeatures.setCreationDate(fishingTrip.getCreationDate());
vesselPersonFeatures.setQualityFlag(fishingTrip.getQualityFlag());
vesselPersonFeatures.setRankOrder((short) 1);
-// vesselPersonFeaturesDao.create(vesselPersonFeatures);
}
addRole(role, vesselPersonFeatures);
@@ -131,14 +125,13 @@
vesselPersonFeatures.setCreationDate(new Date());
vesselPersonFeatures.setQualityFlag(fishingOperation.getQualityFlag());
vesselPersonFeatures.setRankOrder((short) 1);
-// vesselPersonFeaturesDao.create(vesselPersonFeatures);
}
addRole(role, vesselPersonFeatures);
}
protected void addRole(VesselPersonRole role,
- VesselPersonFeatures vesselPersonFeatures) {
+ VesselPersonFeatures vesselPersonFeatures) {
Person person = vesselPersonFeatures.getPerson();
if (vesselPersonFeatures.getVesselPersonRoles().contains(role)) {
if (log.isWarnEnabled()) {
1
0
r981 - in trunk: tutti-service tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by tchemit@users.forge.codelutin.com 22 May '13
by tchemit@users.forge.codelutin.com 22 May '13
22 May '13
Author: tchemit
Date: 2013-05-22 11:19:40 +0200 (Wed, 22 May 2013)
New Revision: 981
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/981
Log:
optimize dependencies + fix java 1.7 code
Modified:
trunk/tutti-service/pom.xml
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java
Modified: trunk/tutti-service/pom.xml
===================================================================
--- trunk/tutti-service/pom.xml 2013-05-22 09:11:54 UTC (rev 980)
+++ trunk/tutti-service/pom.xml 2013-05-22 09:19:40 UTC (rev 981)
@@ -125,11 +125,6 @@
<artifactId>xwork-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </dependency>
-
<!-- Logging -->
<dependency>
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-22 09:11:54 UTC (rev 980)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-05-22 09:19:40 UTC (rev 981)
@@ -39,13 +39,14 @@
import fr.ifremer.tutti.ui.swing.util.CloseableUI;
import fr.ifremer.tutti.ui.swing.util.TuttiUI;
import jaxx.runtime.validator.swing.SwingValidator;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jdesktop.swingx.JXTable;
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.SwingUtilities;
+import java.awt.Point;
+import java.awt.Rectangle;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
@@ -242,7 +243,7 @@
boolean viewMenuEnabled = false;
if (gear != null) {
editMenuEnabled = !getModel().isCreate() && !getModel().isModify()
- && (!gear.isScientificGear() || persistenceService.isTemporary(gear));
+ && (!gear.isScientificGear() || persistenceService.isTemporary(gear));
viewMenuEnabled = true;
ui.setContextValue(gear);
}
@@ -271,14 +272,14 @@
// get the point in the middle lower of the cell
Point p = new Point(r.x + r.width / 2, r.y + r.height);
- List<Gear> gears = source.getSelectedValuesList();
+ Gear[] gears = (Gear[]) source.getSelectedValues();
boolean editMenuEnabled = false;
boolean viewMenuEnabled = false;
- if (gears != null && gears.size() == 1) {
- Gear gear = gears.get(0);
+ if (gears != null && gears.length == 1) {
+ Gear gear = gears[0];
editMenuEnabled = !getModel().isCreate() && !getModel().isModify()
- && (!gear.isScientificGear() || persistenceService.isTemporary(gear));
+ && (!gear.isScientificGear() || persistenceService.isTemporary(gear));
viewMenuEnabled = true;
ui.setContextValue(gear);
}
1
0
r980 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service resources/i18n
by tchemit@users.forge.codelutin.com 22 May '13
by tchemit@users.forge.codelutin.com 22 May '13
22 May '13
Author: tchemit
Date: 2013-05-22 11:11:54 +0200 (Wed, 22 May 2013)
New Revision: 980
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/980
Log:
add missing i18n
Modified:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties
trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-05-22 09:09:52 UTC (rev 979)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-05-22 09:11:54 UTC (rev 980)
@@ -139,6 +139,7 @@
n_("tutti.property.protocol");
n_("tutti.property.label");
n_("tutti.property.name");
+ n_("tutti.property.person");
n_("tutti.property.firstName");
n_("tutti.property.lastName");
n_("tutti.property.department");
Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties
===================================================================
--- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 09:09:52 UTC (rev 979)
+++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 09:11:54 UTC (rev 980)
@@ -34,6 +34,7 @@
tutti.property.multirigAggregation=
tutti.property.name=
tutti.property.parameterName=
+tutti.property.person=
tutti.property.program=
tutti.property.protocol=
tutti.property.refTaxCode=
Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
===================================================================
--- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-22 09:09:52 UTC (rev 979)
+++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-22 09:11:54 UTC (rev 980)
@@ -32,6 +32,7 @@
tutti.property.multirigAggregation=Numéro de poche
tutti.property.name=Nom
tutti.property.parameterName=Paramètre
+tutti.property.person=Personne
tutti.property.program=Série de campagne
tutti.property.protocol=Protocole de saisie
tutti.property.refTaxCode=Code RefTax
1
0
r979 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by kmorin@users.forge.codelutin.com 22 May '13
by kmorin@users.forge.codelutin.com 22 May '13
22 May '13
Author: kmorin
Date: 2013-05-22 11:09:52 +0200 (Wed, 22 May 2013)
New Revision: 979
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/979
Log:
fixes #2485 [DONNEES] Les noms et pr?\195?\169noms des personnes sont invers?\195?\169s dans l'UI
Modified:
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-05-22 08:42:35 UTC (rev 978)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-05-22 09:09:52 UTC (rev 979)
@@ -905,8 +905,8 @@
protected Person loadPerson(Object[] source) {
Person target = TuttiBeanFactory.newPerson();
target.setId(String.valueOf(source[0]));
- target.setFirstName((String) source[1]);
- target.setLastName((String) source[2]);
+ target.setLastName((String) source[1]);
+ target.setFirstName((String) source[2]);
target.setDepartment((String) source[3]);
setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], target);
return target;
1
0
r978 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/util resources/i18n
by tchemit@users.forge.codelutin.com 22 May '13
by tchemit@users.forge.codelutin.com 22 May '13
22 May '13
Author: tchemit
Date: 2013-05-22 10:42:35 +0200 (Wed, 22 May 2013)
New Revision: 978
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/978
Log:
fixes #2473: [TECHN] Message indiquant que le serveur de MAJ n'est pas dispo
possibilite d'utiliser du html dans les businessException messages
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.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_fr_FR.properties
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-05-22 08:23:24 UTC (rev 977)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-05-22 08:42:35 UTC (rev 978)
@@ -57,11 +57,11 @@
public void showErrorDialog(String message, Throwable cause) {
if (cause == null) {
- JOptionPane.showMessageDialog(context.getMainUI(), message,
+ JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>"+message+"</body></html>",
_("tutti.error.ui.business.error"),
JOptionPane.ERROR_MESSAGE);
} else if (cause instanceof TuttiBusinessException) {
- JOptionPane.showMessageDialog(context.getMainUI(), cause.getMessage(),
+ JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>"+cause.getMessage()+"</body></html>",
_("tutti.error.ui.business.error"),
JOptionPane.ERROR_MESSAGE);
} else {
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-05-22 08:23:24 UTC (rev 977)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-05-22 08:42:35 UTC (rev 978)
@@ -357,9 +357,9 @@
public static void tryToConnectToUpdateUrl(String url, String i18nKey) {
try {
URLConnection urlConnection = new URL(url).openConnection();
- urlConnection.setConnectTimeout(5000);
+ urlConnection.setConnectTimeout(10000);
urlConnection.connect();
- } catch (IOException e) {
+ } catch (Exception e) {
if (log.isErrorEnabled()) {
log.error("Could not connect to " + url, e);
}
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-05-22 08:23:24 UTC (rev 977)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-22 08:42:35 UTC (rev 978)
@@ -902,11 +902,11 @@
tutti.editSpeciesFrequencies.table.header.number=Nombre
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 %s n'est pas joignable)
+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.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html>
tutti.error.ui.business.error=Erreur
tutti.error.ui.other.error=Erreur
-tutti.error.update.could.not.reach.url=Mise à jour impossible (l'url %s n'est pas joignable)
+tutti.error.update.could.not.reach.url=Mise à jour impossible (l'url <strong>%s</strong> n'est pas joignable)
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
1
0
r977 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch tutti-service/src/main/resources/i18n
by tchemit@users.forge.codelutin.com 22 May '13
by tchemit@users.forge.codelutin.com 22 May '13
22 May '13
Author: tchemit
Date: 2013-05-22 10:23:24 +0200 (Wed, 22 May 2013)
New Revision: 977
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/977
Log:
refs #2474: [TECHN] Gestion des logs : info trac?\195?\169es
fixes #2457: [CAMPAGNE] Probl?\195?\168me changement de responsable de campagne non pris en compte
fixes #2446: [CAMPAGNE] Le responsable salle de tri n'est pas sauvegard?\195?\169
fixes #2450: [TRAIT] Doublon en tant que saisisseur
Modified:
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java
trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties
trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-05-22 08:23:24 UTC (rev 977)
@@ -116,8 +116,8 @@
target.setSpecies(species);
entityToBenthosBatch(source, target);
result.addChildren(target);
- if (log.isInfoEnabled()) {
- log.info("Loaded CatchBatch Vrac > Benthos > Alive Itemized > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("Loaded CatchBatch Vrac > Benthos > Alive Itemized > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId());
}
}
}
@@ -141,8 +141,8 @@
entityToBenthosBatch(source, target);
result.addChildren(target);
- if (log.isInfoEnabled()) {
- log.info("Loaded CatchBatch Hors Vrac > Benthos > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("Loaded CatchBatch Hors Vrac > Benthos > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId());
}
}
}
@@ -388,8 +388,8 @@
BenthosBatch targetChild = TuttiBeanFactory.newBenthosBatch();
targetChild.setSpecies(target.getSpecies());
entityToBenthosBatch(sourceChild, targetChild);
- if (log.isInfoEnabled()) {
- log.info("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId());
}
if (targetChild.getSampleCategoryValue() != null) {
targetChilds.add(targetChild);
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-05-22 08:23:24 UTC (rev 977)
@@ -966,17 +966,18 @@
if (CollectionUtils.isNotEmpty(source.getRecorderPerson())) {
for (Person person : source.getRecorderPerson()) {
Integer personId = person.getIdAsInt();
- vesselPersonFeaturesPersistenceHelper.fillVesselPersonFeatures(vesselPersonFeaturesMap,
- personId,
- target,
- recorderPersonRole);
+ vesselPersonFeaturesPersistenceHelper.fillVesselPersonFeatures(
+ vesselPersonFeaturesMap,
+ personId,
+ target,
+ recorderPersonRole);
}
}
- if (fishingTrip.getVesselPersonFeatures() == null) {
- fishingTrip.setVesselPersonFeatures(Sets.<VesselPersonFeatures>newHashSet());
+ if (target.getVesselPersonFeatures() == null) {
+ target.setVesselPersonFeatures(Sets.<VesselPersonFeatures>newHashSet());
}
- fishingTrip.getVesselPersonFeatures().clear();
- fishingTrip.getVesselPersonFeatures().addAll(vesselPersonFeaturesMap.values());
+ target.getVesselPersonFeatures().clear();
+ target.getVesselPersonFeatures().addAll(vesselPersonFeaturesMap.values());
// Comment
target.setComments(source.getComment());
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-05-22 08:23:24 UTC (rev 977)
@@ -38,7 +38,6 @@
import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl;
import fr.ifremer.tutti.TuttiBusinessException;
import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory;
-import fr.ifremer.tutti.persistence.entities.TuttiEntities;
import fr.ifremer.tutti.persistence.entities.data.BatchContainer;
import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum;
import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch;
@@ -430,8 +429,8 @@
SpeciesBatch targetChild = TuttiBeanFactory.newSpeciesBatch();
targetChild.setSpecies(target.getSpecies());
entityToSpeciesBatch(sourceChild, targetChild);
- if (log.isInfoEnabled()) {
- log.info("Loaded CatchBatch (Vrac|Hors Vrac) > Species > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId());
+ if (log.isDebugEnabled()) {
+ log.debug("Loaded CatchBatch (Vrac|Hors Vrac) > Species > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId());
}
if (targetChild.getSampleCategoryValue() != null) {
targetChilds.add(targetChild);
@@ -480,8 +479,6 @@
Preconditions.checkNotNull(source.getFishingOperation());
Preconditions.checkNotNull(source.getFishingOperation().getId());
- boolean createEntity = TuttiEntities.isNew(source);
-
Collection<QuantificationMeasurement> quantificationMeasurements = target.getQuantificationMeasurements();
Collection<SortingMeasurement> sortingMeasurements = target.getSortingMeasurements();
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-05-22 08:21:51 UTC (rev 976)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/VesselPersonFeaturesPersistenceHelper.java 2013-05-22 08:23:24 UTC (rev 977)
@@ -24,14 +24,19 @@
* #L%
*/
+import fr.ifremer.adagio.core.dao.administration.user.Person;
import fr.ifremer.adagio.core.dao.administration.user.PersonImpl;
import fr.ifremer.adagio.core.dao.data.operation.FishingOperation;
import fr.ifremer.adagio.core.dao.data.survey.fishingTrip.FishingTrip;
import fr.ifremer.adagio.core.dao.data.vessel.feature.person.VesselPersonFeatures;
+import fr.ifremer.adagio.core.dao.data.vessel.feature.person.VesselPersonFeaturesDao;
import fr.ifremer.adagio.core.dao.referential.VesselPersonRole;
import fr.ifremer.adagio.core.dao.referential.VesselPersonRoleImpl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;
@@ -44,6 +49,13 @@
@Component("vesselPersonFeaturesPersistenceHelper")
public class VesselPersonFeaturesPersistenceHelper extends AbstractPersistenceService {
+ /** Logger. */
+ private static final Log log =
+ LogFactory.getLog(VesselPersonFeaturesPersistenceHelper.class);
+
+ @Resource(name = "vesselPersonFeaturesDao")
+ protected VesselPersonFeaturesDao vesselPersonFeaturesDao;
+
public VesselPersonFeaturesPersistenceHelper() {
}
@@ -67,23 +79,30 @@
VesselPersonFeatures vesselPersonFeatures =
vesselPersonFeaturesPerPerson.get(personId);
if (vesselPersonFeatures == null) {
+
+ PersonImpl person = load(PersonImpl.class, personId);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Create an new vesselPersonFeatures for person: [" + personId + "]" + person.getFirstname() + " - " + person.getLastname());
+ }
+
vesselPersonFeatures = VesselPersonFeatures.Factory.newInstance();
vesselPersonFeaturesPerPerson.put(personId, vesselPersonFeatures);
- }
+ vesselPersonFeatures.setPerson(person);
- PersonImpl person = load(PersonImpl.class, personId);
- vesselPersonFeatures.setFishingTrip(fishingTrip);
- vesselPersonFeatures.setPerson(person);
- vesselPersonFeatures.getVesselPersonRoles().add(role);
+ vesselPersonFeatures.setFishingTrip(fishingTrip);
+ vesselPersonFeatures.setStartDate(fishingTrip.getDepartureDateTime());
+ vesselPersonFeatures.setEndDate(fishingTrip.getReturnDateTime());
+ vesselPersonFeatures.setVessel(fishingTrip.getVessel());
+ vesselPersonFeatures.setProgram(fishingTrip.getProgram());
- vesselPersonFeatures.setStartDate(fishingTrip.getDepartureDateTime());
- vesselPersonFeatures.setEndDate(fishingTrip.getReturnDateTime());
- vesselPersonFeatures.setVessel(fishingTrip.getVessel());
- vesselPersonFeatures.setProgram(fishingTrip.getProgram());
+ vesselPersonFeatures.setCreationDate(fishingTrip.getCreationDate());
+ vesselPersonFeatures.setQualityFlag(fishingTrip.getQualityFlag());
+ vesselPersonFeatures.setRankOrder((short) 1);
+// vesselPersonFeaturesDao.create(vesselPersonFeatures);
+ }
- vesselPersonFeatures.setCreationDate(fishingTrip.getCreationDate());
- vesselPersonFeatures.setQualityFlag(fishingTrip.getQualityFlag());
- vesselPersonFeatures.setRankOrder((short) 1);
+ addRole(role, vesselPersonFeatures);
}
public void fillVesselPersonFeatures(Map<Integer, VesselPersonFeatures> vesselPersonFeaturesPerPerson,
@@ -94,23 +113,45 @@
VesselPersonFeatures vesselPersonFeatures =
vesselPersonFeaturesPerPerson.get(personId);
if (vesselPersonFeatures == null) {
+
+ PersonImpl person = load(PersonImpl.class, personId);
+ if (log.isDebugEnabled()) {
+ log.debug("Create an new vesselPersonFeatures for person: [" + personId + "]" + person.getFirstname() + " - " + person.getLastname());
+ }
+
vesselPersonFeatures = VesselPersonFeatures.Factory.newInstance();
vesselPersonFeaturesPerPerson.put(personId, vesselPersonFeatures);
+ vesselPersonFeatures.setOperation(fishingOperation);
+ vesselPersonFeatures.setPerson(person);
+ vesselPersonFeatures.setStartDate(fishingOperation.getStartDateTime());
+ vesselPersonFeatures.setEndDate(fishingOperation.getEndDateTime());
+ vesselPersonFeatures.setVessel(fishingOperation.getVessel());
+ vesselPersonFeatures.setProgram(fishingOperation.getFishingTrip().getProgram());
+
+ vesselPersonFeatures.setCreationDate(new Date());
+ vesselPersonFeatures.setQualityFlag(fishingOperation.getQualityFlag());
+ vesselPersonFeatures.setRankOrder((short) 1);
+// vesselPersonFeaturesDao.create(vesselPersonFeatures);
}
- PersonImpl person = load(PersonImpl.class, personId);
+ addRole(role, vesselPersonFeatures);
+ }
- vesselPersonFeatures.setOperation(fishingOperation);
- vesselPersonFeatures.setPerson(person);
- vesselPersonFeatures.getVesselPersonRoles().add(role);
+ protected void addRole(VesselPersonRole role,
+ VesselPersonFeatures vesselPersonFeatures) {
+ Person person = vesselPersonFeatures.getPerson();
+ if (vesselPersonFeatures.getVesselPersonRoles().contains(role)) {
+ if (log.isWarnEnabled()) {
+ log.warn("vessel person feature for person: " + person.getId() + " with role: " + role.getName() + " already exist, do not add it twice.");
+ }
+ } else {
- vesselPersonFeatures.setStartDate(fishingOperation.getStartDateTime());
- vesselPersonFeatures.setEndDate(fishingOperation.getEndDateTime());
- vesselPersonFeatures.setVessel(fishingOperation.getVessel());
- vesselPersonFeatures.setProgram(fishingOperation.getFishingTrip().getProgram());
+ // add this new role
+ if (log.isInfoEnabled()) {
+ log.info("Add vessel person feature for person: " + person.getId() + " with role: " + role.getName());
+ }
+ vesselPersonFeatures.getVesselPersonRoles().add(role);
- vesselPersonFeatures.setCreationDate(new Date());
- vesselPersonFeatures.setQualityFlag(fishingOperation.getQualityFlag());
- vesselPersonFeatures.setRankOrder((short) 1);
+ }
}
}
\ No newline at end of file
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-05-22 08:21:51 UTC (rev 976)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2013-05-22 08:23:24 UTC (rev 977)
@@ -505,8 +505,8 @@
params[3 * i + 2] = sortingQualitativeValueId;
}
SortingBatch result = catchBatchDao.getSortingBatch(childs, params);
- if (result != null && debugMessage != null && log.isInfoEnabled()) {
- log.info("Loaded " + debugMessage + ": " + result.getId());
+ if (result != null && debugMessage != null && log.isDebugEnabled()) {
+ log.debug("Loaded " + debugMessage + ": " + result.getId());
}
return result;
}
Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties
===================================================================
--- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 08:21:51 UTC (rev 976)
+++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-05-22 08:23:24 UTC (rev 977)
@@ -75,6 +75,7 @@
tutti.service.exportCruise.exportMarineLitters=
tutti.service.exportCruise.exportOperations=
tutti.service.exportCruise.exportParameters=
+tutti.service.exportCruise.exportSpecies=
tutti.service.exportCruise.exportSurvey=
tutti.service.exportSumatra.error.species.null=
tutti.service.exportSumatra.error.station.null=
Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
===================================================================
--- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-22 08:21:51 UTC (rev 976)
+++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-05-22 08:23:24 UTC (rev 977)
@@ -69,11 +69,11 @@
tutti.service.exportCruise.checkCruise=Vérification de la campagne %s
tutti.service.exportCruise.exportAccidentalCatches=Export du fichier <strong>accidentalCatch.csv</strong> pour la campagne %s
tutti.service.exportCruise.exportCatches=Export du fichier <strong>catch.csv</strong> pour la campagne %s
-tutti.service.exportCruise.exportSpecies=Export du fichier <strong>species.csv</strong> pour la campagne %s
tutti.service.exportCruise.exportIndividualObservations=Export du fichier <strong>individualObservation.csv</strong> pour la campagne %s
tutti.service.exportCruise.exportMarineLitters=Export du fichier <strong>marineLitter.csv</strong> pour la campagne %s
tutti.service.exportCruise.exportOperations=Export du fichier <strong>operations.csv</strong> pour la campagne %s
tutti.service.exportCruise.exportParameters=Export du fichier <strong>parameters.csv</strong> pour la campagne %s
+tutti.service.exportCruise.exportSpecies=Export du fichier <strong>species.csv</strong> pour la campagne %s
tutti.service.exportCruise.exportSurvey=Export du fichier <strong>survey.csv</strong> pour la campagne %s
tutti.service.exportSumatra.error.species.null=L'espèce est nulle
tutti.service.exportSumatra.error.station.null=Le trait est nul
1
0
r976 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit@users.forge.codelutin.com 22 May '13
by tchemit@users.forge.codelutin.com 22 May '13
22 May '13
Author: tchemit
Date: 2013-05-22 10:21:51 +0200 (Wed, 22 May 2013)
New Revision: 976
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/976
Log:
fixes #2484: [CAMPAGNE] Changement du navire sur les op?\195?\169rations non n?\195?\169cessaire
Modified:
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-05-21 17:12:55 UTC (rev 975)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-05-22 08:21:51 UTC (rev 976)
@@ -51,7 +51,12 @@
import fr.ifremer.adagio.core.dao.referential.location.Location;
import fr.ifremer.adagio.core.dao.referential.location.LocationDao;
import fr.ifremer.adagio.core.dao.referential.location.LocationImpl;
-import fr.ifremer.adagio.core.dao.referential.pmfm.*;
+import fr.ifremer.adagio.core.dao.referential.pmfm.Pmfm;
+import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmDao;
+import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmImpl;
+import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValue;
+import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueDao;
+import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl;
import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus;
import fr.ifremer.tutti.persistence.entities.CaracteristicMap;
import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory;
@@ -59,8 +64,14 @@
import fr.ifremer.tutti.persistence.entities.data.Cruise;
import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
import fr.ifremer.tutti.persistence.entities.data.Program;
-import fr.ifremer.tutti.persistence.entities.referential.*;
+import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;
+import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue;
+import fr.ifremer.tutti.persistence.entities.referential.Gear;
+import fr.ifremer.tutti.persistence.entities.referential.Person;
+import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation;
+import fr.ifremer.tutti.persistence.entities.referential.Vessel;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.type.IntegerType;
@@ -72,7 +83,12 @@
import javax.annotation.Resource;
import java.io.Serializable;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* @author tchemit <chemit(a)codelutin.com>
@@ -282,16 +298,23 @@
ScientificCruise scientificCruise = scientificCruiseDao.load(Integer.valueOf(bean.getId()));
if (scientificCruise == null) {
- throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + bean.getId());
+ throw new DataRetrievalFailureException(
+ "Could not retrieve cruise with id=" + bean.getId());
}
- boolean vesselChanged = !bean.getVessel().equals(scientificCruise.getVessel());
+ boolean vesselChanged = ObjectUtils.notEqual(
+ bean.getVessel().getId(),
+ scientificCruise.getVessel().getCode());
cruiseToEntity(bean, scientificCruise);
scientificCruiseDao.update(scientificCruise);
if (vesselChanged) {
Vessel vessel = bean.getVessel();
+ if (log.isInfoEnabled()) {
+ log.info("Change vessel to " + vessel.getId() +
+ " for cruise: " + bean.getId());
+ }
List<FishingOperation> operations = fishingOperationService.getAllFishingOperation(bean.getId());
List<FishingOperation> operationsToSave = Lists.newArrayList();
for (FishingOperation operation : operations) {
1
0