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

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/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns

Files:

• ParametrizedString.java (modified) (1 diff)
• RoadSignInputDialog.java (modified) (10 diffs)
• RoadSignsPlugin.java (modified) (1 diff)
• RoadSignsReader.java (modified) (3 diffs)
• Sign.java (modified) (1 diff)
• javacc/ParamStringScanner.java (modified) (1 diff)
• javacc/ParamStringScannerTokenManager.java (modified) (1 diff)

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/ParametrizedString.java

@@ -22 +22 @@
  */
 public class ParametrizedString {
-    final List<StringOrParameter> token = new ArrayList<StringOrParameter>();
+    final List<StringOrParameter> token = new ArrayList<>();
 
     /**

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java

@@ -166 +166 @@
 
     private Command createCommand(Collection<OsmPrimitive> selPrim) {
-        List<Command> cmds = new LinkedList<Command>();
+        List<Command> cmds = new LinkedList<>();
         for (int i=0; i<previewModel.getRowCount(); i++) {
             String key = (String) previewModel.getValueAt(i, 0);
@@ -272 +272 @@
      */
     public class SignSelection  {
-        private final LinkedList<SignCombination> combos=new LinkedList<SignCombination>();
+        private final LinkedList<SignCombination> combos=new LinkedList<>();
 
         public void remove(SignCombination sc) {
@@ -333 +333 @@
                 for (SignWrapper sw : sc.signs) {
                     if (swFind == sw) {
-                        return new Pair<Integer, Integer>(selIdx, combIdx);
+                        return new Pair<>(selIdx, combIdx);
                     }
                     combIdx++;
@@ -378 +378 @@
 
         public SignCombination() {
-            signs = new LinkedList<SignWrapper>();
+            signs = new LinkedList<>();
         }
 
@@ -428 +428 @@
         String signRef;
         JPanel paramsPanel;
-        Map<String, String> paramValues = new HashMap<String, String>();
+        Map<String, String> paramValues = new HashMap<>();
         public SignWrapper(Sign sign) {
             this.sign = sign;
@@ -575 +575 @@
 
     public class PreviewTableModel extends AbstractTableModel {
-        private List<String> keys = new ArrayList<String>();
-        private List<String> values = new ArrayList<String>();
+        private List<String> keys = new ArrayList<>();
+        private List<String> values = new ArrayList<>();
 
         int rows=3;
@@ -607 +607 @@
          */
         public void update() {
-            final TreeMap<String, String> map= new TreeMap<String, String>();
+            final TreeMap<String, String> map= new TreeMap<>();
             String traffic_sign = "";
 
             for (SignCombination sc : sel.combos) {
-                final Map<String, String> env = new HashMap<String, String>();
+                final Map<String, String> env = new HashMap<>();
                 String combo_traffic_sign = "";
 
@@ -621 +621 @@
                     String key;
                     String default_value;
-                    List<String> values = new ArrayList<String>();
-                    List<String> conditions = new ArrayList<String>();
+                    List<String> values = new ArrayList<>();
+                    List<String> conditions = new ArrayList<>();
                     //String ident;
                     public TagEvaluater(Tag t) {
@@ -653 +653 @@
                             return Collections.singletonMap(key, value);
                         else {
-                            Map<String, String> result = new HashMap<String, String>();
+                            Map<String, String> result = new HashMap<>();
                             for (String c : conditions) {
                                 result.put(key+":"+c, value);
@@ -662 +662 @@
                 }
 
-                Map<String, TagEvaluater> tags = new LinkedHashMap<String, TagEvaluater>();
+                Map<String, TagEvaluater> tags = new LinkedHashMap<>();
                 for (SignWrapper sw : sc.signs) {
                     for (Map.Entry<String,String> entry : sw.paramValues.entrySet()) {

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java

@@ -157 +157 @@
             Collection<String> customIconDirs = null;
             if (customIconDirsStr != null) {
-                customIconDirs = new ArrayList<String>(Arrays.asList(customIconDirsStr.split(",")));
+                customIconDirs = new ArrayList<>(Arrays.asList(customIconDirsStr.split(",")));
             } else {
                 customIconDirs = Main.pref.getCollection("plugin.roadsigns.icon.sources", null);
             }
             if (customIconDirs != null) {
-                customIconDirs = new ArrayList<String>(customIconDirs);
+                customIconDirs = new ArrayList<>(customIconDirs);
             } else {
-                customIconDirs = new ArrayList<String>();
+                customIconDirs = new ArrayList<>();
             }
             // add icon directory relative to preset file

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java

@@ -234 +234 @@
         }
         public void wireSupplements() throws XmlParsingException {
-            Map<String, Sign> map = new HashMap<String, Sign>();
+            Map<String, Sign> map = new HashMap<>();
             for (Sign sign : allSigns) {
                 if (map.get(sign.id) != null)
@@ -309 +309 @@
     public List<Sign> parse() throws SAXException, IOException {
         SignParser parser = new SignParser();
-        parser.allSigns = new ArrayList<Sign>();
-        parser.supplementIds = new HashMap<Sign, List<String>>();
+        parser.allSigns = new ArrayList<>();
+        parser.supplementIds = new HashMap<>();
         try {
             SAXParserFactory factory = SAXParserFactory.newInstance();
@@ -318 +318 @@
             String filterPref = Main.pref.get("plugin.roadsigns.preset.filter");
             if (filterPref.equals("useful")) {
-                List<Sign> filtered = new ArrayList<Sign>();
+                List<Sign> filtered = new ArrayList<>();
                 for (Sign s : parser.allSigns) {
                     if (s.isUseful()) {

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java

@@ -27 +27 @@
     public String name;
     public String long_name;
-    public List<Tag> tags = new ArrayList<Tag>();
-    public List<Sign> supplements = new ArrayList<Sign>();
-    public List<SignParameter> params = new ArrayList<SignParameter>();
+    public List<Tag> tags = new ArrayList<>();
+    public List<Sign> supplements = new ArrayList<>();
+    public List<SignParameter> params = new ArrayList<>();
     public boolean isSupplementing;
     public String loc_wiki;

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScanner.java

@@ -18 +18 @@
     String val;
     Token t;
-    List<StringOrParameter> lst = new ArrayList<StringOrParameter>();
+    List<StringOrParameter> lst = new ArrayList<>();
     label_1:
     while (true) {

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/javacc/ParamStringScannerTokenManager.java

@@ -1 +1 @@
 /* Generated By:JavaCC: Do not edit this line. ParamStringScannerTokenManager.java */
 package org.openstreetmap.josm.plugins.roadsigns.javacc;
-import java.util.ArrayList;
-import java.util.List;
-import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.Prm;
-import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.Str;
-import org.openstreetmap.josm.plugins.roadsigns.ParametrizedString.StringOrParameter;
 
 /** Token Manager. */