sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1626640 - in /sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content: DefaultBand.java DefaultSampleDimension.java
Date Sun, 21 Sep 2014 21:52:37 GMT
Author: desruisseaux
Date: Sun Sep 21 21:52:36 2014
New Revision: 1626640

URL: http://svn.apache.org/r1626640
Log:
Rearrange property order (no significant code change in this commit).

Modified:
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1626640&r1=1626639&r2=1626640&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
[UTF-8] Sun Sep 21 21:52:36 2014
@@ -86,6 +86,11 @@ public class DefaultBand extends Default
     private Unit<Length> boundUnits;
 
     /**
+     * Designation of criterion for defining maximum and minimum wavelengths for a spectral
band.
+     */
+    private BandDefinition bandBoundaryDefinition;
+
+    /**
      * Wavelength at which the response is the highest.
      */
     private Double peakResponse;
@@ -96,11 +101,6 @@ public class DefaultBand extends Default
     private Integer toneGradation;
 
     /**
-     * Designation of criterion for defining maximum and minimum wavelengths for a spectral
band.
-     */
-    private BandDefinition bandBoundaryDefinition;
-
-    /**
      * Smallest distance between which separate points can be distinguished, as specified
in
      * instrument design.
      */
@@ -259,6 +259,27 @@ public class DefaultBand extends Default
     }
 
     /**
+     * Returns the designation of criterion for defining maximum and minimum wavelengths
for a spectral band.
+     *
+     * @return Criterion for defining maximum and minimum wavelengths, or {@code null}.
+     */
+    @Override
+    @XmlElement(name = "bandBoundaryDefinition", namespace = Namespaces.GMI)
+    public BandDefinition getBandBoundaryDefinition() {
+        return bandBoundaryDefinition;
+    }
+
+    /**
+     * Sets designation of criterion for defining maximum and minimum wavelengths for a spectral
band.
+     *
+     * @param newValue The new band definition.
+     */
+    public void setBandBoundaryDefinition(final BandDefinition newValue) {
+        checkWritePermission();
+        bandBoundaryDefinition = newValue;
+    }
+
+    /**
      * Returns the wavelength at which the response is the highest.
      * The units of measurement is given by {@link #getUnits()}.
      *
@@ -356,27 +377,6 @@ public class DefaultBand extends Default
     }
 
     /**
-     * Returns the designation of criterion for defining maximum and minimum wavelengths
for a spectral band.
-     *
-     * @return Criterion for defining maximum and minimum wavelengths, or {@code null}.
-     */
-    @Override
-    @XmlElement(name = "bandBoundaryDefinition", namespace = Namespaces.GMI)
-    public BandDefinition getBandBoundaryDefinition() {
-        return bandBoundaryDefinition;
-    }
-
-    /**
-     * Sets designation of criterion for defining maximum and minimum wavelengths for a spectral
band.
-     *
-     * @param newValue The new band definition.
-     */
-    public void setBandBoundaryDefinition(final BandDefinition newValue) {
-        checkWritePermission();
-        bandBoundaryDefinition = newValue;
-    }
-
-    /**
      * Returns the smallest distance between which separate points can be distinguished,
      * as specified in instrument design.
      *

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java?rev=1626640&r1=1626639&r2=1626640&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
[UTF-8] Sun Sep 21 21:52:36 2014
@@ -68,44 +68,50 @@ public class DefaultSampleDimension exte
     private static final long serialVersionUID = 4517148689016920767L;
 
     /**
+     * Minimum value of data values in each dimension included in the resource.
+     */
+    private Double minValue;
+
+    /**
      * Maximum value of data values in each dimension included in the resource.
      */
     private Double maxValue;
 
     /**
-     * Minimum value of data values in each dimension included in the resource.
+     * Mean value of data values in each dimension included in the resource.
      */
-    private Double minValue;
+    private Double meanValue;
 
     /**
-     * Units of data in each dimension included in the resource.
+     * Number of values used in a thematicClassification resource.
      */
-    private Unit<?> units;
+    private Integer numberOfValues;
 
     /**
-     * Scale factor which has been applied to the cell value.
+     * Standard deviation of data values in each dimension included in the resource.
      */
-    private Double scaleFactor;
+    private Double standardDeviation;
 
     /**
-     * Physical value corresponding to a cell value of zero.
+     * Units of data in each dimension included in the resource.
      */
-    private Double offset;
+    private Unit<?> units;
 
     /**
-     * Mean value of data values in each dimension included in the resource.
+     * Scale factor which has been applied to the cell value.
      */
-    private Double meanValue;
+    private Double scaleFactor;
 
     /**
-     * Number of values used in a thematicClassification resource.
+     * Physical value corresponding to a cell value of zero.
      */
-    private Integer numberOfValues;
+    private Double offset;
 
     /**
-     * Standard deviation of data values in each dimension included in the resource.
+     * Maximum number of significant bits in the uncompressed representation
+     * for the value in each band of each pixel.
      */
-    private Double standardDeviation;
+    private Integer bitsPerValue;
 
     /**
      * Type of other attribute description.
@@ -119,12 +125,6 @@ public class DefaultSampleDimension exte
     private Record otherProperty;
 
     /**
-     * Maximum number of significant bits in the uncompressed representation
-     * for the value in each band of each pixel.
-     */
-    private Integer bitsPerValue;
-
-    /**
      * Constructs an initially empty sample dimension.
      */
     public DefaultSampleDimension() {
@@ -142,17 +142,17 @@ public class DefaultSampleDimension exte
     public DefaultSampleDimension(final SampleDimension object) {
         super(object);
         if (object != null) {
-            maxValue          = object.getMaxValue();
             minValue          = object.getMinValue();
-            units             = object.getUnits();
-            scaleFactor       = object.getScaleFactor();
-            offset            = object.getOffset();
+            maxValue          = object.getMaxValue();
             meanValue         = object.getMeanValue();
             numberOfValues    = object.getNumberOfValues();
             standardDeviation = object.getStandardDeviation();
+            units             = object.getUnits();
+            scaleFactor       = object.getScaleFactor();
+            offset            = object.getOffset();
+            bitsPerValue      = object.getBitsPerValue();
             otherPropertyType = object.getOtherPropertyType();
             otherProperty     = object.getOtherProperty();
-            bitsPerValue      = object.getBitsPerValue();
         }
     }
 
@@ -230,129 +230,154 @@ public class DefaultSampleDimension exte
     }
 
     /**
-     * Returns the units of data in the dimension.
+     * Returns the mean value of data values in each dimension included in the resource.
      *
-     * @return The units of data in the dimension, or {@code null} if unspecified.
+     * @return The mean value of data values in each dimension included in the resource,
or {@code null} if none.
      */
     @Override
-    @XmlElement(name = "units")
-    public Unit<?> getUnits() {
-        return units;
+/// @XmlElement(name = "meanValue")
+    public Double getMeanValue() {
+        return meanValue;
     }
 
     /**
-     * Sets the units of data in the dimension.
+     * Sets the mean value of data values in each dimension included in the resource.
      *
-     * @param newValue The new units of data in the dimension.
+     * @param newValue The new mean value of data values in each dimension included in the
resource.
      */
-    public void setUnits(final Unit<?> newValue) {
+    public void setMeanValue(final Double newValue) {
         checkWritePermission();
-        units = newValue;
+        meanValue = newValue;
     }
 
     /**
-     * Returns the scale factor which has been applied to the cell value.
+     * Returns the number of values used in a thematic classification resource.
      *
-     * @return Scale factor which has been applied to the cell value, or {@code null} if
none.
+     * @return The number of values used in a thematic classification resource, or {@code
null} if none.
      */
     @Override
-/// @XmlElement(name = "scaleFactor")
-    public Double getScaleFactor() {
-        return scaleFactor;
+/// @XmlElement(name = "numberOfValues")
+    public Integer getNumberOfValues() {
+        return numberOfValues;
     }
 
     /**
-     * Sets the scale factor which has been applied to the cell value.
+     * Sets the number of values used in a thematic classification resource.
      *
-     * @param newValue The new scale factor which has been applied to the cell value.
+     * @param newValues The new number of values used in a thematic classification resource.
      */
-    public void setScaleFactor(final Double newValue) {
+    public void setNumberOfValues(final Integer newValues) {
         checkWritePermission();
-        scaleFactor = newValue;
+        numberOfValues = newValues;
     }
 
     /**
-     * Returns the physical value corresponding to a cell value of zero.
+     * Returns the standard deviation of data values in each dimension included in the resource.
      *
-     * @return The physical value corresponding to a cell value of zero, or {@code null}
if none.
+     * @return Standard deviation of data values in each dimension included in the resource,
or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "offset")
-    public Double getOffset() {
-        return offset;
+/// @XmlElement(name = "standardDeviation")
+    public Double getStandardDeviation() {
+        return standardDeviation;
     }
 
     /**
-     * Sets the physical value corresponding to a cell value of zero.
+     * Sets the standard deviation of data values in each dimension included in the resource.
      *
-     * @param newValue The new physical value corresponding to a cell value of zero, or {@code
null} if none..
+     * @param newValue The new standard deviation of data values in each dimension included
in the resource.
      */
-    public void setOffset(final Double newValue) {
+    public void setStandardDeviation(final Double newValue) {
         checkWritePermission();
-        offset = newValue;
+        standardDeviation = newValue;
     }
 
     /**
-     * Returns the mean value of data values in each dimension included in the resource.
+     * Returns the units of data in the dimension.
      *
-     * @return The mean value of data values in each dimension included in the resource,
or {@code null} if none.
+     * @return The units of data in the dimension, or {@code null} if unspecified.
      */
     @Override
-/// @XmlElement(name = "meanValue")
-    public Double getMeanValue() {
-        return meanValue;
+    @XmlElement(name = "units")
+    public Unit<?> getUnits() {
+        return units;
     }
 
     /**
-     * Sets the mean value of data values in each dimension included in the resource.
+     * Sets the units of data in the dimension.
      *
-     * @param newValue The new mean value of data values in each dimension included in the
resource.
+     * @param newValue The new units of data in the dimension.
      */
-    public void setMeanValue(final Double newValue) {
+    public void setUnits(final Unit<?> newValue) {
         checkWritePermission();
-        meanValue = newValue;
+        units = newValue;
     }
 
     /**
-     * Returns the number of values used in a thematic classification resource.
+     * Returns the scale factor which has been applied to the cell value.
      *
-     * @return The number of values used in a thematic classification resource, or {@code
null} if none.
+     * @return Scale factor which has been applied to the cell value, or {@code null} if
none.
      */
     @Override
-/// @XmlElement(name = "numberOfValues")
-    public Integer getNumberOfValues() {
-        return numberOfValues;
+/// @XmlElement(name = "scaleFactor")
+    public Double getScaleFactor() {
+        return scaleFactor;
     }
 
     /**
-     * Sets the number of values used in a thematic classification resource.
+     * Sets the scale factor which has been applied to the cell value.
      *
-     * @param newValues The new number of values used in a thematic classification resource.
+     * @param newValue The new scale factor which has been applied to the cell value.
      */
-    public void setNumberOfValues(final Integer newValues) {
+    public void setScaleFactor(final Double newValue) {
         checkWritePermission();
-        numberOfValues = newValues;
+        scaleFactor = newValue;
     }
 
     /**
-     * Returns the standard deviation of data values in each dimension included in the resource.
+     * Returns the maximum number of significant bits in the uncompressed representation
+     * for the value in each band of each pixel.
      *
-     * @return Standard deviation of data values in each dimension included in the resource,
or {@code null} if none.
+     * @return Maximum number of significant bits in the uncompressed representation
+     *         for the value in each band of each pixel, or {@code null} if none.
      */
     @Override
-/// @XmlElement(name = "standardDeviation")
-    public Double getStandardDeviation() {
-        return standardDeviation;
+    @ValueRange(minimum = 1)
+/// @XmlElement(name = "bitsPerValues")
+    public Integer getBitsPerValue() {
+        return bitsPerValue;
     }
 
     /**
-     * Sets the standard deviation of data values in each dimension included in the resource.
+     * Sets the maximum number of significant bits in the uncompressed representation
+     * for the value in each band of each pixel.
      *
-     * @param newValue The new standard deviation of data values in each dimension included
in the resource.
+     * @param newValue The new maximum number of significant bits.
      */
-    public void setStandardDeviation(final Double newValue) {
+    public void setBitsPerValue(final Integer newValue) {
         checkWritePermission();
-        standardDeviation = newValue;
+        bitsPerValue = newValue;
+    }
+
+    /**
+     * Returns the physical value corresponding to a cell value of zero.
+     *
+     * @return The physical value corresponding to a cell value of zero, or {@code null}
if none.
+     */
+    @Override
+/// @XmlElement(name = "offset")
+    public Double getOffset() {
+        return offset;
+    }
+
+    /**
+     * Sets the physical value corresponding to a cell value of zero.
+     *
+     * @param newValue The new physical value corresponding to a cell value of zero, or {@code
null} if none..
+     */
+    public void setOffset(final Double newValue) {
+        checkWritePermission();
+        offset = newValue;
     }
 
     /**
@@ -398,29 +423,4 @@ public class DefaultSampleDimension exte
         checkWritePermission();
         otherProperty = newValue;
     }
-
-    /**
-     * Returns the maximum number of significant bits in the uncompressed representation
-     * for the value in each band of each pixel.
-     *
-     * @return Maximum number of significant bits in the uncompressed representation
-     *         for the value in each band of each pixel, or {@code null} if none.
-     */
-    @Override
-    @ValueRange(minimum = 1)
-/// @XmlElement(name = "bitsPerValues")
-    public Integer getBitsPerValue() {
-        return bitsPerValue;
-    }
-
-    /**
-     * Sets the maximum number of significant bits in the uncompressed representation
-     * for the value in each band of each pixel.
-     *
-     * @param newValue The new maximum number of significant bits.
-     */
-    public void setBitsPerValue(final Integer newValue) {
-        checkWritePermission();
-        bitsPerValue = newValue;
-    }
 }



Mime
View raw message