Changeset 1630 in josm for trunk

Timestamp:

2009-06-01T00:07:28+02:00 (15 years ago)

Author:

stoecker

Message:

close #2677 - NPE on upload

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/UploadAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (1 diff)
• styles/standard/elemstyles.xml (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -105 +105 @@
                 p.add(new JLabel(tr("Provide a brief comment for the changes you are uploading:")), GBC.eol().insets(0, 5, 10, 3));
                 SuggestingJHistoryComboBox cmt = new SuggestingJHistoryComboBox();
-                List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(HISTORY_KEY, null));
+                List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
                 cmt.setHistory(cmtHistory);
                 //final JTextField cmt = new JTextField(lastCommitComment);

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -100 +100 @@
                 // add the last entered comment to the changeset
                 String cmt = "";
-                List<String> history = new LinkedList<String>(Main.pref.getCollection(UploadAction.HISTORY_KEY, null));
+                List<String> history = new LinkedList<String>(
+                Main.pref.getCollection(UploadAction.HISTORY_KEY, new LinkedList<String>()));
                 if(history.size() > 0) {
                     cmt = history.get(0);

trunk/styles/standard/elemstyles.xml

@@ -355 +355 @@
                 <condition k="barrier" v="bollard"/>
                 <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-                <line width="3" colour="barrier#F0F050" closed="true"/>
+                <line width="3" colour="barrier#F0F050"/>
                 <scale_min>1</scale_min>
                 <scale_max>50000</scale_max>