Changeset 30737 in osm for applications/editors/josm/plugins/tracer2

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

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

Files:

• ConnectWays.java (modified) (3 diffs)
• TagValues.java (modified) (2 diffs)
• TracerAction.java (modified) (3 diffs)
• TracerDebug.java (modified) (1 diff)
• preferences/ServerParamList.java (modified) (2 diffs)
• server/GetTrace.java (modified) (3 diffs)

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/ConnectWays.java

@@ -146 +146 @@
      */
     public static Command connect(Way newWay, LatLon pos, ServerParam param, boolean ctrl, boolean alt) {
-        LinkedList<Command> cmds = new LinkedList<Command>();
-        LinkedList<Command> cmds2 = new LinkedList<Command>();
+        LinkedList<Command> cmds = new LinkedList<>();
+        LinkedList<Command> cmds2 = new LinkedList<>();
         
         s_oParam = param;
@@ -214 +214 @@
      */
     public static List<Command> connectTo() {
-        Map<Way, Way> modifiedWays = new HashMap<Way, Way>();
-        LinkedList<Command> cmds = new LinkedList<Command>();
+        Map<Way, Way> modifiedWays = new HashMap<>();
+        LinkedList<Command> cmds = new LinkedList<>();
         Way way = new Way(s_oWay);
         for (int i = 0; i < way.getNodesCount() - 1; i++) {
@@ -271 +271 @@
      */
     private static List<Command> mergeNodes(Node n1, Node n2){
-        List<Command> cmds = new LinkedList<Command>();
+        List<Command> cmds = new LinkedList<>();
         cmds.add(new MoveCommand(n2,
                  (n1.getEastNorth().getX() - n2.getEastNorth().getX())/2,

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TagValues.java

@@ -53 +53 @@
         
         // get values
-        List<String> tagValues = new ArrayList<String>();
+        List<String> tagValues = new ArrayList<>();
         List<AutoCompletionListItem> values = Main.main.getCurrentDataSet().getAutoCompletionManager().getValues(m_strTag);
         for ( AutoCompletionListItem i : values ) {
@@ -65 +65 @@
         } else {
                 String[] prefered = m_strPreferredValues.split(";");
-                tagValues = new ArrayList<String>();
+                tagValues = new ArrayList<>();
                 
                 for (String str: prefered) {

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java

@@ -83 +83 @@
         
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
-        List<Command> commands = new ArrayList<Command>();
+        List<Command> commands = new ArrayList<>();
         
         if ( checkActiveServerParam() == false ) return;
@@ -281 +281 @@
     
     private void traceSync(LatLon pos, ProgressMonitor progressMonitor) {
-        Collection<Command> commands = new LinkedList<Command>();
+        Collection<Command> commands = new LinkedList<>();
         
         progressMonitor.beginTask(null, 3);
@@ -305 +305 @@
                     coordList = oTraceSimple.m_listLatLon;
                 } catch (Exception e) {
-                coordList = new ArrayList<LatLon>();
+                coordList = new ArrayList<>();
             }
            

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerDebug.java

@@ -66 +66 @@
                 Collection<? extends OsmPrimitive> cpx = null;
                 
-                List<OsmPrimitive> lp1 = new LinkedList<OsmPrimitive>();
-                List<OsmPrimitive> lp2 = new LinkedList<OsmPrimitive>();
-                List<OsmPrimitive> lp3 = new LinkedList<OsmPrimitive>();
-                List<OsmPrimitive> lp = new LinkedList<OsmPrimitive>();
+                List<OsmPrimitive> lp1 = new LinkedList<>();
+                List<OsmPrimitive> lp2 = new LinkedList<>();
+                List<OsmPrimitive> lp3 = new LinkedList<>();
+                List<OsmPrimitive> lp = new LinkedList<>();
                 
                 cp1 = lp1;

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamList.java

@@ -29 +29 @@
 
 public class ServerParamList {
-    ArrayList<ServerParam> m_listServerParam = new ArrayList<ServerParam>();
+    ArrayList<ServerParam> m_listServerParam = new ArrayList<>();
     ServerParam m_oActivParam = null;
     String m_strFilename;
@@ -107 +107 @@
     
     public List<ServerParam> getEnableParamList() {
-        List<ServerParam> listParam = new ArrayList<ServerParam>();
+        List<ServerParam> listParam = new ArrayList<>();
         for ( ServerParam param: m_listServerParam) {
                 if (param.isEnabled()) {

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/GetTrace.java

@@ -28 +28 @@
         private LatLon m_oLatLon;
         private ServerParam m_oServerParam;
-    public ArrayList<LatLon> m_listLatLon = new ArrayList<LatLon>();
+    public ArrayList<LatLon> m_listLatLon = new ArrayList<>();
     
     /**
@@ -71 +71 @@
             strResponse = strResponse.substring(1, strResponse.length()-1);
             
-            ArrayList<LatLon> nodelist = new ArrayList<LatLon>();
+            ArrayList<LatLon> nodelist = new ArrayList<>();
             
             String[] astrPoints = strResponse.split("\\)\\(");
@@ -82 +82 @@
             m_listLatLon = nodelist;
         } catch (Exception e) {
-                m_listLatLon = new ArrayList<LatLon>();
+                m_listLatLon = new ArrayList<>();
         }
     }