Changeset 5791 in josm for trunk

Timestamp:

2013-03-22T01:17:06+01:00 (11 years ago)

Author:

Don-vip

Message:

see #8530 - workaround for NPE when loading "Steps properties" presets ("No handrail" item) + various minor stuff

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/TagChecker.java (modified) (1 diff)
• gui/io/DownloadPrimitivesTask.java (modified) (3 diffs)
• gui/tagging/TaggingPreset.java (modified) (2 diffs)
• gui/tagging/ac/AutoCompletionManager.java (modified) (1 diff)
• tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -304 +304 @@
                     if (i instanceof TaggingPreset.KeyedItem) {
                         TaggingPreset.KeyedItem ky = (TaggingPreset.KeyedItem) i;
-                        presetsValueData.putAll(ky.key, ky.getValues());
+                        if (ky.key != null && ky.getValues() != null) {
+                            try {
+                                presetsValueData.putAll(ky.key, ky.getValues());
+                            } catch (NullPointerException e) {
+                                System.err.println(p+": Unable to initialize "+ky);
+                            }
+                        }
                     }
                 }

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java

@@ -32 +32 @@
     private boolean canceled;
     private Exception lastException;
-    private List<PrimitiveId> ids;
+    private final List<PrimitiveId> ids;
 
     private Set<PrimitiveId> missingPrimitives;
 
-    private OsmDataLayer layer;
-    private boolean fullRelation;
+    private final OsmDataLayer layer;
+    private final boolean fullRelation;
     private MultiFetchServerObjectReader multiObjectReader;
     private OsmServerObjectReader objectReader;
@@ -45 +45 @@
      *
      * @param layer the layer in which primitives are updated. Must not be null.
-     * @param toUpdate a collection of primitives to update from the server. Set to
+     * @param ids a collection of primitives to update from the server. Set to
      * the empty collection if null.
      * @param fullRelation true if a full download is required, i.e.,
@@ -51 +51 @@
      * @throws IllegalArgumentException thrown if layer is null.
      */
-    public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId>  ids, boolean fullRelation) throws IllegalArgumentException {
+    public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation) throws IllegalArgumentException {
         super(tr("Download objects"), false /* don't ignore exception */);
         ensureParameterNotNull(layer, "layer");

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -261 +261 @@
             }
         }
-
+        
+        @Override
+        public String toString() {
+            return "KeyedItem [key=" + key + ", text=" + text
+                    + ", text_context=" + text_context + ", match=" + match
+                    + "]";
+        }
     }
 
@@ -669 +675 @@
 
         protected JComponent component;
-        protected Map<String, PresetListEntry> lhm = new LinkedHashMap<String, PresetListEntry>();
+        protected final Map<String, PresetListEntry> lhm = new LinkedHashMap<String, PresetListEntry>();
         private boolean initialized = false;
         protected Usage usage;

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -151 +151 @@
                 if (item instanceof TaggingPreset.KeyedItem) {
                     TaggingPreset.KeyedItem ki = (TaggingPreset.KeyedItem) item;
-                    if (ki.key == null) {
-                        continue;
+                    if (ki.key != null && ki.getValues() != null) {
+                        try {
+                            presetTagCache.putAll(ki.key, ki.getValues());
+                        } catch (NullPointerException e) {
+                            System.err.println(p+": Unable to cache "+ki);
+                        }
                     }
-                    presetTagCache.putAll(ki.key, ki.getValues());
                 } else if (item instanceof TaggingPreset.Roles) {
                     TaggingPreset.Roles r = (TaggingPreset.Roles) item;

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -591 +591 @@
         while (leadingWhite && start < end) {
             char c = str.charAt(start);
-            if (leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c))) {
+            leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c));
+            if (leadingWhite) {
                 start++;
             }
@@ -598 +599 @@
         while (trailingWhite && end > start+1) {
             char c = str.charAt(end-1);
-            if (trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c))) {
+            trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c));
+            if (trailingWhite) {
                 end--;
             }