sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1813743 - in /sis/trunk: ./ application/sis-console/src/main/java/org/apache/sis/console/ core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/ core/sis-referencing/src/main/java/org/apache/sis/internal/re...
Date Mon, 30 Oct 2017 10:00:25 GMT
Author: desruisseaux
Date: Mon Oct 30 10:00:24 2017
New Revision: 1813743

URL: http://svn.apache.org/viewvc?rev=1813743&view=rev
Log:
Merge release preparation from JDK7 branch.

Modified:
    sis/trunk/   (props changed)
    sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
    sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AlbersEqualArea.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Fraction.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
    sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
    sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
    sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalOpenParameterException.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 30 10:00:24 2017
@@ -1,5 +1,5 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394364-1758914
-/sis/branches/JDK7:1394913-1813524
-/sis/branches/JDK8:1584960-1813514
+/sis/branches/JDK7:1394913-1813742
+/sis/branches/JDK8:1584960-1813741
 /sis/branches/JDK9:1773327-1803064

Modified: sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
[UTF-8] (original)
+++ sis/trunk/application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java
[UTF-8] Mon Oct 30 10:00:24 2017
@@ -60,7 +60,7 @@ public class ResourcesDownloader extends
     /**
      * Where to download the EPSG scripts after user has approved the terms of use.
      */
-    private static final String DOWNLOAD_URL = "http://repo1.maven.org/maven2/org/apache/sis/non-free/sis-epsg/0.7/sis-epsg-0.7.jar";
+    private static final String DOWNLOAD_URL = "http://repo1.maven.org/maven2/org/apache/sis/non-free/sis-epsg/0.8/sis-epsg-0.8.jar";
 
     /**
      * Estimation of the EPSG database size after installation, in mega-bytes.

Modified: sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
[UTF-8] Mon Oct 30 10:00:24 2017
@@ -214,7 +214,7 @@ public class MilitaryGridReferenceSystem
     final CommonCRS datum;
 
     /**
-     * Whether {@link Encoder} should infer the datum from the given coordinates
+     * Whether {@link MilitaryGridReferenceSystem.Encoder} should infer the datum from the
given coordinates
      * instead than using {@link #datum}.
      */
     final boolean avoidDatumChange;

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AlbersEqualArea.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AlbersEqualArea.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AlbersEqualArea.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AlbersEqualArea.java
[UTF-8] Mon Oct 30 10:00:24 2017
@@ -66,7 +66,7 @@ public final class AlbersEqualArea exten
 
     /**
      * The operation parameter descriptor for the <cite>Latitude of 2nd standard parallel</cite>
parameter value.
-     * Valid values range is [-90 … 90]° and default value is the value given to the {@link
#STANDARD_PARALLEL_2}
+     * Valid values range is [-90 … 90]° and default value is the value given to the {@link
#STANDARD_PARALLEL_1}
      * parameter.
      */
     public static final ParameterDescriptor<Double> STANDARD_PARALLEL_2;

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Fraction.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Fraction.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Fraction.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/Fraction.java [UTF-8] Mon
Oct 30 10:00:24 2017
@@ -221,7 +221,7 @@ public final class Fraction extends Numb
      * Returns this fraction rounded toward nearest integer. If the result is located
      * at equal distance from the two nearest integers, then rounds to the even one.
      *
-     * @return {@link #numerator} / {@link denominator} rounded toward nearest integer.
+     * @return {@link #numerator} / {@link #denominator} rounded toward nearest integer.
      */
     public int round() {
         if (denominator == Integer.MIN_VALUE) {
@@ -252,7 +252,7 @@ public final class Fraction extends Numb
      * <p><b>Tip:</b> if the numerator and the denominator are both positive
or both negative,
      * then the result is positive and identical to {@code numerator / denominator}.</p>
      *
-     * @return {@link #numerator} / {@link denominator} rounded toward negative infinity.
+     * @return {@link #numerator} / {@link #denominator} rounded toward negative infinity.
      */
     public int floor() {
         int n = numerator / denominator;
@@ -266,7 +266,7 @@ public final class Fraction extends Numb
      * Returns this fraction rounded toward positive infinity.
      * This is different from the default operation on primitive types, which rounds toward
zero.
      *
-     * @return {@link #numerator} / {@link denominator} rounded toward positive infinity.
+     * @return {@link #numerator} / {@link #denominator} rounded toward positive infinity.
      */
     public int ceil() {
         int n = numerator / denominator;
@@ -327,7 +327,7 @@ public final class Fraction extends Numb
     /**
      * Returns this fraction rounded toward zero.
      *
-     * @return {@link #numerator} / {@link denominator} rounded toward zero.
+     * @return {@link #numerator} / {@link #denominator} rounded toward zero.
      *
      * @see #round()
      * @see #floor()

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java [UTF-8] Mon
Oct 30 10:00:24 2017
@@ -541,7 +541,7 @@ public final class Units extends Static
      * <div class="note"><p class="simpleTagLabel" style="margin-bottom:0">Related
units:</p>
      * <table class="compact" summary="Related units" style="margin-left:30px; line-height:1.25">
      *   <tr><td>SI time units:</td>    <td style="word-spacing:1em">{@link
#MILLISECOND}, <b>{@link #SECOND}</b>.</td></tr>
-     *   <tr><td>In other systems:</td> <td style="word-spacing:1em">{@link
#MINUTE}, {@link #HOUR}, {@link #DAY}, <u>{@link WEEK}</u>, {@link #TROPICAL_YEAR}.</td></tr>
+     *   <tr><td>In other systems:</td> <td style="word-spacing:1em">{@link
#MINUTE}, {@link #HOUR}, {@link #DAY}, <u>{@link #WEEK}</u>, {@link #TROPICAL_YEAR}.</td></tr>
      *   <tr><td>Derived units:</td>    <td style="word-spacing:1em">{@link
#KILOMETRES_PER_HOUR}, {@link #HERTZ}.</td></tr>
      * </table></div>
      *

Modified: sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
[UTF-8] Mon Oct 30 10:00:24 2017
@@ -130,8 +130,8 @@ public class LandsatStore extends DataSt
 
     /**
      * Returns the parameters used to open this Landsat data store.
-     * If non-null, the parameters are described by {@link LandsatStoreProvider#getOpenParameters()}
-     * and contains at least a parameter named {@value LandsatStoreProvider#LOCATION} with
a {@link URI} value.
+     * If non-null, the parameters are described by {@link LandsatStoreProvider#getOpenParameters()}
and contains at
+     * least a parameter named {@value org.apache.sis.storage.DataStoreProvider#LOCATION}
with a {@link URI} value.
      * This method may return {@code null} if the storage input can not be described by a
URI
      * (for example a Landsat file reading directly from a {@link java.nio.channels.ReadableByteChannel}).
      *

Modified: sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
[UTF-8] Mon Oct 30 10:00:24 2017
@@ -152,8 +152,8 @@ public class GeoTiffStore extends DataSt
 
     /**
      * Returns the parameters used to open this GeoTIFF data store.
-     * If non-null, the parameters are described by {@link GeoTiffStoreProvider#getOpenParameters()}
-     * and contains at least a parameter named {@value GeoTiffStoreProvider#LOCATION} with
a {@link URI} value.
+     * If non-null, the parameters are described by {@link GeoTiffStoreProvider#getOpenParameters()}
and contains at
+     * least a parameter named {@value org.apache.sis.storage.DataStoreProvider#LOCATION}
with a {@link URI} value.
      * This method may return {@code null} if the storage input can not be described by a
URI
      * (for example a GeoTIFF file reading directly from a {@link java.nio.channels.ReadableByteChannel}).
      *

Modified: sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] Mon Oct 30 10:00:24 2017
@@ -142,8 +142,8 @@ public class NetcdfStore extends DataSto
 
     /**
      * Returns the parameters used to open this netCDF data store.
-     * If non-null, the parameters are described by {@link NetcdfStoreProvider#getOpenParameters()}
-     * and contains at least a parameter named {@value NetcdfStoreProvider#LOCATION} with
a {@link URI} value.
+     * If non-null, the parameters are described by {@link NetcdfStoreProvider#getOpenParameters()}
and contains at
+     * least a parameter named {@value org.apache.sis.storage.DataStoreProvider#LOCATION}
with a {@link URI} value.
      * This method may return {@code null} if the storage input can not be described by a
URI
      * (for example a netCDF file reading directly from a {@link java.nio.channels.ReadableByteChannel}).
      *

Modified: sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java [UTF-8]
(original)
+++ sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java [UTF-8]
Mon Oct 30 10:00:24 2017
@@ -224,7 +224,7 @@ public abstract class DataStore implemen
      * The collection of legal parameters is implementation-dependent
      * ({@linkplain org.apache.sis.parameter.DefaultParameterValue#getDescriptor() their
description}
      * is given by {@link DataStoreProvider#getOpenParameters()}),
-     * but should contain at least a parameter named {@value DataStoreProvider#LOCATION}
+     * but should contain at least a parameter named {@value org.apache.sis.storage.DataStoreProvider#LOCATION}
      * with a {@link java.net.URI}, {@link java.nio.file.Path} or {@link javax.sql.DataSource}
value.
      *
      * <p>In the event a data store must be closed and reopened later, those parameters
can be stored in a file or

Modified: sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalOpenParameterException.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalOpenParameterException.java?rev=1813743&r1=1813742&r2=1813743&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalOpenParameterException.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/IllegalOpenParameterException.java
[UTF-8] Mon Oct 30 10:00:24 2017
@@ -21,7 +21,7 @@ import java.util.Locale;
 
 /**
  * Thrown when a {@code DataStore} can not be opened because of invalid parameters.
- * This may be a missing {@value DataStoreProvider#LOCATION} parameter value,
+ * This may be a missing {@value org.apache.sis.storage.DataStoreProvider#LOCATION} parameter
value,
  * or an unsupported object given to {@link StorageConnector} constructor.
  *
  * @author  Martin Desruisseaux (Geomatys)



Mime
View raw message