Changeset 1646 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-06-06T21:39:12+02:00 (15 years ago)

Author:

stoecker

Message:

cleanup in file access

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• GpxLayer.java (modified) (9 diffs)
• Layer.java (modified) (2 diffs)
• OsmDataLayer.java (modified) (6 diffs)
• RawGpsLayer.java (modified) (4 diffs)
• markerlayer/MarkerLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -175 +175 @@
                                 namedTrackPoints.waypoints.add(point);
 
-                MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", name), associatedFile, me);
+                MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", name), getAssociatedFile(), me);
                 if (ml.data.size() > 0) {
                     Main.main.addLayer(ml);
@@ -203 +203 @@
                         Main.pref.put("markers.lastaudiodirectory", fc.getCurrentDirectory().getAbsolutePath());
 
-                    MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", name), associatedFile, me);
+                    MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", name), getAssociatedFile(), me);
                     File sel[] = fc.getSelectedFiles();
                     if(sel != null) {
@@ -270 +270 @@
                 new JMenuItem(new ConvertToDataLayerAction()),
                 new JSeparator(),
-                new JMenuItem(new RenameLayerAction(associatedFile, this)),
+                new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
                 new JSeparator(),
                 new JMenuItem(new LayerListPopup.InfoAction(this))};
@@ -287 +287 @@
             new JMenuItem(new DownloadAlongTrackAction()),
             new JSeparator(),
-            new JMenuItem(new RenameLayerAction(associatedFile, this)),
+            new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
             new JSeparator(),
             new JMenuItem(new LayerListPopup.InfoAction(this))};
@@ -680 +680 @@
             }
             Main.main.addLayer(new OsmDataLayer(ds, tr("Converted from: {0}", GpxLayer.this.name),
-                        data.storageFile));
+                        getAssociatedFile()));
             Main.main.removeLayer(GpxLayer.this);
         }
     }
+
+    public File getAssociatedFile() { return data.storageFile; }
+    public void setAssociatedFile(File file) { data.storageFile = file; }
 
     /**
@@ -932 +935 @@
             double duration = AudioUtil.getCalibratedDuration(wavFile);
             double startTime = lastModified - duration;
-            startTime = firstStartTime + (startTime - firstStartTime) /  
+            startTime = firstStartTime + (startTime - firstStartTime) /
                 Main.pref.getDouble("audio.calibration", "1.0" /* default, ratio */);
             WayPoint w1 = null;
@@ -949 +952 @@
                     if (w2 != null) break;
                 }
-            }    
+            }
 
             if (w1 == null || w2 == null) {
@@ -964 +967 @@
                 wayPointFromTimeStamp.attr.put("name", name);
                 waypoints.add(wayPointFromTimeStamp);
-            }            
-        }
-        
+            }
+        }
+
         // (e) analyse audio for spoken markers here, in due course
 
@@ -1013 +1016 @@
                     name, uri, ml, w.time, offset);
             /* timeFromAudio intended for future use to shift markers of this type on synchronization */
-            if (w == wayPointFromTimeStamp) { 
-                am.timeFromAudio = true; 
+            if (w == wayPointFromTimeStamp) {
+                am.timeFromAudio = true;
             }
             ml.data.add(am);

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -65 +65 @@
      * If a file is associated with this layer, this variable should be set to it.
      */
-    public File associatedFile;
+    private File associatedFile;
 
     /**
@@ -120 +120 @@
      */
     public void destroy() {}
+
+    public File getAssociatedFile() { return associatedFile; }
+    public void setAssociatedFile(File file) { associatedFile = file; }
 }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -152 +152 @@
         super(name);
         this.data = data;
-        this.associatedFile = associatedFile;
+        this.setAssociatedFile(associatedFile);
     }
 
@@ -217 +217 @@
         tool += undeletedSize(data.ways)+" "+trn("way", "ways", undeletedSize(data.ways));
         if (data.version != null) tool += ", " + tr("version {0}", data.version);
-        if (associatedFile != null)
-            tool = "<html>"+tool+"<br>"+associatedFile.getPath()+"</html>";
+        File f = getAssociatedFile();
+        if (f != null)
+            tool = "<html>"+tool+"<br>"+f.getPath()+"</html>";
         return tool;
     }
@@ -307 +308 @@
 
         // update the modified flag
-        if (associatedFile != null && processed != null && !dataAdded)
+        boolean b = (getAssociatedFile() != null && processed != null);
+        if (b && !dataAdded)
             return; // do nothing when uploading non-harmful changes.
 
         // modified if server changed the data (esp. the id).
-        uploadedModified = associatedFile != null && processed != null && dataAdded;
+        uploadedModified = b && dataAdded;
         setModified(uploadedModified);
     }
@@ -378 +380 @@
                     new JMenuItem(new LayerListDialog.DeleteLayerAction(this)),
                     new JSeparator(),
-                    new JMenuItem(new RenameLayerAction(associatedFile, this)),
+                    new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
                     new JSeparator(),
                     new JMenuItem(new LayerListPopup.InfoAction(this))};
@@ -391 +393 @@
                 new JMenuItem(new ConvertToGpxLayerAction()),
                 new JSeparator(),
-                new JMenuItem(new RenameLayerAction(associatedFile, this)),
+                new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
                 new JSeparator(),
                 new JMenuItem(new LayerListPopup.InfoAction(this))};
@@ -454 +456 @@
 
     public GpxData toGpxData() {
-        return toGpxData(data, associatedFile);
+        return toGpxData(data, getAssociatedFile());
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -107 +107 @@
         super(name);
         this.fromServer = fromServer;
-        this.associatedFile = associatedFile;
+        setAssociatedFile(associatedFile);
         this.data = data;
         Main.pref.listener.add(this);
@@ -151 +151 @@
         String tool = data.size()+" "+trn("track", "tracks", data.size())
         +" "+points+" "+trn("point", "points", points);
-        if (associatedFile != null)
-            tool = "<html>"+tool+"<br>"+associatedFile.getPath()+"</html>";
+        File f = getAssociatedFile();
+        if (f != null)
+            tool = "<html>"+tool+"<br>"+f.getPath()+"</html>";
         return tool;
     }
@@ -242 +243 @@
                 new JMenuItem(new ConvertToDataLayerAction()),
                 new JSeparator(),
-                new JMenuItem(new RenameLayerAction(associatedFile, this)),
+                new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
                 new JSeparator(),
                 new JMenuItem(new LayerListPopup.InfoAction(this))};
@@ -254 +255 @@
                 new JMenuItem(new ConvertToDataLayerAction()),
                 new JSeparator(),
-                new JMenuItem(new RenameLayerAction(associatedFile, this)),
+                new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
                 new JSeparator(),
                 new JMenuItem(new LayerListPopup.InfoAction(this))};

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -71 +71 @@
 
         super(name);
-        this.associatedFile = associatedFile;
+        this.setAssociatedFile(associatedFile);
         this.data = new ArrayList<Marker>();
         this.fromLayer = fromLayer;
@@ -258 +258 @@
             components.add (moveaudio);
         }
-        components.add(new JMenuItem(new RenameLayerAction(associatedFile, this)));
+        components.add(new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)));
         components.add(new JSeparator());
         components.add(new JMenuItem(new LayerListPopup.InfoAction(this)));