Author: tchemit Date: 2013-04-02 17:19:37 +0200 (Tue, 02 Apr 2013) New Revision: 717 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/717 Log: add computed fields on CatchBatch Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-04-02 14:08:05 UTC (rev 716) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-04-02 15:19:37 UTC (rev 717) @@ -54,40 +54,6 @@ private static final long serialVersionUID = 1L; - public static final String PROPERTY_CATCH_TOTAL_COMPUTED_WEIGHT = "catchTotalComputedWeight"; - - public static final String PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT = "catchTotalSortedComputedWeight"; - - public static final String PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT = "catchTotalUnsortedComputedWeight"; - - public static final String PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT = "catchTotalSortedCarousselWeight"; - - public static final String PROPERTY_CATCH_TOTAL_REJECTED_COMPUTED_WEIGHT = "catchTotalRejectedComputedWeight"; - - public static final String PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT = "speciesTotalComputedWeight"; - - public static final String PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT = "speciesTotalSortedComputedWeight"; - - public static final String PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT = "speciesTotalUnsortedComputedWeight"; - - public static final String PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT = "speciesTotalSampleSortedComputedWeight"; - - public static final String PROPERTY_SPECIES_TOTAL_INERT_COMPUTED_WEIGHT = "speciesTotalInerComputedtWeight"; - - public static final String PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT = "speciesTotalLivingNotItemizedComputedWeight"; - - public static final String PROPERTY_BENTHOS_TOTAL_COMPUTED_WEIGHT = "benthosTotalComputedWeight"; - - public static final String PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT = "benthosTotalSortedComputedWeight"; - - public static final String PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT = "benthosTotalUnsortedComputedWeight"; - - public static final String PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT = "benthosTotalSampleSortedComputedWeight"; - - public static final String PROPERTY_BENTHOS_TOTAL_INERT_COMPUTED_WEIGHT = "benthosTotalInerComputedtWeight"; - - public static final String PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT = "benthosTotalLivingNotItemizedComputedWeight"; - public static final String PROPERTY_CATCH_BATCH = "catchBatch"; protected static final Binder<CatchBatch, EditCatchesUIModel> fromBeanBinder = BinderFactory.newBinder(CatchBatch.class, EditCatchesUIModel.class); @@ -244,30 +210,36 @@ firePropertyChange(PROPERTY_CATCH_TOTAL_WEIGHT, oldValue, catchTotalWeight); } + @Override public Float getCatchTotalComputedWeight() { return catchTotalComputedOrNotWeight.getComputedData(); } + @Override public void setCatchTotalComputedWeight(Float catchTotalComputedWeight) { Object oldValue = getCatchTotalComputedWeight(); this.catchTotalComputedOrNotWeight.setComputedData(catchTotalComputedWeight); firePropertyChange(PROPERTY_CATCH_TOTAL_COMPUTED_WEIGHT, oldValue, catchTotalComputedWeight); } + @Override public Float getCatchTotalSortedComputedWeight() { return catchTotalSortedComputedWeight; } + @Override public void setCatchTotalSortedComputedWeight(Float catchTotalSortedComputedWeight) { Object oldValue = getCatchTotalSortedComputedWeight(); this.catchTotalSortedComputedWeight = catchTotalSortedComputedWeight; firePropertyChange(PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, oldValue, catchTotalSortedComputedWeight); } + @Override public Float getCatchTotalUnsortedComputedWeight() { return catchTotalUnsortedComputedWeight; } + @Override public void setCatchTotalUnsortedComputedWeight(Float catchTotalUnsortedComputedWeight) { Object oldValue = getCatchTotalUnsortedComputedWeight(); this.catchTotalUnsortedComputedWeight = catchTotalUnsortedComputedWeight; @@ -314,10 +286,12 @@ firePropertyChange(PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, oldValue, catchTotalRejectedWeight); } + @Override public Float getCatchTotalRejectedComputedWeight() { return catchTotalRejectedComputedOrNotWeight.getComputedData(); } + @Override public void setCatchTotalRejectedComputedWeight(Float catchTotalRejectedComputedWeight) { Object oldValue = getCatchTotalRejectedComputedWeight(); this.catchTotalRejectedComputedOrNotWeight.setComputedData(catchTotalRejectedComputedWeight); @@ -328,10 +302,12 @@ //-- Species --// //------------------------------------------------------------------------// + @Override public Float getSpeciesTotalComputedWeight() { return speciesTotalComputedWeight; } + @Override public void setSpeciesTotalComputedWeight(Float speciesTotalComputedWeight) { Object oldValue = getSpeciesTotalComputedWeight(); this.speciesTotalComputedWeight = speciesTotalComputedWeight; @@ -354,30 +330,36 @@ firePropertyChange(PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, oldValue, speciesTotalSortedWeight); } + @Override public Float getSpeciesTotalSortedComputedWeight() { return speciesTotalSortedComputedOrNotWeight.getComputedData(); } + @Override public void setSpeciesTotalSortedComputedWeight(Float speciesTotalSortedComputedWeight) { Object oldValue = getSpeciesTotalSortedComputedWeight(); this.speciesTotalSortedComputedOrNotWeight.setComputedData(speciesTotalSortedComputedWeight); firePropertyChange(PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT, oldValue, speciesTotalSortedComputedWeight); } + @Override public Float getSpeciesTotalSampleSortedComputedWeight() { return speciesTotalSampleSortedComputedWeight; } + @Override public void setSpeciesTotalSampleSortedComputedWeight(Float speciesTotalSampleSortedComputedWeight) { Object oldValue = getSpeciesTotalSampleSortedComputedWeight(); this.speciesTotalSampleSortedComputedWeight = speciesTotalSampleSortedComputedWeight; firePropertyChange(PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, oldValue, speciesTotalSampleSortedComputedWeight); } + @Override public Float getSpeciesTotalUnsortedComputedWeight() { return speciesTotalUnsortedComputedWeight; } + @Override public void setSpeciesTotalUnsortedComputedWeight(Float speciesTotalUnsortedComputedWeight) { Object oldValue = getSpeciesTotalUnsortedComputedWeight(); this.speciesTotalUnsortedComputedWeight = speciesTotalUnsortedComputedWeight; @@ -400,10 +382,12 @@ firePropertyChange(PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, oldValue, speciesTotalInertWeight); } + @Override public Float getSpeciesTotalInertComputedWeight() { return speciesTotalInertComputedOrNotWeight.getComputedData(); } + @Override public void setSpeciesTotalInertComputedWeight(Float speciesTotalInertComputedWeight) { Object oldValue = getSpeciesTotalInertComputedWeight(); this.speciesTotalInertComputedOrNotWeight.setComputedData(speciesTotalInertComputedWeight); @@ -426,10 +410,12 @@ firePropertyChange(PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, oldValue, speciesTotalLivingNotItemizedWeight); } + @Override public Float getSpeciesTotalLivingNotItemizedComputedWeight() { return speciesTotalLivingNotItemizedComputedOrNotWeight.getComputedData(); } + @Override public void setSpeciesTotalLivingNotItemizedComputedWeight(Float speciesTotalLivingNotItemizedComputedWeight) { Object oldValue = getSpeciesTotalLivingNotItemizedComputedWeight(); this.speciesTotalLivingNotItemizedComputedOrNotWeight.setComputedData(speciesTotalLivingNotItemizedComputedWeight); @@ -440,10 +426,12 @@ //-- Benthos --// //------------------------------------------------------------------------// + @Override public Float getBenthosTotalComputedWeight() { return benthosTotalComputedWeight; } + @Override public void setBenthosTotalComputedWeight(Float benthosTotalComputedWeight) { Object oldValue = getBenthosTotalComputedWeight(); this.benthosTotalComputedWeight = benthosTotalComputedWeight; @@ -466,30 +454,36 @@ firePropertyChange(PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, oldValue, benthosTotalSortedWeight); } + @Override public Float getBenthosTotalSortedComputedWeight() { return benthosTotalSortedComputedOrNotWeight.getComputedData(); } + @Override public void setBenthosTotalSortedComputedWeight(Float benthosTotalSortedComputedWeight) { Object oldValue = getBenthosTotalSortedComputedWeight(); this.benthosTotalSortedComputedOrNotWeight.setComputedData(benthosTotalSortedComputedWeight); firePropertyChange(PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT, oldValue, benthosTotalSortedComputedWeight); } + @Override public Float getBenthosTotalSampleSortedComputedWeight() { return benthosTotalSampleSortedComputedWeight; } + @Override public void setBenthosTotalSampleSortedComputedWeight(Float benthosTotalSampleSortedComputedWeight) { Object oldValue = getBenthosTotalSampleSortedComputedWeight(); this.benthosTotalSampleSortedComputedWeight = benthosTotalSampleSortedComputedWeight; firePropertyChange(PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, oldValue, benthosTotalSampleSortedComputedWeight); } + @Override public Float getBenthosTotalUnsortedComputedWeight() { return benthosTotalUnsortedComputedWeight; } + @Override public void setBenthosTotalUnsortedComputedWeight(Float benthosTotalUnsortedComputedWeight) { Object oldValue = getBenthosTotalUnsortedComputedWeight(); this.benthosTotalUnsortedComputedWeight = benthosTotalUnsortedComputedWeight; @@ -512,10 +506,12 @@ firePropertyChange(PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT, oldValue, benthosTotalInertWeight); } + @Override public Float getBenthosTotalInertComputedWeight() { return benthosTotalInertComputedOrNotWeight.getComputedData(); } + @Override public void setBenthosTotalInertComputedWeight(Float benthosTotalInertComputedWeight) { Object oldValue = getBenthosTotalInertComputedWeight(); this.benthosTotalInertComputedOrNotWeight.setComputedData(benthosTotalInertComputedWeight); @@ -538,10 +534,12 @@ firePropertyChange(PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT, oldValue, benthosTotalLivingNotItemizedWeight); } + @Override public Float getBenthosTotalLivingNotItemizedComputedWeight() { return benthosTotalLivingNotItemizedComputedOrNotWeight.getComputedData(); } + @Override public void setBenthosTotalLivingNotItemizedComputedWeight(Float benthosTotalLivingNotItemizedComputedWeight) { Object oldValue = getBenthosTotalLivingNotItemizedComputedWeight(); this.benthosTotalLivingNotItemizedComputedOrNotWeight.setComputedData(benthosTotalLivingNotItemizedComputedWeight);