Changeset 29916 in osm for applications/editors/josm

Timestamp:

2013-09-05T03:11:22+02:00 (11 years ago)

Author:

donvip

Message:

[josm_surveyor] fix/cleanup plugin

Location:

applications/editors/josm/plugins/surveyor

Files:

• .project (modified) (1 diff)
• README (moved) (moved from applications/editors/josm/plugins/surveyor/copyright.txt ) (1 diff)
• changelog.txt (deleted)
• gpl-2.0.txt (deleted)
• src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java (modified) (6 diffs)
• src/org/dinopolis/util/collection (deleted)

applications/editors/josm/plugins/surveyor/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>JOSM-plugin-surveyor</name>
+        <name>JOSM-surveyor</name>
         <comment></comment>
         <projects>

applications/editors/josm/plugins/surveyor/README

@@ -1 @@
-Plugin surveyo 
+Plugin surveyor
 
 This plugin is copyrighted 2008-2009 

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

@@ -122 +122 @@
 
         // parse xml file and create component from it:
-        Reader in = new InputStreamReader(SurveyorComponent.class.getClassLoader().getResourceAsStream("surveyor.xml"));
+        Reader in = new InputStreamReader(SurveyorComponent.class.getClassLoader().getResourceAsStream("resources/surveyor.xml"));
         XmlObjectParser parser = new XmlObjectParser();
         parser.mapOnStart("surveyor", SurveyorComponent.class);

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

@@ -39 +39 @@
 public class SurveyorShowAction extends JosmAction {
     private static final long serialVersionUID = 2184570223633094734L;
-    private static final String DEFAULT_SOURCE = "resource://surveyor.xml";
+    private static final String DEFAULT_SOURCE = "resource://resources/surveyor.xml";
     private JFrame surveyorFrame;
     private LiveGpsPlugin gpsPlugin;

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

@@ -8 +8 @@
 import java.util.Collection;
 import java.util.List;
-import java.util.Map.Entry;
 
-import org.dinopolis.util.collection.Tuple;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.tools.Pair;
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
@@ -28 +27 @@
  */
 public class SetNodeAction implements SurveyorAction {
-    private Collection<Tuple<String, String>> keyValues;
+    private Collection<Pair<String, String>> keyValues;
 
     /**
@@ -42 +41 @@
     //@Override
     public void setParameters(List<String> parameters) {
-        keyValues = new ArrayList<Tuple<String, String>>();
+        keyValues = new ArrayList<Pair<String, String>>();
         int pos;
         String key;
@@ -51 +50 @@
                 key = keyValuePair.substring(0, pos);
                 value = keyValuePair.substring(pos + 1);
-                keyValues.add(new Tuple<String, String>(key, value));
+                keyValues.add(new Pair<String, String>(key, value));
             } else {
                 System.err.println("SetNodeAction: ignoring invalid key value pair: " + keyValuePair);
@@ -65 +64 @@
         //System.out.println(getClass().getSimpleName() + " KOORD: " + coordinates.lat() + ", " + coordinates.lon() + " params: " + keyValues);
         Node node = new Node(coordinates);
-        for(Entry<String, String> entry : keyValues) {
-            node.put(entry.getKey(), entry.getValue());
+        for(Pair<String, String> entry : keyValues) {
+            node.put(entry.a, entry.b);
         }
         synchronized(SurveyorLock.class) {
@@ -78 +77 @@
         Main.map.repaint();
     }
-
-
 }