Author: kmorin Date: 2013-05-24 17:24:15 +0200 (Fri, 24 May 2013) New Revision: 1008 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1008 Log: debug sampling categories Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.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/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -122,8 +122,6 @@ public static final String PROPERTY_BATCH_ROOT = "batchRoot"; - public static final String PROPERTY_SAMPLE_CATEGORY = "sampleCategory"; - /** * Species. * @@ -167,16 +165,6 @@ protected SampleCategory<Float> ageCategory; /** - * Sample category of this batch. - * <p/> - * This is one of the sample category befined above, used to know if the - * table row which sample category affects this row exactly. - * - * @since 0.3 - */ - private SampleCategory<?> sampleCategory; - - /** * Is the species need to be confirmed?. * * @since 0.2 @@ -277,17 +265,27 @@ //-- Sample category --// //------------------------------------------------------------------------// - public SampleCategory<?> getSampleCategory() { - return sampleCategory; + public void setSampleCategory(SampleCategory sampleCategory) { + switch (sampleCategory.getCategoryType()) { + case sortedUnsorted: + setSortedUnsortedCategory(sampleCategory); + break; + case size: + setSizeCategory(sampleCategory); + break; + case sex: + setSexCategory(sampleCategory); + break; + case maturity: + setMaturityCategory(sampleCategory); + break; + case age: + setAgeCategory(sampleCategory); + } } - public void setSampleCategory(SampleCategory<?> sampleCategory) { - Object oldValue = getSampleCategory(); - this.sampleCategory = sampleCategory; - firePropertyChange(PROPERTY_SAMPLE_CATEGORY, oldValue, sampleCategory); - } - public SampleCategory<?> getSampleCategory(SampleCategoryEnum sampleCategoryEnum) { + SampleCategory sampleCategory = null; switch (sampleCategoryEnum) { case sortedUnsorted: sampleCategory = getSortedUnsortedCategory(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -112,7 +112,6 @@ LogFactory.getLog(BenthosBatchUIHandler.class); public static final Set<String> SAMPLING_PROPERTIES = Sets.newHashSet( - BenthosBatchRowModel.PROPERTY_SAMPLE_CATEGORY, BenthosBatchRowModel.PROPERTY_SPECIES, BenthosBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, BenthosBatchRowModel.PROPERTY_SIZE_CATEGORY, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -263,7 +263,7 @@ if (batch != null) { //TODO Use the samplingOrder (+ the one from the table model) - SampleCategory<?> lastCategory = batch.getSampleCategory(); + SampleCategory<?> lastCategory = batch.getFinestCategory(); Preconditions.checkNotNull( lastCategory, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -122,7 +122,7 @@ } public Float getBatchWeight() { - return batch == null ? null : batch.getSampleCategory().getCategoryWeight(); + return batch == null ? null : batch.getFinestCategory().getCategoryWeight(); } public Float getSampleWeight() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -112,8 +112,6 @@ public static final String PROPERTY_BATCH_ROOT = "batchRoot"; - public static final String PROPERTY_SAMPLE_CATEGORY = "sampleCategory"; - /** * Delegate edit object. * @@ -157,16 +155,6 @@ protected SampleCategory<Float> ageCategory; /** - * Sample category of this batch. - * <p/> - * This is one of the sample category defined above, used to know if the - * table row which sample category affects this row exactly. - * - * @since 0.3 - */ - private SampleCategory<?> sampleCategory; - - /** * Observed weight. * * @since 0.2 @@ -446,17 +434,27 @@ //-- Sample category --// //------------------------------------------------------------------------// - public SampleCategory<?> getSampleCategory() { - return sampleCategory; + public void setSampleCategory(SampleCategory sampleCategory) { + switch (sampleCategory.getCategoryType()) { + case sortedUnsorted: + setSortedUnsortedCategory(sampleCategory); + break; + case size: + setSizeCategory(sampleCategory); + break; + case sex: + setSexCategory(sampleCategory); + break; + case maturity: + setMaturityCategory(sampleCategory); + break; + case age: + setAgeCategory(sampleCategory); + } } - public void setSampleCategory(SampleCategory<?> sampleCategory) { - Object oldValue = getSampleCategory(); - this.sampleCategory = sampleCategory; - firePropertyChange(PROPERTY_SAMPLE_CATEGORY, oldValue, sampleCategory); - } - public SampleCategory<?> getSampleCategory(SampleCategoryEnum sampleCategoryEnum) { + SampleCategory<?> sampleCategory = null; switch (sampleCategoryEnum) { case sortedUnsorted: sampleCategory = getSortedUnsortedCategory(); 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-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -110,7 +110,6 @@ LogFactory.getLog(SpeciesBatchUIHandler.class); public static final Set<String> SAMPLING_PROPERTIES = Sets.newHashSet( - SpeciesBatchRowModel.PROPERTY_SAMPLE_CATEGORY, SpeciesBatchRowModel.PROPERTY_SPECIES, SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, SpeciesBatchRowModel.PROPERTY_SIZE_CATEGORY, 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-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -262,7 +262,7 @@ if (batch != null) { //TODO Use the samplingOrder (+ the one from the table model) - SampleCategory<?> lastCategory = batch.getSampleCategory(); + SampleCategory<?> lastCategory = batch.getFinestCategory(); Preconditions.checkNotNull( lastCategory, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2013-05-24 15:06:36 UTC (rev 1007) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2013-05-24 15:24:15 UTC (rev 1008) @@ -122,7 +122,7 @@ } public Float getBatchWeight() { - return batch == null ? null : batch.getSampleCategory().getCategoryWeight(); + return batch == null ? null : batch.getFinestCategory().getCategoryWeight(); } public Float getSampleWeight() {