Author: tchemit Date: 2012-03-19 17:00:01 +0100 (Mon, 19 Mar 2012) New Revision: 374 Url: http://forge.codelutin.com/repositories/revision/echobase/374 Log: reformat codes Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/InputFile.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModelRow.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exceptions/ExportQueryNameAlreadyExistException.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/InputFile.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/InputFile.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/InputFile.java 2012-03-19 16:00:01 UTC (rev 374) @@ -89,6 +89,6 @@ } public boolean hasFile() { - return file!=null; + return file != null; } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-03-19 16:00:01 UTC (rev 374) @@ -72,8 +72,8 @@ /** * Import a complete db from the given zip file. * - * @param model model of the db import operation - * @param user user which perform the import + * @param model model of the db import operation + * @param user user which perform the import * @param computeSteps flag to compute stesp inside this method * @throws IOException if any io exception while import * @throws TopiaException if any pb while topia treatment Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java 2012-03-19 16:00:01 UTC (rev 374) @@ -23,8 +23,6 @@ */ package fr.ifremer.echobase.services.configurations; -import org.nuiton.util.StringUtil; - import java.io.IOException; import java.io.Serializable; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModel.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/AcousticDataImportModel.java 2012-03-19 16:00:01 UTC (rev 374) @@ -41,7 +41,7 @@ public class AcousticDataImportModel extends CsvModelUtil.AbstractImportModel<AcousticDataImportModelRow> { -/* + /* ESDU Data Latitude MOVIES_EILayer\\cellset\\lat, OK @@ -71,7 +71,7 @@ NumberOfSamplesEchoIntegrated MOVIES_EILayer\\cellset\\ni minEIthr MOVIES_EILayer\cellset\thresholdlow maxEIthr MOVIES_EILayer\cellset\thresholdup - */ + */ public AcousticDataImportModel(char separator, Map<String, AcousticInstrument> instrumentsById) { super(separator); @@ -147,8 +147,8 @@ newIgnoredColumn("MOVIES_EILayer\\eilayer");//BN newMandatoryColumn("MOVIES_EILayer\\eilayer\\sa", AcousticDataImportModelRow.PROPERTY_CELL_NASC, CsvModelUtil.PRIMITIVE_FLOAT);//BO newIgnoredColumn("MOVIES_EILayer\\eilayer\\sv");//BP - newMandatoryColumn("MOVIES_EILayer\\eilayer\\ni", AcousticDataImportModelRow.PROPERTY_CELL_NUMBER_OF_SAMPLES_ECHO_INTEGRATED,CsvModelUtil.PRIMITIVE_INTEGER);//BQ - newMandatoryColumn("MOVIES_EILayer\\eilayer\\nt", AcousticDataImportModelRow.PROPERTY_CELL_NUMBER_OF_SAMPLES_RECORDED,CsvModelUtil.PRIMITIVE_INTEGER);//BR + newMandatoryColumn("MOVIES_EILayer\\eilayer\\ni", AcousticDataImportModelRow.PROPERTY_CELL_NUMBER_OF_SAMPLES_ECHO_INTEGRATED, CsvModelUtil.PRIMITIVE_INTEGER);//BQ + newMandatoryColumn("MOVIES_EILayer\\eilayer\\nt", AcousticDataImportModelRow.PROPERTY_CELL_NUMBER_OF_SAMPLES_RECORDED, CsvModelUtil.PRIMITIVE_INTEGER);//BR newIgnoredColumn("MOVIES_EILayer\\boterr");//BR newIgnoredColumn("MOVIES_EILayer\\boterr\\sa");//BT newIgnoredColumn("MOVIES_EILayer\\boterr\\ni");//BU Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModel.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BiometrySampleImportModel.java 2012-03-19 16:00:01 UTC (rev 374) @@ -27,7 +27,6 @@ import fr.ifremer.echobase.entities.data.Sample; import fr.ifremer.echobase.entities.data.SampleData; import fr.ifremer.echobase.entities.references.SampleDataType; -import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; import java.util.Map; @@ -40,7 +39,7 @@ */ public class BiometrySampleImportModel extends CsvModelUtil.AbstractImportModel<BiometrySampleImportModelRow> { - public BiometrySampleImportModel(char separator,Map<String, Operation> operationMap, + public BiometrySampleImportModel(char separator, Map<String, Operation> operationMap, Map<String, Species> speciesMap, Map<String, SampleDataType> sampleDataTypeMap) { super(separator); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModel.java 2012-03-19 16:00:01 UTC (rev 374) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.services.csv; +import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.references.Species; import java.util.Map; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchotypeImportModelRow.java 2012-03-19 16:00:01 UTC (rev 374) @@ -23,10 +23,10 @@ */ package fr.ifremer.echobase.services.csv; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.EchotypeImpl; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.DepthStratum; -import fr.ifremer.echobase.entities.data.Echotype; -import fr.ifremer.echobase.entities.data.EchotypeImpl; import fr.ifremer.echobase.entities.references.Species; import java.io.Serializable; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java 2012-03-19 16:00:01 UTC (rev 374) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.services.csv; +import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.Strata; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModelRow.java 2012-03-19 16:00:01 UTC (rev 374) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.services.csv; -import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.data.LengthAgeKeyImpl; +import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.Strata; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModel.java 2012-03-19 16:00:01 UTC (rev 374) @@ -23,8 +23,8 @@ */ package fr.ifremer.echobase.services.csv; +import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthWeightKeyImportModelRow.java 2012-03-19 16:00:01 UTC (rev 374) @@ -23,9 +23,9 @@ */ package fr.ifremer.echobase.services.csv; -import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.entities.data.LengthWeightKeyImpl; +import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModelRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModelRow.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/RegionCellAssociationImportModelRow.java 2012-03-19 16:00:01 UTC (rev 374) @@ -34,7 +34,7 @@ public class RegionCellAssociationImportModelRow { protected Cell esduCell; - + protected Cell regionSurfaceCell; protected Cell regionBottomCell; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exceptions/ExportQueryNameAlreadyExistException.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exceptions/ExportQueryNameAlreadyExistException.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exceptions/ExportQueryNameAlreadyExistException.java 2012-03-19 16:00:01 UTC (rev 374) @@ -29,7 +29,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.3 */ -public class ExportQueryNameAlreadyExistException extends Exception{ +public class ExportQueryNameAlreadyExistException extends Exception { private static final long serialVersionUID = 1L; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonDataImportService.java 2012-03-19 16:00:01 UTC (rev 374) @@ -43,7 +43,6 @@ import fr.ifremer.echobase.entities.references.MissionDAO; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.ImportException; -import fr.ifremer.echobase.services.exceptions.MissionNameAlreadyExistException; import fr.ifremer.echobase.services.configurations.CommonDataImportConfiguration; import fr.ifremer.echobase.services.csv.CsvFileImportResult; import fr.ifremer.echobase.services.csv.TransectImportModel; @@ -51,6 +50,7 @@ import fr.ifremer.echobase.services.csv.TransitImportModel; import fr.ifremer.echobase.services.csv.TransitImportModelRow; import fr.ifremer.echobase.services.csv.VoyageImportModel; +import fr.ifremer.echobase.services.exceptions.MissionNameAlreadyExistException; import org.nuiton.topia.TopiaException; import org.nuiton.util.csv.Import; import org.nuiton.util.csv.ImportModel; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/EmbeddedApplicationServiceTest.java 2012-03-19 16:00:01 UTC (rev 374) @@ -32,9 +32,9 @@ import java.io.File; /** - * Test all fuctionnality of {@link EmbeddedApplicationService} + * Test {@link EmbeddedApplicationService}. * - * @author sletellier <letellier@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 0.2 */ public class EmbeddedApplicationServiceTest extends EchoBaseTestServiceSupport { @@ -63,44 +63,4 @@ Assert.assertTrue(zipFile.exists()); } - -// @Test -// public void replicateVoyageEntity() throws Exception { -// -// String voyageId = getVoyageId(); -// -// // create new H2 dataBase in target/voyageId -// TopiaEntity voyageMocked = getEntityById(Voyage.class, voyageId); -// -// File testBaseDir = new File(getTestDir(), "replicated"); -// -// EmbeddedApplicationService service = -// getService(EmbeddedApplicationService.class); -// -// EmbeddedApplicationConfiguration conf = new EmbeddedApplicationConfiguration(); -// conf.setVoyageIds(voyageId); -// TopiaContext rootContextDest = service.createH2Batabase(conf, -// testBaseDir, -// false); -// -// // verify that replicated voyage is in new base -// TopiaContext transactionDest = null; -// try { -// transactionDest = rootContextDest.beginTransaction(); -// VoyageDAO voyageDAO = EchoBaseDAOHelper.getVoyageDAO(transactionDest); -// Voyage voyageReplicated = voyageDAO.findByTopiaId(voyageId); -// -// // assert voyage is in new base -// Assert.assertNotNull(voyageReplicated); -// -// // and same ids -// Assert.assertEquals(voyageMocked, voyageReplicated); -// -// // TODO sletellier 20111124 : try to test deph equality between entities -// } finally { -// if (transactionDest != null) { -// transactionDest.closeContext(); -// } -// } -// } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-03-19 16:00:01 UTC (rev 374) @@ -55,11 +55,11 @@ public static final String IMPORT_DATA_ECHOBASE_OPERATION_RESULT = "/import-data/echobase-0.3-operation-result.h2.db.gz"; - public static final String IMPORT_DATA_ECHOBASE_CATCHES= "/import-data/echobase-0.3-catches.h2.db.gz"; + public static final String IMPORT_DATA_ECHOBASE_CATCHES = "/import-data/echobase-0.3-catches.h2.db.gz"; - public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC= "/import-data/echobase-0.3-catches-and-acoustic.h2.db.gz"; + public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC = "/import-data/echobase-0.3-catches-and-acoustic.h2.db.gz"; - public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT= "/import-data/echobase-0.3-catches-and-acoustic-and-voyage-result.h2.db.gz"; + public static final String IMPORT_DATA_ECHOBASE_CATCHES_AND_ACOUSTIC_AND_VOYAGE_RESULT = "/import-data/echobase-0.3-catches-and-acoustic-and-voyage-result.h2.db.gz"; public static final String VESSEL_ID = "fr.ifremer.echobase.entities.references.Vessel#1323196672049#0.9790502711645855"; @@ -111,7 +111,7 @@ public static final int NB_ESDU_RESULT_BY_ECHOTYPE = 8; - public static final int NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES= 8; + public static final int NB_ESDU_RESULT_BY_ECHOTYPE_AND_SPECIES = 8; public void assertImportCommonData() throws TopiaException { assertNbEntities(Voyage.class, NB_VOYAGE); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java 2012-03-19 15:58:51 UTC (rev 373) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduImportServiceIT.java 2012-03-19 16:00:01 UTC (rev 374) @@ -142,7 +142,6 @@ getImportPath("regionResults.csv")); - ResultsImportService service = getService(ResultsImportService.class);