sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1732910 - in /sis/branches/JDK8/core: sis-metadata/src/test/java/org/apache/sis/io/wkt/ sis-referencing/src/main/java/org/apache/sis/referencing/factory/ sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/ sis-referencing...
Date Mon, 29 Feb 2016 15:51:40 GMT
Author: desruisseaux
Date: Mon Feb 29 15:51:39 2016
New Revision: 1732910

URL: http://svn.apache.org/viewvc?rev=1732910&view=rev
Log:
Fix a test failure and improve javadoc.

Modified:
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/package-info.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ColorsTest.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -40,7 +40,7 @@ public final strictfp class ColorsTest e
         final Colors colors = Colors.DEFAULT;
         assertEquals("cyan",  colors.getName(ElementKind.CODE_LIST));
         assertEquals("green", colors.getName(ElementKind.METHOD));
-        assertEquals("blue",  colors.getName(ElementKind.DATUM));
+        assertEquals("red",   colors.getName(ElementKind.IDENTIFIER));
         assertEquals("red",   colors.getName(ElementKind.ERROR));
     }
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -44,10 +44,13 @@ import org.apache.sis.util.Debug;
 /**
  * Creates geodetic objects from codes defined by an authority.
  * An <cite>authority</cite> is an organization that maintains definitions of
authority codes.
- * An <cite>authority code</cite> is a compact string defined by an authority
to reference a particular
- * spatial reference object. For example the <a href="http://www.epsg.org">EPSG geodetic
dataset</a> maintains
- * a database of coordinate systems, and other spatial referencing objects, where each object
has a code number ID.
- * For example, the EPSG code for a WGS84 Lat/Lon coordinate system is {@code "4326"}.
+ * An <cite>authority code</cite> is a compact string defined by an authority
to reference a particular spatial reference object.
+ * A frequently used set of authority codes is the <a href="http://www.epsg.org">EPSG
geodetic dataset</a>,
+ * a database of coordinate systems and other spatial referencing objects where each object
has a code number ID.
+ *
+ * <div class="note"><b>Example:</b>
+ * the EPSG code for a <cite>World Geodetic System 1984</cite> (WGS84) coordinate
reference system
+ * with latitude and longitude axes is {@code "4326"}.</div>
  *
  * <p>This class defines a default implementation for most methods defined in the {@link
DatumAuthorityFactory},
  * {@link CSAuthorityFactory} and {@link CRSAuthorityFactory} interfaces. However, those
interfaces do not appear

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -69,7 +69,7 @@ import org.apache.sis.xml.XML;
  * This factory serves two purposes:
  *
  * <ul>
- *   <li><b>For users</b>, allows the creation of complex objects that
can not be created by the authority factory,
+ *   <li><b>For users</b>, allows the creation of complex objects that
can not be created by the authority factories,
  *       without explicit dependency to Apache SIS (when using the GeoAPI interfaces implemented
by this class).</li>
  *   <li><b>For providers</b>, allows <cite>inversion of control</cite>
by overriding methods in this class,
  *       then specifying the customized instance to other services that consume {@code CRSFactory}
(for example
@@ -78,8 +78,8 @@ import org.apache.sis.xml.XML;
  *
  * This {@code GeodeticObjectFactory} class is not easy to use directly.
  * Users are encouraged to use an authority factory instead
- * (or the {@link CRS#forCode(String)} convenience method) when the CRS object to construct
can be identified
- * by a code in the namespace of an authority (typically EPSG).
+ * (or the {@link org.apache.sis.referencing.CRS#forCode(String)} convenience method)
+ * when the CRS object to construct can be identified by a code in the namespace of an authority
(typically EPSG).
  *
  * <div class="section">Object properties</div>
  * Most factory methods expect a {@link Map Map&lt;String,?&gt;} argument, often
followed by explicit arguments.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/package-info.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/package-info.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -16,10 +16,47 @@
  */
 
 /**
- * Creates Coordinate Reference System (CRS) objects from given properties.
+ * Creates Coordinate Reference System (CRS) objects from given properties or authority codes.
+ * This package provides two kinds of factories:
+ *
+ * <ul class="verbose">
+ *   <li>{@link org.apache.sis.referencing.factory.GeodeticAuthorityFactory}
+ *     creates geodetic objects from codes defined by an authority.
+ *     An <cite>authority</cite> is an organization that maintains definitions
of authority codes.
+ *     An <cite>authority code</cite> is a compact string defined by an authority
to reference a particular spatial reference object.
+ *     A frequently used set of authority codes is the <a href="http://www.epsg.org">EPSG
geodetic dataset</a>,
+ *     a database of coordinate systems and other spatial referencing objects where each
object has a code number ID.</li>
+ *
+ *   <li>{@link org.apache.sis.referencing.factory.GeodeticObjectFactory}
+ *     creates complex objects that can not be created by the authority factories.
+ *     Allows also <cite>inversion of control</cite> when used with the
+ *     {@linkplain org.apache.sis.referencing.factory.sql.EPSGFactory EPSG authority factory}
+ *     or with the {@linkplain org.apache.sis.io.wkt.WKTFormat WKT parser}.</li>
+ * </ul>
+ *
+ * Authority factories available in Apache SIS are listed below.
+ * Factories defined in this package do not require any configuration or external resources.
+ * Factories defined in the {@link org.apache.sis.referencing.factory.sql sql} sub-package
require a connection to a database.
+ *
+ * <table class="sis">
+ *   <caption>Authority factory implementations</caption>
+ *   <tr>
+ *     <th>Authorities</th>
+ *     <th>Implementation class</th>
+ *     <th>Conditions</th>
+ *   </tr><tr>
+ *     <td>{@code CRS}, {@code AUTO} and {@code AUTO2}</td>
+ *     <td>{@link org.apache.sis.referencing.factory.CommonAuthorityFactory}</td>
+ *     <td>None.</td>
+ *   </tr><tr>
+ *     <td>{@code EPSG}</td>
+ *     <td>{@link org.apache.sis.referencing.factory.sql.EPSGFactory}</td>
+ *     <td>Requires installation of EPSG dataset.</td>
+ *   </tr>
+ * </table>
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @version 0.6
+ * @version 0.7
  * @since   0.6
  * @module
  */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -76,6 +76,7 @@ import org.apache.sis.util.Localized;
  *
  * @see EPSGDataAccess
  * @see SQLTranslator
+ * @see <a href="http://sis.apache.org/book/tables/CoordinateReferenceSystems.html">List
of authority codes</a>
  */
 public class EPSGFactory extends ConcurrentAuthorityFactory<EPSGDataAccess> implements
CRSAuthorityFactory,
         CSAuthorityFactory, DatumAuthorityFactory, CoordinateOperationAuthorityFactory, Localized

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -237,6 +237,7 @@ final class EPSGInstaller extends Script
     /**
      * Processes to the creation of the EPSG database using the SQL scripts from the given
provider.
      *
+     * @param  scriptProvider User-provided scripts, or {@code null} for automatic lookup.
      * @throws IOException if an error occurred while reading an input.
      * @throws SQLException if an error occurred while executing a SQL statement.
      */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -37,9 +37,9 @@ import java.nio.file.Path;
 
 
 /**
- * Provides SQL scripts needed for creating a copy of the EPSG dataset. This interface allows
Apache SIS
- * users to bundle the EPSG dataset in their own product for automatic installation when
first needed.
- * That dataset is not included directly in Apache SIS for
+ * Provides SQL scripts needed for creating a local copy of a dataset. This interface allows
Apache SIS users
+ * to bundle the EPSG or other datasets in their own product for automatic installation when
first needed.
+ * Some datasets can not included directly in Apache SIS for
  * <a href="https://issues.apache.org/jira/browse/LEGAL-183">licensing reasons</a>.
  *
  * <p>Implementations of this interface can be declared in the following file for automatic
discovery
@@ -69,7 +69,7 @@ import java.nio.file.Path;
  */
 public abstract class InstallationScriptProvider {
     /**
-     * A sentinel value for the content of the script to execute before the official EPSG
scripts.
+     * A sentinel value for the content of the script to execute before the SQL scripts provided
by the authority.
      * This is an Apache SIS build-in script for constraining the values of some {@code VARCHAR}
columns
      * to enumerations of values recognized by {@link EPSGDataAccess}. Those enumerations
are not required
      * for proper working of {@link EPSGFactory}, but can improve data integrity.
@@ -77,10 +77,10 @@ public abstract class InstallationScript
     protected static final String PREPARE = "Prepare";
 
     /**
-     * A sentinel value for the content of the script to execute after the official EPSG
scripts.
-     * This is an Apache SIS build-in script for creating indexes or performing any other
manipulation
-     * that help SIS to use the EPSG dataset. Those indexes are not required for proper working
of
-     * {@link EPSGFactory}, but can significantly improve performances.
+     * A sentinel value for the content of the script to execute after the SQL scripts provided
by the authority.
+     * This is an Apache SIS build-in script for creating indexes or performing any other
manipulation that help
+     * SIS to use the dataset. Those indexes are not required for proper working of {@link
EPSGFactory},
+     * but can significantly improve performances.
      */
     protected static final String FINISH = "Finish";
 
@@ -94,12 +94,16 @@ public abstract class InstallationScript
      * The given names are often filenames, but not necessarily
      * (it is okay to use those names only as labels).
      *
-     * <p>For the EPSG dataset, the {@code names} argument is usually
-     * (potentially completed with EPSG dataset version and database software name):</p>
-     *
-     * <blockquote><code>
-     *   {@linkplain #PREPARE}, "EPSG_Tables.sql", "EPSG_Data.sql", "EPSG_FKeys.sql", {@linkplain
#FINISH}
-     * </code></blockquote>
+     * <table class="sis">
+     *   <caption>Typical argument values</caption>
+     *   <tr>
+     *     <th>Authority</th>
+     *     <th>Argument</th>
+     *   </tr><tr>
+     *     <td>{@code EPSG}</td>
+     *     <td><code>{@linkplain #PREPARE}, "EPSG_Tables.sql", "EPSG_Data.sql",
"EPSG_FKeys.sql", {@linkplain #FINISH}</code></td>
+     *   </tr>
+     * </table>
      *
      * @param names Names of the SQL scripts to read.
      *
@@ -112,32 +116,35 @@ public abstract class InstallationScript
     }
 
     /**
-     * Returns the identifier of the dataset installed by the SQL scripts, or {@code "unavailable"}
-     * if the SQL scripts are not available.
+     * Returns the identifier of the dataset installed by the SQL scripts.
+     * The values recognized by SIS are:
+     *
+     * <ul>
+     *   <li>{@code "EPSG"}</li>
+     * </ul>
      *
-     * <p>Currently, the only allowed return values are {@code "EPSG"} and {@code "unavailable"}.
-     * This list may be expanded in future SIS versions if more authorities are supported.</p>
+     * The above list may be expanded in future SIS versions if more authorities are supported.
      *
-     * @return {@code "EPSG"} if the SQL scripts for installing the EPSG dataset are available,
-     *         or {@code "unavailable"} otherwise.
+     * @return {@code "EPSG"} or other authority acronym.
      */
     public abstract String getAuthority();
 
     /**
-     * Returns the terms of use of the dataset, or {@code null} if presumed already accepted.
+     * Returns the terms of use of the dataset, or {@code null} if none.
      * The terms of use can be returned in either plain text or HTML.
      *
      * <p>For the EPSG dataset, this method should return the content of the
      * <a href="http://www.epsg.org/TermsOfUse">http://www.epsg.org/TermsOfUse</a>
page.</p>
      *
      * @param  mimeType Either {@code "text/plain"} or {@code "text/html"}.
-     * @return The terms of use in plain text or HTML, or {@code null} if the license is
presumed already accepted.
+     * @return The terms of use in plain text or HTML, or {@code null} if none.
      * @throws IOException if an error occurred while reading the license file.
      */
     public abstract InternationalString getLicense(String mimeType) throws IOException;
 
     /**
      * Returns the names of all SQL scripts to execute.
+     * This is a copy of the array of names given to the constructor.
      * Those names are often filenames, but not necessarily (they may be just labels).
      *
      * @return The names of all SQL scripts to execute.
@@ -158,17 +165,18 @@ public abstract class InstallationScript
      * The fourth file is provided by Apache SIS.
      *
      * <ol>
+     *   <li>Content of {@link #PREPARE}, an optional data definition script that define
the enumerations expected by {@link EPSGDataAccess}.</li>
      *   <li>Content of {@code "EPSG_<version>.mdb_Tables_<product>.sql"},
a data definition script that create empty tables.</li>
      *   <li>Content of {@code "EPSG_<version>.mdb_Data_<product>.sql"},
a data manipulation script that populate the tables.</li>
      *   <li>Content of {@code "EPSG_<version>.mdb_FKeys_<product>.sql"},
a data definition script that create foreigner key constraints.</li>
-     *   <li>Content of {@link #POST_CREATE}, a data definition and data control script
that create indexes and set permissions.</li>
+     *   <li>Content of {@link #FINISH}, an optional data definition and data control
script that create indexes and set permissions.</li>
      * </ol>
      *
      * Implementors are free to return a different set of scripts with equivalent content.
      *
      * <div class="section">Default implementation</div>
-     * The default implementation invokes {@link #open(String)} – except for {@link #POST_CREATE}
in which case
-     * an Apache SIS build-in script is used – and wrap the result in a {@link LineNumberReader}.
+     * The default implementation invokes {@link #open(String)} – except for {@link #PREPARE}
and {@link #FINISH}
+     * in which case an Apache SIS build-in script is used – and wrap the result in a {@link
LineNumberReader}.
      *
      * @param  index Index of the SQL script to read, from 0 inclusive to
      *         <code>{@linkplain #getScriptNames()}.length</code> exclusive.
@@ -203,8 +211,8 @@ public abstract class InstallationScript
      * This method is invoked by the default implementation of {@link #getScriptContent(int)}
      * for all scripts except {@link #PREPARE} and {@link #FINISH}.
      *
-     * <div class="note"><b>Examples:</b>
-     * If this {@code InstallationScriptProvider} instance gets the SQL scripts from files
in a well-known directory
+     * <div class="note"><b>Example 1:</b>
+     * if this {@code InstallationScriptProvider} instance gets the SQL scripts from files
in a well-known directory
      * and if the names given at {@linkplain #InstallationScriptProvider(String...) construction
time} are the
      * filenames in that directory, then this method can be implemented as below:
      *
@@ -213,8 +221,10 @@ public abstract class InstallationScript
      *        return Files.newInputStream(directory.resolve(name));
      *    }
      * }
+     * </div>
      *
-     * If this {@code InstallationScriptProvider} instance rather gets the SQL scripts from
resources bundled
+     * <div class="note"><b>Example 2:</b>
+     * if this {@code InstallationScriptProvider} instance rather gets the SQL scripts from
resources bundled
      * in the same JAR files than and in the same package, then this method can be implemented
as below:
      *
      * {@preformat java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -17,15 +17,18 @@
 
 /**
  * Factories for geodetic objects defined in a SQL database, typically the EPSG dataset.
+ * This package provides support for all codes prefixed by {@code "EPSG:"} in the Apache
SIS's
+ * <a href="http://sis.apache.org/book/tables/CoordinateReferenceSystems.html">list
of authority codes</a>.
  * The main class in this package is {@link org.apache.sis.referencing.factory.sql.EPSGFactory},
  * which requires a {@link javax.sql.DataSource} providing connections to an EPSG database.
  *
  *
  * <div class="section">Connection to the database</div>
- * By default Apache SIS used Apache Derby (a.k.a. JavaDB), but the database can also be
PostgreSQL or MS-Access.
- * The connection is obtained by the first of the following data sources which is found:
+ * By default Apache SIS uses Apache Derby (a.k.a. JavaDB in Oracle JDK),
+ * but the database can also be PostgreSQL or MS-Access.
+ * The database connection is obtained by the first of the following data sources which is
found:
  *
- * <ol class="verbose">
+ * <ol>
  *   <li>If a {@linkplain javax.naming.InitialContext JNDI context} exists,
  *       the {@link javax.sql.DataSource} registered under the {@code "java:comp/env/jdbc/SpatialMetadata"}
name.</li>
  *   <li>If the {@code SIS_DATA} {@linkplain System#getenv(String) environment variable}
is defined,

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -31,6 +31,7 @@ import org.opengis.referencing.crs.Geogr
 import org.opengis.referencing.crs.ProjectedCRS;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.internal.util.Constants;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.Utilities;
 
@@ -114,7 +115,7 @@ public final strictfp class EPSGInstalle
     private static InstallationScriptProvider getScripts() {
         final InstallationScriptProvider scripts = new InstallationScriptProvider.Default();
         assumeTrue("EPSG scripts not found in Databases/ExternalSources directory.",
-                scripts.getAuthority().equals("EPSG"));
+                Constants.EPSG.equals(scripts.getAuthority()));
         return scripts;
     }
 

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java?rev=1732910&r1=1732909&r2=1732910&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
[UTF-8] Mon Feb 29 15:51:39 2016
@@ -20,9 +20,9 @@ import java.util.Arrays;
 import java.util.Set;
 import java.util.EnumSet;
 import java.util.Iterator;
+import org.apache.sis.math.FunctionProperty;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.ObjectConverter;
-import org.apache.sis.math.FunctionProperty;
 import org.apache.sis.util.UnconvertibleObjectException;
 import org.apache.sis.util.collection.TreeTable;
 import org.apache.sis.util.ArgumentChecks;



Mime
View raw message