sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1773511 - in /sis/branches/JDK8: ./ core/sis-feature/src/test/java/org/apache/sis/filter/ core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/ core/sis-referencing/src/...
Date Sat, 10 Dec 2016 09:43:50 GMT
Author: desruisseaux
Date: Sat Dec 10 09:43:50 2016
New Revision: 1773511

URL: http://svn.apache.org/viewvc?rev=1773511&view=rev
Log:
Fix some javadoc and javac warnings.

Modified:
    sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/filter/DefaultLiteralTest.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
    sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
    sis/branches/JDK8/pom.xml

Modified: sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/filter/DefaultLiteralTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/filter/DefaultLiteralTest.java?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/filter/DefaultLiteralTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/filter/DefaultLiteralTest.java
[UTF-8] Sat Dec 10 09:43:50 2016
@@ -17,12 +17,14 @@
 package org.apache.sis.filter;
 
 import java.util.Date;
-import static org.apache.sis.test.Assert.*;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 import org.opengis.filter.FilterFactory2;
 import org.opengis.filter.expression.Literal;
 
+import static org.apache.sis.test.Assert.*;
+
+
 /**
  * Tests {@link DefaultLiteral}.
  *
@@ -32,19 +34,17 @@ import org.opengis.filter.expression.Lit
  * @module
  */
 public class DefaultLiteralTest extends TestCase {
-
     /**
      * Test factory.
      */
     @Test
     public void testConstructor() {
-        final FilterFactory2 FF = new DefaultFilterFactory();
-
-        assertNotNull(FF.literal(true));
-        assertNotNull(FF.literal("a text string"));
-        assertNotNull(FF.literal('x'));
-        assertNotNull(FF.literal(122));
-        assertNotNull(FF.literal(45.56d));
+        final FilterFactory2 factory = new DefaultFilterFactory();
+        assertNotNull(factory.literal(true));
+        assertNotNull(factory.literal("a text string"));
+        assertNotNull(factory.literal('x'));
+        assertNotNull(factory.literal(122));
+        assertNotNull(factory.literal(45.56d));
     }
 
     /**
@@ -52,13 +52,12 @@ public class DefaultLiteralTest extends
      */
     @Test
     public void testEvaluate() {
-
-        final Literal literal = new DefaultLiteral(12.45);
+        final Literal literal = new DefaultLiteral<>(12.45);
         assertEquals(12.45, (Double)literal.getValue(), STRICT);
         assertEquals(12.45, (Double)literal.evaluate(null), STRICT);
-        assertEquals(12.45, literal.evaluate(null,Double.class), STRICT);
-        assertEquals("12.45", literal.evaluate(null,String.class));
-        assertEquals(null, literal.evaluate(null,Date.class));
+        assertEquals(12.45, literal.evaluate(null, Double.class), STRICT);
+        assertEquals("12.45", literal.evaluate(null, String.class));
+        assertEquals(null, literal.evaluate(null, Date.class));
     }
 
     /**
@@ -66,12 +65,10 @@ public class DefaultLiteralTest extends
      */
     @Test
     public void testSerialize() {
-
-        assertSerializedEquals(new DefaultLiteral(true));
-        assertSerializedEquals(new DefaultLiteral("a text string"));
-        assertSerializedEquals(new DefaultLiteral('x'));
-        assertSerializedEquals(new DefaultLiteral(122));
-        assertSerializedEquals(new DefaultLiteral(45.56d));
+        assertSerializedEquals(new DefaultLiteral<>(true));
+        assertSerializedEquals(new DefaultLiteral<>("a text string"));
+        assertSerializedEquals(new DefaultLiteral<>('x'));
+        assertSerializedEquals(new DefaultLiteral<>(122));
+        assertSerializedEquals(new DefaultLiteral<>(45.56d));
     }
-
 }

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8]
(original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8]
Sat Dec 10 09:43:50 2016
@@ -216,6 +216,7 @@ public class Colors implements Cloneable
      * Replaces the deserialized instance by {@link #DEFAULT} one if possible.
      *
      * @return the object to use after deserialization.
+     * @throws ObjectStreamException required by specification but should never be thrown.
      */
     final Object readResolve() throws ObjectStreamException {
         return isImmutable && map.equals(DEFAULT.map) ? DEFAULT : this;

Modified: sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8]
(original)
+++ sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8]
Sat Dec 10 09:43:50 2016
@@ -740,6 +740,7 @@ public class Symbols implements Localize
      * This method also opportunistically recompute the {@link #quote} field if no replacement
is done.
      *
      * @return the object to use after deserialization.
+     * @throws ObjectStreamException required by specification but should never be thrown.
      */
     final Object readResolve() throws ObjectStreamException {
         if (isImmutable) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
[UTF-8] Sat Dec 10 09:43:50 2016
@@ -371,7 +371,7 @@ public abstract class DatumShiftGrid<C e
 
     /**
      * Converts the given normalized <var>x</var> ordinate to grid index.
-     * "Normalized coordinates" are coordinates in the unit of measurement given by {@link
Unit#toSI()}.
+     * "Normalized coordinates" are coordinates in the unit of measurement given by {@link
Unit#getSystemUnit()}.
      * For angular coordinates, this is radians. For linear coordinates, this is metres.
      *
      * @param  x  the "real world" ordinate (often longitude in radians) of the point for
which to get the translation.
@@ -383,7 +383,7 @@ public abstract class DatumShiftGrid<C e
 
     /**
      * Converts the given normalized <var>x</var> ordinate to grid index.
-     * "Normalized coordinates" are coordinates in the unit of measurement given by {@link
Unit#toSI()}.
+     * "Normalized coordinates" are coordinates in the unit of measurement given by {@link
Unit#getSystemUnit()}.
      * For angular coordinates, this is radians. For linear coordinates, this is metres.
      *
      * @param  y  the "real world" ordinate (often latitude in radians) of the point for
which to get the translation.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
[UTF-8] Sat Dec 10 09:43:50 2016
@@ -198,7 +198,7 @@ public class InterpolatedTransform exten
      *   <li>If the datum shift unit {@linkplain Units#isTemporal(Unit) is temporal},
then the transform
      *       will work with input and output coordinates in seconds.</li>
      *   <li>Generally for all units other than angular, the transform will work with
input and output
-     *       coordinates in the unit given by {@link Unit#toSI()}.</li>
+     *       coordinates in the unit given by {@link Unit#getSystemUnit()}.</li>
      * </ul>
      *
      * @param  <T>      dimension of the coordinate and the translation unit.

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java [UTF-8]
(original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/setup/OptionKey.java [UTF-8]
Sat Dec 10 09:43:50 2016
@@ -274,6 +274,7 @@ public class OptionKey<T> implements Ser
      * only for instance of the exact {@code OptionKey} class, not subclasses.
      *
      * @return  the unique {@code OptionKey} instance.
+     * @throws ObjectStreamException required by specification but should never be thrown.
      */
     private Object readResolve() throws ObjectStreamException {
         try {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
[UTF-8] Sat Dec 10 09:43:50 2016
@@ -318,6 +318,7 @@ public class DefaultLocalName extends Ab
      * to replace an instance of a user-defined class.</p>
      *
      * @return the unique instance.
+     * @throws ObjectStreamException required by specification but should never be thrown.
      */
     private Object readResolve() throws ObjectStreamException {
         final DefaultNameSpace ns;

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
[UTF-8] Sat Dec 10 09:43:50 2016
@@ -526,6 +526,7 @@ public class DefaultNameSpace implements
      * behavior since we don't want to replace an instance of a user-defined class.</p>
      *
      * @return the unique instance.
+     * @throws ObjectStreamException required by specification but should never be thrown.
      */
     Object readResolve() throws ObjectStreamException {
         final DefaultNameSpace p = parent();

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java [UTF-8]
(original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java [UTF-8]
Sat Dec 10 09:43:50 2016
@@ -264,6 +264,7 @@ public final class NilReason implements
      * Invoked after deserialization in order to return a unique instance if possible.
      *
      * @return a unique instance of the deserialized {@code NilReason}.
+     * @throws ObjectStreamException required by specification but should never be thrown.
      */
     private Object readResolve() throws ObjectStreamException {
         if (reason instanceof String) {

Modified: sis/branches/JDK8/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/pom.xml?rev=1773511&r1=1773510&r2=1773511&view=diff
==============================================================================
--- sis/branches/JDK8/pom.xml (original)
+++ sis/branches/JDK8/pom.xml Sat Dec 10 09:43:50 2016
@@ -81,7 +81,7 @@ Apache SIS is a free software, Java lang
 
   <ciManagement>
     <system>jenkins</system>
-    <url>https://builds.apache.org/job/sis-jdk8</url>
+    <url>https://builds.apache.org/job/sis-dev</url>
   </ciManagement>
 
   <issueManagement>



Mime
View raw message