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

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

Files:

• ac/AutoCompletionListViewer.java (modified) (2 diffs)
• editor/TagEditorModel.java (modified) (1 diff)
• preset/ui/PresetsTableModel.java (modified) (1 diff)
• preset/ui/TabularPresetSelector.java (modified) (1 diff)
• tagspec/TagSpecification.java (modified) (1 diff)
• tagspec/TagSpecifications.java (modified) (5 diffs)
• tagspec/ui/TabularTagSelector.java (modified) (1 diff)
• tagspec/ui/TagsTableModel.java (modified) (1 diff)

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListViewer.java

@@ -94 +94 @@
         this.autoCompletionList = list;
         createGUI();
-        listener = new ArrayList<IAutoCompletionListListener>();
+        listener = new ArrayList<>();
     }
     
@@ -103 +103 @@
         this.autoCompletionList = null;
         createGUI();
-        listener = new ArrayList<IAutoCompletionListListener>();
+        listener = new ArrayList<>();
     }
 

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java

@@ -147 +147 @@
      */
     public void updateJOSMSelection() {
-        ArrayList<Command> commands = new ArrayList<Command>();
+        ArrayList<Command> commands = new ArrayList<>();
         Collection<OsmPrimitive> selection = Main.main.getCurrentDataSet().getSelected();
         if (selection == null)

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableModel.java

@@ -14 +14 @@
     //private static final Logger logger = Logger.getLogger(PresetsTableModel.class.getName());
 
-    private final ArrayList<TableModelListener> listeners = new ArrayList<TableModelListener>();
-    private final ArrayList<TaggingPreset> items = new ArrayList<TaggingPreset>();
-    private final ArrayList<TaggingPreset> visibleItems = new ArrayList<TaggingPreset>();
+    private final ArrayList<TableModelListener> listeners = new ArrayList<>();
+    private final ArrayList<TaggingPreset> items = new ArrayList<>();
+    private final ArrayList<TaggingPreset> visibleItems = new ArrayList<>();
 
     protected void initModelFromPresets(Collection<TaggingPreset> presets) {

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java

@@ -40 +40 @@
     private PresetsTable presetsTable = null;
     private JTextField   tfFilter = null;
-    private final ArrayList<IPresetSelectorListener> listeners = new ArrayList<IPresetSelectorListener>();
+    private final ArrayList<IPresetSelectorListener> listeners = new ArrayList<>();
     private JScrollPane scrollPane;
     private JButton btnApply;

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecification.java

@@ -39 +39 @@
      */
     public TagSpecification() {
-        lables = new ArrayList<LabelSpecification>();
+        lables = new ArrayList<>();
     }
 

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java

@@ -91 +91 @@
      */
     public TagSpecifications() {
-        tagSpecifications = new ArrayList<TagSpecification>();
+        tagSpecifications = new ArrayList<>();
     }
 
@@ -125 +125 @@
 
     public List<AutoCompletionListItem> getKeysForAutoCompletion(AutoCompletionContext context) {
-        ArrayList<AutoCompletionListItem> keys = new ArrayList<AutoCompletionListItem>();
+        ArrayList<AutoCompletionListItem> keys = new ArrayList<>();
         for (TagSpecification spec : tagSpecifications) {
             if (!spec.isApplicable(context)) {
@@ -139 +139 @@
 
     public List<AutoCompletionListItem> getLabelsForAutoCompletion(String forKey, AutoCompletionContext context) {
-        ArrayList<AutoCompletionListItem> items = new ArrayList<AutoCompletionListItem>();
+        ArrayList<AutoCompletionListItem> items = new ArrayList<>();
         for (TagSpecification spec : tagSpecifications) {
             if (spec.getKey().equals(forKey)) {
@@ -164 +164 @@
      */
     public ArrayList<KeyValuePair> asList() {
-        ArrayList<KeyValuePair> entries = new ArrayList<KeyValuePair>();
+        ArrayList<KeyValuePair> entries = new ArrayList<>();
 
         for (TagSpecification s : tagSpecifications) {
@@ -233 +233 @@
          */
         protected void startElementOsmTagDefinitions(Attributes atts) throws SAXException {
-            tagSpecifications = new ArrayList<TagSpecification>();
+            tagSpecifications = new ArrayList<>();
         }
 

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java

@@ -38 +38 @@
     private JButton btnApply;
     private JScrollPane scrollPane;
-    private final ArrayList<ITagSelectorListener> listeners = new ArrayList<ITagSelectorListener>();
+    private final ArrayList<ITagSelectorListener> listeners = new ArrayList<>();
 
     protected JPanel buildFilterPanel() {

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java

@@ -23 +23 @@
 
     public TagsTableModel() {
-        items = new ArrayList<KeyValuePair>();
-        visibleItems = new ArrayList<KeyValuePair>();
+        items = new ArrayList<>();
+        visibleItems = new ArrayList<>();
     }