Author: desruisseaux
Date: Tue Mar 17 21:59:53 2015
New Revision: 1667415
URL: http://svn.apache.org/r1667415
Log:
Minor formatting and warning fixes.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java?rev=1667415&r1=1667414&r2=1667415&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
[UTF-8] Tue Mar 17 21:59:53 2015
@@ -100,6 +100,7 @@ public final class Mercator1SP extends M
private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
+
LATITUDE_OF_ORIGIN = createLatitude(builder
.addIdentifier("8801")
.addName("Latitude of natural origin")
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1667415&r1=1667414&r2=1667415&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
[UTF-8] Tue Mar 17 21:59:53 2015
@@ -24,7 +24,6 @@ import java.lang.reflect.Type;
import java.lang.reflect.ParameterizedType;
import org.opengis.util.NameSpace;
import org.opengis.util.GenericName;
-import org.opengis.util.InternationalString;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.opengis.referencing.IdentifiedObject;
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java?rev=1667415&r1=1667414&r2=1667415&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
[UTF-8] Tue Mar 17 21:59:53 2015
@@ -77,7 +77,7 @@ public strictfp class ReferencingAssert
public static void assertOgcIdentifierEquals(final String expected, final
Identifier actual) {
assertNotNull(actual);
assertSame("Authority", Citations.OGC, actual.getAuthority());
- Assert.assertIdentifierEquals(null, "OGC", "OGC", null, expected,
actual);
+ assertIdentifierEquals(null, "OGC", "OGC", null, expected, actual);
}
/**