Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2014-04-26T17:39:23+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (4 diffs)
• SearchCompiler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -84 +84 @@
     }
 
-    private static final LinkedList<SearchSetting> searchHistory = new LinkedList<SearchSetting>();
+    private static final LinkedList<SearchSetting> searchHistory = new LinkedList<>();
     static {
         for (String s: Main.pref.getCollection("search.history", Collections.<String>emptyList())) {
@@ -110 +110 @@
             searchHistory.removeLast();
         }
-        LinkedHashSet<String> savedHistory = new LinkedHashSet<String>(searchHistory.size());
+        LinkedHashSet<String> savedHistory = new LinkedHashSet<>(searchHistory.size());
         for (SearchSetting item: searchHistory) {
             savedHistory.add(item.writeToString());
@@ -118 +118 @@
 
     public static List<String> getSearchExpressionHistory() {
-        List<String> ret = new ArrayList<String>(getSearchHistory().size());
+        List<String> ret = new ArrayList<>(getSearchHistory().size());
         for (SearchSetting ss: getSearchHistory()) {
             ret.add(ss.text);
@@ -582 +582 @@
 
         final DataSet ds = Main.main.getCurrentDataSet();
-        Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>(ds.getAllSelected());
+        Collection<OsmPrimitive> sel = new HashSet<>(ds.getAllSelected());
         int foundMatches = getSelection(s, sel, new Predicate<OsmPrimitive>(){
             @Override

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -59 +59 @@
     private static String  rxErrorMsgNoPos = marktr("The regex \"{0}\" had a parse error, full error:\n\n{1}");
     private PushbackTokenizer tokenizer;
-    private static Map<String, SimpleMatchFactory> simpleMatchFactoryMap = new HashMap<String, SimpleMatchFactory>();
-    private static Map<String, UnaryMatchFactory> unaryMatchFactoryMap = new HashMap<String, UnaryMatchFactory>();
-    private static Map<String, BinaryMatchFactory> binaryMatchFactoryMap = new HashMap<String, BinaryMatchFactory>();
+    private static Map<String, SimpleMatchFactory> simpleMatchFactoryMap = new HashMap<>();
+    private static Map<String, UnaryMatchFactory> unaryMatchFactoryMap = new HashMap<>();
+    private static Map<String, BinaryMatchFactory> binaryMatchFactoryMap = new HashMap<>();
 
     public SearchCompiler(boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) {