Codebase list osmosis / caf86be
Add patch to regenerate protobuf files with protobuf 3.0.0. Bas Couwenberg 5 years ago
3 changed file(s) with 1450 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
+1
-0
debian/changelog less more
33 * Bump Standards-Version to 4.2.1, no changes.
44 * Drop example-shell-script-fails-syntax-check.patch, applied upstream.
55 * Add patch to revert protobuf 3.6.1 changes.
6 * Add patch to regenerate protobuf files with protobuf 3.0.0.
67
78 -- Bas Couwenberg <sebastic@debian.org> Sat, 29 Sep 2018 09:56:18 +0200
89
+1448
-0
debian/patches/protobuf-3.0.0.patch less more
0 Description: Regenerate protobuf files with protobuf 3.0.0.
1 Author: Bas Couwenberg <sebastic@debian.org>
2 Forwarded: not-needed
3
4 --- a/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Fileformat.java
5 +++ b/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Fileformat.java
6 @@ -400,19 +400,6 @@ public final class Fileformat {
7 }
8
9 public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
10 - java.nio.ByteBuffer data)
11 - throws com.google.protobuf.InvalidProtocolBufferException {
12 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
13 - DEFAULT_INSTANCE, data);
14 - }
15 - public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
16 - java.nio.ByteBuffer data,
17 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
18 - throws com.google.protobuf.InvalidProtocolBufferException {
19 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
20 - DEFAULT_INSTANCE, data, extensionRegistry);
21 - }
22 - public static org.openstreetmap.osmosis.osmbinary.Fileformat.Blob parseFrom(
23 com.google.protobuf.ByteString data)
24 throws com.google.protobuf.InvalidProtocolBufferException {
25 return com.google.protobuf.GeneratedMessageLite.parseFrom(
26 @@ -474,10 +461,10 @@ public final class Fileformat {
27 }
28
29 public static Builder newBuilder() {
30 - return (Builder) DEFAULT_INSTANCE.createBuilder();
31 + return DEFAULT_INSTANCE.toBuilder();
32 }
33 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Fileformat.Blob prototype) {
34 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
35 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
36 }
37
38 /**
39 @@ -721,10 +708,9 @@ public final class Fileformat {
40
41 // @@protoc_insertion_point(builder_scope:OSMPBF.Blob)
42 }
43 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
44 - protected final java.lang.Object dynamicMethod(
45 + protected final Object dynamicMethod(
46 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
47 - java.lang.Object arg0, java.lang.Object arg1) {
48 + Object arg0, Object arg1) {
49 switch (method) {
50 case NEW_MUTABLE_INSTANCE: {
51 return new org.openstreetmap.osmosis.osmbinary.Fileformat.Blob();
52 @@ -767,9 +753,6 @@ public final class Fileformat {
53 (com.google.protobuf.CodedInputStream) arg0;
54 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
55 (com.google.protobuf.ExtensionRegistryLite) arg1;
56 - if (extensionRegistry == null) {
57 - throw new java.lang.NullPointerException();
58 - }
59 try {
60 boolean done = false;
61 while (!done) {
62 @@ -820,7 +803,6 @@ public final class Fileformat {
63 } finally {
64 }
65 }
66 - // fall through
67 case GET_DEFAULT_INSTANCE: {
68 return DEFAULT_INSTANCE;
69 }
70 @@ -832,13 +814,7 @@ public final class Fileformat {
71 }
72 }
73 return PARSER;
74 - }
75 - case GET_MEMOIZED_IS_INITIALIZED: {
76 - return (byte) 1;
77 - }
78 - case SET_MEMOIZED_IS_INITIALIZED: {
79 - return null;
80 - }
81 + }
82 }
83 throw new UnsupportedOperationException();
84 }
85 @@ -1060,19 +1036,6 @@ public final class Fileformat {
86 }
87
88 public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
89 - java.nio.ByteBuffer data)
90 - throws com.google.protobuf.InvalidProtocolBufferException {
91 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
92 - DEFAULT_INSTANCE, data);
93 - }
94 - public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
95 - java.nio.ByteBuffer data,
96 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
97 - throws com.google.protobuf.InvalidProtocolBufferException {
98 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
99 - DEFAULT_INSTANCE, data, extensionRegistry);
100 - }
101 - public static org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader parseFrom(
102 com.google.protobuf.ByteString data)
103 throws com.google.protobuf.InvalidProtocolBufferException {
104 return com.google.protobuf.GeneratedMessageLite.parseFrom(
105 @@ -1134,10 +1097,10 @@ public final class Fileformat {
106 }
107
108 public static Builder newBuilder() {
109 - return (Builder) DEFAULT_INSTANCE.createBuilder();
110 + return DEFAULT_INSTANCE.toBuilder();
111 }
112 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader prototype) {
113 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
114 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
115 }
116
117 /**
118 @@ -1260,11 +1223,10 @@ public final class Fileformat {
119
120 // @@protoc_insertion_point(builder_scope:OSMPBF.BlobHeader)
121 }
122 - private byte memoizedIsInitialized = 2;
123 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
124 - protected final java.lang.Object dynamicMethod(
125 + private byte memoizedIsInitialized = -1;
126 + protected final Object dynamicMethod(
127 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
128 - java.lang.Object arg0, java.lang.Object arg1) {
129 + Object arg0, Object arg1) {
130 switch (method) {
131 case NEW_MUTABLE_INSTANCE: {
132 return new org.openstreetmap.osmosis.osmbinary.Fileformat.BlobHeader();
133 @@ -1276,11 +1238,18 @@ public final class Fileformat {
134
135 boolean shouldMemoize = ((Boolean) arg0).booleanValue();
136 if (!hasType()) {
137 + if (shouldMemoize) {
138 + memoizedIsInitialized = 0;
139 + }
140 return null;
141 }
142 if (!hasDatasize()) {
143 + if (shouldMemoize) {
144 + memoizedIsInitialized = 0;
145 + }
146 return null;
147 }
148 + if (shouldMemoize) memoizedIsInitialized = 1;
149 return DEFAULT_INSTANCE;
150
151 }
152 @@ -1313,9 +1282,6 @@ public final class Fileformat {
153 (com.google.protobuf.CodedInputStream) arg0;
154 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
155 (com.google.protobuf.ExtensionRegistryLite) arg1;
156 - if (extensionRegistry == null) {
157 - throw new java.lang.NullPointerException();
158 - }
159 try {
160 boolean done = false;
161 while (!done) {
162 @@ -1331,7 +1297,7 @@ public final class Fileformat {
163 break;
164 }
165 case 10: {
166 - java.lang.String s = input.readString();
167 + String s = input.readString();
168 bitField0_ |= 0x00000001;
169 type_ = s;
170 break;
171 @@ -1357,7 +1323,6 @@ public final class Fileformat {
172 } finally {
173 }
174 }
175 - // fall through
176 case GET_DEFAULT_INSTANCE: {
177 return DEFAULT_INSTANCE;
178 }
179 @@ -1369,14 +1334,7 @@ public final class Fileformat {
180 }
181 }
182 return PARSER;
183 - }
184 - case GET_MEMOIZED_IS_INITIALIZED: {
185 - return memoizedIsInitialized;
186 - }
187 - case SET_MEMOIZED_IS_INITIALIZED: {
188 - memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
189 - return null;
190 - }
191 + }
192 }
193 throw new UnsupportedOperationException();
194 }
195 --- a/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Osmformat.java
196 +++ b/osmosis-osm-binary/gen-src/main/java/org/openstreetmap/osmosis/osmbinary/Osmformat.java
197 @@ -28,7 +28,7 @@ public final class Osmformat {
198 *
199 * <code>repeated string required_features = 4;</code>
200 */
201 - java.util.List<java.lang.String>
202 + java.util.List<String>
203 getRequiredFeaturesList();
204 /**
205 * <pre>
206 @@ -59,7 +59,7 @@ public final class Osmformat {
207 /**
208 * <code>repeated string optional_features = 5;</code>
209 */
210 - java.util.List<java.lang.String>
211 + java.util.List<String>
212 getOptionalFeaturesList();
213 /**
214 * <code>repeated string optional_features = 5;</code>
215 @@ -248,7 +248,7 @@ public final class Osmformat {
216 }
217
218 public static final int REQUIRED_FEATURES_FIELD_NUMBER = 4;
219 - private com.google.protobuf.Internal.ProtobufList<java.lang.String> requiredFeatures_;
220 + private com.google.protobuf.Internal.ProtobufList<String> requiredFeatures_;
221 /**
222 * <pre>
223 * Additional tags to aid in parsing this dataset
224 @@ -256,7 +256,7 @@ public final class Osmformat {
225 *
226 * <code>repeated string required_features = 4;</code>
227 */
228 - public java.util.List<java.lang.String> getRequiredFeaturesList() {
229 + public java.util.List<String> getRequiredFeaturesList() {
230 return requiredFeatures_;
231 }
232 /**
233 @@ -367,11 +367,11 @@ public final class Osmformat {
234 }
235
236 public static final int OPTIONAL_FEATURES_FIELD_NUMBER = 5;
237 - private com.google.protobuf.Internal.ProtobufList<java.lang.String> optionalFeatures_;
238 + private com.google.protobuf.Internal.ProtobufList<String> optionalFeatures_;
239 /**
240 * <code>repeated string optional_features = 5;</code>
241 */
242 - public java.util.List<java.lang.String> getOptionalFeaturesList() {
243 + public java.util.List<String> getOptionalFeaturesList() {
244 return optionalFeatures_;
245 }
246 /**
247 @@ -830,19 +830,6 @@ public final class Osmformat {
248 }
249
250 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
251 - java.nio.ByteBuffer data)
252 - throws com.google.protobuf.InvalidProtocolBufferException {
253 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
254 - DEFAULT_INSTANCE, data);
255 - }
256 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
257 - java.nio.ByteBuffer data,
258 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
259 - throws com.google.protobuf.InvalidProtocolBufferException {
260 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
261 - DEFAULT_INSTANCE, data, extensionRegistry);
262 - }
263 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock parseFrom(
264 com.google.protobuf.ByteString data)
265 throws com.google.protobuf.InvalidProtocolBufferException {
266 return com.google.protobuf.GeneratedMessageLite.parseFrom(
267 @@ -904,10 +891,10 @@ public final class Osmformat {
268 }
269
270 public static Builder newBuilder() {
271 - return (Builder) DEFAULT_INSTANCE.createBuilder();
272 + return DEFAULT_INSTANCE.toBuilder();
273 }
274 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock prototype) {
275 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
276 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
277 }
278
279 /**
280 @@ -976,7 +963,7 @@ public final class Osmformat {
281 *
282 * <code>repeated string required_features = 4;</code>
283 */
284 - public java.util.List<java.lang.String>
285 + public java.util.List<String>
286 getRequiredFeaturesList() {
287 return java.util.Collections.unmodifiableList(
288 instance.getRequiredFeaturesList());
289 @@ -1080,7 +1067,7 @@ public final class Osmformat {
290 /**
291 * <code>repeated string optional_features = 5;</code>
292 */
293 - public java.util.List<java.lang.String>
294 + public java.util.List<String>
295 getOptionalFeaturesList() {
296 return java.util.Collections.unmodifiableList(
297 instance.getOptionalFeaturesList());
298 @@ -1435,11 +1422,10 @@ public final class Osmformat {
299
300 // @@protoc_insertion_point(builder_scope:OSMPBF.HeaderBlock)
301 }
302 - private byte memoizedIsInitialized = 2;
303 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
304 - protected final java.lang.Object dynamicMethod(
305 + private byte memoizedIsInitialized = -1;
306 + protected final Object dynamicMethod(
307 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
308 - java.lang.Object arg0, java.lang.Object arg1) {
309 + Object arg0, Object arg1) {
310 switch (method) {
311 case NEW_MUTABLE_INSTANCE: {
312 return new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBlock();
313 @@ -1452,9 +1438,13 @@ public final class Osmformat {
314 boolean shouldMemoize = ((Boolean) arg0).booleanValue();
315 if (hasBbox()) {
316 if (!getBbox().isInitialized()) {
317 + if (shouldMemoize) {
318 + memoizedIsInitialized = 0;
319 + }
320 return null;
321 }
322 }
323 + if (shouldMemoize) memoizedIsInitialized = 1;
324 return DEFAULT_INSTANCE;
325
326 }
327 @@ -1498,9 +1488,6 @@ public final class Osmformat {
328 (com.google.protobuf.CodedInputStream) arg0;
329 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
330 (com.google.protobuf.ExtensionRegistryLite) arg1;
331 - if (extensionRegistry == null) {
332 - throw new java.lang.NullPointerException();
333 - }
334 try {
335 boolean done = false;
336 while (!done) {
337 @@ -1529,7 +1516,7 @@ public final class Osmformat {
338 break;
339 }
340 case 34: {
341 - java.lang.String s = input.readString();
342 + String s = input.readString();
343 if (!requiredFeatures_.isModifiable()) {
344 requiredFeatures_ =
345 com.google.protobuf.GeneratedMessageLite.mutableCopy(requiredFeatures_);
346 @@ -1538,7 +1525,7 @@ public final class Osmformat {
347 break;
348 }
349 case 42: {
350 - java.lang.String s = input.readString();
351 + String s = input.readString();
352 if (!optionalFeatures_.isModifiable()) {
353 optionalFeatures_ =
354 com.google.protobuf.GeneratedMessageLite.mutableCopy(optionalFeatures_);
355 @@ -1547,13 +1534,13 @@ public final class Osmformat {
356 break;
357 }
358 case 130: {
359 - java.lang.String s = input.readString();
360 + String s = input.readString();
361 bitField0_ |= 0x00000002;
362 writingprogram_ = s;
363 break;
364 }
365 case 138: {
366 - java.lang.String s = input.readString();
367 + String s = input.readString();
368 bitField0_ |= 0x00000004;
369 source_ = s;
370 break;
371 @@ -1569,7 +1556,7 @@ public final class Osmformat {
372 break;
373 }
374 case 274: {
375 - java.lang.String s = input.readString();
376 + String s = input.readString();
377 bitField0_ |= 0x00000020;
378 osmosisReplicationBaseUrl_ = s;
379 break;
380 @@ -1585,7 +1572,6 @@ public final class Osmformat {
381 } finally {
382 }
383 }
384 - // fall through
385 case GET_DEFAULT_INSTANCE: {
386 return DEFAULT_INSTANCE;
387 }
388 @@ -1597,14 +1583,7 @@ public final class Osmformat {
389 }
390 }
391 return PARSER;
392 - }
393 - case GET_MEMOIZED_IS_INITIALIZED: {
394 - return memoizedIsInitialized;
395 - }
396 - case SET_MEMOIZED_IS_INITIALIZED: {
397 - memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
398 - return null;
399 - }
400 + }
401 }
402 throw new UnsupportedOperationException();
403 }
404 @@ -1839,19 +1818,6 @@ public final class Osmformat {
405 }
406
407 public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
408 - java.nio.ByteBuffer data)
409 - throws com.google.protobuf.InvalidProtocolBufferException {
410 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
411 - DEFAULT_INSTANCE, data);
412 - }
413 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
414 - java.nio.ByteBuffer data,
415 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
416 - throws com.google.protobuf.InvalidProtocolBufferException {
417 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
418 - DEFAULT_INSTANCE, data, extensionRegistry);
419 - }
420 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox parseFrom(
421 com.google.protobuf.ByteString data)
422 throws com.google.protobuf.InvalidProtocolBufferException {
423 return com.google.protobuf.GeneratedMessageLite.parseFrom(
424 @@ -1913,10 +1879,10 @@ public final class Osmformat {
425 }
426
427 public static Builder newBuilder() {
428 - return (Builder) DEFAULT_INSTANCE.createBuilder();
429 + return DEFAULT_INSTANCE.toBuilder();
430 }
431 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox prototype) {
432 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
433 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
434 }
435
436 /**
437 @@ -2051,11 +2017,10 @@ public final class Osmformat {
438
439 // @@protoc_insertion_point(builder_scope:OSMPBF.HeaderBBox)
440 }
441 - private byte memoizedIsInitialized = 2;
442 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
443 - protected final java.lang.Object dynamicMethod(
444 + private byte memoizedIsInitialized = -1;
445 + protected final Object dynamicMethod(
446 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
447 - java.lang.Object arg0, java.lang.Object arg1) {
448 + Object arg0, Object arg1) {
449 switch (method) {
450 case NEW_MUTABLE_INSTANCE: {
451 return new org.openstreetmap.osmosis.osmbinary.Osmformat.HeaderBBox();
452 @@ -2067,17 +2032,30 @@ public final class Osmformat {
453
454 boolean shouldMemoize = ((Boolean) arg0).booleanValue();
455 if (!hasLeft()) {
456 + if (shouldMemoize) {
457 + memoizedIsInitialized = 0;
458 + }
459 return null;
460 }
461 if (!hasRight()) {
462 + if (shouldMemoize) {
463 + memoizedIsInitialized = 0;
464 + }
465 return null;
466 }
467 if (!hasTop()) {
468 + if (shouldMemoize) {
469 + memoizedIsInitialized = 0;
470 + }
471 return null;
472 }
473 if (!hasBottom()) {
474 + if (shouldMemoize) {
475 + memoizedIsInitialized = 0;
476 + }
477 return null;
478 }
479 + if (shouldMemoize) memoizedIsInitialized = 1;
480 return DEFAULT_INSTANCE;
481
482 }
483 @@ -2113,9 +2091,6 @@ public final class Osmformat {
484 (com.google.protobuf.CodedInputStream) arg0;
485 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
486 (com.google.protobuf.ExtensionRegistryLite) arg1;
487 - if (extensionRegistry == null) {
488 - throw new java.lang.NullPointerException();
489 - }
490 try {
491 boolean done = false;
492 while (!done) {
493 @@ -2161,7 +2136,6 @@ public final class Osmformat {
494 } finally {
495 }
496 }
497 - // fall through
498 case GET_DEFAULT_INSTANCE: {
499 return DEFAULT_INSTANCE;
500 }
501 @@ -2173,14 +2147,7 @@ public final class Osmformat {
502 }
503 }
504 return PARSER;
505 - }
506 - case GET_MEMOIZED_IS_INITIALIZED: {
507 - return memoizedIsInitialized;
508 - }
509 - case SET_MEMOIZED_IS_INITIALIZED: {
510 - memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
511 - return null;
512 - }
513 + }
514 }
515 throw new UnsupportedOperationException();
516 }
517 @@ -2699,19 +2666,6 @@ public final class Osmformat {
518 }
519
520 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
521 - java.nio.ByteBuffer data)
522 - throws com.google.protobuf.InvalidProtocolBufferException {
523 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
524 - DEFAULT_INSTANCE, data);
525 - }
526 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
527 - java.nio.ByteBuffer data,
528 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
529 - throws com.google.protobuf.InvalidProtocolBufferException {
530 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
531 - DEFAULT_INSTANCE, data, extensionRegistry);
532 - }
533 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock parseFrom(
534 com.google.protobuf.ByteString data)
535 throws com.google.protobuf.InvalidProtocolBufferException {
536 return com.google.protobuf.GeneratedMessageLite.parseFrom(
537 @@ -2773,10 +2727,10 @@ public final class Osmformat {
538 }
539
540 public static Builder newBuilder() {
541 - return (Builder) DEFAULT_INSTANCE.createBuilder();
542 + return DEFAULT_INSTANCE.toBuilder();
543 }
544 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock prototype) {
545 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
546 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
547 }
548
549 /**
550 @@ -3101,11 +3055,10 @@ public final class Osmformat {
551
552 // @@protoc_insertion_point(builder_scope:OSMPBF.PrimitiveBlock)
553 }
554 - private byte memoizedIsInitialized = 2;
555 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
556 - protected final java.lang.Object dynamicMethod(
557 + private byte memoizedIsInitialized = -1;
558 + protected final Object dynamicMethod(
559 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
560 - java.lang.Object arg0, java.lang.Object arg1) {
561 + Object arg0, Object arg1) {
562 switch (method) {
563 case NEW_MUTABLE_INSTANCE: {
564 return new org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveBlock();
565 @@ -3117,13 +3070,20 @@ public final class Osmformat {
566
567 boolean shouldMemoize = ((Boolean) arg0).booleanValue();
568 if (!hasStringtable()) {
569 + if (shouldMemoize) {
570 + memoizedIsInitialized = 0;
571 + }
572 return null;
573 }
574 for (int i = 0; i < getPrimitivegroupCount(); i++) {
575 if (!getPrimitivegroup(i).isInitialized()) {
576 + if (shouldMemoize) {
577 + memoizedIsInitialized = 0;
578 + }
579 return null;
580 }
581 }
582 + if (shouldMemoize) memoizedIsInitialized = 1;
583 return DEFAULT_INSTANCE;
584
585 }
586 @@ -3162,9 +3122,6 @@ public final class Osmformat {
587 (com.google.protobuf.CodedInputStream) arg0;
588 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
589 (com.google.protobuf.ExtensionRegistryLite) arg1;
590 - if (extensionRegistry == null) {
591 - throw new java.lang.NullPointerException();
592 - }
593 try {
594 boolean done = false;
595 while (!done) {
596 @@ -3232,7 +3189,6 @@ public final class Osmformat {
597 } finally {
598 }
599 }
600 - // fall through
601 case GET_DEFAULT_INSTANCE: {
602 return DEFAULT_INSTANCE;
603 }
604 @@ -3244,14 +3200,7 @@ public final class Osmformat {
605 }
606 }
607 return PARSER;
608 - }
609 - case GET_MEMOIZED_IS_INITIALIZED: {
610 - return memoizedIsInitialized;
611 - }
612 - case SET_MEMOIZED_IS_INITIALIZED: {
613 - memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
614 - return null;
615 - }
616 + }
617 }
618 throw new UnsupportedOperationException();
619 }
620 @@ -3946,19 +3895,6 @@ public final class Osmformat {
621 }
622
623 public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
624 - java.nio.ByteBuffer data)
625 - throws com.google.protobuf.InvalidProtocolBufferException {
626 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
627 - DEFAULT_INSTANCE, data);
628 - }
629 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
630 - java.nio.ByteBuffer data,
631 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
632 - throws com.google.protobuf.InvalidProtocolBufferException {
633 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
634 - DEFAULT_INSTANCE, data, extensionRegistry);
635 - }
636 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup parseFrom(
637 com.google.protobuf.ByteString data)
638 throws com.google.protobuf.InvalidProtocolBufferException {
639 return com.google.protobuf.GeneratedMessageLite.parseFrom(
640 @@ -4020,10 +3956,10 @@ public final class Osmformat {
641 }
642
643 public static Builder newBuilder() {
644 - return (Builder) DEFAULT_INSTANCE.createBuilder();
645 + return DEFAULT_INSTANCE.toBuilder();
646 }
647 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup prototype) {
648 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
649 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
650 }
651
652 /**
653 @@ -4479,11 +4415,10 @@ public final class Osmformat {
654
655 // @@protoc_insertion_point(builder_scope:OSMPBF.PrimitiveGroup)
656 }
657 - private byte memoizedIsInitialized = 2;
658 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
659 - protected final java.lang.Object dynamicMethod(
660 + private byte memoizedIsInitialized = -1;
661 + protected final Object dynamicMethod(
662 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
663 - java.lang.Object arg0, java.lang.Object arg1) {
664 + Object arg0, Object arg1) {
665 switch (method) {
666 case NEW_MUTABLE_INSTANCE: {
667 return new org.openstreetmap.osmosis.osmbinary.Osmformat.PrimitiveGroup();
668 @@ -4496,24 +4431,37 @@ public final class Osmformat {
669 boolean shouldMemoize = ((Boolean) arg0).booleanValue();
670 for (int i = 0; i < getNodesCount(); i++) {
671 if (!getNodes(i).isInitialized()) {
672 + if (shouldMemoize) {
673 + memoizedIsInitialized = 0;
674 + }
675 return null;
676 }
677 }
678 for (int i = 0; i < getWaysCount(); i++) {
679 if (!getWays(i).isInitialized()) {
680 + if (shouldMemoize) {
681 + memoizedIsInitialized = 0;
682 + }
683 return null;
684 }
685 }
686 for (int i = 0; i < getRelationsCount(); i++) {
687 if (!getRelations(i).isInitialized()) {
688 + if (shouldMemoize) {
689 + memoizedIsInitialized = 0;
690 + }
691 return null;
692 }
693 }
694 for (int i = 0; i < getChangesetsCount(); i++) {
695 if (!getChangesets(i).isInitialized()) {
696 + if (shouldMemoize) {
697 + memoizedIsInitialized = 0;
698 + }
699 return null;
700 }
701 }
702 + if (shouldMemoize) memoizedIsInitialized = 1;
703 return DEFAULT_INSTANCE;
704
705 }
706 @@ -4546,9 +4494,6 @@ public final class Osmformat {
707 (com.google.protobuf.CodedInputStream) arg0;
708 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
709 (com.google.protobuf.ExtensionRegistryLite) arg1;
710 - if (extensionRegistry == null) {
711 - throw new java.lang.NullPointerException();
712 - }
713 try {
714 boolean done = false;
715 while (!done) {
716 @@ -4623,7 +4568,6 @@ public final class Osmformat {
717 } finally {
718 }
719 }
720 - // fall through
721 case GET_DEFAULT_INSTANCE: {
722 return DEFAULT_INSTANCE;
723 }
724 @@ -4635,14 +4579,7 @@ public final class Osmformat {
725 }
726 }
727 return PARSER;
728 - }
729 - case GET_MEMOIZED_IS_INITIALIZED: {
730 - return memoizedIsInitialized;
731 - }
732 - case SET_MEMOIZED_IS_INITIALIZED: {
733 - memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
734 - return null;
735 - }
736 + }
737 }
738 throw new UnsupportedOperationException();
739 }
740 @@ -4792,19 +4729,6 @@ public final class Osmformat {
741 }
742
743 public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
744 - java.nio.ByteBuffer data)
745 - throws com.google.protobuf.InvalidProtocolBufferException {
746 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
747 - DEFAULT_INSTANCE, data);
748 - }
749 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
750 - java.nio.ByteBuffer data,
751 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
752 - throws com.google.protobuf.InvalidProtocolBufferException {
753 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
754 - DEFAULT_INSTANCE, data, extensionRegistry);
755 - }
756 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable parseFrom(
757 com.google.protobuf.ByteString data)
758 throws com.google.protobuf.InvalidProtocolBufferException {
759 return com.google.protobuf.GeneratedMessageLite.parseFrom(
760 @@ -4866,10 +4790,10 @@ public final class Osmformat {
761 }
762
763 public static Builder newBuilder() {
764 - return (Builder) DEFAULT_INSTANCE.createBuilder();
765 + return DEFAULT_INSTANCE.toBuilder();
766 }
767 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable prototype) {
768 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
769 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
770 }
771
772 /**
773 @@ -4949,10 +4873,9 @@ public final class Osmformat {
774
775 // @@protoc_insertion_point(builder_scope:OSMPBF.StringTable)
776 }
777 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
778 - protected final java.lang.Object dynamicMethod(
779 + protected final Object dynamicMethod(
780 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
781 - java.lang.Object arg0, java.lang.Object arg1) {
782 + Object arg0, Object arg1) {
783 switch (method) {
784 case NEW_MUTABLE_INSTANCE: {
785 return new org.openstreetmap.osmosis.osmbinary.Osmformat.StringTable();
786 @@ -4981,9 +4904,6 @@ public final class Osmformat {
787 (com.google.protobuf.CodedInputStream) arg0;
788 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
789 (com.google.protobuf.ExtensionRegistryLite) arg1;
790 - if (extensionRegistry == null) {
791 - throw new java.lang.NullPointerException();
792 - }
793 try {
794 boolean done = false;
795 while (!done) {
796 @@ -5017,7 +4937,6 @@ public final class Osmformat {
797 } finally {
798 }
799 }
800 - // fall through
801 case GET_DEFAULT_INSTANCE: {
802 return DEFAULT_INSTANCE;
803 }
804 @@ -5029,13 +4948,7 @@ public final class Osmformat {
805 }
806 }
807 return PARSER;
808 - }
809 - case GET_MEMOIZED_IS_INITIALIZED: {
810 - return (byte) 1;
811 - }
812 - case SET_MEMOIZED_IS_INITIALIZED: {
813 - return null;
814 - }
815 + }
816 }
817 throw new UnsupportedOperationException();
818 }
819 @@ -5455,19 +5368,6 @@ public final class Osmformat {
820 }
821
822 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
823 - java.nio.ByteBuffer data)
824 - throws com.google.protobuf.InvalidProtocolBufferException {
825 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
826 - DEFAULT_INSTANCE, data);
827 - }
828 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
829 - java.nio.ByteBuffer data,
830 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
831 - throws com.google.protobuf.InvalidProtocolBufferException {
832 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
833 - DEFAULT_INSTANCE, data, extensionRegistry);
834 - }
835 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.Info parseFrom(
836 com.google.protobuf.ByteString data)
837 throws com.google.protobuf.InvalidProtocolBufferException {
838 return com.google.protobuf.GeneratedMessageLite.parseFrom(
839 @@ -5529,10 +5429,10 @@ public final class Osmformat {
840 }
841
842 public static Builder newBuilder() {
843 - return (Builder) DEFAULT_INSTANCE.createBuilder();
844 + return DEFAULT_INSTANCE.toBuilder();
845 }
846 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Info prototype) {
847 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
848 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
849 }
850
851 /**
852 @@ -5789,10 +5689,9 @@ public final class Osmformat {
853
854 // @@protoc_insertion_point(builder_scope:OSMPBF.Info)
855 }
856 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
857 - protected final java.lang.Object dynamicMethod(
858 + protected final Object dynamicMethod(
859 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
860 - java.lang.Object arg0, java.lang.Object arg1) {
861 + Object arg0, Object arg1) {
862 switch (method) {
863 case NEW_MUTABLE_INSTANCE: {
864 return new org.openstreetmap.osmosis.osmbinary.Osmformat.Info();
865 @@ -5838,9 +5737,6 @@ public final class Osmformat {
866 (com.google.protobuf.CodedInputStream) arg0;
867 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
868 (com.google.protobuf.ExtensionRegistryLite) arg1;
869 - if (extensionRegistry == null) {
870 - throw new java.lang.NullPointerException();
871 - }
872 try {
873 boolean done = false;
874 while (!done) {
875 @@ -5896,7 +5792,6 @@ public final class Osmformat {
876 } finally {
877 }
878 }
879 - // fall through
880 case GET_DEFAULT_INSTANCE: {
881 return DEFAULT_INSTANCE;
882 }
883 @@ -5908,13 +5803,7 @@ public final class Osmformat {
884 }
885 }
886 return PARSER;
887 - }
888 - case GET_MEMOIZED_IS_INITIALIZED: {
889 - return (byte) 1;
890 - }
891 - case SET_MEMOIZED_IS_INITIALIZED: {
892 - return null;
893 - }
894 + }
895 }
896 throw new UnsupportedOperationException();
897 }
898 @@ -6804,19 +6693,6 @@ public final class Osmformat {
899 }
900
901 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
902 - java.nio.ByteBuffer data)
903 - throws com.google.protobuf.InvalidProtocolBufferException {
904 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
905 - DEFAULT_INSTANCE, data);
906 - }
907 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
908 - java.nio.ByteBuffer data,
909 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
910 - throws com.google.protobuf.InvalidProtocolBufferException {
911 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
912 - DEFAULT_INSTANCE, data, extensionRegistry);
913 - }
914 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo parseFrom(
915 com.google.protobuf.ByteString data)
916 throws com.google.protobuf.InvalidProtocolBufferException {
917 return com.google.protobuf.GeneratedMessageLite.parseFrom(
918 @@ -6878,10 +6754,10 @@ public final class Osmformat {
919 }
920
921 public static Builder newBuilder() {
922 - return (Builder) DEFAULT_INSTANCE.createBuilder();
923 + return DEFAULT_INSTANCE.toBuilder();
924 }
925 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo prototype) {
926 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
927 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
928 }
929
930 /**
931 @@ -7423,10 +7299,9 @@ public final class Osmformat {
932
933 // @@protoc_insertion_point(builder_scope:OSMPBF.DenseInfo)
934 }
935 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
936 - protected final java.lang.Object dynamicMethod(
937 + protected final Object dynamicMethod(
938 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
939 - java.lang.Object arg0, java.lang.Object arg1) {
940 + Object arg0, Object arg1) {
941 switch (method) {
942 case NEW_MUTABLE_INSTANCE: {
943 return new org.openstreetmap.osmosis.osmbinary.Osmformat.DenseInfo();
944 @@ -7465,9 +7340,6 @@ public final class Osmformat {
945 (com.google.protobuf.CodedInputStream) arg0;
946 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
947 (com.google.protobuf.ExtensionRegistryLite) arg1;
948 - if (extensionRegistry == null) {
949 - throw new java.lang.NullPointerException();
950 - }
951 try {
952 boolean done = false;
953 while (!done) {
954 @@ -7620,7 +7492,6 @@ public final class Osmformat {
955 } finally {
956 }
957 }
958 - // fall through
959 case GET_DEFAULT_INSTANCE: {
960 return DEFAULT_INSTANCE;
961 }
962 @@ -7632,13 +7503,7 @@ public final class Osmformat {
963 }
964 }
965 return PARSER;
966 - }
967 - case GET_MEMOIZED_IS_INITIALIZED: {
968 - return (byte) 1;
969 - }
970 - case SET_MEMOIZED_IS_INITIALIZED: {
971 - return null;
972 - }
973 + }
974 }
975 throw new UnsupportedOperationException();
976 }
977 @@ -7791,19 +7656,6 @@ public final class Osmformat {
978 }
979
980 public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
981 - java.nio.ByteBuffer data)
982 - throws com.google.protobuf.InvalidProtocolBufferException {
983 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
984 - DEFAULT_INSTANCE, data);
985 - }
986 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
987 - java.nio.ByteBuffer data,
988 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
989 - throws com.google.protobuf.InvalidProtocolBufferException {
990 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
991 - DEFAULT_INSTANCE, data, extensionRegistry);
992 - }
993 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet parseFrom(
994 com.google.protobuf.ByteString data)
995 throws com.google.protobuf.InvalidProtocolBufferException {
996 return com.google.protobuf.GeneratedMessageLite.parseFrom(
997 @@ -7865,10 +7717,10 @@ public final class Osmformat {
998 }
999
1000 public static Builder newBuilder() {
1001 - return (Builder) DEFAULT_INSTANCE.createBuilder();
1002 + return DEFAULT_INSTANCE.toBuilder();
1003 }
1004 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet prototype) {
1005 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
1006 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
1007 }
1008
1009 /**
1010 @@ -7953,11 +7805,10 @@ public final class Osmformat {
1011
1012 // @@protoc_insertion_point(builder_scope:OSMPBF.ChangeSet)
1013 }
1014 - private byte memoizedIsInitialized = 2;
1015 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
1016 - protected final java.lang.Object dynamicMethod(
1017 + private byte memoizedIsInitialized = -1;
1018 + protected final Object dynamicMethod(
1019 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
1020 - java.lang.Object arg0, java.lang.Object arg1) {
1021 + Object arg0, Object arg1) {
1022 switch (method) {
1023 case NEW_MUTABLE_INSTANCE: {
1024 return new org.openstreetmap.osmosis.osmbinary.Osmformat.ChangeSet();
1025 @@ -7969,8 +7820,12 @@ public final class Osmformat {
1026
1027 boolean shouldMemoize = ((Boolean) arg0).booleanValue();
1028 if (!hasId()) {
1029 + if (shouldMemoize) {
1030 + memoizedIsInitialized = 0;
1031 + }
1032 return null;
1033 }
1034 + if (shouldMemoize) memoizedIsInitialized = 1;
1035 return DEFAULT_INSTANCE;
1036
1037 }
1038 @@ -7997,9 +7852,6 @@ public final class Osmformat {
1039 (com.google.protobuf.CodedInputStream) arg0;
1040 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
1041 (com.google.protobuf.ExtensionRegistryLite) arg1;
1042 - if (extensionRegistry == null) {
1043 - throw new java.lang.NullPointerException();
1044 - }
1045 try {
1046 boolean done = false;
1047 while (!done) {
1048 @@ -8030,7 +7882,6 @@ public final class Osmformat {
1049 } finally {
1050 }
1051 }
1052 - // fall through
1053 case GET_DEFAULT_INSTANCE: {
1054 return DEFAULT_INSTANCE;
1055 }
1056 @@ -8042,14 +7893,7 @@ public final class Osmformat {
1057 }
1058 }
1059 return PARSER;
1060 - }
1061 - case GET_MEMOIZED_IS_INITIALIZED: {
1062 - return memoizedIsInitialized;
1063 - }
1064 - case SET_MEMOIZED_IS_INITIALIZED: {
1065 - memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
1066 - return null;
1067 - }
1068 + }
1069 }
1070 throw new UnsupportedOperationException();
1071 }
1072 @@ -8608,19 +8452,6 @@ public final class Osmformat {
1073 }
1074
1075 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
1076 - java.nio.ByteBuffer data)
1077 - throws com.google.protobuf.InvalidProtocolBufferException {
1078 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
1079 - DEFAULT_INSTANCE, data);
1080 - }
1081 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
1082 - java.nio.ByteBuffer data,
1083 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1084 - throws com.google.protobuf.InvalidProtocolBufferException {
1085 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
1086 - DEFAULT_INSTANCE, data, extensionRegistry);
1087 - }
1088 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.Node parseFrom(
1089 com.google.protobuf.ByteString data)
1090 throws com.google.protobuf.InvalidProtocolBufferException {
1091 return com.google.protobuf.GeneratedMessageLite.parseFrom(
1092 @@ -8682,10 +8513,10 @@ public final class Osmformat {
1093 }
1094
1095 public static Builder newBuilder() {
1096 - return (Builder) DEFAULT_INSTANCE.createBuilder();
1097 + return DEFAULT_INSTANCE.toBuilder();
1098 }
1099 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Node prototype) {
1100 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
1101 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
1102 }
1103
1104 /**
1105 @@ -9026,11 +8857,10 @@ public final class Osmformat {
1106
1107 // @@protoc_insertion_point(builder_scope:OSMPBF.Node)
1108 }
1109 - private byte memoizedIsInitialized = 2;
1110 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
1111 - protected final java.lang.Object dynamicMethod(
1112 + private byte memoizedIsInitialized = -1;
1113 + protected final Object dynamicMethod(
1114 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
1115 - java.lang.Object arg0, java.lang.Object arg1) {
1116 + Object arg0, Object arg1) {
1117 switch (method) {
1118 case NEW_MUTABLE_INSTANCE: {
1119 return new org.openstreetmap.osmosis.osmbinary.Osmformat.Node();
1120 @@ -9042,14 +8872,24 @@ public final class Osmformat {
1121
1122 boolean shouldMemoize = ((Boolean) arg0).booleanValue();
1123 if (!hasId()) {
1124 + if (shouldMemoize) {
1125 + memoizedIsInitialized = 0;
1126 + }
1127 return null;
1128 }
1129 if (!hasLat()) {
1130 + if (shouldMemoize) {
1131 + memoizedIsInitialized = 0;
1132 + }
1133 return null;
1134 }
1135 if (!hasLon()) {
1136 + if (shouldMemoize) {
1137 + memoizedIsInitialized = 0;
1138 + }
1139 return null;
1140 }
1141 + if (shouldMemoize) memoizedIsInitialized = 1;
1142 return DEFAULT_INSTANCE;
1143
1144 }
1145 @@ -9087,9 +8927,6 @@ public final class Osmformat {
1146 (com.google.protobuf.CodedInputStream) arg0;
1147 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
1148 (com.google.protobuf.ExtensionRegistryLite) arg1;
1149 - if (extensionRegistry == null) {
1150 - throw new java.lang.NullPointerException();
1151 - }
1152 try {
1153 boolean done = false;
1154 while (!done) {
1155 @@ -9185,7 +9022,6 @@ public final class Osmformat {
1156 } finally {
1157 }
1158 }
1159 - // fall through
1160 case GET_DEFAULT_INSTANCE: {
1161 return DEFAULT_INSTANCE;
1162 }
1163 @@ -9197,14 +9033,7 @@ public final class Osmformat {
1164 }
1165 }
1166 return PARSER;
1167 - }
1168 - case GET_MEMOIZED_IS_INITIALIZED: {
1169 - return memoizedIsInitialized;
1170 - }
1171 - case SET_MEMOIZED_IS_INITIALIZED: {
1172 - memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
1173 - return null;
1174 - }
1175 + }
1176 }
1177 throw new UnsupportedOperationException();
1178 }
1179 @@ -9896,19 +9725,6 @@ public final class Osmformat {
1180 }
1181
1182 public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
1183 - java.nio.ByteBuffer data)
1184 - throws com.google.protobuf.InvalidProtocolBufferException {
1185 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
1186 - DEFAULT_INSTANCE, data);
1187 - }
1188 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
1189 - java.nio.ByteBuffer data,
1190 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1191 - throws com.google.protobuf.InvalidProtocolBufferException {
1192 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
1193 - DEFAULT_INSTANCE, data, extensionRegistry);
1194 - }
1195 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes parseFrom(
1196 com.google.protobuf.ByteString data)
1197 throws com.google.protobuf.InvalidProtocolBufferException {
1198 return com.google.protobuf.GeneratedMessageLite.parseFrom(
1199 @@ -9970,10 +9786,10 @@ public final class Osmformat {
1200 }
1201
1202 public static Builder newBuilder() {
1203 - return (Builder) DEFAULT_INSTANCE.createBuilder();
1204 + return DEFAULT_INSTANCE.toBuilder();
1205 }
1206 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes prototype) {
1207 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
1208 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
1209 }
1210
1211 /**
1212 @@ -10393,10 +10209,9 @@ public final class Osmformat {
1213
1214 // @@protoc_insertion_point(builder_scope:OSMPBF.DenseNodes)
1215 }
1216 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
1217 - protected final java.lang.Object dynamicMethod(
1218 + protected final Object dynamicMethod(
1219 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
1220 - java.lang.Object arg0, java.lang.Object arg1) {
1221 + Object arg0, Object arg1) {
1222 switch (method) {
1223 case NEW_MUTABLE_INSTANCE: {
1224 return new org.openstreetmap.osmosis.osmbinary.Osmformat.DenseNodes();
1225 @@ -10433,9 +10248,6 @@ public final class Osmformat {
1226 (com.google.protobuf.CodedInputStream) arg0;
1227 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
1228 (com.google.protobuf.ExtensionRegistryLite) arg1;
1229 - if (extensionRegistry == null) {
1230 - throw new java.lang.NullPointerException();
1231 - }
1232 try {
1233 boolean done = false;
1234 while (!done) {
1235 @@ -10558,7 +10370,6 @@ public final class Osmformat {
1236 } finally {
1237 }
1238 }
1239 - // fall through
1240 case GET_DEFAULT_INSTANCE: {
1241 return DEFAULT_INSTANCE;
1242 }
1243 @@ -10570,13 +10381,7 @@ public final class Osmformat {
1244 }
1245 }
1246 return PARSER;
1247 - }
1248 - case GET_MEMOIZED_IS_INITIALIZED: {
1249 - return (byte) 1;
1250 - }
1251 - case SET_MEMOIZED_IS_INITIALIZED: {
1252 - return null;
1253 - }
1254 + }
1255 }
1256 throw new UnsupportedOperationException();
1257 }
1258 @@ -11295,19 +11100,6 @@ public final class Osmformat {
1259 }
1260
1261 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
1262 - java.nio.ByteBuffer data)
1263 - throws com.google.protobuf.InvalidProtocolBufferException {
1264 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
1265 - DEFAULT_INSTANCE, data);
1266 - }
1267 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
1268 - java.nio.ByteBuffer data,
1269 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1270 - throws com.google.protobuf.InvalidProtocolBufferException {
1271 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
1272 - DEFAULT_INSTANCE, data, extensionRegistry);
1273 - }
1274 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.Way parseFrom(
1275 com.google.protobuf.ByteString data)
1276 throws com.google.protobuf.InvalidProtocolBufferException {
1277 return com.google.protobuf.GeneratedMessageLite.parseFrom(
1278 @@ -11369,10 +11161,10 @@ public final class Osmformat {
1279 }
1280
1281 public static Builder newBuilder() {
1282 - return (Builder) DEFAULT_INSTANCE.createBuilder();
1283 + return DEFAULT_INSTANCE.toBuilder();
1284 }
1285 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Way prototype) {
1286 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
1287 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
1288 }
1289
1290 /**
1291 @@ -11796,11 +11588,10 @@ public final class Osmformat {
1292
1293 // @@protoc_insertion_point(builder_scope:OSMPBF.Way)
1294 }
1295 - private byte memoizedIsInitialized = 2;
1296 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
1297 - protected final java.lang.Object dynamicMethod(
1298 + private byte memoizedIsInitialized = -1;
1299 + protected final Object dynamicMethod(
1300 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
1301 - java.lang.Object arg0, java.lang.Object arg1) {
1302 + Object arg0, Object arg1) {
1303 switch (method) {
1304 case NEW_MUTABLE_INSTANCE: {
1305 return new org.openstreetmap.osmosis.osmbinary.Osmformat.Way();
1306 @@ -11812,8 +11603,12 @@ public final class Osmformat {
1307
1308 boolean shouldMemoize = ((Boolean) arg0).booleanValue();
1309 if (!hasId()) {
1310 + if (shouldMemoize) {
1311 + memoizedIsInitialized = 0;
1312 + }
1313 return null;
1314 }
1315 + if (shouldMemoize) memoizedIsInitialized = 1;
1316 return DEFAULT_INSTANCE;
1317
1318 }
1319 @@ -11851,9 +11646,6 @@ public final class Osmformat {
1320 (com.google.protobuf.CodedInputStream) arg0;
1321 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
1322 (com.google.protobuf.ExtensionRegistryLite) arg1;
1323 - if (extensionRegistry == null) {
1324 - throw new java.lang.NullPointerException();
1325 - }
1326 try {
1327 boolean done = false;
1328 while (!done) {
1329 @@ -12002,7 +11794,6 @@ public final class Osmformat {
1330 } finally {
1331 }
1332 }
1333 - // fall through
1334 case GET_DEFAULT_INSTANCE: {
1335 return DEFAULT_INSTANCE;
1336 }
1337 @@ -12014,14 +11805,7 @@ public final class Osmformat {
1338 }
1339 }
1340 return PARSER;
1341 - }
1342 - case GET_MEMOIZED_IS_INITIALIZED: {
1343 - return memoizedIsInitialized;
1344 - }
1345 - case SET_MEMOIZED_IS_INITIALIZED: {
1346 - memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
1347 - return null;
1348 - }
1349 + }
1350 }
1351 throw new UnsupportedOperationException();
1352 }
1353 @@ -12869,19 +12653,6 @@ public final class Osmformat {
1354 }
1355
1356 public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
1357 - java.nio.ByteBuffer data)
1358 - throws com.google.protobuf.InvalidProtocolBufferException {
1359 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
1360 - DEFAULT_INSTANCE, data);
1361 - }
1362 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
1363 - java.nio.ByteBuffer data,
1364 - com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1365 - throws com.google.protobuf.InvalidProtocolBufferException {
1366 - return com.google.protobuf.GeneratedMessageLite.parseFrom(
1367 - DEFAULT_INSTANCE, data, extensionRegistry);
1368 - }
1369 - public static org.openstreetmap.osmosis.osmbinary.Osmformat.Relation parseFrom(
1370 com.google.protobuf.ByteString data)
1371 throws com.google.protobuf.InvalidProtocolBufferException {
1372 return com.google.protobuf.GeneratedMessageLite.parseFrom(
1373 @@ -12943,10 +12714,10 @@ public final class Osmformat {
1374 }
1375
1376 public static Builder newBuilder() {
1377 - return (Builder) DEFAULT_INSTANCE.createBuilder();
1378 + return DEFAULT_INSTANCE.toBuilder();
1379 }
1380 public static Builder newBuilder(org.openstreetmap.osmosis.osmbinary.Osmformat.Relation prototype) {
1381 - return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);
1382 + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
1383 }
1384
1385 /**
1386 @@ -13395,11 +13166,10 @@ public final class Osmformat {
1387
1388 // @@protoc_insertion_point(builder_scope:OSMPBF.Relation)
1389 }
1390 - private byte memoizedIsInitialized = 2;
1391 - @java.lang.SuppressWarnings({"unchecked", "fallthrough"})
1392 - protected final java.lang.Object dynamicMethod(
1393 + private byte memoizedIsInitialized = -1;
1394 + protected final Object dynamicMethod(
1395 com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
1396 - java.lang.Object arg0, java.lang.Object arg1) {
1397 + Object arg0, Object arg1) {
1398 switch (method) {
1399 case NEW_MUTABLE_INSTANCE: {
1400 return new org.openstreetmap.osmosis.osmbinary.Osmformat.Relation();
1401 @@ -13411,8 +13181,12 @@ public final class Osmformat {
1402
1403 boolean shouldMemoize = ((Boolean) arg0).booleanValue();
1404 if (!hasId()) {
1405 + if (shouldMemoize) {
1406 + memoizedIsInitialized = 0;
1407 + }
1408 return null;
1409 }
1410 + if (shouldMemoize) memoizedIsInitialized = 1;
1411 return DEFAULT_INSTANCE;
1412
1413 }
1414 @@ -13450,9 +13224,6 @@ public final class Osmformat {
1415 (com.google.protobuf.CodedInputStream) arg0;
1416 com.google.protobuf.ExtensionRegistryLite extensionRegistry =
1417 (com.google.protobuf.ExtensionRegistryLite) arg1;
1418 - if (extensionRegistry == null) {
1419 - throw new java.lang.NullPointerException();
1420 - }
1421 try {
1422 boolean done = false;
1423 while (!done) {
1424 @@ -13613,7 +13384,6 @@ public final class Osmformat {
1425 } finally {
1426 }
1427 }
1428 - // fall through
1429 case GET_DEFAULT_INSTANCE: {
1430 return DEFAULT_INSTANCE;
1431 }
1432 @@ -13625,14 +13395,7 @@ public final class Osmformat {
1433 }
1434 }
1435 return PARSER;
1436 - }
1437 - case GET_MEMOIZED_IS_INITIALIZED: {
1438 - return memoizedIsInitialized;
1439 - }
1440 - case SET_MEMOIZED_IS_INITIALIZED: {
1441 - memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);
1442 - return null;
1443 - }
1444 + }
1445 }
1446 throw new UnsupportedOperationException();
1447 }
+1
-0
debian/patches/series less more
22 04-osmosis-version.patch
33 disable-netty3.patch
44 revert-protobuf-3.6.1-changes.patch
5 protobuf-3.0.0.patch