Changeset 23191 in osm for applications/editors/josm/plugins/globalsat/src

Timestamp:

2010-09-15T18:56:19+02:00 (15 years ago)

Author:

stoecker

Message:

remove tabs

Location:

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat

Files:

• GlobalsatDg100.java (modified) (1 diff)
• GlobalsatPlugin.java (modified) (2 diffs)
• SingleSegmentGpxTrack.java (modified) (1 diff)

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java

@@ -135 +135 @@
      */
     public GpxData readData(ProgressMonitor progressMonitor) throws ConnectionException {
-        progressMonitor.beginTask(null);
-        try {
-                GpxData result = null;
-                cancelled = false;
-                if(port == null){
-                        connect();
-                }
-
-                List<FileInfoRec> fileInfoList = readFileInfoList();
-                List<GpsRec> gpsRecList = readGpsRecList(fileInfoList);
-
-                progressMonitor.setTicksCount(gpsRecList.size());
-                if(gpsRecList.size() > 0){
-                        GpsRec last = null;
-                        result = new GpxData();
-                        Collection<WayPoint> seg = new ArrayList<WayPoint>(100);
-                        for(GpsRec r:gpsRecList){
-                                if(cancelled){
-                                        return result;
-                                }
-                                WayPoint p = wayPointFrom(r);
-                                if(r.equals(last)){
-                                        result.waypoints.add(p);
-                                }else{
-                                        seg.add(p);
-                                }
-                                last = r;
-                                progressMonitor.worked(1);
-                        }
-                        result.tracks.add(new SingleSegmentGpxTrack(new ImmutableGpxTrackSegment(seg), Collections.<String, Object>emptyMap()));
-                }
-                return result;
-        } finally {
-                progressMonitor.finishTask();
-        }
+        progressMonitor.beginTask(null);
+        try {
+            GpxData result = null;
+            cancelled = false;
+            if(port == null){
+                connect();
+            }
+
+            List<FileInfoRec> fileInfoList = readFileInfoList();
+            List<GpsRec> gpsRecList = readGpsRecList(fileInfoList);
+
+            progressMonitor.setTicksCount(gpsRecList.size());
+            if(gpsRecList.size() > 0){
+                GpsRec last = null;
+                result = new GpxData();
+                Collection<WayPoint> seg = new ArrayList<WayPoint>(100);
+                for(GpsRec r:gpsRecList){
+                    if(cancelled){
+                        return result;
+                    }
+                    WayPoint p = wayPointFrom(r);
+                    if(r.equals(last)){
+                        result.waypoints.add(p);
+                    }else{
+                        seg.add(p);
+                    }
+                    last = r;
+                    progressMonitor.worked(1);
+                }
+                result.tracks.add(new SingleSegmentGpxTrack(new ImmutableGpxTrackSegment(seg), Collections.<String, Object>emptyMap()));
+            }
+            return result;
+        } finally {
+            progressMonitor.finishTask();
+        }
     }
 

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java

@@ -47 +47 @@
 
         @Override public void realRun() throws IOException, SAXException {
-                progressMonitor.subTask(tr("Importing data from DG100..."));
+            progressMonitor.subTask(tr("Importing data from DG100..."));
             try{
                 data = GlobalsatPlugin.dg100().readData(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, true));
@@ -89 +89 @@
     GlobalsatImportAction importAction;
     public GlobalsatPlugin(PluginInformation info) {
-        super(info);
+        super(info);
         boolean error = false;
         try{

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/SingleSegmentGpxTrack.java

@@ -11 +11 @@
 public class SingleSegmentGpxTrack implements GpxTrack {
 
-        private final Map<String, Object> attributes;
-        private final GpxTrackSegment trackSegment;
+    private final Map<String, Object> attributes;
+    private final GpxTrackSegment trackSegment;
 
-        public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
-                this.attributes = Collections.unmodifiableMap(attributes);
-                this.trackSegment = trackSegment;
-        }
+    public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
+        this.attributes = Collections.unmodifiableMap(attributes);
+        this.trackSegment = trackSegment;
+    }
 
 
-        public Map<String, Object> getAttributes() {
-                return attributes;
-        }
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
 
-        public Bounds getBounds() {
-                return trackSegment.getBounds();
-        }
+    public Bounds getBounds() {
+        return trackSegment.getBounds();
+    }
 
-        public Collection<GpxTrackSegment> getSegments() {
-                return Collections.singleton(trackSegment);
-        }
+    public Collection<GpxTrackSegment> getSegments() {
+        return Collections.singleton(trackSegment);
+    }
 
-        public double length() {
-                return trackSegment.length();
-        }
+    public double length() {
+        return trackSegment.length();
+    }
 
-        @Override
-        public int getUpdateCount() {
-                return trackSegment.getUpdateCount();
-        }
+    @Override
+    public int getUpdateCount() {
+        return trackSegment.getUpdateCount();
+    }
 
 }