Changeset 7368 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-08-05T12:17:33+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #10348 - NPE when using F1 (Go to OSM wiki) on a relation without type key

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -139 +139 @@
      */
     private final JTable tagTable = new JTable(tagData);
-    
+
     /**
      * The membership table.
@@ -257 +257 @@
             bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
         }
-        
+
         setupBlankSpaceMenu();
         setupKeyboardShortcuts();
@@ -279 +279 @@
 
         editHelper.loadTagsIfNeeded();
-        
+
         Main.pref.addPreferenceChangeListener(this);
     }
@@ -583 +583 @@
             tagTable.getCellEditor().cancelCellEditing();
         }
-        
+
         // Ignore parameter as we do not want to operate always on real selection here, especially in draw mode
         Collection<OsmPrimitive> newSel = Main.main.getInProgressSelection();
@@ -1078 +1078 @@
                 } else if (membershipTable.getSelectedRowCount() == 1) {
                     row = membershipTable.getSelectedRow();
-                    String type = URLEncoder.encode(
-                            ((Relation)membershipData.getValueAt(row, 0)).get("type"), "UTF-8"
-                            );
+                    String type = ((Relation)membershipData.getValueAt(row, 0)).get("type");
+                    if (type != null) {
+                        type = URLEncoder.encode(type, "UTF-8");
+                    }
 
                     if (type != null && !type.isEmpty()) {
@@ -1111 +1112 @@
                                     if (osize > -1) {
                                         conn.disconnect();
-    
+
                                         conn = Utils.openHttpConnection(new URI(u.toString()
                                                 .replace("=", "%3D") /* do not URLencode whole string! */