You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/04/01 15:51:09 UTC
svn commit: r1789810 [2/2] - in /sis/branches/JDK8: ./
application/sis-console/src/main/java/org/apache/sis/console/
core/sis-build-helper/src/main/java/org/apache/sis/internal/book/
core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/ c...
Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java?rev=1789810&r1=1789809&r2=1789810&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/GeoHashCoder.java [UTF-8] Sat Apr 1 15:51:08 2017
@@ -55,7 +55,7 @@ public class GeoHashCoder implements Ser
* @deprecated Moved to {@link org.apache.sis.referencing.gazetteer.GeohashReferenceSystem.Format}.
*/
@Deprecated
- public static enum Format {
+ public enum Format {
/**
* Format consisting of 32 symbols used at {@code http://geohash.org}. This encoding uses digits 0 to 9,
* and lower-case letters {@code 'b'} to {@code 'z'} excluding {@code 'i'}, {@code 'l'} and {@code 'o'}.
Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java?rev=1789810&r1=1789809&r2=1789810&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/index/tree/QuadTree.java [UTF-8] Sat Apr 1 15:51:08 2017
@@ -422,7 +422,7 @@ public class QuadTree {
* point
*/
public List<QuadTreeData> queryByBoundingBox(final Envelope2D searchRegion) {
- Rectangle2D.Double rectArray[] = searchRegion.toRectangles();
+ Rectangle2D.Double[] rectArray = searchRegion.toRectangles();
for (final Rectangle2D.Double r : rectArray) {
r.x += 180;
r.y += 90;
Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java?rev=1789810&r1=1789809&r2=1789810&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java [UTF-8] Sat Apr 1 15:51:08 2017
@@ -246,7 +246,7 @@ public class MetadataBuilder {
/**
* The type of party to create (individual, organization or unknown).
*/
- public static enum PartyType {
+ public enum PartyType {
/**
* Instructs {@link #newParty(PartyType)} that the next party to create should be an instance of
* {@link DefaultIndividual}.
@@ -659,7 +659,7 @@ public class MetadataBuilder {
/**
* Specify if an information apply to data, to metadata or to both.
*/
- public static enum Scope {
+ public enum Scope {
/**
* Information applies only to data.
*/
Modified: sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java?rev=1789810&r1=1789809&r2=1789810&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Store.java [UTF-8] Sat Apr 1 15:51:08 2017
@@ -215,7 +215,7 @@ public final class Store extends StaxDat
/*
* Get the writer if no read or other write operation is in progress, then write the data.
*/
- try (final Writer writer = new Writer(this, org.apache.sis.internal.storage.gpx.Metadata.castOrCopy(metadata, locale))) {
+ try (Writer writer = new Writer(this, org.apache.sis.internal.storage.gpx.Metadata.castOrCopy(metadata, locale))) {
writer.writeStartDocument();
if (features != null) {
features.forEachOrdered(writer);
Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java?rev=1789810&r1=1789809&r2=1789810&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java [UTF-8] Sat Apr 1 15:51:08 2017
@@ -134,7 +134,7 @@ public final strictfp class ReaderTest e
*/
@Test
public void testMetadata100() throws DataStoreException {
- try (final Store reader = create("1.0/metadata.xml")) {
+ try (Store reader = create("1.0/metadata.xml")) {
final Metadata md = (Metadata) reader.getMetadata();
verifyMetadata(md, 1);
assertNull(md.author.link);
@@ -150,7 +150,7 @@ public final strictfp class ReaderTest e
*/
@Test
public void testMetadata110() throws DataStoreException {
- try (final Store reader = create("1.1/metadata.xml")) {
+ try (Store reader = create("1.1/metadata.xml")) {
final Metadata md = (Metadata) reader.getMetadata();
verifyMetadata(md, 3);
assertStringEquals("http://someone-site.org", md.author.link);
@@ -220,10 +220,10 @@ public final strictfp class ReaderTest e
@Test
@DependsOnMethod("testMetadata100")
public void testWayPoint100() throws DataStoreException {
- try (final Store reader = create("1.0/waypoint.xml")) {
+ try (Store reader = create("1.0/waypoint.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_0, reader.getVersion());
- try (final Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features()) {
final Iterator<Feature> it = features.iterator();
verifyPoint(it.next(), 0, false);
verifyPoint(it.next(), 1, false);
@@ -241,10 +241,10 @@ public final strictfp class ReaderTest e
@Test
@DependsOnMethod("testMetadata110")
public void testWayPoint110() throws DataStoreException {
- try (final Store reader = create("1.1/waypoint.xml")) {
+ try (Store reader = create("1.1/waypoint.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_1, reader.getVersion());
- try (final Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features()) {
final Iterator<Feature> it = features.iterator();
verifyPoint(it.next(), 0, true);
verifyPoint(it.next(), 1, true);
@@ -262,10 +262,10 @@ public final strictfp class ReaderTest e
@Test
@DependsOnMethod("testWayPoint100")
public void testRoute100() throws DataStoreException {
- try (final Store reader = create("1.0/route.xml")) {
+ try (Store reader = create("1.0/route.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_0, reader.getVersion());
- try (final Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features()) {
final Iterator<Feature> it = features.iterator();
verifyRoute(it.next(), false, 1);
verifyEmpty(it.next(), "rtept");
@@ -282,7 +282,7 @@ public final strictfp class ReaderTest e
@Test
@DependsOnMethod("testWayPoint110")
public void testRoute110() throws DataStoreException {
- try (final Store reader = create("1.1/route.xml")) {
+ try (Store reader = create("1.1/route.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_1, reader.getVersion());
verifyRoute110(reader);
@@ -294,7 +294,7 @@ public final strictfp class ReaderTest e
* This verification is shared by {@link #testRoute110()} and {@link #testSequentialReads()}.
*/
static void verifyRoute110(final Store reader) throws DataStoreException {
- try (final Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features()) {
final Iterator<Feature> it = features.iterator();
verifyRoute(it.next(), true, 3);
verifyEmpty(it.next(), "rtept");
@@ -369,10 +369,10 @@ public final strictfp class ReaderTest e
@Test
@DependsOnMethod("testRoute100")
public void testTrack100() throws DataStoreException {
- try (final Store reader = create("1.0/track.xml")) {
+ try (Store reader = create("1.0/track.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_0, reader.getVersion());
- try (final Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features()) {
final Iterator<Feature> it = features.iterator();
verifyTrack(it.next(), false, 1);
verifyEmpty(it.next(), "trkseg");
@@ -389,10 +389,10 @@ public final strictfp class ReaderTest e
@Test
@DependsOnMethod("testRoute110")
public void testTrack110() throws DataStoreException {
- try (final Store reader = create("1.1/track.xml")) {
+ try (Store reader = create("1.1/track.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_1, reader.getVersion());
- try (final Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features()) {
final Iterator<Feature> it = features.iterator();
verifyTrack(it.next(), true, 3);
verifyEmpty(it.next(), "trkseg");
@@ -555,7 +555,7 @@ public final strictfp class ReaderTest e
@Test
@DependsOnMethod("testRoute110")
public void testRouteSkipMetadata() throws DataStoreException {
- try (final Store reader = create("1.1/route.xml")) {
+ try (Store reader = create("1.1/route.xml")) {
verifyRoute110(reader);
}
}
@@ -579,7 +579,7 @@ public final strictfp class ReaderTest e
@DependsOnMethod("testRouteSkipMetadata")
public void testSequentialReads() throws DataStoreException {
final Metadata md;
- try (final Store reader = createFromURL()) {
+ try (Store reader = createFromURL()) {
verifyRoute110(reader);
/*
* Ask for metadata only after a first read, for testing the way the store manages readers.
@@ -606,7 +606,7 @@ public final strictfp class ReaderTest e
@Test
@DependsOnMethod("testSequentialReads")
public void testConcurrentReads() throws DataStoreException {
- try (final Store reader = createFromURL()) {
+ try (Store reader = createFromURL()) {
final Stream<Feature> f1 = reader.features();
final Iterator<Feature> i1 = f1.iterator();
verifyRoute(i1.next(), true, 3);
Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java?rev=1789810&r1=1789809&r2=1789810&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java [UTF-8] Sat Apr 1 15:51:08 2017
@@ -230,7 +230,7 @@ public final strictfp class WriterTest e
* @param expected name of a test file containing the expected XML result.
*/
private void testFeatures(final Version version, final Type type, final String expected) throws Exception {
- try (final Store store = create()) {
+ try (Store store = create()) {
store.version = version;
testFeatures(store, type);
}
@@ -364,7 +364,7 @@ public final strictfp class WriterTest e
@Test
@DependsOnMethod("testRoutes110")
public void testInputReplacement() throws Exception {
- try (final Store store = new Store(provider, new StorageConnector(
+ try (Store store = new Store(provider, new StorageConnector(
TestUtilities.createTemporaryFile(ReaderTest.class, "1.1/metadata.xml"))))
{
/*