Changeset 30060 in osm for applications/editors/josm/plugins

Timestamp:

2013-11-19T02:41:51+01:00 (11 years ago)

Author:

donvip

Message:

[josm_directupload] fix #josm9329 - NPE with GPX traces without storage file

File:

• applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java (modified) (9 diffs)

applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java

@@ -92 +92 @@
     // as we don't know its contents yet and therefore have a height of 0. This will
     // lead to unnecessary scrollbars.
-    private JMultilineLabel OutputDisplay = new JMultilineLabel(" ");
+    private JMultilineLabel outputDisplay = new JMultilineLabel(" ");
     private HistoryComboBox descriptionField;
     private HistoryComboBox tagsField;
@@ -162 +162 @@
         JPanel p = new JPanel(new GridBagLayout());
 
-        OutputDisplay.setMaxWidth(findMaxDialogSize().width-10);
-        p.add(OutputDisplay, GBC.eol());
+        outputDisplay.setMaxWidth(findMaxDialogSize().width-10);
+        p.add(outputDisplay, GBC.eol());
 
         p.add(tagsLabel, GBC.eol().insets(0,10,0,0));
@@ -179 +179 @@
 
     private void initTitleAndDescriptionFromGpxData(GpxData gpxData) {
-      String description, title, tags = "";
+      String description = "", title = "", tags = "";
       if (gpxData != null) {
           GpxTrack firstTrack = gpxData.tracks.iterator().next();
@@ -187 +187 @@
           } else if (firstTrack != null && gpxData.tracks.size() == 1 && firstTrack.get("desc") != null) {
               description = firstTrack.getString("desc");
-          } else {
+          } else if (gpxData.storageFile != null) {
               description = gpxData.storageFile.getName().replaceAll("[&?/\\\\]"," ").replaceAll("(\\.[^.]*)$","");
           }
-          title = tr("Selected track: {0}", gpxData.storageFile.getName());
+          if (gpxData.storageFile != null) {
+              title = tr("Selected track: {0}", gpxData.storageFile.getName());
+          }
           Object meta_tags = gpxData.attr.get(GpxConstants.META_KEYWORDS);
           if (meta_tags != null) {
@@ -200 +202 @@
           title = tr("No GPX layer selected. Cannot upload a trace.");
       }
-      OutputDisplay.setText(title);
+      outputDisplay.setText(title);
       descriptionField.setText(description);
       tagsField.setText(tags);
@@ -246 +248 @@
                 GuiHelper.runInEDT(new Runnable() {
                     @Override public void run() {
-                        OutputDisplay.setText(tr("Upload canceled"));
+                        outputDisplay.setText(tr("Upload canceled"));
                         buttons.get(0).setEnabled(true);
                     }
@@ -267 +269 @@
             GuiHelper.runInEDT(new Runnable() {
                 @Override public void run() {
-                    OutputDisplay.setText(tr("Error while uploading"));
+                    outputDisplay.setText(tr("Error while uploading"));
                 }
             });
@@ -325 +327 @@
         GuiHelper.runInEDT(new Runnable() {
             @Override public void run() {
-                OutputDisplay.setText(success
+                outputDisplay.setText(success
                         ? tr("GPX upload was successful")
                         : tr("Upload failed. Server returned the following message: ") + returnMsgEDT);
@@ -409 +411 @@
         GuiHelper.runInEDT(new Runnable() {
             @Override public void run() {
-                OutputDisplay.setText(errorsEDT);
+                outputDisplay.setText(errorsEDT);
             }
         });