Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (14 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -127 +127 @@
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
         this.availableSourcesModel = new AvailableSourcesListModel(selectionModel);
-        this.lstAvailableSources = new JList<ExtendedSourceEntry>(availableSourcesModel);
+        this.lstAvailableSources = new JList<>(availableSourcesModel);
         this.lstAvailableSources.setSelectionModel(selectionModel);
         this.lstAvailableSources.setCellRenderer(new SourceEntryListCellRenderer());
@@ -446 +446 @@
 
         public AvailableSourcesListModel(DefaultListSelectionModel selectionModel) {
-            data = new ArrayList<ExtendedSourceEntry>();
+            data = new ArrayList<>();
             this.selectionModel = selectionModel;
         }
@@ -483 +483 @@
 
         public List<ExtendedSourceEntry> getSelected() {
-            List<ExtendedSourceEntry> ret = new ArrayList<ExtendedSourceEntry>();
+            List<ExtendedSourceEntry> ret = new ArrayList<>();
             for(int i=0; i<data.size();i++) {
                 if (selectionModel.isSelectedIndex(i)) {
@@ -499 +499 @@
         public ActiveSourcesModel(DefaultListSelectionModel selectionModel) {
             this.selectionModel = selectionModel;
-            this.data = new ArrayList<SourceEntry>();
+            this.data = new ArrayList<>();
         }
 
@@ -575 +575 @@
 
         public void removeIdxs(Collection<Integer> idxs) {
-            List<SourceEntry> newData = new ArrayList<SourceEntry>();
+            List<SourceEntry> newData = new ArrayList<>();
             for (int i=0; i<data.size(); ++i) {
                 if (!idxs.contains(i)) {
@@ -601 +601 @@
 
         public List<SourceEntry> getSources() {
-            return new ArrayList<SourceEntry>(data);
+            return new ArrayList<>(data);
         }
 
@@ -983 +983 @@
             int josmVersion = Version.getInstance().getVersion();
             if (josmVersion != Version.JOSM_UNKNOWN_VERSION) {
-                Collection<String> messages = new ArrayList<String>();
+                Collection<String> messages = new ArrayList<>();
                 for (ExtendedSourceEntry entry : sources) {
                     if (entry.minJosmVersion != null && entry.minJosmVersion > josmVersion) {
@@ -1054 +1054 @@
         public IconPathTableModel(DefaultListSelectionModel selectionModel) {
             this.selectionModel = selectionModel;
-            this.data = new ArrayList<String>();
+            this.data = new ArrayList<>();
         }
 
@@ -1145 +1145 @@
 
         public List<String> getIconPaths() {
-            return new ArrayList<String>(data);
+            return new ArrayList<>(data);
         }
     }
@@ -1237 +1237 @@
         private BufferedReader reader;
         private boolean canceled;
-        private final List<ExtendedSourceEntry> sources = new ArrayList<ExtendedSourceEntry>();
+        private final List<ExtendedSourceEntry> sources = new ArrayList<>();
 
         public SourceLoader(String url, List<SourceProvider> sourceProviders) {
@@ -1423 +1423 @@
         public FileOrUrlCellEditor(boolean isFile) {
             this.isFile = isFile;
-            listeners = new CopyOnWriteArrayList<CellEditorListener>();
+            listeners = new CopyOnWriteArrayList<>();
             build();
         }
@@ -1575 +1575 @@
                 return new ArrayList<SourceEntry>(getDefault());
 
-            List<SourceEntry> entries = new ArrayList<SourceEntry>();
+            List<SourceEntry> entries = new ArrayList<>();
             for (Map<String, String> sourcePref : src) {
-                SourceEntry e = deserialize(new HashMap<String, String>(sourcePref));
+                SourceEntry e = deserialize(new HashMap<>(sourcePref));
                 if (e != null) {
                     entries.add(e);
@@ -1586 +1586 @@
 
         public boolean put(Collection<? extends SourceEntry> entries) {
-            Collection<Map<String, String>> setting = new ArrayList<Map<String, String>>(entries.size());
+            Collection<Map<String, String>> setting = new ArrayList<>(entries.size());
             for (SourceEntry e : entries) {
                 setting.add(serialize(e));
@@ -1598 +1598 @@
          */
         public final Set<String> getActiveUrls() {
-            Set<String> urls = new HashSet<String>();
+            Set<String> urls = new HashSet<>();
             for (SourceEntry e : get()) {
                 if (e.active) {