Ticket #20793: 20793.gpx-memory.diff

src/org/openstreetmap/josm/data/gpx/GpxExtensionCollection.java

@@ -22 +22 @@
 
     private static final long serialVersionUID = 1L;
 
-    private final Stack<GpxExtension> childStack = new Stack<>();
+    private Stack<GpxExtension> childStack;
     private IWithAttributes parent;
 
     /**
@@ -46 +46 @@
      * @param atts the attributes
      */
     public void openChild(String namespaceURI, String qName, Attributes atts) {
+        if (childStack == null) {
+            childStack = new Stack<>();
+        }
         GpxExtension child = new GpxExtension(namespaceURI, qName, atts);
         if (!childStack.isEmpty()) {
             childStack.lastElement().getExtensions().add(child);
@@ -62 +65 @@
      * @param value the value
      */
     public void closeChild(String qName, String value) {
-        if (childStack.isEmpty())
+        if (childStack == null || childStack.isEmpty())
             throw new InvalidArgumentException("Can't close child " + qName + ", no element in stack.");
 
         GpxExtension child = childStack.pop();
@@ -258 +261 @@
 
     @Override
     public void clear() {
-        childStack.clear();
+        if (childStack != null) {
+            childStack.clear();
+            childStack = null;
+        }
         super.clear();
     }
 

src/org/openstreetmap/josm/data/gpx/GpxTrack.java

@@ -104 +104 @@
     }
 
     private Color getColorFromExtension() {
-        GpxExtension gpxd = getExtensions().find("gpxd", "color");
-        if (gpxd != null) {
-            colorFormat = ColorFormat.GPXD;
-            String cs = gpxd.getValue();
-            try {
-                return Color.decode(cs);
-            } catch (NumberFormatException ex) {
-                Logging.warn("Could not read gpxd color: " + cs);
-            }
-        } else {
-            GpxExtension gpxx = getExtensions().find("gpxx", "DisplayColor");
-            if (gpxx != null) {
-                colorFormat = ColorFormat.GPXX;
-                String cs = gpxx.getValue();
-                if (cs != null) {
-                    Color cc = GARMIN_COLORS.get(cs);
-                    if (cc != null) {
-                        return cc;
+        if (hasExtensions()) {
+            GpxExtension gpxd = getExtensions().find("gpxd", "color");
+            if (gpxd != null) {
+                colorFormat = ColorFormat.GPXD;
+                String cs = gpxd.getValue();
+                try {
+                    return Color.decode(cs);
+                } catch (NumberFormatException ex) {
+                    Logging.warn("Could not read gpxd color: " + cs);
+                }
+            } else {
+                GpxExtension gpxx = getExtensions().find("gpxx", "DisplayColor");
+                if (gpxx != null) {
+                    colorFormat = ColorFormat.GPXX;
+                    String cs = gpxx.getValue();
+                    if (cs != null) {
+                        Color cc = GARMIN_COLORS.get(cs);
+                        if (cc != null) {
+                            return cc;
+                        }
                     }
+                    Logging.warn("Could not read garmin color: " + cs);
                 }
-                Logging.warn("Could not read garmin color: " + cs);
             }
         }
         return null;

src/org/openstreetmap/josm/data/gpx/IWithAttributes.java

@@ -57 +57 @@
     Map<String, Object> getAttributes();
 
     /**
+     * Returns whether the {@link GpxExtensionCollection} instance has been created yet, should be overridden.
+     * The instance will usually be created on first call of {@link #getExtensions()}.
+     * @return whether the {@link GpxExtensionCollection} instance has been created yet
+     */
+    default boolean hasExtensions() {
+        return getExtensions() != null;
+    }
+
+    /**
      * Returns the extensions
      * @return the extensions
      */

src/org/openstreetmap/josm/data/gpx/WithAttributes.java

@@ -24 +24 @@
     /**
      * The "exts" collection contains all extensions.
      */
-    private final GpxExtensionCollection exts = new GpxExtensionCollection(this);
+    private GpxExtensionCollection exts;
 
     /**
      * Returns the Object value to which the specified key is mapped,
@@ -86 +86 @@
     }
 
     @Override
+    public boolean hasExtensions() {
+        return exts != null;
+    }
+
+    @Override
     public GpxExtensionCollection getExtensions() {
+        if (exts == null) {
+            exts = new GpxExtensionCollection(this);
+        }
         return exts;
     }
 

src/org/openstreetmap/josm/io/GpxReader.java

@@ -506 +506 @@
                     currentState = states.pop();
                     if (!currentTrackSeg.isEmpty()) {
                         GpxTrackSegment seg = new GpxTrackSegment(currentTrackSeg);
-                        seg.getExtensions().addAll(currentExtensionCollection);
+                        if (!currentExtensionCollection.isEmpty()) {
+                            seg.getExtensions().addAll(currentExtensionCollection);
+                        }
                         currentTrack.add(seg);
                     }
                     currentExtensionCollection.clear();
@@ -518 +520 @@
                     currentState = states.pop();
                     convertUrlToLink(currentTrackAttr);
                     GpxTrack trk = new GpxTrack(new ArrayList<>(currentTrack), currentTrackAttr);
-                    trk.getExtensions().addAll(currentTrackExtensionCollection);
+                    if (!currentTrackExtensionCollection.isEmpty()) {
+                        trk.getExtensions().addAll(currentTrackExtensionCollection);
+                    }
                     data.addTrack(trk);
                     currentTrackExtensionCollection.clear();
                     break;