Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/plugin

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/gui/preferences/plugin

Files:

• PluginListPanel.java (modified) (1 diff)
• PluginPreference.java (modified) (3 diffs)
• PluginPreferencesModel.java (modified) (10 diffs)
• PluginUpdatePolicyPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -151 +151 @@
             // If the plugin has been unselected, was it required by other plugins still selected ?
             else if (!cb.isSelected()) {
-                Set<String> otherPlugins = new HashSet<String>();
+                Set<String> otherPlugins = new HashSet<>();
                 for (PluginInformation pi : model.getAvailablePlugins()) {
                     if (!pi.equals(cb.pi) && pi.requires != null && model.isSelectedPlugin(pi.getName())) {

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -280 +280 @@
         pnlPluginUpdatePolicy.rememberInPreferences();
         if (model.isActivePluginsChanged()) {
-            LinkedList<String> l = new LinkedList<String>(model.getSelectedPluginNames());
+            LinkedList<String> l = new LinkedList<>(model.getSelectedPluginNames());
             Collections.sort(l);
             Main.pref.putCollection("plugins", l);
@@ -494 +494 @@
             setLayout(new GridBagLayout());
             add(new JLabel(tr("Add JOSM Plugin description URL.")), GBC.eol());
-            model = new DefaultListModel<String>();
+            model = new DefaultListModel<>();
             for (String s : Main.pref.getPluginSites()) {
                 model.addElement(s);
             }
-            final JList<String> list = new JList<String>(model);
+            final JList<String> list = new JList<>(model);
             add(new JScrollPane(list), GBC.std().fill());
             JPanel buttons = new JPanel(new GridBagLayout());
@@ -565 +565 @@
         public List<String> getUpdateSites() {
             if (model.getSize() == 0) return Collections.emptyList();
-            List<String> ret = new ArrayList<String>(model.getSize());
+            List<String> ret = new ArrayList<>(model.getSize());
             for (int i=0; i< model.getSize();i++){
                 ret.add((String)model.get(i));

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

@@ -25 +25 @@
  */
 public class PluginPreferencesModel extends Observable {
-    private final List<PluginInformation> availablePlugins = new ArrayList<PluginInformation>();
-    private final List<PluginInformation> displayedPlugins = new ArrayList<PluginInformation>();
-    private final Map<PluginInformation, Boolean> selectedPluginsMap = new HashMap<PluginInformation, Boolean>();
-    private Set<String> pendingDownloads = new HashSet<String>();
+    private final List<PluginInformation> availablePlugins = new ArrayList<>();
+    private final List<PluginInformation> displayedPlugins = new ArrayList<>();
+    private final Map<PluginInformation, Boolean> selectedPluginsMap = new HashMap<>();
+    private Set<String> pendingDownloads = new HashSet<>();
     private String filterExpression;
     private Set<String> currentActivePlugins;
@@ -36 +36 @@
      */
     public PluginPreferencesModel() {
-        currentActivePlugins = new HashSet<String>();
+        currentActivePlugins = new HashSet<>();
         currentActivePlugins.addAll(Main.pref.getCollection("plugins", currentActivePlugins));
     }
@@ -77 +77 @@
         sort();
         filterDisplayedPlugins(filterExpression);
-        Set<String> activePlugins = new HashSet<String>();
+        Set<String> activePlugins = new HashSet<>();
         activePlugins.addAll(Main.pref.getCollection("plugins", activePlugins));
         for (PluginInformation pi: availablePlugins) {
@@ -119 +119 @@
      */
     public List<PluginInformation> getSelectedPlugins() {
-        List<PluginInformation> ret = new LinkedList<PluginInformation>();
+        List<PluginInformation> ret = new LinkedList<>();
         for (PluginInformation pi: availablePlugins) {
             if (selectedPluginsMap.get(pi) == null) {
@@ -137 +137 @@
      */
     public Set<String> getSelectedPluginNames() {
-        Set<String> ret = new HashSet<String>();
+        Set<String> ret = new HashSet<>();
         for (PluginInformation pi: getSelectedPlugins()) {
             ret.add(pi.name);
@@ -177 +177 @@
      */
     public List<PluginInformation> getPluginsScheduledForUpdateOrDownload() {
-        List<PluginInformation> ret = new ArrayList<PluginInformation>();
+        List<PluginInformation> ret = new ArrayList<>();
         for (String plugin: pendingDownloads) {
             PluginInformation pi = getPluginInformation(plugin);
@@ -274 +274 @@
      */
     public List<PluginInformation> getNewlyActivatedPlugins() {
-        List<PluginInformation> ret = new LinkedList<PluginInformation>();
+        List<PluginInformation> ret = new LinkedList<>();
         for (Entry<PluginInformation, Boolean> entry: selectedPluginsMap.entrySet()) {
             PluginInformation pi = entry.getKey();
@@ -292 +292 @@
      */
     public List<PluginInformation> getNewlyDeactivatedPlugins() {
-        List<PluginInformation> ret = new LinkedList<PluginInformation>();
+        List<PluginInformation> ret = new LinkedList<>();
         for (PluginInformation pi: availablePlugins) {
             if (!currentActivePlugins.contains(pi.name)) {
@@ -310 +310 @@
      */
     public List<PluginInformation> getAvailablePlugins() {
-        return new LinkedList<PluginInformation>(availablePlugins);
+        return new LinkedList<>(availablePlugins);
     }
 
@@ -320 +320 @@
      */
     public Set<String> getNewlyActivatedPluginNames() {
-        Set<String> ret = new HashSet<String>();
+        Set<String> ret = new HashSet<>();
         List<PluginInformation> plugins = getNewlyActivatedPlugins();
         for (PluginInformation pi: plugins) {

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java

@@ -68 +68 @@
 
         ButtonGroup bgVersionBasedUpdatePolicy = new ButtonGroup();
-        rbVersionBasedUpatePolicy = new HashMap<Policy, JRadioButton>();
+        rbVersionBasedUpatePolicy = new HashMap<>();
         JRadioButton btn = new JRadioButton(tr("Ask before updating"));
         rbVersionBasedUpatePolicy.put(Policy.ASK, btn);
@@ -109 +109 @@
 
         ButtonGroup bgTimeBasedUpdatePolicy = new ButtonGroup();
-        rbTimeBasedUpatePolicy = new HashMap<Policy, JRadioButton>();
+        rbTimeBasedUpatePolicy = new HashMap<>();
         JRadioButton btn = new JRadioButton(tr("Ask before updating"));
         btn.addChangeListener(changeListener);