sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1804420 [1/3] - in /sis/trunk: ./ application/sis-console/src/main/artifact/ core/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ core/sis-metadata/src/main/jav...
Date Tue, 08 Aug 2017 13:13:54 GMT
Author: desruisseaux
Date: Tue Aug  8 13:13:53 2017
New Revision: 1804420

URL: http://svn.apache.org/viewvc?rev=1804420&view=rev
Log:
Merge from JDK7 branch.

Added:
    sis/trunk/core/sis-raster/
      - copied from r1804411, sis/branches/JDK7/core/sis-raster/
    sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml~
      - copied, changed from r1804411, sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractFeatureSet.java
      - copied unchanged from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractFeatureSet.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java
      - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractResource.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureAccess.java
      - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FeatureAccess.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java
      - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/Aggregate.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java
      - copied unchanged from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataSet.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
      - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/FeatureSet.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java
      - copied, changed from r1804411, sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/Resource.java
    sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/FeatureAccess.java
      - copied, changed from r1804411, sis/branches/JDK7/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/FeatureAccess.java
Removed:
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/FeatureStore.java
Modified:
    sis/trunk/   (props changed)
    sis/trunk/README
    sis/trunk/application/sis-console/src/main/artifact/README
    sis/trunk/core/pom.xml
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
    sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java
    sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
    sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
    sis/trunk/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
    sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
    sis/trunk/ide-project/NetBeans/build.xml
    sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml
    sis/trunk/ide-project/NetBeans/nbproject/cfg_hints.xml   (props changed)
    sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties
    sis/trunk/ide-project/NetBeans/nbproject/project.properties
    sis/trunk/ide-project/NetBeans/nbproject/project.xml
    sis/trunk/pom.xml
    sis/trunk/src/main/javadoc/overview.html
    sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
    sis/trunk/storage/sis-gdal/pom.xml   (props changed)
    sis/trunk/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
    sis/trunk/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Transform.java
    sis/trunk/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java
    sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
    sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java
    sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
    sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
    sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
    sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/FeatureCatalogBuilder.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources.properties
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/Resources_fr.properties
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
    sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoreMock.java
    sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
    sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Types.java
    sis/trunk/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java
    sis/trunk/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  8 13:13:53 2017
@@ -1,5 +1,5 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394364-1758914
-/sis/branches/JDK7:1394913-1803100
-/sis/branches/JDK8:1584960-1803097
+/sis/branches/JDK7:1394913-1804411
+/sis/branches/JDK8:1584960-1804404
 /sis/branches/JDK9:1773327-1803064

Modified: sis/trunk/README
URL: http://svn.apache.org/viewvc/sis/trunk/README?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/README (original)
+++ sis/trunk/README Tue Aug  8 13:13:53 2017
@@ -26,7 +26,7 @@ project logo are trademarks of The Apach
 Getting Started
 ===============
 
-SIS requires Java 6 and uses the Maven 3 <http://maven.apache.org/>
+SIS requires Java 7 and uses the Maven 3 <http://maven.apache.org/>
 build system. To build SIS, use the following command in this directory:
 
     mvn clean install

Modified: sis/trunk/application/sis-console/src/main/artifact/README
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/artifact/README?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/application/sis-console/src/main/artifact/README [UTF-8] (original)
+++ sis/trunk/application/sis-console/src/main/artifact/README [UTF-8] Tue Aug  8 13:13:53 2017
@@ -13,7 +13,7 @@ project logo are trademarks of The Apach
 Installation
 ============
 
-SIS is based on Java 6 and provided as a unique standalone JAR file.
+SIS is based on Java 7 and provided as a unique standalone JAR file.
 
 Unix
 ----

Modified: sis/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/pom.xml?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/pom.xml (original)
+++ sis/trunk/core/pom.xml Tue Aug  8 13:13:53 2017
@@ -192,6 +192,7 @@
     <module>sis-referencing</module>
     <module>sis-referencing-by-identifiers</module>
     <module>sis-feature</module>
+    <module>sis-raster</module>
   </modules>
 
 </project>

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -39,9 +39,11 @@ import org.apache.sis.util.Deprecable;
 import org.apache.sis.util.Characters;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArgumentChecks;
+import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.internal.system.Modules;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.math.MathFunctions;
 
@@ -112,6 +114,12 @@ public class FeatureFormat extends Tabul
     private static final int MAXIMAL_VALUE_LENGTH = 40;
 
     /**
+     * The bit patterns of the last {@link Float#NaN} value for which {@link MathFunctions#toNanOrdinal(float)} could
+     * not get the ordinal value. We use this information for avoiding flooding the logger with the same message.
+     */
+    private transient int illegalNaN;
+
+    /**
      * Creates a new formatter for the default locale and timezone.
      */
     public FeatureFormat() {
@@ -504,8 +512,17 @@ public class FeatureFormat extends Tabul
                                                 t.setLength(0);
                                                 t.append("NaN");
                                             }
-                                            final int n = MathFunctions.toNanOrdinal(f);
-                                            if (n > 0) buffer.append(" #").append(n);
+                                            try {
+                                                final int n = MathFunctions.toNanOrdinal(f);
+                                                if (n > 0) t.append(" #").append(n);
+                                            } catch (IllegalArgumentException e) {
+                                                // May happen if the NaN is a signaling NaN instead than a quiet NaN.
+                                                final int bits = Float.floatToRawIntBits(f);
+                                                if (bits != illegalNaN) {
+                                                    illegalNaN = bits;
+                                                    Logging.recoverableException(Logging.getLogger(Modules.FEATURE), FeatureFormat.class, "format", e);
+                                                }
+                                            }
                                         }
                                     }
                                     value = t;

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -31,7 +31,10 @@ import org.apache.sis.internal.jaxb.gco.
  * @version 0.3
  * @since   0.3
  * @module
+ *
+ * @deprecated Not anymore part of ISO 19115.
  */
+@Deprecated
 public final class MD_FeatureTypeList extends PropertyType<MD_FeatureTypeList, FeatureTypeList> {
     /**
      * Empty constructor for JAXB only.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -208,9 +208,17 @@ public final class NameToIdentifier impl
      */
     public static boolean isHeuristicMatchForIdentifier(final Iterable<? extends ReferenceIdentifier> identifiers, final String toSearch) {
         if (toSearch != null && identifiers != null) {
-            for (int s = toSearch.indexOf(DefaultNameSpace.DEFAULT_SEPARATOR); s >= 0;
-                     s = toSearch.indexOf(DefaultNameSpace.DEFAULT_SEPARATOR, s))
-            {
+            int s = toSearch.indexOf(DefaultNameSpace.DEFAULT_SEPARATOR);
+            if (s < 0) {
+                // no codespace in searched name
+                for (final Identifier id : identifiers) {
+                    if (toSearch.equalsIgnoreCase(id.getCode())) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            do {
                 final String codespace = toSearch.substring(0, s).trim();
                 final String code = toSearch.substring(++s).trim();
                 for (final ReferenceIdentifier id : identifiers) {
@@ -218,7 +226,8 @@ public final class NameToIdentifier impl
                         return true;
                     }
                 }
-            }
+                s = toSearch.indexOf(DefaultNameSpace.DEFAULT_SEPARATOR, s);
+            } while (s >= 0);
         }
         return false;
     }

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -45,7 +45,10 @@ import org.opengis.metadata.FeatureTypeL
  * @version 0.3
  * @since   0.3
  * @module
+ *
+ * @deprecated Not anymore part of ISO 19115.
  */
+@Deprecated                                     // TODO: after deletion, search "FeatureTypeList" on the whole code base.
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs shallow clones.
 @XmlType(propOrder = {
     "spatialObject",

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -62,7 +62,7 @@ import static org.opengis.annotation.Spe
  *       same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
  * </ul>
  *
- * @author  Remi Marechal (geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5
  * @since   0.5

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -39,7 +39,6 @@
  * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultApplicationSchemaInformation Application schema information}<br>
  * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultMetadataExtensionInformation Metadata extension information}<br>
  * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultExtendedElementInformation   Extended element information}<br>
- * {@code  ├─} {@linkplain org.apache.sis.metadata.iso.DefaultFeatureTypeList              Feature type list}<br>
  * {@code  └─} {@linkplain org.apache.sis.metadata.iso.DefaultIdentifier                   Identifier}<br>
  * {@linkplain org.opengis.util.CodeList Code list}<br>
  * {@code  ├─} {@linkplain org.opengis.metadata.Datatype   Data type}<br>
@@ -53,7 +52,6 @@
  * {@code  │   └─}     {@linkplain org.apache.sis.metadata.iso.DefaultExtendedElementInformation   Extended element information}<br>
  * {@code  │       ├─} {@linkplain org.opengis.metadata.Datatype                                   Data type} «code list»<br>
  * {@code  │       └─} {@linkplain org.opengis.metadata.Obligation                                 Obligation} «code list»<br>
- * {@code  ├─}         {@linkplain org.apache.sis.metadata.iso.DefaultFeatureTypeList              Feature type list}<br>
  * {@code  └─}         {@linkplain org.apache.sis.metadata.iso.DefaultIdentifier                   Identifier}<br>
  * </td></tr></table>
  *

Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -58,7 +58,6 @@ public final strictfp class AllMetadataT
             org.opengis.metadata.ApplicationSchemaInformation.class,
             org.opengis.metadata.Datatype.class,
             org.opengis.metadata.ExtendedElementInformation.class,
-            org.opengis.metadata.FeatureTypeList.class,
             org.opengis.metadata.Identifier.class,
             org.opengis.metadata.Metadata.class,
             org.opengis.metadata.MetadataExtensionInformation.class,
@@ -276,10 +275,6 @@ public final strictfp class AllMetadataT
     protected String getExpectedXmlTypeForElement(final Class<?> type, final Class<?> impl) {
         final String rootName = type.getAnnotation(UML.class).identifier();
         switch (rootName) {
-            // We don't know yet what is the type of this one.
-            case "MD_FeatureTypeList": {
-                return null;
-            }
             // Following prefix was changed in ISO 19115 corrigendum,
             // but ISO 19139 still use the old prefix.
             case "SV_ServiceIdentification": {

Modified: sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java?rev=1804420&r1=1804411&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java [UTF-8] (original)
+++ sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -29,7 +29,6 @@ import java.nio.Buffer;
 import java.nio.IntBuffer;
 import java.nio.FloatBuffer;
 import java.nio.DoubleBuffer;
-import org.opengis.coverage.grid.SequenceType;
 import org.apache.sis.internal.raster.Resources;
 import org.apache.sis.util.ArgumentChecks;
 
@@ -140,18 +139,6 @@ final class DefaultIterator extends Writ
     }
 
     /**
-     * Returns the order in which pixels are traversed.
-     */
-    @Override
-    public SequenceType getIterationOrder() {
-        if (image == null || (tileUpperX - tileLowerX) <=1 && (tileUpperY - tileLowerY) <= 1) {
-            return SequenceType.LINEAR;
-        } else {
-            return null;            // Undefined order.
-        }
-    }
-
-    /**
      * Returns the column (x) and row (y) indices of the current pixel.
      *
      * @return column and row indices of current iterator position.

Modified: sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java?rev=1804420&r1=1804411&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java [UTF-8] (original)
+++ sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -23,8 +23,6 @@ import java.awt.Rectangle;
 import java.awt.image.Raster;
 import java.awt.image.RenderedImage;
 import java.util.NoSuchElementException;
-import org.opengis.coverage.grid.SequenceType;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.internal.jdk8.JDK8;
 
@@ -34,8 +32,8 @@ import static org.apache.sis.internal.jd
 /**
  * An iterator over sample values in a raster or an image.  This iterator makes easier to read and write efficiently
  * pixel or sample values. The iterator {@linkplain RenderedImage#getTile(int,int) acquires tiles} and releases them
- * automatically. Unless otherwise specified, iterators are free to use an {@linkplain #getIterationOrder() iteration
- * order} that minimize the "acquire / release tile" operations (in other words, iterations are not necessarily from
+ * automatically. Unless otherwise specified, iterators are free to use an iteration order
+ * that minimize the "acquire / release tile" operations (in other words, iterations are not necessarily from
  * left to right). Iteration can be performed on a complete image or only a sub-region of it. Some optimized iterator
  * implementations exist for a few commonly used {@linkplain java.awt.image.SampleModel sample models}.
  *
@@ -201,7 +199,7 @@ public abstract class PixelIterator {
      * @return a new iterator traversing all pixels in the given raster, in arbitrary order.
      */
     public static PixelIterator create(Raster data) {
-        return create(data, null, null, null);
+        return create(data, null, null);
     }
 
     /**
@@ -211,72 +209,41 @@ public abstract class PixelIterator {
      * @return a new iterator traversing all pixels in the given image, in arbitrary order.
      */
     public static PixelIterator create(RenderedImage data) {
-        return create(data, null, null, null);
+        return create(data, null, null);
     }
 
     /**
      * Creates an iterator for the given region in the given raster.
-     * The {@code order} argument can have the following values:
-     *
-     * <table class="sis">
-     *   <caption>Supported iteration order</caption>
-     *   <tr><th>Value</th>                         <th>Iteration order</th></tr>
-     *   <tr><td>{@code null}</td>                  <td>Most efficient iteration order.</td></tr>
-     *   <tr><td>{@link SequenceType#LINEAR}</td>   <td>From left to right, then from top to bottom.</td></tr>
-     * </table>
-     *
-     * Any other {@code order} value will cause an {@link IllegalArgumentException} to be thrown.
-     * More iteration orders may be supported in future Apache SIS versions.
      *
      * @param  data     the raster which contains the sample values on which to iterate.
      * @param  subArea  the raster region where to perform the iteration, or {@code null}
      *                  for iterating over all the raster domain.
      * @param  window   size of the window to use in {@link #createWindow(TransferType)} method, or {@code null} if none.
-     * @param  order    the desired iteration order, or {@code null} for a default order.
      * @return a new iterator.
      */
-    public static PixelIterator create(Raster data, Rectangle subArea, Dimension window, SequenceType order) {
+    public static PixelIterator create(Raster data, Rectangle subArea, Dimension window) {
         ArgumentChecks.ensureNonNull("data", data);
 
         // TODO: check here for cases that we can optimize (after we ported corresponding implementations).
 
-        if (order == null || order.equals(SequenceType.LINEAR)) {
-            return new DefaultIterator(data, null, subArea, window);
-        } else {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.UnsupportedType_1, order));
-        }
+        return new DefaultIterator(data, null, subArea, window);
     }
 
     /**
      * Creates an iterator for the given region in the given image.
-     * The {@code order} argument can have the following values:
-     *
-     * <table class="sis">
-     *   <caption>Supported iteration order</caption>
-     *   <tr><th>Value</th>                         <th>Iteration order</th></tr>
-     *   <tr><td>{@code null}</td>                  <td>Most efficient iteration order.</td></tr>
-     * </table>
-     *
-     * Any other {@code order} value will cause an {@link IllegalArgumentException} to be thrown.
-     * More iteration orders may be supported in future Apache SIS versions.
      *
      * @param  data     the image which contains the sample values on which to iterate.
      * @param  subArea  the image region where to perform the iteration, or {@code null}
      *                  for iterating over all the image domain.
      * @param  window   size of the window to use in {@link #createWindow(TransferType)} method, or {@code null} if none.
-     * @param  order    the desired iteration order, or {@code null} for a default order.
      * @return a new iterator.
      */
-    public static PixelIterator create(RenderedImage data, Rectangle subArea, Dimension window, SequenceType order) {
+    public static PixelIterator create(RenderedImage data, Rectangle subArea, Dimension window) {
         ArgumentChecks.ensureNonNull("data", data);
 
         // TODO: check here for cases that we can optimize (after we ported corresponding implementations).
 
-        if (order == null) {
-            return new DefaultIterator(data, null, subArea, window);
-        } else {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.UnsupportedType_1, order));
-        }
+        return new DefaultIterator(data, null, subArea, window);
     }
 
     /**
@@ -309,15 +276,6 @@ public abstract class PixelIterator {
     }
 
     /**
-     * Returns the order in which pixels are traversed. {@link SequenceType#LINEAR} means that pixels on the first
-     * row are traversed from left to right, then pixels on the second row from left to right, <i>etc.</i>
-     * A {@code null} value means that the iteration order is unspecified.
-     *
-     * @return order in which pixels are traversed, or {@code null} if unspecified.
-     */
-    public abstract SequenceType getIterationOrder();
-
-    /**
      * Returns the pixel coordinates of the region where this iterator is doing the iteration.
      * If no region was specified at construction time, then this method returns the image or raster bounds.
      *
@@ -466,8 +424,8 @@ public abstract class PixelIterator {
      * <var>(number of bands)</var> × <var>(window width)</var> × <var>(window height)</var>.
      * Values are always stored with band index varying fastest, then column index, then row index.
      * Columns are traversed from left to right and rows are traversed from top to bottom
-     * ({@link SequenceType#LINEAR} iteration order).
-     * That order is the same regardless the {@linkplain #getIterationOrder() iteration order} of this iterator.
+     * (linear iteration order).
+     * That order is the same regardless the iteration order of this iterator.
      *
      * <div class="note"><b>Example:</b>
      * for an RGB image, the 3 first values are the red, green and blue components of the pixel at
@@ -482,7 +440,7 @@ public abstract class PixelIterator {
      * <div class="note"><b>Usage example:</b>
      * following code creates an iterator over the full area of given image, then a window of 5×5 pixels.
      * The window is moved over all the image area in iteration order. Inside the window, data are copied
-     * in {@linkplain SequenceType#LINEAR linear order} regardless the iteration order.
+     * in linear order regardless the iteration order.
      *
      * {@preformat java
      *     PixelIterator it = create(image, null, new Dimension(5, 5), null);     // Windows size will be 5×5 pixels.
@@ -526,8 +484,8 @@ public abstract class PixelIterator {
          * capacity is <var>(number of bands)</var> × <var>(window width)</var> × <var>(window height)</var>.
          * Values are always stored with band index varying fastest, then column index, then row index.
          * Columns are traversed from left to right and rows are traversed from top to bottom
-         * ({@link SequenceType#LINEAR} iteration order).
-         * That order is the same regardless the {@linkplain PixelIterator#getIterationOrder() iteration order}
+         * (linear iteration order).
+         * That order is the same regardless the iteration order
          * of enclosing iterator.
          *
          * <p>Every time that {@link #update()} is invoked, the buffer content is replaced by sample values

Modified: sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java?rev=1804420&r1=1804411&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java [UTF-8] (original)
+++ sis/trunk/core/sis-raster/src/main/java/org/apache/sis/image/WritablePixelIterator.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -23,9 +23,7 @@ import java.awt.image.Raster;
 import java.awt.image.RenderedImage;
 import java.awt.image.WritableRaster;
 import java.awt.image.WritableRenderedImage;
-import org.opengis.coverage.grid.SequenceType;
 import org.apache.sis.internal.raster.Resources;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 
 
@@ -112,7 +110,7 @@ public abstract class WritablePixelItera
      * @return a new iterator traversing all pixels in the given raster, in arbitrary order.
      */
     public static WritablePixelIterator create(WritableRaster data) {
-        return create(data, null, null, null, null);
+        return create(data, null, null, null);
     }
 
     /**
@@ -122,33 +120,21 @@ public abstract class WritablePixelItera
      * @return a new iterator traversing all pixels in the given image, in arbitrary order.
      */
     public static WritablePixelIterator create(WritableRenderedImage data) {
-        return create(data, null, null, null, null);
+        return create(data, null, null, null);
     }
 
     /**
      * Creates an iterator for the given region in the given rasters.
-     * The {@code order} argument can have the following values:
-     *
-     * <table class="sis">
-     *   <caption>Supported iteration order</caption>
-     *   <tr><th>Value</th>                         <th>Iteration order</th></tr>
-     *   <tr><td>{@code null}</td>                  <td>Most efficient iteration order.</td></tr>
-     *   <tr><td>{@link SequenceType#LINEAR}</td>   <td>From left to right, then from top to bottom.</td></tr>
-     * </table>
-     *
-     * Any other {@code order} value will cause an {@link IllegalArgumentException} to be thrown.
-     * More iteration orders may be supported in future Apache SIS versions.
      *
      * @param  input    the raster which contains the sample values to read.
      * @param  output   the raster where to write the sample values. Can be the same than {@code input}.
      * @param  subArea  the raster region where to perform the iteration, or {@code null}
      *                  for iterating over all the raster domain.
      * @param  window   size of the window to use in {@link #createWindow(TransferType)} method, or {@code null} if none.
-     * @param  order    the desired iteration order, or {@code null} for a default order.
      * @return a new writable iterator.
      */
     public static WritablePixelIterator create(Raster input, WritableRaster output,
-            Rectangle subArea, Dimension window, SequenceType order)
+            Rectangle subArea, Dimension window)
     {
         ArgumentChecks.ensureNonNull("input",  input);
         ArgumentChecks.ensureNonNull("output", output);
@@ -160,36 +146,21 @@ public abstract class WritablePixelItera
 
         // TODO: check here for cases that we can optimize (after we ported corresponding implementations).
 
-        if (order == null || order.equals(SequenceType.LINEAR)) {
-            return new DefaultIterator(input, output, subArea, window);
-        } else {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.UnsupportedType_1, order));
-        }
+        return new DefaultIterator(input, output, subArea, window);
     }
 
     /**
      * Creates an iterator for the given region in the given image.
-     * The {@code order} argument can have the following values:
-     *
-     * <table class="sis">
-     *   <caption>Supported iteration order</caption>
-     *   <tr><th>Value</th>                         <th>Iteration order</th></tr>
-     *   <tr><td>{@code null}</td>                  <td>Most efficient iteration order.</td></tr>
-     * </table>
-     *
-     * Any other {@code order} value will cause an {@link IllegalArgumentException} to be thrown.
-     * More iteration orders may be supported in future Apache SIS versions.
      *
      * @param  input    the image which contains the sample values to read.
      * @param  output   the image where to write the sample values. Can be the same than {@code input}.
      * @param  subArea  the image region where to perform the iteration, or {@code null}
      *                  for iterating over all the image domain.
      * @param  window   size of the window to use in {@link #createWindow(TransferType)} method, or {@code null} if none.
-     * @param  order    the desired iteration order, or {@code null} for a default order.
      * @return a new iterator.
      */
     public static WritablePixelIterator create(RenderedImage input, WritableRenderedImage output,
-            Rectangle subArea, Dimension window, SequenceType order)
+            Rectangle subArea, Dimension window)
     {
         ArgumentChecks.ensureNonNull("input",  input);
         ArgumentChecks.ensureNonNull("output", output);
@@ -211,11 +182,7 @@ public abstract class WritablePixelItera
 
         // TODO: check here for cases that we can optimize (after we ported corresponding implementations).
 
-        if (order == null) {
-            return new DefaultIterator(input, output, subArea, window);
-        } else {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.UnsupportedType_1, order));
-        }
+        return new DefaultIterator(input, output, subArea, window);
     }
 
     /**

Modified: sis/trunk/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java?rev=1804420&r1=1804411&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-raster/src/test/java/org/apache/sis/image/DefaultIteratorTest.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -25,7 +25,6 @@ import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 import java.awt.image.WritableRenderedImage;
 import java.nio.FloatBuffer;
-import org.opengis.coverage.grid.SequenceType;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
 import org.junit.After;
@@ -255,7 +254,6 @@ public strictfp class DefaultIteratorTes
      */
     void createPixelIterator(WritableRaster raster, Rectangle subArea) {
         iterator = new DefaultIterator(raster, isWritable ? raster : null, subArea, null);
-        assertEquals("getIterationOrder()", SequenceType.LINEAR, iterator.getIterationOrder());
         assertEquals("isWritable", isWritable, iterator.isWritable());
     }
 
@@ -565,7 +563,6 @@ public strictfp class DefaultIteratorTes
         tileHeight =   5;
         numBands   =   3;
         createPixelIterator(createImage(null), null);
-        assertNull("getIterationOrder()", iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -585,7 +582,6 @@ public strictfp class DefaultIteratorTes
         tileHeight =   5;
         numBands   =   2;
         createPixelIterator(createImage(null), null);
-        assertNull("getIterationOrder()", iterator.getIterationOrder());
         verifyIteration(false);
 
         iterator.rewind();
@@ -612,7 +608,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(-10, -20, 8, 28);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertEquals("getIterationOrder()", SequenceType.LINEAR, iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -636,7 +631,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(45, -20, 30, 29);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertEquals("getIterationOrder()", SequenceType.LINEAR, iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -661,7 +655,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(68, 5, 4, 4);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertEquals("getIterationOrder()", SequenceType.LINEAR, iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -686,7 +679,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(0, 0, 9, 50);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertEquals("getIterationOrder()", SequenceType.LINEAR, iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -709,7 +701,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(6, 20, 4, 5);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertEquals("getIterationOrder()", SequenceType.LINEAR, iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -733,7 +724,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(-10, -5, 25, 22);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertNull("getIterationOrder()", iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -757,7 +747,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(27, -20, 30, 37);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertNull("getIterationOrder()", iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -781,7 +770,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(36, 8, 12, 20);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertNull("getIterationOrder()", iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -805,7 +793,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(-20, -1, 30, 20);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertNull("getIterationOrder()", iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -828,7 +815,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(20, 10, 30, 25);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertNull("getIterationOrder()", iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -850,7 +836,6 @@ public strictfp class DefaultIteratorTes
         final Rectangle subArea = new Rectangle(-10, -10, 150, 80);
         createPixelIterator(createImage(subArea), subArea);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertNull("getIterationOrder()", iterator.getIterationOrder());
         verifyIteration(false);
     }
 
@@ -1091,7 +1076,6 @@ public strictfp class DefaultIteratorTes
         final Dimension window = new Dimension(3, 4);
         createWindowIterator(createImage(null), window);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertEquals("getIterationOrder()", SequenceType.LINEAR, iterator.getIterationOrder());
         verifyWindow(window);
     }
 
@@ -1113,7 +1097,6 @@ public strictfp class DefaultIteratorTes
         final Dimension window = new Dimension(2, 3);
         createWindowIterator(createImage(null), window);
         assertTrue("Expected a non-empty set of values.", expected.length != 0);
-        assertNull("getIterationOrder()", iterator.getIterationOrder());
         verifyWindow(window);
     }
 

Modified: sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -170,9 +170,9 @@ public final strictfp class MilitaryGrid
              * The lowest 4 bits are the number of the row cycle (a cycle of 2000 km). The remaining bits tell which
              * rows are valid in that latitude band.
              */
-            final int rowCycle = (int) Math.floor(ymin / (MilitaryGridReferenceSystem.GRID_SQUARE_SIZE * MilitaryGridReferenceSystem.GRID_ROW_COUNT));
-            final int lowerRow = (int) Math.floor(ymin /  MilitaryGridReferenceSystem.GRID_SQUARE_SIZE);    // Inclusive
-            final int upperRow = (int) Math.ceil (ymax /  MilitaryGridReferenceSystem.GRID_SQUARE_SIZE);    // Exclusive
+            final int rowCycle = (int) StrictMath.floor(ymin / (MilitaryGridReferenceSystem.GRID_SQUARE_SIZE * MilitaryGridReferenceSystem.GRID_ROW_COUNT));
+            final int lowerRow = (int) StrictMath.floor(ymin /  MilitaryGridReferenceSystem.GRID_SQUARE_SIZE);    // Inclusive
+            final int upperRow = (int) StrictMath.ceil (ymax /  MilitaryGridReferenceSystem.GRID_SQUARE_SIZE);    // Exclusive
             assertTrue("rowCycle", rowCycle >= 0 && rowCycle <= MilitaryGridReferenceSystem.Decoder.NORTHING_BITS_MASK);
             assertTrue("lowerRow", lowerRow >= 0);
             assertTrue("upperRow", upperRow >= 0);

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -33,7 +33,7 @@ import static org.apache.sis.internal.ut
  * objects defined in the EPSG database.
  * Current version uses hard-coded mapping.
  *
- * @author  Rémi Marechal (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.8

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -56,7 +56,7 @@ import static org.apache.sis.internal.ut
  * in some relatively rare scenarios like 1 ± x where <var>x</var> is much smaller than 1.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @author  Rémi Marechal (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @version 0.7
  * @since   0.6
  * @module

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -40,7 +40,7 @@ import org.apache.sis.util.resources.Err
  * then concatenating this transform with a transform that multiply all output values by -1.</p>
  *
  * @author  Johann Sorel (Geomatys)
- * @author  Remi Marechal (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
  * @since   0.7

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -33,7 +33,7 @@ import static org.opengis.test.Assert.*;
 /**
  * Tests the {@link Initializer} class.
  *
- * @author  Rémi Marechal (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
  * @since   0.7

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -38,7 +38,7 @@ import static org.apache.sis.test.Assert
 /**
  * Tests the {@link ObliqueStereographic} class.
  *
- * @author  Rémi Marechal (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  * @since   0.7

Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -28,7 +28,7 @@ import static org.opengis.test.Assert.*;
 /**
  * Test {@link LinearInterpolator1D} class.
  *
- * @author  Remi Marechal (Geomatys).
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys).
  * @version 0.7
  * @since   0.7

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -173,10 +173,30 @@ public final class JDK8 {
      */
     public static int toIntExact(final long value) {
         final int vi = (int) value;
-        if (vi != value) {
-            throw new ArithmeticException();
-        }
-        return vi;
+        if (vi == value) return vi;
+        throw new ArithmeticException();
+    }
+
+    /**
+     * Returns the given value + 1, throwing an exception if the result overflows.
+     *
+     * @param  a  the value to increment.
+     * @return {@code a+1}.
+     */
+    public static int incrementExact(int a) {
+        if (a != Integer.MAX_VALUE) return a+1;
+        throw new ArithmeticException();
+    }
+
+    /**
+     * Returns the given value - 1, throwing an exception if the result underflows.
+     *
+     * @param  a  the value to increment.
+     * @return {@code a-1}.
+     */
+    public static int decrementExact(int a) {
+        if (a != Integer.MIN_VALUE) return a-1;
+        throw new ArithmeticException();
     }
 
     /**
@@ -190,9 +210,7 @@ public final class JDK8 {
      * @since 0.8
      */
     public static int addExact(final int x, final int y) {
-        final long r = x + y;
-        if ((r & 0xFFFFFFFF00000000L) == 0) return (int) r;
-        throw new ArithmeticException();
+        return toIntExact(x + (long) y);
     }
 
     /**
@@ -201,14 +219,12 @@ public final class JDK8 {
      * @param  x  first value to add.
      * @param  y  second value to add.
      * @return the sum.
-     * @throws ArithmeticException if the result overflows.
+     * @throws ArithmeticException if the result overflows (Note: not implemented in this placeholder).
      *
      * @since 0.8
      */
     public static long addExact(final long x, final long y) {
-        final long r = x + y;
-        if (((x ^ r) & (y ^ r)) >= 0) return r;
-        throw new ArithmeticException();
+        return x + y;   // Check for overflow not implemented in this placeholder.
     }
 
     /**
@@ -221,24 +237,22 @@ public final class JDK8 {
      *
      * @since 0.8
      */
-    public static long subtractExact(final long x, final long y) {
-        final long r = x - y;
-        if (((x ^ r) & (y ^ r)) >= 0) return r;
-        throw new ArithmeticException();
+    public static int subtractExact(final int x, final int y) {
+        return toIntExact(x - (long) y);
     }
 
     /**
-     * Safe product of the arguments.
+     * Safe subtraction of the given numbers.
      *
-     * @param  x  first value to multiply.
-     * @param  y  second value to multiply.
-     * @return the product.
-     * @throws ArithmeticException if the result overflows (Note: not implemented in this placeholder).
+     * @param  x  first value.
+     * @param  y  second value to subtract.
+     * @return the difference.
+     * @throws ArithmeticException if the result underflows (Note: not implemented in this placeholder).
      *
      * @since 0.8
      */
-    public static long multiplyExact(final long x, final long y) {
-        return x * y;   // Check for overflow not implemented in this placeholder.
+    public static long subtractExact(final long x, final long y) {
+        return x - y;   // Check for underflow not implemented in this placeholder.
     }
 
     /**
@@ -256,6 +270,33 @@ public final class JDK8 {
     }
 
     /**
+     * Safe product of the arguments.
+     *
+     * @param  x  first value to multiply.
+     * @param  y  second value to multiply.
+     * @return the product.
+     * @throws ArithmeticException if the result overflows (Note: not implemented in this placeholder).
+     *
+     * @since 0.8
+     */
+    public static long multiplyExact(final long x, final long y) {
+        return x * y;   // Check for overflow not implemented in this placeholder.
+    }
+
+    /**
+     * Divides two values, rounding toward negative infinity.
+     *
+     * @param  x  numerator.
+     * @param  y  denominator.
+     * @return x/y rounded toward negative infinity.
+     */
+    public static int floorDiv(int x, int y) {
+        int r = x / y;
+        if ((x % y != 0) && (x < 0) != (y < 0)) r--;
+        return r;
+    }
+
+    /**
      * Returns the floating-point value adjacent to {@code value} in the direction of negative infinity.
      *
      * @param  value  the value for which to get the adjacent value.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -60,6 +60,11 @@ public final class Modules {
     /**
      * The {@value} module name.
      */
+    public static final String FEATURE = "org.apache.sis.feature";
+
+    /**
+     * The {@value} module name.
+     */
     public static final String STORAGE = "org.apache.sis.storage";
 
     /**

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java [UTF-8] Tue Aug  8 13:13:53 2017
@@ -186,9 +186,9 @@ public final strictfp class Conventional
         verify    (Units.CUBIC_METRE,  Units.CUBIC_METRE .divide  (1E+9), "mm³", 1E-9);
 
         assertSame(Units.HOUR,        Units.SECOND.multiply(3600));
-        assertSame(Units.DEGREE,      Units.RADIAN.multiply(Math.PI/180));
-        assertSame(Units.GRAD,        Units.RADIAN.multiply(Math.PI/200));
-        assertSame(Units.ARC_SECOND,  Units.RADIAN.multiply(Math.PI / (180*60*60)));
+        assertSame(Units.DEGREE,      Units.RADIAN.multiply(StrictMath.PI/180));
+        assertSame(Units.GRAD,        Units.RADIAN.multiply(StrictMath.PI/200));
+        assertSame(Units.ARC_SECOND,  Units.RADIAN.multiply(StrictMath.PI / (180*60*60)));
         assertSame(Units.MICRORADIAN, Units.RADIAN.divide(1E6));
 
         assertSame(Units.GRAM, Units.KILOGRAM.divide(1E+3));

Modified: sis/trunk/ide-project/NetBeans/build.xml
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/build.xml?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/build.xml (original)
+++ sis/trunk/ide-project/NetBeans/build.xml Tue Aug  8 13:13:53 2017
@@ -50,6 +50,9 @@
       <fileset dir="${project.root}/core/sis-feature/target/generated-resources">
         <include name="**/*.utf"/>
       </fileset>
+      <fileset dir="${project.root}/core/sis-raster/target/generated-resources">
+        <include name="**/*.utf"/>
+      </fileset>
       <fileset dir="${project.root}/storage/sis-storage/target/generated-resources">
         <include name="**/*.utf"/>
       </fileset>

Modified: sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml?rev=1804420&r1=1804419&r2=1804420&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml Tue Aug  8 13:13:53 2017
@@ -131,6 +131,7 @@ is divided into following sections:
                 <available file="${test.xmlstore.dir}"/>
                 <available file="${test.storage.dir}"/>
                 <available file="${test.feature.dir}"/>
+                <available file="${test.raster.dir}"/>
                 <available file="${test.referencing.dir}"/>
                 <available file="${test.ref-by-id.dir}"/>
                 <available file="${test.metadata.dir}"/>
@@ -151,6 +152,7 @@ is divided into following sections:
                 <available file="${src.xmlstore.dir}"/>
                 <available file="${src.storage.dir}"/>
                 <available file="${src.feature.dir}"/>
+                <available file="${src.raster.dir}"/>
                 <available file="${src.referencing.dir}"/>
                 <available file="${src.ref-by-id.dir}"/>
                 <available file="${src.metadata.dir}"/>
@@ -270,6 +272,7 @@ is divided into following sections:
         <fail unless="src.xmlstore.dir">Must set src.xmlstore.dir</fail>
         <fail unless="src.storage.dir">Must set src.storage.dir</fail>
         <fail unless="src.feature.dir">Must set src.feature.dir</fail>
+        <fail unless="src.raster.dir">Must set src.raster.dir</fail>
         <fail unless="src.referencing.dir">Must set src.referencing.dir</fail>
         <fail unless="src.ref-by-id.dir">Must set src.ref-by-id.dir</fail>
         <fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
@@ -286,6 +289,7 @@ is divided into following sections:
         <fail unless="test.xmlstore.dir">Must set test.xmlstore.dir</fail>
         <fail unless="test.storage.dir">Must set test.storage.dir</fail>
         <fail unless="test.feature.dir">Must set test.feature.dir</fail>
+        <fail unless="test.raster.dir">Must set test.raster.dir</fail>
         <fail unless="test.referencing.dir">Must set test.referencing.dir</fail>
         <fail unless="test.ref-by-id.dir">Must set test.ref-by-id.dir</fail>
         <fail unless="test.metadata.dir">Must set test.metadata.dir</fail>
@@ -312,7 +316,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -353,7 +357,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -386,7 +390,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -500,6 +504,9 @@ is divided into following sections:
                         <fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
+                        <fileset dir="${test.raster.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
@@ -574,6 +581,9 @@ is divided into following sections:
                     <fileset dir="${test.feature.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
                         <filename name="@{testincludes}"/>
                     </fileset>
+                    <fileset dir="${test.raster.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
                     <fileset dir="${test.referencing.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
                         <filename name="@{testincludes}"/>
                     </fileset>
@@ -728,6 +738,9 @@ is divided into following sections:
                         <fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
+                        <fileset dir="${test.raster.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
@@ -1110,7 +1123,7 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
@@ -1125,6 +1138,7 @@ is divided into following sections:
             <fileset dir="${src.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1152,7 +1166,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1448,6 +1462,9 @@ is divided into following sections:
             <fileset dir="${src.feature.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
+            <fileset dir="${src.raster.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.referencing.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1506,6 +1523,9 @@ is divided into following sections:
             <fileset dir="${src.feature.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
+            <fileset dir="${src.raster.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${src.referencing.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
@@ -1549,10 +1569,10 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
     </target>
     <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1563,6 +1583,7 @@ is divided into following sections:
             <fileset dir="${test.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1583,7 +1604,7 @@ is divided into following sections:
     <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1594,6 +1615,7 @@ is divided into following sections:
             <fileset dir="${test.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>



Mime
View raw message