Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• BookmarkList.java (modified) (4 diffs)
• DownloadDialog.java (modified) (1 diff)
• PlaceSelection.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -52 +52 @@
          */
         public Bookmark(Collection<String> list) throws NumberFormatException, IllegalArgumentException {
-            List<String> array = new ArrayList<String>(list);
+            List<String> array = new ArrayList<>(list);
             if(array.size() < 5)
                 throw new IllegalArgumentException(tr("Wrong number of arguments for bookmark"));
@@ -167 +167 @@
         Collection<Collection<String>> args = Main.pref.getArray("bookmarks", null);
         if(args != null) {
-            LinkedList<Bookmark> bookmarks = new LinkedList<Bookmark>();
+            LinkedList<Bookmark> bookmarks = new LinkedList<>();
             for(Collection<String> entry : args) {
                 try {
@@ -184 +184 @@
             File bookmarkFile = new File(Main.pref.getPreferencesDir(),"bookmarks");
             try {
-                LinkedList<Bookmark> bookmarks = new LinkedList<Bookmark>();
+                LinkedList<Bookmark> bookmarks = new LinkedList<>();
                 if (bookmarkFile.exists()) {
                     Main.info("Try loading obsolete bookmarks file");
@@ -240 +240 @@
      */
     public final void save() {
-        LinkedList<Collection<String>> coll = new LinkedList<Collection<String>>();
+        LinkedList<Collection<String>> coll = new LinkedList<>();
         for (Object o : ((DefaultListModel<Bookmark>)getModel()).toArray()) {
             String[] array = new String[5];

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -67 +67 @@
 
     protected SlippyMapChooser slippyMapChooser;
-    protected final List<DownloadSelection> downloadSelections = new ArrayList<DownloadSelection>();
+    protected final List<DownloadSelection> downloadSelections = new ArrayList<>();
     protected final JTabbedPane tpDownloadAreaSelectors = new JTabbedPane();
     protected JCheckBox cbNewLayer;

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -110 +110 @@
         cbSearchExpression = new HistoryComboBox();
         cbSearchExpression.setToolTipText(tr("Enter a place name to search for"));
-        List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
+        List<String> cmtHistory = new LinkedList<>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
         Collections.reverse(cmtHistory);
         cbSearchExpression.setPossibleItems(cmtHistory);
@@ -195 +195 @@
         private StringBuffer description = null;
         private int depth = 0;
-        private List<SearchResult> data = new LinkedList<SearchResult>();
+        private List<SearchResult> data = new LinkedList<>();
 
         /**
@@ -389 +389 @@
 
         public NamedResultTableModel(ListSelectionModel selectionModel) {
-            data = new ArrayList<SearchResult>();
+            data = new ArrayList<>();
             this.selectionModel = selectionModel;
         }
@@ -408 +408 @@
                 this.data.clear();
             } else {
-                this.data  =new ArrayList<SearchResult>(data);
+                this.data = new ArrayList<>(data);
             }
             fireTableDataChanged();