Author: tchemit Date: 2013-03-27 22:56:27 +0100 (Wed, 27 Mar 2013) New Revision: 694 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/694 Log: prepare release (reformat code, clean imports, ...) Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.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/PupitriCatch.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.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/FishingOperationsUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.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/content/operation/fishing/AbstractCaracteristicTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabContentModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentModelAware.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicRow.java trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -101,11 +101,11 @@ @Override public void setSize(long size) { - setTotal((int)size); + setTotal((int) size); } @Override public void setCurrent(long current) { - setCurrent((int)current); + setCurrent((int) current); } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-03-27 21:56:27 UTC (rev 694) @@ -49,8 +49,8 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceService; import fr.ifremer.tutti.persistence.service.AttachmentPersistenceService; +import fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceService; import fr.ifremer.tutti.persistence.service.CatchBatchPersistenceService; -import fr.ifremer.tutti.persistence.service.BenthosBatchPersistenceService; import fr.ifremer.tutti.persistence.service.CruisePersistenceService; import fr.ifremer.tutti.persistence.service.FishingOperationPersistenceService; import fr.ifremer.tutti.persistence.service.MacroWasteBatchPersistenceService; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java 2013-03-27 21:56:27 UTC (rev 694) @@ -51,7 +51,6 @@ * <p/> * <strong>Note:</strong> All childs of the batch should be loaded here. * - * * @param fishingOperationId if of the fishing operation to seek * @return the list of root {@link SpeciesBatch} * @since 1.0 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-03-27 21:56:27 UTC (rev 694) @@ -133,7 +133,7 @@ } result.setSpecies(species); - List<SpeciesProtocol> benthos= Lists.newArrayList(); + List<SpeciesProtocol> benthos = Lists.newArrayList(); if (!bean.isBenthosEmpty()) { for (SpeciesProtocol speciesProtocol : bean.getBenthos()) { SpeciesProtocol s = new SpeciesProtocol(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiEnumerationFile.java 2013-03-27 21:56:27 UTC (rev 694) @@ -66,7 +66,7 @@ public final Integer LOCATION_LEVEL_ID_COUNTRY = null; @Value("${LocationLevelId.PORT}") - public final Integer LOCATION_LEVEL_ID_HARBOUR= null; + public final Integer LOCATION_LEVEL_ID_HARBOUR = null; @Value("${LocationLevelId.LOCALITE}") public final Integer LOCATION_LEVEL_ID_LOCALITE = null; Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-03-27 21:56:27 UTC (rev 694) @@ -159,7 +159,7 @@ Assert.assertEquals(Lists.newArrayList("14", "18"), protocol.getLengthClassesPmfmId()); Assert.assertEquals(Lists.newArrayList("114", "228", "821"), protocol.getVesselUseFeaturePmfmId()); Assert.assertEquals(Lists.newArrayList("21", "22"), protocol.getGearUseFeaturePmfmId()); - + Assert.assertNotNull(protocol.getSpecies()); Assert.assertEquals(2, protocol.getSpecies().size()); SpeciesProtocol sp1 = protocol.getSpecies().get(0); @@ -281,7 +281,7 @@ b2.setSizeEnabled(true); b2.setWeightEnabled(true); protocol.addBenthos(b2); - + return protocol; } Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java 2013-03-27 21:56:27 UTC (rev 694) @@ -220,7 +220,7 @@ catchBatch.setSpeciesTotalLivingNotItemizedWeight(0.2f); catchBatch.setSpeciesTotalInertWeight(0.1f); } - + // Benthos { catchBatch.setBenthosTotalSortedWeight(24f); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java 2013-03-27 21:56:27 UTC (rev 694) @@ -82,7 +82,7 @@ // ----------------------------------------------------------------------------- // 1. Test with all properties filled // ----------------------------------------------------------------------------- - cruise.setId((String)null); + cruise.setId((String) null); cruise.setName("Unit-test-" + System.currentTimeMillis()); @@ -148,7 +148,7 @@ // ----------------------------------------------------------------------------- // 2. Test with only mandatory properties // ----------------------------------------------------------------------------- - createdCruise.setId((String)null); + createdCruise.setId((String) null); createdCruise.setHeadOfMission(null); // createdCruise.setBeginDate(cruise.getBeginDate()); // createdCruise.setEndDate(cruise.getEndDate()); @@ -203,7 +203,7 @@ // ----------------------------------------------------------------------------- Cruise cruise = service.getCruise(dbResource.getFixtures().cruiseId()); - cruise.setId((String)null); + cruise.setId((String) null); Calendar calendar = new GregorianCalendar(); cruise.setBeginDate(calendar.getTime()); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java 2013-03-27 21:56:27 UTC (rev 694) @@ -87,7 +87,7 @@ // Duplicate an existing cruise, to attach new fishing operations cruise = cruiseService.getCruise(dbResource.getFixtures().cruiseId()); - cruise.setId((String)null); + cruise.setId((String) null); cruise.setName("Unit-test-" + System.currentTimeMillis()); Calendar calendar = new GregorianCalendar(); cruise.setBeginDate(calendar.getTime()); @@ -206,7 +206,7 @@ // 2. Test with all properties set // ----------------------------------------------------------------------------- // Set properties - fishingOperation.setId((String)null); + fishingOperation.setId((String) null); fishingOperation.setStationNumber("STA2"); fishingOperation.setFishingOperationNumber(2); fishingOperation.setMultirigAggregation("1"); @@ -319,7 +319,7 @@ // - try to save a operation using a gear not declared in the cruise // - try to save a operation using a multirig aggregation greater than the cruise multirig number // ----------------------------------------------------------------------------- - fishingOperation.setId((String)null); + fishingOperation.setId((String) null); // Find and set a gear not used in the cruise List<Gear> gears = referentialService.getAllFishingGear(); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-03-27 21:56:27 UTC (rev 694) @@ -27,9 +27,9 @@ import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; +import org.apache.commons.lang3.StringUtils; import java.io.Serializable; -import org.apache.commons.lang3.StringUtils; /** * Row of a {@link SpeciesProtocol} to import or export. @@ -104,7 +104,7 @@ if (!StringUtils.isEmpty(name)) { boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); setMadeFromAReferentTaxon(madeFromAReferentTaxon && - species != null && species.getName().equals(name)); + species != null && species.getName().equals(name)); } } @@ -116,7 +116,7 @@ if (!StringUtils.isEmpty(refTaxCode)) { boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); setMadeFromAReferentTaxon(madeFromAReferentTaxon && - species != null && species.getRefTaxCode().equals(refTaxCode)); + species != null && species.getRefTaxCode().equals(refTaxCode)); } } 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-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -25,12 +25,13 @@ */ import fr.ifremer.tutti.service.TuttiCsvUtil; -import java.text.ParseException; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.ValueParser; +import java.text.ParseException; + /** * @author kmorin <kmorin@codelutin.com> * @since 1.2 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java 2013-03-27 21:56:27 UTC (rev 694) @@ -1,13 +1,36 @@ - package fr.ifremer.tutti.service.pupitri; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.referential.Species; + import java.io.Serializable; import java.util.Map; /** - * * @author kmorin <kmorin@codelutin.com> * @since 1.2 */ Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java 2013-03-27 21:56:27 UTC (rev 694) @@ -1,10 +1,32 @@ - package fr.ifremer.tutti.service.pupitri; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; /** - * * @author kmorin <kmorin@codelutin.com> * @since 1.2 */ Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/SpeciesRowModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -25,11 +25,8 @@ */ import fr.ifremer.tutti.service.TuttiCsvUtil; -import java.text.ParseException; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.csv.ValueParser; /** * @author kmorin <kmorin@codelutin.com> 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-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-03-27 21:56:27 UTC (rev 694) @@ -43,19 +43,19 @@ import fr.ifremer.tutti.persistence.entities.data.SizeEnum; import fr.ifremer.tutti.persistence.entities.data.SortedUnsortedEnum; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; -import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; -import java.io.BufferedWriter; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.csv.Export; import org.nuiton.util.csv.Import; import java.io.File; @@ -65,10 +65,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.Export; -import org.nuiton.util.csv.ExportModel; /** * @author kmorin <kmorin@codelutin.com> @@ -130,7 +126,7 @@ addFileAsAttachment(trunkFile, catchBatch); addFileAsAttachment(carrouselFile, catchBatch); addFileAsAttachment(speciesFile, catchBatch); - + persistenceService.saveCatchBatch(catchBatch); } @@ -217,10 +213,10 @@ } protected void importPupitriCarrousel(File carrouselFile, - File speciesFile, - FishingOperation operation, - CatchBatch catchBatch, - List<Species> referentSpecies) { + File speciesFile, + FishingOperation operation, + CatchBatch catchBatch, + List<Species> referentSpecies) { if (log.isInfoEnabled()) { log.info("Will import pupitri operation [" + operation.toString() + @@ -241,25 +237,25 @@ try { // import the species - String[] header = new String [] { - SpeciesRow.PROPERTY_CODE_FIRST_PART, - SpeciesRow.PROPERTY_CODE_SECOND_PART, - SpeciesRow.PROPERTY_SCIENTIFIC_NAME - }; + String[] header = new String[]{ + SpeciesRow.PROPERTY_CODE_FIRST_PART, + SpeciesRow.PROPERTY_CODE_SECOND_PART, + SpeciesRow.PROPERTY_SCIENTIFIC_NAME + }; fileWithHeaders = createFileWithHeaders(speciesFile, header, speciesSeparator); reader = Files.newReader(fileWithHeaders, Charsets.UTF_8); speciesImporter = Import.newImport(speciesCsvModel, reader); // get the map of species by survey code Multimap<String, Species> speciesBySurveyCode = - Multimaps.index(referentSpecies, new Function<Species, String>() { - @Override - public String apply(Species input) { - String surveyCode = String.valueOf(input.getSurveyCode()); - int end = Math.min(surveyCode.length(), 7); - return surveyCode.substring(0, end); - } - }); + Multimaps.index(referentSpecies, new Function<Species, String>() { + @Override + public String apply(Species input) { + String surveyCode = String.valueOf(input.getSurveyCode()); + int end = Math.min(surveyCode.length(), 7); + return surveyCode.substring(0, end); + } + }); // keep only the species whose survey code and name are the same // in theimported file and the referent species Map<String, Species> speciesMap = Maps.newHashMap(); @@ -275,20 +271,20 @@ } // import the batches - header = new String[] { - CarrouselRow.PROPERTY_FILE_ORIGIN, - CarrouselRow.PROPERTY_DATE, - CarrouselRow.PROPERTY_TIME, - CarrouselRow.PROPERTY_BALANCE_ID, - CarrouselRow.PROPERTY_TO_CONFIRM, - CarrouselRow.PROPERTY_OPERATION_CODE, - CarrouselRow.PROPERTY_RIG_NUMBER, - CarrouselRow.PROPERTY_BOX_TYPE, - CarrouselRow.PROPERTY_SPECIES_ID, - CarrouselRow.PROPERTY_SIGN, - CarrouselRow.PROPERTY_DIRECTION, - CarrouselRow.PROPERTY_WEIGHT - }; + header = new String[]{ + CarrouselRow.PROPERTY_FILE_ORIGIN, + CarrouselRow.PROPERTY_DATE, + CarrouselRow.PROPERTY_TIME, + CarrouselRow.PROPERTY_BALANCE_ID, + CarrouselRow.PROPERTY_TO_CONFIRM, + CarrouselRow.PROPERTY_OPERATION_CODE, + CarrouselRow.PROPERTY_RIG_NUMBER, + CarrouselRow.PROPERTY_BOX_TYPE, + CarrouselRow.PROPERTY_SPECIES_ID, + CarrouselRow.PROPERTY_SIGN, + CarrouselRow.PROPERTY_DIRECTION, + CarrouselRow.PROPERTY_WEIGHT + }; fileWithHeaders = createFileWithHeaders(carrouselFile, header, carrouselSeparator); reader = Files.newReader(fileWithHeaders, Charsets.UTF_8); carrouselImporter = Import.newImport(carrouselCsvModel, reader); @@ -302,7 +298,7 @@ for (CarrouselRow bean : carrouselImporter) { // is the bean from the current operation and rig ? if (bean.getOperationCode().equals(operationNumber) - && bean.getRigNumber().equals(rigNumber)) { + && bean.getRigNumber().equals(rigNumber)) { String speciesId = bean.getSpeciesId(); Species species = speciesMap.get(speciesId); @@ -316,7 +312,7 @@ sorted = false; break; - default : + default: sorted = true; carrouselSortedWeight += beanWeight; } @@ -345,7 +341,7 @@ Float catchWeight = pupitriCatch.getWeightBySign().get(PupitriCatch.Signs.DEFAULT); CaracteristicQualitativeValue cqv = pupitriCatch.isSorted() ? - sortedCaracteristic : unsortedCaracteristic; + sortedCaracteristic : unsortedCaracteristic; SpeciesBatch batch = new SpeciesBatch(); batch.setFishingOperation(operation); @@ -387,7 +383,7 @@ category = SampleCategoryEnum.size; break; } - + SpeciesBatch childBatch = new SpeciesBatch(); childBatch.setFishingOperation(operation); childBatch.setSampleCategoryType(category); @@ -413,7 +409,6 @@ IOUtils.closeQuietly(reader); FileUtils.deleteQuietly(fileWithHeaders); } - } public void exportSpecies(List<Species> species, File target) { @@ -426,7 +421,7 @@ public SpeciesRow apply(Species input) { Preconditions.checkNotNull(input.getSurveyCode(), - "Unable to export a species with a null survey code : " + input); + "Unable to export a species with a null survey code : " + input); SpeciesRow row = new SpeciesRow(); String codeFirstPart = StringUtils.substring(input.getSurveyCode(), 0, 4); row.setCodeFirstPart(StringUtils.rightPad(codeFirstPart, 4)); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-03-27 21:56:27 UTC (rev 694) @@ -43,10 +43,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; -import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.FileUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; +import org.nuiton.util.config.ApplicationConfig; import java.io.File; import java.util.List; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-03-27 21:56:27 UTC (rev 694) @@ -28,8 +28,8 @@ import org.apache.commons.lang.StringUtils; import org.springframework.util.DigestUtils; -import javax.swing.*; -import java.security.MessageDigest; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; import static org.nuiton.i18n.I18n._; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java 2013-03-27 21:56:27 UTC (rev 694) @@ -164,7 +164,7 @@ if (e.getKeyCode() == KeyEvent.VK_DOWN) { - if (selectedIndex < listModel.size() ) { + if (selectedIndex < listModel.size()) { // can move to down newSelectedIndex = selectedIndex - 1; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-03-27 21:56:27 UTC (rev 694) @@ -61,7 +61,7 @@ TuttiProtocol protocol = getContext().getPersistenceService().getProtocol(getContext().getProtocolId()); // remove id - protocol.setId(null); + protocol.setId((String) null); // store protocol in context CLONE_PROTOCOL_ENTRY.setContextValue(getContext().getMainUI(), protocol); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-03-27 21:56:27 UTC (rev 694) @@ -103,7 +103,7 @@ IMPORT_PROTOCOL_ENTRY.setContextValue(getContext().getMainUI(), protocol); // remove id - protocol.setId(null); + protocol.setId((String) null); // removed selected protocol getContext().setProtocolId(null); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-27 21:56:27 UTC (rev 694) @@ -532,7 +532,7 @@ Integer objectId = Integer.valueOf(batch.getId()); attachments = persistenceService.getAllAttachments(objectId); getModel().setCatchEnabled(true); - + } catch (InvalidBatchModelException e) { // batch is not compatible with Tutti @@ -565,7 +565,7 @@ // 4) Propagate new selected fishingoperation to others tabs - ui.getSpeciesTabContent().getHandler().selectFishingOperation(batch == null ? null : bean); + ui.getSpeciesTabContent().getHandler().selectFishingOperation(batch == null ? null : bean); ui.getBenthosTabContent().getHandler().selectFishingOperation(batch == null ? null : bean); // ui.getPlanktonTabContent().getHandler().selectFishingOperation(bean); // ui.getMacroWasteTabContent().getHandler().selectFishingOperation(bean); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -60,7 +60,7 @@ * @since 0.1 */ public class EditFishingOperationUIModel extends AbstractTuttiBeanUIModel<FishingOperation, EditFishingOperationUIModel> - implements AttachmentModelAware, TabContentModel { + implements AttachmentModelAware, TabContentModel { private static final long serialVersionUID = 1L; @@ -227,20 +227,20 @@ public boolean isEmpty() { return StringUtils.isEmpty(stationNumber) - && fishingOperationNumber == null - && strata == null - && subStrata == null - && location == null - && gearShootingStartLatitudeAsSexagecimal.isNull() - && gearShootingStartLongitudeAsSexagecimal.isNull() - && gearShootingStartDate == null - && gearShootingEndLatitudeAsSexagecimal.isNull() - && gearShootingEndLongitudeAsSexagecimal.isNull() - && gearShootingEndDate == null - && recorderPerson == null - && gear == null - && StringUtils.isEmpty(comment) - && CollectionUtils.isEmpty(getAttachment()); + && fishingOperationNumber == null + && strata == null + && subStrata == null + && location == null + && gearShootingStartLatitudeAsSexagecimal.isNull() + && gearShootingStartLongitudeAsSexagecimal.isNull() + && gearShootingStartDate == null + && gearShootingEndLatitudeAsSexagecimal.isNull() + && gearShootingEndLongitudeAsSexagecimal.isNull() + && gearShootingEndDate == null + && recorderPerson == null + && gear == null + && StringUtils.isEmpty(comment) + && CollectionUtils.isEmpty(getAttachment()); // TODO add the otehr ones } 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-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-03-27 21:56:27 UTC (rev 694) @@ -148,8 +148,8 @@ } editFishingOperationAction.setFishingOperation(operation); // try { - AbstractTuttiAction.runAction(editFishingOperationAction); - + AbstractTuttiAction.runAction(editFishingOperationAction); + // } catch(RuntimeException e) { // getModel().setSelectedFishingOperation(null); //// throw e; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -53,6 +53,7 @@ public static final String PROPERTY_SELECTED_FISHING_OPERATION = "selectedFishingOperation"; public static final String PROPERTY_EDITED_FISHING_OPERATION = "editedFishingOperation"; + public static final String PROPERTY_CATCH_ENABLED = "catchEnabled"; /** @@ -109,6 +110,7 @@ /** * Flag to use or not catch tab. + * * @since 1.1 */ protected boolean catchEnabled; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-03-27 21:56:27 UTC (rev 694) @@ -60,8 +60,8 @@ public EditFishingOperationAction getEditAction() { if (editAction == null) { - editAction = TuttiActionHelper.createLogicAction( getHandler().getParentHandler(), - EditFishingOperationAction.class); + editAction = TuttiActionHelper.createLogicAction(getHandler().getParentHandler(), + EditFishingOperationAction.class); } return editAction; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -646,8 +646,8 @@ @Override public boolean isEmpty() { return getCatchTotalWeight() == null - && getCatchTotalRejectedWeight() == null - && CollectionUtils.isEmpty(getAttachment()); + && getCatchTotalRejectedWeight() == null + && CollectionUtils.isEmpty(getAttachment()); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java 2013-03-27 21:56:27 UTC (rev 694) @@ -24,26 +24,13 @@ * #L% */ -import com.google.common.collect.Lists; -import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; -import fr.ifremer.tutti.persistence.entities.data.SexEnum; -import fr.ifremer.tutti.persistence.entities.data.SizeEnum; -import fr.ifremer.tutti.persistence.entities.data.SortedUnsortedEnum; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; -import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.pupitri.PupitriCatch; import fr.ifremer.tutti.service.pupitri.TuttiPupitriImportExportService; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationAction; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; @@ -52,7 +39,6 @@ import javax.swing.JOptionPane; import java.io.File; -import java.util.List; import static org.nuiton.i18n.I18n._; @@ -86,22 +72,21 @@ public EditFishingOperationAction getEditAction() { if (editAction == null) { - editAction = TuttiActionHelper.createLogicAction( getHandler().getParentHandler(), - EditFishingOperationAction.class); + editAction = TuttiActionHelper.createLogicAction(getHandler().getParentHandler(), + EditFishingOperationAction.class); } return editAction; } @Override protected boolean prepareAction() throws Exception { - boolean result = true; + boolean result; if (!getContext().isProtocolFilled()) { result = false; } else { - String protocolId = getContext().getProtocolId(); - currentProtocol = persistenceService.getProtocol(protocolId); + currentProtocol = getDataContext().getProtocol(); result = currentProtocol != null && !currentProtocol.getSpecies().isEmpty(); } @@ -133,7 +118,7 @@ importedTrunkFile = importPupitriDialog.getTrunkFile().getSelectedFile(); importedCarrouselFile = importPupitriDialog.getCarrouselFile().getSelectedFile(); importedSpeciesFile = importPupitriDialog.getSpeciesFile().getSelectedFile(); - result = importedTrunkFile != null + result = importedTrunkFile != null && importedCarrouselFile != null && importedSpeciesFile != null; } @@ -158,7 +143,7 @@ operation, catchBatch, getDataContext().getReferentSpeciesWithSurveyCode()); - + String fishingOperationText = getEditAction().getFishingOperationTitle(operation); getEditAction().loadCatchBatch(operation, fishingOperationText, true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.jaxx 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUI.jaxx 2013-03-27 21:56:27 UTC (rev 694) @@ -58,7 +58,7 @@ <!--<AttachmentModelAware id='bean' javaBean='null'/>--> <ImportPupitriPopupUIHandler id='handler' - initializer='getContextValue(ImportPupitriPopupUIHandler.class)'/> + initializer='getContextValue(ImportPupitriPopupUIHandler.class)'/> <Table id='mainPanel' fill='both'> @@ -99,5 +99,5 @@ </row> </Table> - + </JDialog> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUIHandler.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriPopupUIHandler.java 2013-03-27 21:56:27 UTC (rev 694) @@ -25,11 +25,11 @@ */ import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JOptionPane; -import jaxx.runtime.SwingUtil; import static org.nuiton.i18n.I18n._; @@ -49,7 +49,7 @@ protected final TuttiUIContext context; public ImportPupitriPopupUIHandler(TuttiUIContext context, - ImportPupitriPopupUI ui) { + ImportPupitriPopupUI ui) { this.context = context; this.ui = ui; } @@ -83,8 +83,8 @@ public void validate() { if (ui.getTrunkFile().getSelectedFile() != null - && ui.getCarrouselFile().getSelectedFile() != null - && ui.getSpeciesFile().getSelectedFile() != null) { + && ui.getCarrouselFile().getSelectedFile() != null + && ui.getSpeciesFile().getSelectedFile() != null) { ui.dispose(); } else { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2013-03-27 21:56:27 UTC (rev 694) @@ -123,7 +123,7 @@ } String label = sampleCategory == null ? "-" : - categoryDecorator.toString(categoryValue); + categoryDecorator.toString(categoryValue); editorLabel.setText(label); return editor; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -46,7 +46,7 @@ * @since 0.1 */ public class BenthosBatchUIModel extends AbstractTuttiBatchUIModel<BenthosBatchRowModel, BenthosBatchUIModel> - implements AttachmentModelAware, TabContentModel { + implements AttachmentModelAware, TabContentModel { private static final long serialVersionUID = 1L; @@ -388,10 +388,10 @@ @Override public boolean isEmpty() { return CollectionUtils.isEmpty(getRows()) - && getBenthosTotalSortedWeight() == null - && getBenthosTotalInertWeight() == null - && getBenthosTotalLivingNotItemizedWeight() == null - && CollectionUtils.isEmpty(getAttachment()); + && getBenthosTotalSortedWeight() == null + && getBenthosTotalInertWeight() == null + && getBenthosTotalLivingNotItemizedWeight() == null + && CollectionUtils.isEmpty(getAttachment()); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-03-27 21:56:27 UTC (rev 694) @@ -31,9 +31,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiComputedOrNotData; import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-03-27 21:56:27 UTC (rev 694) @@ -197,8 +197,10 @@ <Table constraints='"noLengthCaracteristicPmfm"' fill='horizontal'> <row> <cell columns='2'> - <JPanel id='dataInFrequenciesWarningContainer' layout='{new BorderLayout(10, 10)}'> - <JLabel id='dataInFrequenciesWarning' constraints='BorderLayout.CENTER'/> + <JPanel id='dataInFrequenciesWarningContainer' + layout='{new BorderLayout(10, 10)}'> + <JLabel id='dataInFrequenciesWarning' + constraints='BorderLayout.CENTER'/> </JPanel> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-03-27 21:56:27 UTC (rev 694) @@ -37,7 +37,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-03-27 21:56:27 UTC (rev 694) @@ -79,7 +79,7 @@ handler.collectChildren(parentBatch, rowToRemove); table.clearSelection(); - + // remove all rows from the model getModel().getRows().removeAll(rowToRemove); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-27 21:56:27 UTC (rev 694) @@ -50,7 +50,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUI; -import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -640,7 +639,7 @@ recomputeRowValidState(newRow); saveRow(newRow); - + tableModel.addNewRow(newRow); AbstractSelectTableAction.doSelectCell(getTable(), tableModel.getRowCount() - 1, 0); @@ -734,7 +733,7 @@ parentBatch.setChildBatch(newBatches); //TODO Should only save parentBatch (will persist all his childs) - //saveRow(parentBatch); + //saveRow(parentBatch); // save new batches saveRows(newBatches); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -46,7 +46,7 @@ * @since 0.1 */ public class SpeciesBatchUIModel extends AbstractTuttiBatchUIModel<SpeciesBatchRowModel, SpeciesBatchUIModel> - implements AttachmentModelAware, TabContentModel { + implements AttachmentModelAware, TabContentModel { private static final long serialVersionUID = 1L; @@ -388,10 +388,10 @@ @Override public boolean isEmpty() { return CollectionUtils.isEmpty(getRows()) - && getSpeciesTotalSortedWeight() == null - && getSpeciesTotalInertWeight() == null - && getSpeciesTotalLivingNotItemizedWeight() == null - && CollectionUtils.isEmpty(getAttachment()); + && getSpeciesTotalSortedWeight() == null + && getSpeciesTotalInertWeight() == null + && getSpeciesTotalLivingNotItemizedWeight() == null + && CollectionUtils.isEmpty(getAttachment()); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-03-27 21:56:27 UTC (rev 694) @@ -197,8 +197,10 @@ <Table constraints='"noLengthCaracteristicPmfm"' fill='horizontal'> <row> <cell columns='2'> - <JPanel id='dataInFrequenciesWarningContainer' layout='{new BorderLayout(10, 10)}'> - <JLabel id='dataInFrequenciesWarning' constraints='BorderLayout.CENTER'/> + <JPanel id='dataInFrequenciesWarningContainer' + layout='{new BorderLayout(10, 10)}'> + <JLabel id='dataInFrequenciesWarning' + constraints='BorderLayout.CENTER'/> </JPanel> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -28,8 +28,6 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategory; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; import java.io.Serializable; 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-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-03-27 21:56:27 UTC (rev 694) @@ -303,8 +303,8 @@ SplitSpeciesBatchUIModel model = getModel(); if (model.isValid()) { parent.getSpeciesTabContent().getHandler().splitBatch( - model.getSelectedCategory(), - model.getRows()); + model.getSelectedCategory(), + model.getRows()); } // close dialog Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -25,7 +25,6 @@ * #L% */ -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -38,8 +37,6 @@ import java.util.List; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; - /** * @author kmorin <kmorin@codelutin.com> * @since 1.0 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java 2013-03-27 21:56:27 UTC (rev 694) @@ -27,9 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.TuttiIOUtil; -import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; import fr.ifremer.tutti.service.pupitri.TuttiPupitriImportExportService; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; 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-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-27 21:56:27 UTC (rev 694) @@ -367,7 +367,7 @@ Component result; TuttiActionUI actionUI = getContext().getActionUI(); // if (actionUI.isVisible()) { - result = actionUI; + result = actionUI; // } else { // result = getContext().getMainUI(); // } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java 2013-03-27 21:56:27 UTC (rev 694) @@ -26,20 +26,18 @@ */ import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.beans.BeanUtil; import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.UIManager; import java.awt.Color; import java.awt.Font; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.InvocationTargetException; -import javax.swing.UIManager; -import jaxx.runtime.JAXXUtil; -import org.apache.commons.beanutils.MethodUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.BeanUtil; import static org.nuiton.i18n.I18n._; @@ -74,11 +72,11 @@ public void propertyChange(PropertyChangeEvent evt) { updateTitle(); } - },this.model); - - } catch (NoSuchMethodException - | IllegalAccessException - | InvocationTargetException ex) { + }, this.model); + + } catch (NoSuchMethodException + | IllegalAccessException + | InvocationTargetException ex) { log.error("Error while adding the listener to the model modifications", ex); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabContentModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabContentModel.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabContentModel.java 2013-03-27 21:56:27 UTC (rev 694) @@ -2,7 +2,7 @@ /** * Interface defining the models of the tab content UIs. - * + * * @author kmorin <kmorin@codelutin.com> * @since 1.2 */ @@ -11,7 +11,7 @@ boolean isEmpty(); boolean isValid(); - + boolean isModify(); String getTitle(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentModelAware.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentModelAware.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentModelAware.java 2013-03-27 21:56:27 UTC (rev 694) @@ -32,7 +32,7 @@ */ public interface CommentModelAware { - String PROPERTY_COMMENT= "comment"; + String PROPERTY_COMMENT = "comment"; String getComment(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-27 21:56:27 UTC (rev 694) @@ -40,7 +40,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.text.DecimalFormat; -import org.apache.commons.lang3.StringUtils; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-27 21:56:27 UTC (rev 694) @@ -45,7 +45,6 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.text.DecimalFormat; -import org.apache.commons.lang3.StringUtils; /** * Editor for TuttiComputedOrNotData Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicRow.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicRow.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicRow.java 2013-03-27 21:56:27 UTC (rev 694) @@ -24,8 +24,8 @@ * #L% */ +import fr.ifremer.tutti.LabelAware; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.LabelAware; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java =================================================================== --- trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java 2013-03-27 21:49:05 UTC (rev 693) +++ trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/BeanValidatorDetectorTest.java 2013-03-27 21:56:27 UTC (rev 694) @@ -26,11 +26,9 @@ import fr.ifremer.tutti.ui.swing.content.cruise.EditCruiseUIModel; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.CreateBenthosBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUIModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUIModel;