sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1583789 - in /sis/branches/JDK6: ./ CHANGES README core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
Date Tue, 01 Apr 2014 21:18:41 GMT
Author: desruisseaux
Date: Tue Apr  1 21:18:41 2014
New Revision: 1583789

URL: http://svn.apache.org/r1583789
Log:
Merge from the JDK7 branch.

Removed:
    sis/branches/JDK6/CHANGES
Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/README
    sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1583521-1583788

Modified: sis/branches/JDK6/README
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/README?rev=1583789&r1=1583788&r2=1583789&view=diff
==============================================================================
--- sis/branches/JDK6/README (original)
+++ sis/branches/JDK6/README Tue Apr  1 21:18:41 2014
@@ -38,7 +38,7 @@ Information for running the application 
 License (see also LICENSE)
 ==========================
 
-Collective work: Copyright 2010-2013 The Apache Software Foundation.
+Collective work: Copyright 2010-2014 The Apache Software Foundation.
 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with

Modified: sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java?rev=1583789&r1=1583788&r2=1583789&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
[UTF-8] Tue Apr  1 21:18:41 2014
@@ -728,7 +728,6 @@ public abstract class AbstractEnvelope i
 
     /**
      * Returns {@code true} if this envelope completely encloses the specified envelope.
-     * All edges of this envelope are considered inclusive.
      *
      * {@section Pre-conditions}
      * This method assumes that the specified envelope uses the same CRS than this envelope.
@@ -738,7 +737,7 @@ public abstract class AbstractEnvelope i
      * For every cases illustrated below, the yellow box is considered completely enclosed
      * in the blue envelope:
      *
-     * <img src="doc-files/Contains.png">
+     * <p><img src="doc-files/Contains.png"></p>
      *
      * @param  envelope The envelope to test for inclusion.
      * @return {@code true} if this envelope completely encloses the specified one.
@@ -750,7 +749,7 @@ public abstract class AbstractEnvelope i
      *
      * @since 0.4
      */
-    public final boolean contains(final Envelope envelope) throws MismatchedDimensionException
{
+    public boolean contains(final Envelope envelope) throws MismatchedDimensionException
{
         return contains(envelope, true);
     }
 
@@ -763,6 +762,10 @@ public abstract class AbstractEnvelope i
      * <p>This method is subject to the same pre-conditions than {@link #contains(Envelope)},
      * and handles envelopes spanning the anti-meridian in the same way.</p>
      *
+     * <div class="warning"><b>Warning:</b> This method may change or be
removed in a future SIS version.
+     * For API stability, use the {@link #contains(Envelope)} method instead.
+     * See <a href="http://issues.apache.org/jira/browse/SIS-172">SIS-172</a>
for more information.</div>
+     *
      * @param  envelope The envelope to test for inclusion.
      * @param  edgesInclusive {@code true} if this envelope edges are inclusive.
      * @return {@code true} if this envelope completely encloses the specified one.
@@ -843,7 +846,6 @@ public abstract class AbstractEnvelope i
 
     /**
      * Returns {@code true} if this envelope intersects the specified envelope.
-     * All edges of this envelope are considered inclusive.
      *
      * {@section Pre-conditions}
      * This method assumes that the specified envelope uses the same CRS than this envelope.
@@ -874,6 +876,10 @@ public abstract class AbstractEnvelope i
      * <p>This method is subject to the same pre-conditions than {@link #intersects(Envelope)},
      * and handles envelopes spanning the anti-meridian in the same way.</p>
      *
+     * <div class="warning"><b>Warning:</b> This method may change or be
removed in a future SIS version.
+     * For API stability, use the {@link #intersects(Envelope)} method instead.
+     * See <a href="http://issues.apache.org/jira/browse/SIS-172">SIS-172</a>
for more information.</div>
+     *
      * @param  envelope The envelope to test for intersection.
      * @param  edgesInclusive {@code true} if this envelope edges are inclusive.
      * @return {@code true} if this envelope intersects the specified one.



Mime
View raw message