From 404dd0e935a197f3c740ffe2a77f0a508d0cc3d5 Mon Sep 17 00:00:00 2001 From: Tore Halset Date: Tue, 18 Sep 2018 09:54:46 +0200 Subject: [PATCH] 1.2.3 incl reduced java to 1.5 to satisfy geotools prev 2.0 --- README.md | 2 +- pom.xml | 6 ++--- src/main/java/vector_tile/VectorTile.java | 28 ----------------------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index c46f125..1831045 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ byte[] encoded = encoder.encode(); no.ecc.vectortile java-vector-tile - 1.2.2 + 1.2.3 ``` diff --git a/pom.xml b/pom.xml index 39a9495..fa78b17 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ no.ecc.vectortile java-vector-tile jar - 1.2.2 + 1.2.3 java-vector-tile http://maven.apache.org @@ -37,8 +37,8 @@ maven-compiler-plugin 2.3.2 - 1.8 - 1.8 + 1.5 + 1.5 true UTF-8 ${fork.javac} diff --git a/src/main/java/vector_tile/VectorTile.java b/src/main/java/vector_tile/VectorTile.java index 280c45d..4e8928f 100644 --- a/src/main/java/vector_tile/VectorTile.java +++ b/src/main/java/vector_tile/VectorTile.java @@ -848,7 +848,6 @@ public static vector_tile.VectorTile.Tile.Value parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -856,7 +855,6 @@ public static Builder newBuilder() { public static Builder newBuilder(vector_tile.VectorTile.Tile.Value prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -935,12 +933,10 @@ public Builder clear() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Value_descriptor; } - @java.lang.Override public vector_tile.VectorTile.Tile.Value getDefaultInstanceForType() { return vector_tile.VectorTile.Tile.Value.getDefaultInstance(); } - @java.lang.Override public vector_tile.VectorTile.Tile.Value build() { vector_tile.VectorTile.Tile.Value result = buildPartial(); if (!result.isInitialized()) { @@ -949,7 +945,6 @@ public vector_tile.VectorTile.Tile.Value build() { return result; } - @java.lang.Override public vector_tile.VectorTile.Tile.Value buildPartial() { vector_tile.VectorTile.Tile.Value result = new vector_tile.VectorTile.Tile.Value(this); int from_bitField0_ = bitField0_; @@ -1434,7 +1429,6 @@ public static vector_tile.VectorTile.Tile.Value getDefaultInstance() { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Value parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1452,7 +1446,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public vector_tile.VectorTile.Tile.Value getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -2036,7 +2029,6 @@ public static vector_tile.VectorTile.Tile.Feature parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -2044,7 +2036,6 @@ public static Builder newBuilder() { public static Builder newBuilder(vector_tile.VectorTile.Tile.Feature prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -2115,12 +2106,10 @@ public Builder clear() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Feature_descriptor; } - @java.lang.Override public vector_tile.VectorTile.Tile.Feature getDefaultInstanceForType() { return vector_tile.VectorTile.Tile.Feature.getDefaultInstance(); } - @java.lang.Override public vector_tile.VectorTile.Tile.Feature build() { vector_tile.VectorTile.Tile.Feature result = buildPartial(); if (!result.isInitialized()) { @@ -2129,7 +2118,6 @@ public vector_tile.VectorTile.Tile.Feature build() { return result; } - @java.lang.Override public vector_tile.VectorTile.Tile.Feature buildPartial() { vector_tile.VectorTile.Tile.Feature result = new vector_tile.VectorTile.Tile.Feature(this); int from_bitField0_ = bitField0_; @@ -2592,7 +2580,6 @@ public static vector_tile.VectorTile.Tile.Feature getDefaultInstance() { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Feature parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -2610,7 +2597,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public vector_tile.VectorTile.Tile.Feature getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -3428,7 +3414,6 @@ public static vector_tile.VectorTile.Tile.Layer parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -3436,7 +3421,6 @@ public static Builder newBuilder() { public static Builder newBuilder(vector_tile.VectorTile.Tile.Layer prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -3522,12 +3506,10 @@ public Builder clear() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_Layer_descriptor; } - @java.lang.Override public vector_tile.VectorTile.Tile.Layer getDefaultInstanceForType() { return vector_tile.VectorTile.Tile.Layer.getDefaultInstance(); } - @java.lang.Override public vector_tile.VectorTile.Tile.Layer build() { vector_tile.VectorTile.Tile.Layer result = buildPartial(); if (!result.isInitialized()) { @@ -3536,7 +3518,6 @@ public vector_tile.VectorTile.Tile.Layer build() { return result; } - @java.lang.Override public vector_tile.VectorTile.Tile.Layer buildPartial() { vector_tile.VectorTile.Tile.Layer result = new vector_tile.VectorTile.Tile.Layer(this); int from_bitField0_ = bitField0_; @@ -4738,7 +4719,6 @@ public static vector_tile.VectorTile.Tile.Layer getDefaultInstance() { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Layer parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -4756,7 +4736,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public vector_tile.VectorTile.Tile.Layer getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -4954,7 +4933,6 @@ public static vector_tile.VectorTile.Tile parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -4962,7 +4940,6 @@ public static Builder newBuilder() { public static Builder newBuilder(vector_tile.VectorTile.Tile prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -5029,12 +5006,10 @@ public Builder clear() { return vector_tile.VectorTile.internal_static_vector_tile_Tile_descriptor; } - @java.lang.Override public vector_tile.VectorTile.Tile getDefaultInstanceForType() { return vector_tile.VectorTile.Tile.getDefaultInstance(); } - @java.lang.Override public vector_tile.VectorTile.Tile build() { vector_tile.VectorTile.Tile result = buildPartial(); if (!result.isInitialized()) { @@ -5043,7 +5018,6 @@ public vector_tile.VectorTile.Tile build() { return result; } - @java.lang.Override public vector_tile.VectorTile.Tile buildPartial() { vector_tile.VectorTile.Tile result = new vector_tile.VectorTile.Tile(this); int from_bitField0_ = bitField0_; @@ -5463,7 +5437,6 @@ public static vector_tile.VectorTile.Tile getDefaultInstance() { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Tile parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -5481,7 +5454,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public vector_tile.VectorTile.Tile getDefaultInstanceForType() { return DEFAULT_INSTANCE; }