Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/data/StructUtils.java

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

• trunk/src/org/openstreetmap/josm/data/StructUtils.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/StructUtils.java

@@ -148 +148 @@
      * @return the resulting map (same data content as <code>struct</code>)
      */
-    @SuppressWarnings("deprecation")
     public static <T> Map<String, String> serializeStruct(T struct, Class<T> klass) {
         T structPrototype;
@@ -159 +158 @@
         Map<String, String> hash = new LinkedHashMap<>();
         for (Field f : klass.getDeclaredFields()) {
-            if (f.getAnnotation(Preferences.pref.class) == null && f.getAnnotation(StructEntry.class) == null) {
+            if (f.getAnnotation(StructEntry.class) == null) {
                 continue;
             }
@@ -167 +166 @@
                 Object defaultFieldValue = f.get(structPrototype);
                 if (fieldValue != null && (
-                        f.getAnnotation(Preferences.writeExplicitly.class) != null ||
                         f.getAnnotation(WriteExplicitly.class) != null ||
                         !Objects.equals(fieldValue, defaultFieldValue))) {
@@ -216 +214 @@
                 continue;
             }
-            if (f.getAnnotation(Preferences.pref.class) == null && f.getAnnotation(StructEntry.class) == null) {
+            if (f.getAnnotation(StructEntry.class) == null) {
                 continue;
             }