This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 24cdd122c0786a892735eaf6183b6745a44026cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 13 11:15:29 2016 +0200 Nettoyage code --- .../catches/species/BenthosBatchUISupportImpl.java | 17 ----------------- .../catches/species/SpeciesBatchUISupportImpl.java | 7 ------- .../catches/species/SpeciesOrBenthosBatchUISupport.java | 7 ++++++- 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java index 9cc5dec..f46815a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java @@ -50,31 +50,14 @@ import static org.nuiton.i18n.I18n.n; */ public class BenthosBatchUISupportImpl extends SpeciesOrBenthosBatchUISupport { - public static final String PROPERTY_TOTAL_COMPUTED_WEIGHT = "totalComputedWeight"; - public static final String PROPERTY_TOTAL_SORTED_WEIGHT = "totalSortedWeight"; -// public static final String PROPERTY_TOTAL_SORTED_COMPUTED_WEIGHT = "totalSortedComputedWeight"; - public static final String PROPERTY_TOTAL_UNSORTED_COMPUTED_WEIGHT = "totalUnsortedComputedWeight"; - public static final String PROPERTY_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT = "totalSampleSortedComputedWeight"; -// public static final String PROPERTY_TOTAL_INERT_COMPUTED_WEIGHT = "totalInertComputedWeight"; - public static final String PROPERTY_TOTAL_INERT_WEIGHT = "totalInertWeight"; -// public static final String PROPERTY_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT = "totalLivingNotItemizedComputedWeight"; - public static final String PROPERTY_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT = "totalLivingNotItemizedWeight"; -// public static final String PROPERTY_DISTINCT_SORTED_SPECIES_COUNT = "distinctSortedSpeciesCount"; -// public static final String PROPERTY_DISTINCT_UNSORTED_SPECIES_COUNT = "distinctUnsortedSpeciesCount"; - protected static final Map<String, String> CATCHES_UI_MODEL_PROPERTIES_MAPPING = ImmutableMap.<String, String>builder() .put(EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_COMPUTED_WEIGHT, PROPERTY_TOTAL_COMPUTED_WEIGHT) .put(EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, PROPERTY_TOTAL_SORTED_WEIGHT) -// .put(EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT, PROPERTY_TOTAL_SORTED_COMPUTED_WEIGHT) .put(EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, PROPERTY_TOTAL_UNSORTED_COMPUTED_WEIGHT) .put(EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, PROPERTY_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT) -// .put(EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_COMPUTED_WEIGHT, PROPERTY_TOTAL_INERT_COMPUTED_WEIGHT) .put(EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, PROPERTY_TOTAL_INERT_WEIGHT) -// .put(EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, PROPERTY_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT) .put(EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, PROPERTY_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT) -// .put(EditCatchesUIModel.PROPERTY_BENTHOS_DISTINCT_SORTED_SPECIES_COUNT, PROPERTY_DISTINCT_SORTED_SPECIES_COUNT) -// .put(EditCatchesUIModel.PROPERTY_BENTHOS_DISTINCT_UNSORTED_SPECIES_COUNT, PROPERTY_DISTINCT_UNSORTED_SPECIES_COUNT) .build(); public BenthosBatchUISupportImpl(TuttiUIContext context, EditCatchesUIModel catchesUIModel, WeightUnit weightUnit) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java index 8bba93e..28faded 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java @@ -50,13 +50,6 @@ import static org.nuiton.i18n.I18n.n; */ public class SpeciesBatchUISupportImpl extends SpeciesOrBenthosBatchUISupport { - public static final String PROPERTY_TOTAL_COMPUTED_WEIGHT = "totalComputedWeight"; - public static final String PROPERTY_TOTAL_SORTED_WEIGHT = "totalSortedWeight"; - public static final String PROPERTY_TOTAL_UNSORTED_COMPUTED_WEIGHT = "totalUnsortedComputedWeight"; - public static final String PROPERTY_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT = "totalSampleSortedComputedWeight"; - public static final String PROPERTY_TOTAL_INERT_WEIGHT = "totalInertWeight"; - public static final String PROPERTY_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT = "totalLivingNotItemizedWeight"; - protected static final Map<String, String> CATCHES_UI_MODEL_PROPERTIES_MAPPING = ImmutableMap.<String, String>builder() .put(EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, PROPERTY_TOTAL_COMPUTED_WEIGHT) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java index d9f2de7..96b60bc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java @@ -54,8 +54,13 @@ import java.util.Map; public abstract class SpeciesOrBenthosBatchUISupport { public static final String SPECIES = "SPECIES"; - public static final String BENTHOS = "BENTHOS"; + public static final String PROPERTY_TOTAL_COMPUTED_WEIGHT = "totalComputedWeight"; + public static final String PROPERTY_TOTAL_SORTED_WEIGHT = "totalSortedWeight"; + public static final String PROPERTY_TOTAL_UNSORTED_COMPUTED_WEIGHT = "totalUnsortedComputedWeight"; + public static final String PROPERTY_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT = "totalSampleSortedComputedWeight"; + public static final String PROPERTY_TOTAL_INERT_WEIGHT = "totalInertWeight"; + public static final String PROPERTY_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT = "totalLivingNotItemizedWeight"; protected final TuttiUIContext context; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.