Changeset 273 in josm

Timestamp:

2007-07-05T10:48:17+02:00 (17 years ago)

Author:

imi

Message:

• fixed NPE when switching to way mapmode and emtpy data loaded

Files:

• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java (modified) (2 diffs)
• test/org/openstreetmap/josm/data/osm/DataSetTest.java (modified) (1 diff)

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -108 +108 @@
         public void setSelected(OsmPrimitive... osm) {
                 clearSelection();
-                if (osm.length == 0)
+                if (osm.length == 0 || (osm.length == 1 && osm[0] == null))
                         return;
                 for (OsmPrimitive o : osm)

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

@@ -214 +214 @@
                 // Refresh the values model when focus is gained 
                 editor.addFocusListener(new FocusAdapter() {
-            public void focusGained(FocusEvent e) {
+            @Override public void focusGained(FocusEvent e) {
                 String key = keys.getEditor().getItem().toString();
                 if (allData.containsKey(key)) {

src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java

@@ -29 +29 @@
                 }
 
-                public void remove(int offs, int len) throws BadLocationException {
+                @Override public void remove(int offs, int len) throws BadLocationException {
                         if (selecting)
                                 return;
@@ -35 +35 @@
                 }
 
-                public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+                @Override public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
                         super.insertString(offs, str, a);
 

test/org/openstreetmap/josm/data/osm/DataSetTest.java

@@ -73 +73 @@
                 assertTrue(node3.selected);
                 assertFalse(node2.selected);
+
+                ds.setSelected();
+                assertFalse(node3.selected || node2.selected);
+                
+                ds.setSelected(node1, way);
+                assertTrue(node1.selected && way.selected);
+                assertFalse(node3.selected);
+                
+                ds.setSelected((OsmPrimitive)null);
+                assertFalse(node1.selected || node2.selected || node3.selected || way.selected);
         }