Changeset 2974 in osm for applications/editors

Timestamp:

2007-05-21T10:11:58+02:00 (17 years ago)

Author:

christofd

Message:

removed unused imports, added serial ids for all classes that needed it, etc. so only a couple of warnings remain

Location:

applications/editors/josm/plugins/surveyor/src

Files:

• at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java (modified) (1 diff)
• at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java (modified) (2 diffs)
• at/dallermassl/josm/plugin/surveyor/GpsActionEvent.java (modified) (1 diff)
• at/dallermassl/josm/plugin/surveyor/GpxTrackMarkerWriter.java (modified) (1 diff)
• at/dallermassl/josm/plugin/surveyor/MetaAction.java (modified) (2 diffs)
• at/dallermassl/josm/plugin/surveyor/SurveyorActionDescription.java (modified) (1 diff)
• at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java (modified) (3 diffs)
• at/dallermassl/josm/plugin/surveyor/action/AnnotationPresetAction.java (modified) (1 diff)
• at/dallermassl/josm/plugin/surveyor/action/ConsolePrinterAction.java (modified) (1 diff)
• at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java (modified) (2 diffs)
• at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java (modified) (3 diffs)
• at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java (modified) (2 diffs)
• at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java (modified) (2 diffs)
• livegps/LiveGpsDialog.java (modified) (1 diff)
• livegps/LiveGpsLayer.java (modified) (1 diff)
• org/dinopolis/util/collection/Tuple.java (modified) (1 diff)
• test/DialogClosingThread.java (modified) (1 diff)
• test/DialogTest.java (modified) (2 diffs)

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java

@@ -22 +22 @@
  */
 public class AutoSaveAction extends AbstractAction {
+    private static final long serialVersionUID = -8608679323231116043L;
     private static final long AUTO_SAVE_PERIOD_SEC = 60; // once a minute
     public static final String GPS_FILE_NAME_PATTERN = "surveyor-{0,date,yyyyMMdd-HHmmss}.gpx";

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java

@@ -13 +13 @@
 import javax.swing.JOptionPane;
 
-import livegps.LiveGpsLayer;
 import livegps.LiveGpsLock;
 
@@ -19 +18 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer;
-import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.GpxWriter;
 import org.openstreetmap.josm.io.XmlWriter;

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/GpsActionEvent.java

@@ -13 +13 @@
  */
 public class GpsActionEvent extends ActionEvent {
+    private static final long serialVersionUID = 2674961758007055637L;
     private LatLon coordinates;
     

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/GpxTrackMarkerWriter.java

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
 import org.openstreetmap.josm.io.XmlWriter;
-import org.openstreetmap.josm.io.XmlWriter.OsmWriterInterface;
 
 /**

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/MetaAction.java

@@ -4 +4 @@
 package at.dallermassl.josm.plugin.surveyor;
 
-import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
 
 import javax.swing.AbstractAction;
 import javax.swing.Icon;
-import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JTextField;
-
-import test.DialogClosingThread;
-
 
 import livegps.LiveGpsData;
@@ -35 +20 @@
  */
 public class MetaAction extends AbstractAction {
+    private static final long serialVersionUID = -1523524381092575809L;
     private List<SurveyorActionDescription> actions;
     private GpsDataSource gpsDataSource;

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionDescription.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.List;
-import java.util.StringTokenizer;
 
 import org.dinopolis.util.io.Tokenizer;

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java

@@ -11 +11 @@
 import java.io.Reader;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -19 +18 @@
 import livegps.LiveGpsData;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Check;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Combo;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Item;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Key;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Label;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Text;
 import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.xml.sax.SAXException;
@@ -35 +26 @@
  */
 public class SurveyorComponent extends JComponent implements PropertyChangeListener, GpsDataSource {
-    
+    private static final long serialVersionUID = 4539838472057529042L;
     private LiveGpsData gpsData;
     private int rows = 3;

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/AnnotationPresetAction.java

@@ -8 +8 @@
 import javax.swing.Action;
 
-import livegps.LiveGpsLock;
-
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
 import org.openstreetmap.josm.gui.preferences.AnnotationPresetPreference;

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/ConsolePrinterAction.java

@@ -4 +4 @@
 package at.dallermassl.josm.plugin.surveyor.action;
 
-import java.util.List;
-
-import javax.swing.AbstractButton;
-
 import org.openstreetmap.josm.data.coor.LatLon;
 
-import at.dallermassl.josm.plugin.surveyor.SurveyorAction;
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
 

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java

@@ -7 +7 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 
 import javax.sound.sampled.AudioFormat;
@@ -22 +19 @@
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
-import at.dallermassl.josm.plugin.surveyor.SurveyorAction;
 
 /**

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java

@@ -9 +9 @@
 import java.util.Map.Entry;
 
-import javax.swing.Action;
-
 import livegps.LiveGpsLock;
 
@@ -17 +15 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.gui.annotation.AnnotationPreset;
-import org.openstreetmap.josm.gui.preferences.AnnotationPresetPreference;
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
@@ -54 +50 @@
                 key = keyValuePair.substring(0, pos);
                 value = keyValuePair.substring(pos + 1);
-                keyValues.add(new Tuple(key, value));
+                keyValues.add(new Tuple<String, String>(key, value));
             } else {
                 System.err.println("SetNodeAction: ignoring invalid key value pair: " + keyValuePair);

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import javax.swing.JToggleButton;
@@ -21 +20 @@
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
-import at.dallermassl.josm.plugin.surveyor.SurveyorAction;
 
 /**

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SystemExecuteAction.java

@@ -6 +6 @@
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
-import at.dallermassl.josm.plugin.surveyor.SurveyorAction;
 
 /**
@@ -28 +23 @@
     public void actionPerformed(GpsActionEvent event) {
         final ProcessBuilder builder = new ProcessBuilder(getParameters());
-        Map<String, String> environ = builder.environment();
+        //Map<String, String> environ = builder.environment();
         builder.directory(new File(System.getProperty("user.home")));
 

applications/editors/josm/plugins/surveyor/src/livegps/LiveGpsDialog.java

@@ -29 +29 @@
  */
 public class LiveGpsDialog extends ToggleDialog implements PropertyChangeListener {
+    private static final long serialVersionUID = 6183400754671501117L;
     private JLabel statusLabel;
     private JLabel wayLabel;

applications/editors/josm/plugins/surveyor/src/livegps/LiveGpsLayer.java

@@ -4 +4 @@
 import java.awt.Graphics;
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;

applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/collection/Tuple.java

@@ -101 +101 @@
      * @see java.lang.Object#equals(java.lang.Object)
      */
+    @SuppressWarnings("unchecked")
     @Override
     public boolean equals(Object obj) {

applications/editors/josm/plugins/surveyor/src/test/DialogClosingThread.java

@@ -9 +9 @@
 import java.awt.event.KeyListener;
 
-import javax.swing.JButton;
 import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;

applications/editors/josm/plugins/surveyor/src/test/DialogTest.java

@@ -5 +5 @@
 
 import java.awt.BorderLayout;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -15 +13 @@
 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
-
-import at.dallermassl.josm.plugin.surveyor.MetaAction;
 
 /**