Changeset 7518 in josm for trunk/src/org/openstreetmap/josm/io/GpxExporter.java

Timestamp:

2014-09-10T02:29:55+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10489 - Add additional attributes to GPX Export for nodes + GPX code improvements

File:

• trunk/src/org/openstreetmap/josm/io/GpxExporter.java (modified) (7 diffs)

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

@@ -90 +90 @@
         desc.setWrapStyleWord(true);
         desc.setLineWrap(true);
-        desc.setText((String) gpxData.attr.get(META_DESC));
+        desc.setText(gpxData.getString(META_DESC));
         p.add(new JScrollPane(desc), GBC.eop().fill(GBC.BOTH));
 
@@ -120 +120 @@
         p.add(new JLabel(tr("Keywords")), GBC.eol());
         JosmTextField keywords = new JosmTextField();
-        keywords.setText((String) gpxData.attr.get(META_KEYWORDS));
+        keywords.setText(gpxData.getString(META_KEYWORDS));
         p.add(keywords, GBC.eop().fill(GBC.HORIZONTAL));
 
@@ -155 +155 @@
         if (author.isSelected()) {
             if (authorName.getText().length() > 0) {
-                gpxData.attr.put(META_AUTHOR_NAME, authorName.getText());
-                gpxData.attr.put(META_COPYRIGHT_AUTHOR, authorName.getText());
+                gpxData.put(META_AUTHOR_NAME, authorName.getText());
+                gpxData.put(META_COPYRIGHT_AUTHOR, authorName.getText());
             }
             if (email.getText().length() > 0) {
-                gpxData.attr.put(META_AUTHOR_EMAIL, email.getText());
+                gpxData.put(META_AUTHOR_EMAIL, email.getText());
             }
             if (copyright.getText().length() > 0) {
-                gpxData.attr.put(META_COPYRIGHT_LICENSE, copyright.getText());
+                gpxData.put(META_COPYRIGHT_LICENSE, copyright.getText());
             }
             if (copyrightYear.getText().length() > 0) {
-                gpxData.attr.put(META_COPYRIGHT_YEAR, copyrightYear.getText());
+                gpxData.put(META_COPYRIGHT_YEAR, copyrightYear.getText());
             }
         }
@@ -171 +171 @@
         // add the description to the gpx data
         if (desc.getText().length() > 0) {
-            gpxData.attr.put(META_DESC, desc.getText());
+            gpxData.put(META_DESC, desc.getText());
         }
 
         // add keywords to the gpx data
         if (keywords.getText().length() > 0) {
-            gpxData.attr.put(META_KEYWORDS, keywords.getText());
+            gpxData.put(META_KEYWORDS, keywords.getText());
         }
 
@@ -201 +201 @@
         if (enable) {
             if (copyrightYear.getText().length()==0) {
-                String sCopyrightYear = (String) data.attr.get(META_COPYRIGHT_YEAR);
+                String sCopyrightYear = data.getString(META_COPYRIGHT_YEAR);
                 if (sCopyrightYear == null) {
                     sCopyrightYear = Integer.toString(Calendar.getInstance().get(Calendar.YEAR));
@@ -208 +208 @@
             }
             if (copyright.getText().length()==0) {
-                String sCopyright = (String) data.attr.get(META_COPYRIGHT_LICENSE);
+                String sCopyright = data.getString(META_COPYRIGHT_LICENSE);
                 if (sCopyright == null) {
                     sCopyright = Main.pref.get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5");
@@ -247 +247 @@
                 emailLabel.setEnabled(b);
                 if (b) {
-                    String sAuthorName = (String) data.attr.get(META_AUTHOR_NAME);
+                    String sAuthorName = data.getString(META_AUTHOR_NAME);
                     if (sAuthorName == null) {
                         sAuthorName = Main.pref.get("lastAuthorName");
                     }
                     authorName.setText(sAuthorName);
-                    String sEmail = (String) data.attr.get(META_AUTHOR_EMAIL);
+                    String sEmail = data.getString(META_AUTHOR_EMAIL);
                     if (sEmail == null) {
                         sEmail = Main.pref.get("lastAuthorEmail");