Author: desruisseaux
Date: Tue Aug  8 12:43:28 2017
New Revision: 1804411

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

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

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  8 12:43:28 2017
@@ -1,5 +1,5 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1803097
+/sis/branches/JDK8:1584960-1804404
 /sis/branches/JDK9:1773327-1803064
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/README
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/README?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/README (original)
+++ sis/branches/JDK7/README Tue Aug  8 12:43:28 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/branches/JDK7/application/sis-console/src/main/artifact/README
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/artifact/README?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/artifact/README [UTF-8] 
(original)
+++ sis/branches/JDK7/application/sis-console/src/main/artifact/README [UTF-8] 
Tue Aug  8 12:43:28 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/branches/JDK7/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/pom.xml?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/core/pom.xml (original)
+++ sis/branches/JDK7/core/pom.xml Tue Aug  8 12:43:28 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/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
 [UTF-8] Tue Aug  8 12:43:28 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;
 
@@ -122,6 +124,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() {
@@ -525,8 +533,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/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
 [UTF-8] Tue Aug  8 12:43:28 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/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -217,9 +217,17 @@ public final class NameToIdentifier impl
      */
     public static boolean isHeuristicMatchForIdentifier(final Iterable<? 
extends Identifier> 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 Identifier id : identifiers) {
@@ -227,7 +235,8 @@ public final class NameToIdentifier impl
                         return true;
                     }
                 }
-            }
+                s = toSearch.indexOf(DefaultNameSpace.DEFAULT_SEPARATOR, s);
+            } while (s >= 0);
         }
         return false;
     }

Modified: 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
 [UTF-8] Tue Aug  8 12:43:28 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/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -49,7 +49,7 @@ import static org.apache.sis.internal.me
  *       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/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
 [UTF-8] Tue Aug  8 12:43:28 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.annotation.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/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -60,7 +60,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,
@@ -288,10 +287,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/branches/JDK7/core/sis-raster/pom.xml
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-raster/pom.xml?rev=1804411&r1=1804404&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-raster/pom.xml (original)
+++ sis/branches/JDK7/core/sis-raster/pom.xml Tue Aug  8 12:43:28 2017
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.8-jdk8-SNAPSHOT</version>
+    <version>0.8-jdk7-SNAPSHOT</version>
   </parent>
 
 

Modified: 
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java?rev=1804411&r1=1804404&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/DefaultIterator.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -33,6 +33,9 @@ import org.opengis.coverage.grid.Sequenc
 import org.apache.sis.internal.raster.Resources;
 import org.apache.sis.util.ArgumentChecks;
 
+// Branch-dependent imports
+import org.apache.sis.internal.jdk8.JDK8;
+
 
 /**
  * Default iterator used when no specialized implementation is available.
@@ -90,7 +93,7 @@ final class DefaultIterator extends Writ
         currentLowerX = lowerX;
         currentUpperX = upperX;
         currentUpperY = upperY;
-        x = Math.decrementExact(lowerX);        // Set the position before 
first pixel.
+        x = JDK8.decrementExact(lowerX);        // Set the position before 
first pixel.
         y = lowerY;
     }
 
@@ -105,12 +108,12 @@ final class DefaultIterator extends Writ
      */
     DefaultIterator(final RenderedImage input, final WritableRenderedImage 
output, final Rectangle subArea, final Dimension window) {
         super(input, output, subArea, window);
-        tileX = Math.decrementExact(tileLowerX);
+        tileX = JDK8.decrementExact(tileLowerX);
         tileY = tileLowerY;
         currentLowerX = lowerX;
         currentUpperX = lowerX;                 // Really 'lower', so the 
position is the tile before the first tile.
         currentUpperY = lowerY;
-        x = Math.decrementExact(lowerX);        // Set the position before 
first pixel.
+        x = JDK8.decrementExact(lowerX);        // Set the position before 
first pixel.
         y = lowerY;
     }
 
@@ -181,8 +184,8 @@ final class DefaultIterator extends Writ
             throw new 
IndexOutOfBoundsException(Resources.format(Resources.Keys.CoordinateOutsideDomain_2,
 px, py));
         }
         if (image != null) {
-            final int tx = Math.floorDiv(px - tileGridXOffset, tileWidth);
-            final int ty = Math.floorDiv(py - tileGridYOffset, tileHeight);
+            final int tx = JDK8.floorDiv(px - tileGridXOffset, tileWidth);
+            final int ty = JDK8.floorDiv(py - tileGridYOffset, tileHeight);
             if (tx != tileX || ty != tileY) {
                 close();                                    // Release current 
writable raster, if any.
                 tileX = tx;
@@ -207,7 +210,7 @@ final class DefaultIterator extends Writ
             if (++y >= currentUpperY) {                     // Strict equality 
(==) would work, but use >= as a safety.
                 close();                                    // Release current 
writable raster, if any.
                 if (++tileX >= tileUpperX) {                // Strict equality 
(==) would work, but use >= as a safety.
-                    tileY = Math.incrementExact(tileY);     // 
'incrementExact' because 'tileY > tileUpperY' is allowed.
+                    tileY = JDK8.incrementExact(tileY);     // 
'incrementExact' because 'tileY > tileUpperY' is allowed.
                     if (tileY >= tileUpperY) {
                         /*
                          * Paranoiac safety: keep the x, y and tileX values 
before their maximal values

Modified: 
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java?rev=1804411&r1=1804404&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-raster/src/main/java/org/apache/sis/image/PixelIterator.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -26,8 +26,9 @@ 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;
 
-import static java.lang.Math.floorDiv;
+import static org.apache.sis.internal.jdk8.JDK8.floorDiv;
 
 
 /**
@@ -131,8 +132,8 @@ public abstract class PixelIterator {
         bounds          = intersection(tileGridXOffset, tileGridYOffset, 
tileWidth, tileHeight, subArea, window);
         lowerX          = bounds.x;
         lowerY          = bounds.y;
-        upperX          = Math.addExact(lowerX, bounds.width);
-        upperY          = Math.addExact(lowerY, bounds.height);
+        upperX          = JDK8.addExact(lowerX, bounds.width);
+        upperY          = JDK8.addExact(lowerY, bounds.height);
         windowWidth     = (window != null) ? window.width  : 0;
         windowHeight    = (window != null) ? window.height : 0;
     }
@@ -156,12 +157,12 @@ public abstract class PixelIterator {
         bounds          = intersection(data.getMinX(), data.getMinY(), 
data.getWidth(), data.getHeight(), subArea, window);
         lowerX          = bounds.x;
         lowerY          = bounds.y;
-        upperX          = Math.addExact(lowerX, bounds.width);
-        upperY          = Math.addExact(lowerY, bounds.height);
-        tileLowerX      = floorDiv(Math.subtractExact(lowerX, 
tileGridXOffset), tileWidth);
-        tileLowerY      = floorDiv(Math.subtractExact(lowerY, 
tileGridYOffset), tileHeight);
-        tileUpperX      =  ceilDiv(Math.subtractExact(upperX, 
tileGridXOffset), tileWidth);
-        tileUpperY      =  ceilDiv(Math.subtractExact(upperY, 
tileGridYOffset), tileHeight);
+        upperX          = JDK8.addExact(lowerX, bounds.width);
+        upperY          = JDK8.addExact(lowerY, bounds.height);
+        tileLowerX      = floorDiv(JDK8.subtractExact(lowerX, 
tileGridXOffset), tileWidth);
+        tileLowerY      = floorDiv(JDK8.subtractExact(lowerY, 
tileGridYOffset), tileHeight);
+        tileUpperX      =  ceilDiv(JDK8.subtractExact(upperX, 
tileGridXOffset), tileWidth);
+        tileUpperY      =  ceilDiv(JDK8.subtractExact(upperY, 
tileGridYOffset), tileHeight);
         windowWidth     = (window != null) ? window.width  : 0;
         windowHeight    = (window != null) ? window.height : 0;
     }

Modified: 
sis/branches/JDK7/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystemTest.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -174,9 +174,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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Codes.java
 [UTF-8] Tue Aug  8 12:43:28 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
 [UTF-8] Tue Aug  8 12:43:28 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
 [UTF-8] Tue Aug  8 12:43:28 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/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
 [UTF-8] Tue Aug  8 12:43:28 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/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -39,7 +39,7 @@ import static org.junit.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/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -29,7 +29,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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java
 [UTF-8] Tue Aug  8 12:43:28 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Modules.java
 [UTF-8] Tue Aug  8 12:43:28 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
 [UTF-8] Tue Aug  8 12:43:28 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/branches/JDK7/ide-project/NetBeans/build.xml
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/build.xml?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/build.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/build.xml Tue Aug  8 12:43:28 2017
@@ -45,6 +45,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/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml Tue Aug  8 
12:43:28 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>
@@ -1118,7 +1131,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}"/>
@@ -1133,6 +1146,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}"/>
@@ -1160,7 +1174,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. -->
@@ -1456,6 +1470,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>
@@ -1514,6 +1531,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>
@@ -1557,10 +1577,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}"/>
@@ -1571,6 +1591,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}"/>
@@ -1591,7 +1612,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}"/>
@@ -1602,6 +1623,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}"/>

Propchange: sis/branches/JDK7/ide-project/NetBeans/nbproject/cfg_hints.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/ide-project/NetBeans/nbproject/cfg_hints.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties 
[ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties 
[ISO-8859-1] Tue Aug  8 12:43:28 2017
@@ -3,6 +3,6 @@
 build.xml.data.CRC32=58e6b21c
 build.xml.script.CRC32=462eaba0
 build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=e5519b85
-nbproject/build-impl.xml.script.CRC32=45c804f7
+nbproject/build-impl.xml.data.CRC32=0b3b5126
+nbproject/build-impl.xml.script.CRC32=1cb14af5
 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties 
[ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties 
[ISO-8859-1] Tue Aug  8 12:43:28 2017
@@ -68,6 +68,8 @@ src.storage.dir      = ${project.root}/s
 test.storage.dir     = ${project.root}/storage/sis-storage/src/test/java
 src.feature.dir      = ${project.root}/core/sis-feature/src/main/java
 test.feature.dir     = ${project.root}/core/sis-feature/src/test/java
+src.raster.dir       = ${project.root}/core/sis-raster/src/main/java
+test.raster.dir      = ${project.root}/core/sis-raster/src/test/java
 src.referencing.dir  = ${project.root}/core/sis-referencing/src/main/java
 test.referencing.dir = ${project.root}/core/sis-referencing/src/test/java
 src.ref-by-id.dir    = 
${project.root}/core/sis-referencing-by-identifiers/src/main/java

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml Tue Aug  8 
12:43:28 2017
@@ -33,6 +33,7 @@
                 <root id="src.xmlstore.dir" name="XMLStore"/>
                 <root id="src.storage.dir" name="Storage"/>
                 <root id="src.feature.dir" name="Feature"/>
+                <root id="src.raster.dir" name="Raster"/>
                 <root id="src.referencing.dir" name="Referencing"/>
                 <root id="src.ref-by-id.dir" name="Referencing by 
identifiers"/>
                 <root id="src.metadata.dir" name="Metadata"/>
@@ -51,6 +52,7 @@
                 <root id="test.xmlstore.dir" name="Test XMLStore"/>
                 <root id="test.storage.dir" name="Test Storage"/>
                 <root id="test.feature.dir" name="Test Feature"/>
+                <root id="test.raster.dir" name="Test Raster"/>
                 <root id="test.referencing.dir" name="Test Referencing"/>
                 <root id="test.ref-by-id.dir" name="Test Referencing by 
identifiers"/>
                 <root id="test.metadata.dir" name="Test Metadata"/>

Modified: sis/branches/JDK7/pom.xml
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Tue Aug  8 12:43:28 2017
@@ -591,7 +591,7 @@ Apache SIS is a free software, Java lang
       <!-- Compile -->
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
         <configuration>
           <source>${maven.compile.source}</source>
           <target>${maven.compile.target}</target>
@@ -826,6 +826,10 @@ Apache SIS is a free software, Java lang
               
<packages>org.apache.sis.storage*:org.apache.sis.index*</packages>
             </group>
             <group>
+              <title>Coverage and raster</title>
+              
<packages>org.apache.sis.coverage*:org.apache.sis.image*</packages>
+            </group>
+            <group>
               <title>Feature and Geometry</title>
               
<packages>org.apache.sis.feature*:org.apache.sis.geometry*</packages>
             </group>

Modified: sis/branches/JDK7/src/main/javadoc/overview.html
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/src/main/javadoc/overview.html?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- sis/branches/JDK7/src/main/javadoc/overview.html [UTF-8] (original)
+++ sis/branches/JDK7/src/main/javadoc/overview.html [UTF-8] Tue Aug  8 
12:43:28 2017
@@ -28,7 +28,7 @@
     Overview of <a href="http://sis.apache.org";>Apache SIS™ (Spatial 
Information System)</a>.
 
     <h3>Requirements</h3>
-    <p>SIS requires Java 6 Standard Edition.</p>
+    <p>SIS requires Java 7 Standard Edition.</p>
 
     <h3>Classes naming</h3>
     <p>Implementations of <a href="http://www.geoapi.org/";>GeoAPI 
interfaces</a> usually (but not always)

Modified: 
sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -28,6 +28,7 @@ import org.apache.sis.storage.DataStoreR
 import org.apache.sis.storage.UnsupportedStorageException;
 import org.apache.sis.storage.StorageConnector;
 import org.apache.sis.setup.OptionKey;
+import org.apache.sis.storage.Resource;
 import org.apache.sis.util.Debug;
 
 
@@ -106,7 +107,7 @@ public class LandsatStore extends DataSt
     public synchronized Metadata getMetadata() throws DataStoreException {
         if (metadata == null && source != null) try {
             try (BufferedReader reader = (source instanceof BufferedReader) ? 
(BufferedReader) source : new LineNumberReader(source)) {
-                source = null;      // Will be closed at the end of this 
try-catch block.
+                source = null;      // Will be closed at the end of this 
try-finally block.
                 final LandsatReader parser = new 
LandsatReader(getDisplayName(), listeners);
                 parser.read(reader);
                 metadata = parser.getMetadata();
@@ -120,6 +121,18 @@ public class LandsatStore extends DataSt
     }
 
     /**
+     * Current implementation does not provide any resource yet.
+     * Future versions may return an aggregate of all raster data in the 
GeoTIFF files associated with this metadata.
+     *
+     * @return the starting point of all resources in this data store.
+     * @throws DataStoreException if an error occurred while reading the data.
+     */
+    @Override
+    public Resource getRootResource() throws DataStoreException {
+        return null;
+    }
+
+    /**
      * Closes this Landsat store and releases any underlying resources.
      *
      * @throws DataStoreException if an error occurred while closing the 
Landsat file.

Propchange: sis/branches/JDK7/storage/sis-gdal/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/storage/sis-gdal/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: 
sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -42,7 +42,10 @@ import org.opengis.referencing.operation
 import org.apache.sis.referencing.operation.AbstractCoordinateOperation;
 import org.apache.sis.referencing.factory.UnavailableFactoryException;
 import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
+import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
+import org.apache.sis.referencing.datum.BursaWolfParameters;
 import org.apache.sis.referencing.IdentifiedObjects;
+import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.internal.metadata.AxisDirections;
@@ -51,6 +54,7 @@ import org.apache.sis.internal.system.OS
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
+import org.apache.sis.util.Utilities;
 import org.apache.sis.util.Static;
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.measure.Units;
@@ -255,7 +259,23 @@ public final class Proj4 extends Static
                 
definition.append("to_meter=").append(Units.toStandardUnit(unit));
             }
         }
+        /*
+         * Append the "+towgs84" element if any. This is the last piece of 
information.
+         * Note that the use of a "+towgs84" parameter is an "early binding" 
approach,
+         * which is usually not recommended. But Proj4 works that way.
+         */
         if (validCS) {
+            if (datum instanceof DefaultGeodeticDatum) {
+                for (final BursaWolfParameters bwp : ((DefaultGeodeticDatum) 
datum).getBursaWolfParameters()) {
+                    if 
(Utilities.equalsIgnoreMetadata(CommonCRS.WGS84.datum(), bwp.getTargetDatum())) 
{
+                        definition.append(" 
+towgs84=").append(bwp.tX).append(',').append(bwp.tY).append(',').append(bwp.tZ);
+                        if (!bwp.isTranslation()) {
+                            
definition.append(',').append(bwp.rX).append(',').append(bwp.rY).append(',').append(bwp.rZ).append(',').append(bwp.dS);
+                        }
+                        break;
+                    }
+                }
+            }
             return definition.toString();
         }
         /*

Modified: 
sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Transform.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Transform.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Transform.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Transform.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -38,6 +38,13 @@ import org.apache.sis.util.ComparisonMod
 
 /**
  * A math transform which delegate its work to the {@literal Proj.4} native 
library.
+ * The WKT for this math transform looks like the following fragment:
+ *
+ * {@preformat wkt
+ *   PARAM_MT["pj_transform",
+ *     PARAMETER["srcdefn", "+proj=…"],
+ *     PARAMETER["dstdefn", "+proj=…"]]
+ * }
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8

Modified: 
sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -40,10 +40,16 @@
  * }
  *
  * Calls to {@link org.apache.sis.referencing.CRS#findOperation 
CRS.findOperation(…)} will delegate the coordinate
- * transformation to Proj.4 if an only if {@code sourceCRS} and {@code 
targetCRS} were both obtained from a code
- * in {@code "Proj4"} namespace or by a method in this package. If at least 
one CRS were obtained by another way,
- * then Apache SIS will use its own referencing engine. The backing 
referencing engine can be seen by printing
- * the {@code CoordinateOperation}.
+ * transformation to Proj.4 if {@code sourceCRS} and {@code targetCRS} were 
both obtained from a code in {@code "Proj4"}
+ * namespace or by a method in this package. Otherwise, Apache SIS will use 
its own referencing engine.
+ * The backing referencing engine can be seen by printing the {@code 
MathTransform}:
+ * a transform backed by Proj.4 have a <cite>Well Known Text 1</cite> 
representation like below:
+ *
+ * {@preformat wkt
+ *   PARAM_MT["pj_transform",
+ *     PARAMETER["srcdefn", "+proj=…"],
+ *     PARAMETER["dstdefn", "+proj=…"]]
+ * }
  *
  * <div class="section">Note on Proj.4 definition strings</div>
  * Proj.4 unconditionally requires 3 letters for the {@code "+axis="} 
parameter — for example {@code "neu"} for

Modified: 
sis/branches/JDK7/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/TransformTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/TransformTest.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/TransformTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/TransformTest.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -24,6 +24,7 @@ import org.opengis.util.NoSuchIdentifier
 import org.opengis.test.referencing.ParameterizedTransformTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.junit.BeforeClass;
 import org.junit.AfterClass;
 
 import static org.apache.sis.test.Assert.*;
@@ -64,6 +65,14 @@ public class TransformTest extends Param
     }
 
     /**
+     * Verifies if the {@literal Proj.4} library is available.
+     */
+    @BeforeClass
+    public static void verifyNativeLibraryAvailability() {
+        PJTest.verifyNativeLibraryAvailability();
+    }
+
+    /**
      * Invoked after all the tests have been run for comparing the list of 
failures with the expected list.
      * This method checks for the exact same content, so this method detects 
both unexpected failures and
      * "unexpected" successes. Note that a failure is not necessarily because 
Proj.4 does not support the
@@ -72,22 +81,28 @@ public class TransformTest extends Param
      */
     @AfterClass
     public static void verifyFailureList() {
-        assertSetEquals(Arrays.asList(
-                "Abridged Molodensky",
-                "Cassini-Soldner",                          // No 
OperationMethod in SIS yet.
-                "Hotine Oblique Mercator (variant B)",
-                "Krovak",                                   // No 
OperationMethod in SIS yet.
-                "Lambert Azimuthal Equal Area",             // No 
OperationMethod in SIS yet.
-                "Lambert Conic Conformal (1SP)",
-                "Lambert Conic Conformal (2SP Belgium)",
-                "Lambert Conic Conformal (2SP Michigan)",
-                "Mercator (Spherical)",
-                "Mercator (variant C)",
-                "Polar Stereographic (variant B)",
-                "Polar Stereographic (variant C)",
-                "Popular Visualisation Pseudo Mercator",
-                "Polyconic",                                // No 
OperationMethod in SIS yet.
-                "Transverse Mercator (South Orientated)"), FAILURES);
-        FAILURES.clear();
+        /*
+         * The list of failires is empty if verifyNativeLibraryAvailability() 
failed,
+         * in which case no test have been run.
+         */
+        if (!FAILURES.isEmpty()) {
+            assertSetEquals(Arrays.asList(
+                    "Abridged Molodensky",
+                    "Cassini-Soldner",                          // No 
OperationMethod in SIS yet.
+                    "Hotine Oblique Mercator (variant B)",
+                    "Krovak",                                   // No 
OperationMethod in SIS yet.
+                    "Lambert Azimuthal Equal Area",             // No 
OperationMethod in SIS yet.
+                    "Lambert Conic Conformal (1SP)",
+                    "Lambert Conic Conformal (2SP Belgium)",
+                    "Lambert Conic Conformal (2SP Michigan)",
+                    "Mercator (Spherical)",
+                    "Mercator (variant C)",
+                    "Polar Stereographic (variant B)",
+                    "Polar Stereographic (variant C)",
+                    "Popular Visualisation Pseudo Mercator",
+                    "Polyconic",                                // No 
OperationMethod in SIS yet.
+                    "Transverse Mercator (South Orientated)"), FAILURES);
+            FAILURES.clear();
+        }
     }
 }

Modified: 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -133,7 +133,7 @@ import org.apache.sis.internal.jdk8.JDK8
  * <p>Going further down the list, the key 2051 ({@code GeogLinearUnitSize}) 
is located in {@code GeoDoubleParams(34736)}
  * at offset 0 and has the value 1.5; the value of key 2049 ({@code 
GeogCitation}) is "My Geographic".</p>
  *
- * @author  Rémi Marechal (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  *

Modified: 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTIFF.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -30,7 +30,7 @@ import org.apache.sis.internal.geotiff.R
  * Those readers and writers are <strong>not</strong> thread safe.
  * The {@link GeoTiffStore} class is responsible for synchronization if needed.
  *
- * @author  Rémi Marechal (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Alexis Manin (Geomatys)
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)

Modified: 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -36,6 +36,7 @@ import org.apache.sis.internal.storage.M
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.metadata.sql.MetadataStoreException;
 import org.apache.sis.storage.DataStoreClosedException;
+import org.apache.sis.storage.Resource;
 import org.apache.sis.util.resources.Errors;
 
 
@@ -132,6 +133,18 @@ public class GeoTiffStore extends DataSt
     }
 
     /**
+     * Current implementation does not provide any resource yet.
+     * A future version will return the raster data in a coverage resource.
+     *
+     * @return the starting point of all resources in this data store.
+     * @throws DataStoreException if an error occurred while reading the data.
+     */
+    @Override
+    public Resource getRootResource() throws DataStoreException {
+        return null;
+    }
+
+    /**
      * Returns the reader if it is not closed, or thrown an exception 
otherwise.
      */
     private Reader reader() throws DataStoreException {

Modified: 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -50,7 +50,7 @@ import org.apache.sis.internal.jdk8.JDK8
 /**
  * An Image File Directory (FID) in a TIFF image.
  *
- * @author  Rémi Marechal (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Alexis Manin (Geomatys)
  * @author  Johann Sorel (Geomatys)
  * @author  Thi Phuong Hao Nguyen (VNSC)

Modified: 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java?rev=1804411&r1=1804410&r2=1804411&view=diff
==============================================================================
--- 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Reader.java
 [UTF-8] Tue Aug  8 12:43:28 2017
@@ -48,7 +48,7 @@ import org.apache.sis.internal.jdk8.JDK8
  * <p>The TIFF format specification version 6.0 (June 3, 1992) is available
  * <a 
href="https://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf";>here</a>.</p>
  *
- * @author  Rémi Marechal (Geomatys)
+ * @author  Rémi Maréchal (Geomatys)
  * @author  Alexis Manin (Geomatys)
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)


Reply via email to