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()); -// } -// } -// } -// } }