Author: desruisseaux
Date: Mon May 16 22:11:14 2016
New Revision: 1744161
URL: http://svn.apache.org/viewvc?rev=1744161&view=rev
Log:
Merge editions from the JDK7 branch.
Added:
sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGMethodDimensions.sql
- copied unchanged from r1744160,
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGMethodDimensions.sql
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 16 22:11:14 2016
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK7:1394913-1743954
-/sis/branches/JDK8:1584960-1743953
+/sis/branches/JDK7:1394913-1744160
+/sis/branches/JDK8:1584960-1744159
/sis/trunk:1394364-1508466,1519089-1519674
Modified:
sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java?rev=1744161&r1=1744160&r2=1744161&view=diff
==============================================================================
---
sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
[UTF-8] (original)
+++
sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
[UTF-8] Mon May 16 22:11:14 2016
@@ -65,7 +65,7 @@ public class ResourcesDownloader extends
* THIS IS A TEMPORARY LINK to be moved to another location after
discussion on the mailing list.
* This temporary link is provided in order to allow experimentations by
other SIS developers.
*/
- private static final String DOWNLOAD_URL =
"http://home.apache.org/~desruisseaux/Temporary/geotk-epsg-4.0-SNAPSHOT.jar";;
+ private static final String DOWNLOAD_URL =
"http://home.apache.org/~desruisseaux/Temporary/sis-epsg-0.7-SNAPSHOT.jar";;
/**
* Estimation of the EPSG database size after installation, in mega-bytes.
Modified:
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java?rev=1744161&r1=1744160&r2=1744161&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] Mon May 16 22:11:14 2016
@@ -80,7 +80,7 @@ import static java.util.Collections.sing
* <div class="section">Usage example</div>
* The most frequently used methods in this class are {@link #forCode
forCode(…)}, {@link #fromWKT fromWKT(…)}
* and {@link #findOperation findOperation(…)}. An usage example is like below
- * (see the <a
href="http://sis.apache.org/book/tables/CoordinateReferenceSystems.html";>Apache
SIS™ Coordinate
+ * (see the <a
href="http://sis.apache.org/tables/CoordinateReferenceSystems.html";>Apache SIS™
Coordinate
* Reference System (CRS) codes</a> page for the complete list of EPSG codes):
*
* {@preformat java
@@ -125,7 +125,7 @@ public final class CRS extends Static {
/**
* Returns the Coordinate Reference System for the given authority code.
* The set of available codes depends on the {@link CRSAuthorityFactory}
instances available on the classpath.
- * There is many thousands of <a
href="http://sis.apache.org/book/tables/CoordinateReferenceSystems.html";>CRS
+ * There is many thousands of <a
href="http://sis.apache.org/tables/CoordinateReferenceSystems.html";>CRS
* defined by EPSG authority or by other authorities</a>.
* The following table lists a very small subset of codes which are
guaranteed to be available
* on any installation of Apache SIS:
Modified:
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java?rev=1744161&r1=1744160&r2=1744161&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
[UTF-8] Mon May 16 22:11:14 2016
@@ -1117,7 +1117,7 @@ public abstract class GeodeticAuthorityF
* @throws FactoryException if the object creation failed for some other
reason.
*
* @see org.apache.sis.parameter.DefaultParameterDescriptor
- * @see <a
href="http://sis.apache.org/book/tables/CoordinateOperationMethods.html";>Apache
SIS™ Coordinate Operation Methods</a>
+ * @see <a
href="http://sis.apache.org/tables/CoordinateOperationMethods.html";>Apache SIS™
Coordinate Operation Methods</a>
*/
public ParameterDescriptor<?> createParameterDescriptor(final String code)
throws NoSuchAuthorityCodeException, FactoryException
@@ -1131,7 +1131,7 @@ public abstract class GeodeticAuthorityF
* (e.g. map projection) by itself, but tells us what is needed in order
to perform such operation.
*
* <p>Available methods depend both on the {@linkplain
#getAuthorityCodes(Class) set declared by the authority} and on the
- * <a
href="http://sis.apache.org/book/tables/CoordinateOperationMethods.html";>list
of methods implemented in Apache SIS</a>.
+ * <a
href="http://sis.apache.org/tables/CoordinateOperationMethods.html";>list of
methods implemented in Apache SIS</a>.
* In order to be supported, an operation method must have its formulas
coded in the Java programming language.
* See {@link
org.apache.sis.referencing.operation.transform.MathTransformProvider} for more
information.</p>
*
@@ -1145,7 +1145,7 @@ public abstract class GeodeticAuthorityF
* @throws FactoryException if the object creation failed for some other
reason.
*
* @see org.apache.sis.referencing.operation.DefaultOperationMethod
- * @see <a
href="http://sis.apache.org/book/tables/CoordinateOperationMethods.html";>Apache
SIS™ Coordinate Operation Methods</a>
+ * @see <a
href="http://sis.apache.org/tables/CoordinateOperationMethods.html";>Apache SIS™
Coordinate Operation Methods</a>
*/
public OperationMethod createOperationMethod(final String code) throws
NoSuchAuthorityCodeException, FactoryException {
return cast(OperationMethod.class, createObject(code), code);
Modified:
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1744161&r1=1744160&r2=1744161&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] Mon May 16 22:11:14 2016
@@ -163,7 +163,7 @@ import org.apache.sis.internal.util.Stan
* @version 0.7
* @module
*
- * @see <a
href="http://sis.apache.org/book/tables/CoordinateReferenceSystems.html";>List
of authority codes</a>
+ * @see <a
href="http://sis.apache.org/tables/CoordinateReferenceSystems.html";>List of
authority codes</a>
*/
@AutoCloseable
public class EPSGDataAccess extends GeodeticAuthorityFactory implements
CRSAuthorityFactory,
Modified:
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java?rev=1744161&r1=1744160&r2=1744161&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGFactory.java
[UTF-8] Mon May 16 22:11:14 2016
@@ -79,7 +79,7 @@ import org.apache.sis.util.resources.Err
*
* @see EPSGDataAccess
* @see SQLTranslator
- * @see <a
href="http://sis.apache.org/book/tables/CoordinateReferenceSystems.html";>List
of authority codes</a>
+ * @see <a
href="http://sis.apache.org/tables/CoordinateReferenceSystems.html";>List of
authority codes</a>
*/
public class EPSGFactory extends ConcurrentAuthorityFactory<EPSGDataAccess>
implements CRSAuthorityFactory,
CSAuthorityFactory, DatumAuthorityFactory,
CoordinateOperationAuthorityFactory, Localized
Modified:
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java?rev=1744161&r1=1744160&r2=1744161&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/package-info.java
[UTF-8] Mon May 16 22:11:14 2016
@@ -18,7 +18,7 @@
/**
* 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>.
+ * <a href="http://sis.apache.org/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.
*
Modified:
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java?rev=1744161&r1=1744160&r2=1744161&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/package-info.java
[UTF-8] Mon May 16 22:11:14 2016
@@ -36,7 +36,7 @@
* More on this convention is explained below.</p>
*
* <p>Users wanting to know more about the available projections and their
parameters should look at the
- * <a
href="http://sis.apache.org/book/tables/CoordinateOperationMethods.html";>list
of coordinate operation methods</a>.
+ * <a href="http://sis.apache.org/tables/CoordinateOperationMethods.html";>list
of coordinate operation methods</a>.
* Only users interested in the <em>implementation</em> of those projections
should look at this package.</p>
*
*
Modified:
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java?rev=1744161&r1=1744160&r2=1744161&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
[UTF-8] Mon May 16 22:11:14 2016
@@ -96,7 +96,7 @@ import org.apache.sis.internal.jdk8.JDK8
* <div class="section">Standard parameters</div>
* {@code MathTransform} instances are created from {@linkplain
DefaultParameterValueGroup parameter values}.
* The parameters expected by each operation available in a default Apache SIS
installation is
- * <a
href="http://sis.apache.org/book/tables/CoordinateOperationMethods.html";>listed
here</a>.
+ * <a
href="http://sis.apache.org/tables/CoordinateOperationMethods.html";>listed
here</a>.
* The set of parameters varies for each operation or projection, but the
following can be considered typical:
*
* <ul>
Modified:
sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java?rev=1744161&r1=1744160&r2=1744161&view=diff
==============================================================================
---
sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
[UTF-8] (original)
+++
sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
[UTF-8] Mon May 16 22:11:14 2016
@@ -55,7 +55,7 @@ import org.opengis.metadata.Identifier;
/**
* Generates a list of projection parameters in a HTML page. This class is
used for updating the
- * <a
href="http://sis.apache.org/book/tables/CoordinateOperationMethods.html";>CoordinateOperationMethods.html</a>
page.
+ * <a
href="http://sis.apache.org/tables/CoordinateOperationMethods.html";>CoordinateOperationMethods.html</a>
page.
* The {@linkplain #main(String[])} method creates the "{@code
CoordinateOperationMethods.html}" file in the current
* default directory if it does not already exists. Users is responsible for
moving the generated file to the Apache
* SIS {@code "content/"} site directory.
