Author: tchemit Date: 2012-03-10 10:26:38 +0100 (Sat, 10 Mar 2012) New Revision: 349 Url: http://forge.codelutin.com/repositories/revision/echobase/349 Log: add ne function + rename one Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.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-10 01:36:11 UTC (rev 348) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java 2012-03-10 09:26:38 UTC (rev 349) @@ -200,6 +200,12 @@ } }; + public static final Function<SampleDataType, String> SAMPLE_DATA_TYPE_NAME = new Function<SampleDataType, String>() { + @Override + public String apply(SampleDataType input) { + return String.valueOf(input.getName()); + } + }; public static final Function<OperationEvent, String> OPERATION_EVENT_NAME = new Function<OperationEvent, String>() { @Override public String apply(OperationEvent input) { @@ -231,7 +237,7 @@ } }; - public static final Function<SpeciesCategory, String> SPECIES_CATEGORY_SPIECIES = new Function<SpeciesCategory, String>() { + public static final Function<SpeciesCategory, String> SPECIES_CATEGORY_KEY = new Function<SpeciesCategory, String>() { @Override public String apply(SpeciesCategory input) { return getSpeciesCategoryKey(input.getSpecies(), input.getSizeCategory(), input.getSexCategory()); Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoader.java 2012-03-10 01:36:11 UTC (rev 348) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/LengthWeightKeyLoader.java 2012-03-10 09:26:38 UTC (rev 349) @@ -73,7 +73,7 @@ SizeCategory.class, EchoBaseFunctions.SIZE_CATEGORY_NAME); Map<String, SpeciesCategory> speciesCategoryBySizeAndName = getUniverse( - SpeciesCategory.class, EchoBaseFunctions.SPECIES_CATEGORY_SPIECIES); + SpeciesCategory.class, EchoBaseFunctions.SPECIES_CATEGORY_KEY); TopiaDAO<LengthWeightKey> dao = getDAO(); Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java 2012-03-10 01:36:11 UTC (rev 348) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java 2012-03-10 09:26:38 UTC (rev 349) @@ -142,7 +142,7 @@ SexCategory.class, EchoBaseFunctions.SEX_CATEGORY_NAME); speciesCategoryByName = getUniverse( - SpeciesCategory.class, EchoBaseFunctions.SPECIES_CATEGORY_SPIECIES); + SpeciesCategory.class, EchoBaseFunctions.SPECIES_CATEGORY_KEY); Multimap<String, Map<String, Object>> mensurationByNosta = Multimaps.index( db.getTable("MENSURATIONS", true),