Changeset 17846 in josm

Timestamp:

2021-05-01T21:50:00+02:00 (3 years ago)

Author:

simon04

Message:

fix #20793 - Reduce memory consumption for GpxExtensionCollection (patch by Bjoeni, modified)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxExtensionCollection.java (modified) (4 diffs)
• data/gpx/GpxTrack.java (modified) (1 diff)
• data/gpx/IWithAttributes.java (modified) (1 diff)
• data/gpx/WithAttributes.java (modified) (2 diffs)
• io/GpxReader.java (modified) (2 diffs)

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

@@ -23 +23 @@
     private static final long serialVersionUID = 1L;
 
-    private final Stack<GpxExtension> childStack = new Stack<>();
+    private Stack<GpxExtension> childStack;
     private IWithAttributes parent;
 
@@ -47 +47 @@
      */
     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()) {
@@ -63 +66 @@
      */
     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.");
 
@@ -259 +262 @@
     @Override
     public void clear() {
-        childStack.clear();
+        if (childStack != null) {
+            childStack.clear();
+            childStack = null;
+        }
         super.clear();
     }

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

@@ -105 +105 @@
 
     private Color getColorFromExtension() {
+        if (!hasExtensions()) {
+            return null;
+        }
         GpxExtension gpxd = getExtensions().find("gpxd", "color");
         if (gpxd != null) {

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

@@ -58 +58 @@
 
     /**
+     * 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

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

@@ -25 +25 @@
      * The "exts" collection contains all extensions.
      */
-    private final GpxExtensionCollection exts = new GpxExtensionCollection(this);
+    private GpxExtensionCollection exts;
 
     /**
@@ -87 +87 @@
 
     @Override
+    public boolean hasExtensions() {
+        return exts != null;
+    }
+
+    @Override
     public GpxExtensionCollection getExtensions() {
+        if (exts == null) {
+            exts = new GpxExtensionCollection(this);
+        }
         return exts;
     }

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

@@ -507 +507 @@
                     if (!currentTrackSeg.isEmpty()) {
                         GpxTrackSegment seg = new GpxTrackSegment(currentTrackSeg);
-                        seg.getExtensions().addAll(currentExtensionCollection);
+                        if (!currentExtensionCollection.isEmpty()) {
+                            seg.getExtensions().addAll(currentExtensionCollection);
+                        }
                         currentTrack.add(seg);
                     }
@@ -519 +521 @@
                     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();