Author: desruisseaux
Date: Tue Jul 21 13:32:21 2015
New Revision: 1692111
URL: http://svn.apache.org/r1692111
Log:
Make some fields private when possible, and resole some other warnings.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -120,6 +120,7 @@ public final class Affine extends Abstra
*
* @see
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory
*/
+ @SuppressWarnings("ThisEscapedInObjectConstruction")
public Affine() {
super(IDENTIFICATION_EPSG, EPSG_DIMENSION, EPSG_DIMENSION, new
Descriptor(IDENTIFICATION_EPSG,
Arrays.copyOfRange( // Discards param 0 and 1, take only the
ones in index range [2…7].
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -65,7 +65,7 @@ public final class LambertConformal1SP e
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -50,7 +50,7 @@ public final class LambertConformalMichi
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
SCALE_FACTOR = builder
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -61,7 +61,7 @@ public final class LambertConformalWest
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
FALSE_WESTING = createShift(builder
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -57,7 +57,7 @@ public final class ObliqueStereographic
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
PARAMETERS = builder
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -59,7 +59,7 @@ public final class PolarStereographicA e
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
LONGITUDE_OF_ORIGIN = createLongitude(builder
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -65,12 +65,13 @@ public final class PolarStereographicB e
* because it is sometime used in Well Known Text (WKT). However it shall
be interpreted as a
* <cite>Scale factor at the standard parallel</cite> rather than at the
natural origin.</p>
*/
+ @SuppressWarnings("FieldNameHidesFieldInSuperclass")
static final ParameterDescriptor<Double> SCALE_FACTOR;
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
LONGITUDE_OF_ORIGIN = createLongitude(
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -55,7 +55,7 @@ public final class PolarStereographicC e
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
PARAMETERS = builder()
.addIdentifier(IDENTIFIER)
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -44,7 +44,7 @@ public final class PolarStereographicNor
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
List<GeneralParameterDescriptor> sp =
PolarStereographicSouth.PARAMETERS.descriptors();
sp = sp.subList(2, sp.size()); // Skip the "semi-major" and
"semi-minor" parameters.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -44,7 +44,7 @@ public final class PseudoMercator extend
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
PARAMETERS = builder
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -62,7 +62,7 @@ public final class TransverseMercator ex
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
LATITUDE_OF_ORIGIN = createLatitude(builder
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -52,7 +52,7 @@ public final class TransverseMercatorSou
/**
* The group of all parameters expected by this coordinate operation.
*/
- static final ParameterDescriptorGroup PARAMETERS;
+ private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
final ParameterDescriptor<Double> falseSouthing = createShift(builder
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -141,7 +141,7 @@ public final strictfp class MapProjectio
* This test is mostly for {@link Equirectangular#LATITUDE_OF_ORIGIN}.
*/
private static void assertIsForcedToZero(final ParameterDescriptor<?>
parameter) {
- final Double zero = Double.valueOf(0);
+ final Double zero = 0.0;
assertEquals("minimumValue", zero, parameter.getMinimumValue());
assertEquals("maximumValue", zero, parameter.getMaximumValue());
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java?rev=1692111&r1=1692110&r2=1692111&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
[UTF-8] Tue Jul 21 13:32:21 2015
@@ -61,6 +61,7 @@ public final class MercatorMethodCompari
/**
* Where to print the outputs of this class.
*/
+ @SuppressWarnings("UseOfSystemOutOrSystemErr")
private static final PrintStream out = System.out;
/**
