Author: tchemit Date: 2012-03-01 23:41:46 +0100 (Thu, 01 Mar 2012) New Revision: 332 Url: http://forge.codelutin.com/repositories/revision/echobase/332 Log: - modify Echotype entity - consider Echotype, LengthAgeKey and LengthWeightKey as data (since they are only attach to Voyage) - add getAllOperations on Voyage Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2012-03-01 22:40:15 UTC (rev 331) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2012-03-01 22:41:46 UTC (rev 332) @@ -51,6 +51,7 @@ import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.entities.references.Strata; import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.entities.references.VesselType; import org.nuiton.topia.persistence.TopiaEntity; import java.io.File; @@ -86,6 +87,13 @@ } }; + public static final Function<VesselType, String> VESSEL_TYPE_NAME = new Function<VesselType, String>() { + @Override + public String apply(VesselType input) { + return input.getName(); + } + }; + public static final Function<AcousticInstrument, String> ACOUSTIC_INSTRUMENT_ID = new Function<AcousticInstrument, String>() { @Override public String apply(AcousticInstrument input) { @@ -209,13 +217,6 @@ } }; -// public static final Function<Gear, String> GEAR_GEAR_CODE = new Function<Gear, String>() { -// @Override -// public String apply(Gear input) { -// return input.getGearCode(); -// } -// }; - public static final Function<Operation, String> OPERATION_ID = new Function<Operation, String>() { @Override public String apply(Operation input) { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-03-01 22:40:15 UTC (rev 331) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-03-01 22:41:46 UTC (rev 332) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase; +import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.common.io.Closeables; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; @@ -65,6 +66,8 @@ InputStream input = null; try { input = getClass().getResourceAsStream(configPath); + Preconditions.checkNotNull(input, "Could not find resource " + + configPath); properties.load(input); } catch (IOException e) { throw new RuntimeException(e); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-03-01 22:40:15 UTC (rev 331) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-03-01 22:41:46 UTC (rev 332) @@ -60,6 +60,10 @@ result.add(EchoBaseEntityEnum.Sample); result.add(EchoBaseEntityEnum.SampleData); + result.add(EchoBaseEntityEnum.Echotype); + result.add(EchoBaseEntityEnum.LengthAgeKey); + result.add(EchoBaseEntityEnum.LengthWeightKey); + return result.toArray(new EchoBaseEntityEnum[result.size()]); } @@ -85,6 +89,11 @@ result.add(EchoBaseEntityEnum.DataAcquisition); result.add(EchoBaseEntityEnum.Transect); result.add(EchoBaseEntityEnum.Transit); + + result.add(EchoBaseEntityEnum.Echotype); + result.add(EchoBaseEntityEnum.LengthAgeKey); + result.add(EchoBaseEntityEnum.LengthWeightKey); + result.add(EchoBaseEntityEnum.Voyage); return result.toArray(new EchoBaseEntityEnum[result.size()]); @@ -122,10 +131,10 @@ result.add(EchoBaseEntityEnum.SampleDataType); result.add(EchoBaseEntityEnum.SampleType); result.add(EchoBaseEntityEnum.Vessel); - result.add(EchoBaseEntityEnum.Echotype); +// result.add(EchoBaseEntityEnum.Echotype); result.add(EchoBaseEntityEnum.DataMetadata); - result.add(EchoBaseEntityEnum.LengthAgeKey); - result.add(EchoBaseEntityEnum.LengthWeightKey); +// result.add(EchoBaseEntityEnum.LengthAgeKey); +// result.add(EchoBaseEntityEnum.LengthWeightKey); result.add(EchoBaseEntityEnum.CellType); result.add(EchoBaseEntityEnum.Impacte); result.add(EchoBaseEntityEnum.Mission); @@ -183,12 +192,12 @@ result.add(EchoBaseEntityEnum.GearMetadata); result.add(EchoBaseEntityEnum.GearCharacteristicValue); result.add(EchoBaseEntityEnum.Gear); - result.add(EchoBaseEntityEnum.LengthAgeKey); +// result.add(EchoBaseEntityEnum.LengthAgeKey); result.add(EchoBaseEntityEnum.SpeciesCategory); - result.add(EchoBaseEntityEnum.LengthWeightKey); +// result.add(EchoBaseEntityEnum.LengthWeightKey); result.add(EchoBaseEntityEnum.TSParameters); - result.add(EchoBaseEntityEnum.Echotype); +// result.add(EchoBaseEntityEnum.Echotype); result.add(EchoBaseEntityEnum.DataMetadata); result.add(EchoBaseEntityEnum.Category); result.add(EchoBaseEntityEnum.CategoryRef); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2012-03-01 22:40:15 UTC (rev 331) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2012-03-01 22:41:46 UTC (rev 332) @@ -113,6 +113,23 @@ } @Override + public Collection<Operation> getAllOperations() { + Collection<Operation> result = Lists.newArrayList(); + if (!isTransitEmpty()) { + for (Transit transit : getTransit()) { + if (!transit.isTransectEmpty()) { + for (Transect transect : transit.getTransect()) { + if (!transect.isOperationEmpty()) { + result.addAll(transect.getOperation()); + } + } + } + } + } + return result; + } + + @Override public Collection<Operation> getOperations(Vessel vessel) { Preconditions.checkNotNull(vessel); Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties 2012-03-01 22:40:15 UTC (rev 331) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_en_GB.properties 2012-03-01 22:41:46 UTC (rev 332) @@ -249,8 +249,10 @@ echobase.common.transducerAcquisitionBeamAngleAthwartship= echobase.common.transducerAcquisitionPsi= echobase.common.transducerAperture= +echobase.common.transducerAzimuth= echobase.common.transducerBeams= echobase.common.transducerDepth= +echobase.common.transducerElevation= echobase.common.transducerLocation= echobase.common.transducerModel= echobase.common.transducerOrientation= Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-03-01 22:40:15 UTC (rev 331) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-03-01 22:41:46 UTC (rev 332) @@ -249,8 +249,10 @@ echobase.common.transducerAcquisitionBeamAngleAthwartship= echobase.common.transducerAcquisitionPsi= echobase.common.transducerAperture= +echobase.common.transducerAzimuth= echobase.common.transducerBeams= echobase.common.transducerDepth= +echobase.common.transducerElevation= echobase.common.transducerLocation= echobase.common.transducerModel= echobase.common.transducerOrientation= Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Modified: trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java =================================================================== --- trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java 2012-03-01 22:40:15 UTC (rev 331) +++ trunk/echobase-entities/src/test/java/fr/ifremer/echobase/entities/EntitiesUtilTest.java 2012-03-01 22:41:46 UTC (rev 332) @@ -63,6 +63,9 @@ List<EchoBaseEntityEnum> expectedTypes = Lists.newArrayList(getContractsOf(Mission.class.getPackage())); + expectedTypes.remove(EchoBaseEntityEnum.Echotype); + expectedTypes.remove(EchoBaseEntityEnum.LengthAgeKey); + expectedTypes.remove(EchoBaseEntityEnum.LengthWeightKey); Assert.assertNotNull(types); @@ -80,6 +83,9 @@ List<EchoBaseEntityEnum> expectedTypes = Lists.newArrayList(getContractsOf(Mission.class.getPackage())); + expectedTypes.remove(EchoBaseEntityEnum.Echotype); + expectedTypes.remove(EchoBaseEntityEnum.LengthAgeKey); + expectedTypes.remove(EchoBaseEntityEnum.LengthWeightKey); Assert.assertNotNull(types); @@ -97,7 +103,9 @@ List<EchoBaseEntityEnum> expectedTypes = Lists.newArrayList(getContractsOf(Voyage.class.getPackage())); - + expectedTypes.add(EchoBaseEntityEnum.Echotype); + expectedTypes.add(EchoBaseEntityEnum.LengthAgeKey); + expectedTypes.add(EchoBaseEntityEnum.LengthWeightKey); Assert.assertNotNull(types); for (EchoBaseEntityEnum type : expectedTypes) { @@ -115,7 +123,10 @@ List<EchoBaseEntityEnum> expectedTypes = Lists.newArrayList(getContractsOf(Voyage.class.getPackage())); - + expectedTypes.add(EchoBaseEntityEnum.Echotype); + expectedTypes.add(EchoBaseEntityEnum.LengthAgeKey); + expectedTypes.add(EchoBaseEntityEnum.LengthWeightKey); + Assert.assertNotNull(types); for (EchoBaseEntityEnum type : expectedTypes) {