Author: desruisseaux
Date: Tue Feb 3 13:36:14 2015
New Revision: 1656727
URL: http://svn.apache.org/r1656727
Log:
Merge from the JDK6 branch.
Modified:
sis/trunk/ (props changed)
sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/package-info.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
sis/trunk/src/main/javadoc/stylesheet.css
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 3 13:36:14 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK6:1394364-1656497
-/sis/branches/JDK7:1394913-1656489
-/sis/branches/JDK8:1584960-1656486
+/sis/branches/JDK6:1394364-1656726
+/sis/branches/JDK7:1394913-1656724
+/sis/branches/JDK8:1584960-1656723
Modified:
sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
URL:
http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
[UTF-8] (original)
+++
sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -42,7 +42,7 @@
* The {@code com.sun.management.jmxremote.local.only} property is recommended
if the remote JVM is an other
* JVM instance running on the local machine. Otherwise this property can be
omitted for debugging purpose.
* For production environment, see the security settings documented on the
- * <a
href="http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html";>Monitoring
+ * <a
href="http://docs.oracle.com/javase/8/docs/technotes/guides/management/agent.html";>Monitoring
* and Management Using JMX Technology</a> page.
*
* @author Martin Desruisseaux (Geomatys)
Modified:
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
[UTF-8] (original)
+++
sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -34,7 +34,7 @@ import org.apache.sis.util.resources.Voc
/**
- * Formats {@link AbstractFeature features} or {@linkplain DefaultFeatureType
feature types} in a tabular format.
+ * Formats {@linkplain AbstractFeature features} or {@linkplain
DefaultFeatureType feature types} in a tabular format.
* This format assumes a monospaced font and an encoding supporting drawing
box characters (e.g. UTF-8).
*
* <div class="note"><b>Example:</b> a feature named “City” and containing 3
properties (“name”, “population” and
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -44,6 +44,8 @@ import org.apache.sis.internal.jdk7.Obje
/**
* Base class for {@link DirectPosition} implementations.
+ * A direct position holds the coordinates for a position within some
+ * {@linkplain org.apache.sis.referencing.crs.AbstractCRS coordinate reference
system}.
* This base class provides default implementations for {@link #toString()},
* {@link #equals(Object)} and {@link #hashCode()} methods.
*
@@ -389,7 +391,7 @@ parse: while (i < length) {
final int dimension = getDimension();
if (dimension == that.getDimension()) {
for (int i=0; i<dimension; i++) {
- if (doubleToLongBits(getOrdinate(i)) !=
doubleToLongBits(that.getOrdinate(i))) {
+ if (!Numerics.equals(getOrdinate(i), that.getOrdinate(i)))
{
return false;
}
}
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition1D.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -35,7 +35,7 @@ import org.apache.sis.internal.jdk7.Obje
/**
- * Holds the coordinates for a one-dimensional position within some coordinate
reference system.
+ * A one-dimensional position within some coordinate reference system.
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.3
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/DirectPosition2D.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -33,7 +33,7 @@ import org.apache.sis.internal.jdk7.Obje
/**
- * Holds the coordinates for a two-dimensional position on top of {@link
Point2D}.
+ * A two-dimensional position on top of {@link Point2D}.
* This implementation is provided for inter-operability between Java2D and
GeoAPI.
*
* <p>This class inherits {@linkplain #x x} and {@linkplain #y y} fields.
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -36,19 +36,20 @@ import org.apache.sis.internal.jdk7.Obje
/**
- * Holds the coordinates for a position within some coordinate reference
system.
+ * A mutable {@code DirectPosition} (the coordinates of a position) of
arbitrary dimension.
+ * This particular implementation of {@code DirectPosition} is said "General"
because it
+ * uses an {@linkplain #ordinates array of ordinates} of an arbitrary length.
If the direct
+ * position is known to be always two-dimensional, then {@link
DirectPosition2D} provides
+ * a more efficient implementation.
+ *
+ * {@section Coordinate Reference System (CRS) optionality}
* Since {@code DirectPosition}s, as data types, will often be included in
larger objects
- * (such as {@linkplain org.opengis.geometry.Geometry geometries}) that have
references
+ * (such as {@link org.opengis.geometry.Geometry}) that have references
* to {@code CoordinateReferenceSystem}, the {@link
#getCoordinateReferenceSystem()} method
* may returns {@code null} if this particular {@code DirectPosition} is
included in such
* larger object. In this case, the coordinate reference system is implicitly
assumed to take
* on the value of the containing object's {@code CoordinateReferenceSystem}.
*
- * <p>This particular implementation of {@code DirectPosition} is said
"General" because it
- * uses an {@linkplain #ordinates array of ordinates} of an arbitrary length.
If the direct
- * position is known to be always two-dimensional, then {@link
DirectPosition2D} provides
- * a more efficient implementation.</p>
- *
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.3
* @version 0.3
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -40,10 +40,10 @@ import static org.apache.sis.math.MathFu
/**
- * A minimum bounding box or rectangle. Regardless of dimension, an {@code
Envelope} can
- * be represented without ambiguity as two {@linkplain DirectPosition direct
positions}
- * (coordinate points). To encode an {@code Envelope}, it is sufficient to
encode these
- * two points.
+ * A mutable {@code Envelope} (a minimum bounding box or rectangle) of
arbitrary dimension.
+ * Regardless of dimension, an {@code Envelope} can be represented without
ambiguity
+ * as two {@linkplain AbstractDirectPosition direct positions} (coordinate
points).
+ * To encode an {@code Envelope}, it is sufficient to encode these two points.
*
* <div class="note"><b>Note:</b>
* {@code Envelope} uses an arbitrary <cite>Coordinate Reference
System</cite>, which does not need to be geographic.
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/ImmutableEnvelope.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -32,7 +32,7 @@ import static org.apache.sis.util.Argume
/**
- * Immutable representation of an {@linkplain Envelope envelope}.
+ * An immutable {@code Envelope} (a minimum bounding box or rectangle) of
arbitrary dimension.
* This class is final in order to ensure that the immutability contract can
not be broken
* (assuming not using <cite>Java Native Interface</cite> or reflections).
*
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/package-info.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -16,7 +16,7 @@
*/
/**
- * Coordinate reference system definitions as coordinate systems related to
the earth through datum.
+ * Coordinate Reference System (CRS) definitions as coordinate systems related
to the earth through datum.
* An explanation for this package is provided in the {@linkplain
org.opengis.referencing.crs OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/package-info.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/package-info.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/package-info.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/package-info.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -16,7 +16,7 @@
*/
/**
- * Coordinate system definitions as the set of coordinate system axes that
spans the coordinate space.
+ * Coordinate System (CS) definitions as the set of coordinate system axes
that spans the coordinate space.
* An explanation for this package is provided in the {@linkplain
org.opengis.referencing.cs OpenGIS® javadoc}.
* The remaining discussion on this page is specific to the SIS implementation.
*
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix1.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -22,7 +22,7 @@ import org.apache.sis.internal.util.Nume
/**
* A matrix of fixed {@value #SIZE}×{@value #SIZE} size,
- * typically resulting from {@linkplain
org.opengis.referencing.operation.MathTransform1D} derivative computation.
+ * typically resulting from {@link
org.opengis.referencing.operation.MathTransform1D} derivative computation.
* The matrix member is:
*
* <blockquote><pre> ┌ ┐
Modified:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
---
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
[UTF-8] (original)
+++
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrix2.java
[UTF-8] Tue Feb 3 13:36:14 2015
@@ -22,7 +22,7 @@ import org.apache.sis.internal.util.Nume
/**
* A matrix of fixed {@value #SIZE}×{@value #SIZE} size,
- * typically resulting from {@linkplain
org.opengis.referencing.operation.MathTransform2D} derivative computation.
+ * typically resulting from {@link
org.opengis.referencing.operation.MathTransform2D} derivative computation.
* The matrix members are:
*
* <blockquote><pre> ┌ ┐
Modified: sis/trunk/src/main/javadoc/stylesheet.css
URL:
http://svn.apache.org/viewvc/sis/trunk/src/main/javadoc/stylesheet.css?rev=1656727&r1=1656726&r2=1656727&view=diff
==============================================================================
--- sis/trunk/src/main/javadoc/stylesheet.css (original)
+++ sis/trunk/src/main/javadoc/stylesheet.css Tue Feb 3 13:36:14 2015
@@ -223,6 +223,6 @@ h5 {
* JDK style uses bold characters for the left column, which contains the
class and
* package names. But we do not want those bold characters to apply to the
descriptions.
*/
-td.colLast a:link {
+td.colLast div.block a:link {
font-weight: normal;
}
