Changeset 33887 in osm for applications/editors/josm/plugins/indoorhelper/src/model

Timestamp:

2017-11-25T01:25:40+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12856

Location:

applications/editors/josm/plugins/indoorhelper/src/model

Files:

• IndoorHelperModel.java (modified) (8 diffs)
• PresetCounter.java (modified) (4 diffs)

applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.Filter.FilterPreferenceEntry;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.FilterDialog;
 import org.openstreetmap.josm.gui.dialogs.FilterTableModel;
@@ -78 +79 @@
 
                 // Get the filter dialog
-                FilterDialog filterDialog = Main.map.getToggleDialog(FilterDialog.class);
+                FilterDialog filterDialog = MainApplication.getMap().getToggleDialog(FilterDialog.class);
 
                 if (filterDialog != null) {
@@ -123 +124 @@
 
             // Get the filter dialog
-            FilterDialog filterDialog = Main.map.getToggleDialog(FilterDialog.class);
+            FilterDialog filterDialog = MainApplication.getMap().getToggleDialog(FilterDialog.class);
 
             if (filterDialog != null) {
@@ -182 +183 @@
         this.workingLevel = this.getLevelNumberFromIndex(index);
 
-        FilterDialog filterDialog = Main.map.getToggleDialog(FilterDialog.class);
+        FilterDialog filterDialog = MainApplication.getMap().getToggleDialog(FilterDialog.class);
         FilterTableModel filterTableModel = filterDialog.getFilterModel();
 
@@ -258 +259 @@
      */
     public void addTagsToOSM(IndoorObject object, List<Tag> userTags) {
-        if (!Main.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
+        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
 
             List<Tag> tags = this.getObjectTags(object);
@@ -276 +277 @@
             }
 
-        } else if (Main.getLayerManager().getEditDataSet().selectionEmpty()) {
+        } else if (MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
 
             JOptionPane.showMessageDialog(null, "No data selected.", "Error", JOptionPane.ERROR_MESSAGE);
@@ -290 +291 @@
     public void addTagsToOSM(IndoorObject object) {
 
-        if (!Main.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
+        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
             List<Tag> tags = this.getObjectTags(object);
             tags.add(new Tag("indoor:level", Integer.toString(workingLevel)));
@@ -301 +302 @@
                 Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue()));
             }
-        } else if (Main.getLayerManager().getEditDataSet().selectionEmpty()) {
+        } else if (MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
             JOptionPane.showMessageDialog(null, "No data selected.", "Error", JOptionPane.ERROR_MESSAGE);
         }

applications/editors/josm/plugins/indoorhelper/src/model/PresetCounter.java

@@ -28 +28 @@
 /**
  * Counter for the calls of specific indoor objects, to track which items were used most frequently.
- * 
+ *
  * @author egru
  *
  */
 public class PresetCounter {
-    
+
     private List<IndoorObject> rankingList;
     private List<ObjectCounter> counterList;
-    
+
     /**
      * Initiates the counterList with the available IndoorObjects.
      */
-    
+
     public PresetCounter() {
         this.init();
     }
-    
+
     private void init() {
         counterList = new ArrayList<>();
-        
+
         counterList.add(new ObjectCounter(IndoorObject.CONCRETE_WALL, 0));
         counterList.add(new ObjectCounter(IndoorObject.DOOR, 0));
@@ -60 +60 @@
         counterList.add(new ObjectCounter(IndoorObject.TOILET_MALE, 0));
     }
-    
+
     /**
      * Increments the counter of a specific IndoorObject in the list.
@@ -67 +67 @@
     public void count(IndoorObject object) {
         ListIterator<ObjectCounter> iterator = this.counterList.listIterator();
-        
+
         // Go through the list and increment the corresponding objects counter value.
         while (iterator.hasNext()) {
             ObjectCounter counterTemp = iterator.next();
             if (counterTemp.getObject().equals(object)) {
-                    counterList.get(iterator.nextIndex()-1).increment();    
+                    counterList.get(iterator.nextIndex()-1).increment();
             }
         }
-        
+
         //Sort the list.
         this.sort();
     }
-    
+
     private void sort() {
         Collections.sort(counterList);
         Collections.reverse(counterList);
     }
-    
+
     public List<IndoorObject> getRanking() {
-        rankingList = new ArrayList<IndoorObject>();
-        
+        rankingList = new ArrayList<>();
+
         rankingList.add(counterList.get(0).getObject());
         rankingList.add(counterList.get(1).getObject());
         rankingList.add(counterList.get(2).getObject());
         rankingList.add(counterList.get(3).getObject());
-        
+
         return rankingList;
     }
-    
-    private class ObjectCounter implements Comparable<ObjectCounter> {
+
+    private static class ObjectCounter implements Comparable<ObjectCounter> {
         private IndoorObject object;
         private int count;
-        
+
         ObjectCounter(IndoorObject o, int c) {
             this.object = o;
             this.count = c;
         }
-        
+
         public int getCount() {
             return this.count;
         }
-        
+
         public IndoorObject getObject() {
             return this.object;
         }
-        
+
         public void increment() {
             this.count += 1;
         }
-        
+
         @Override
         public int compareTo(ObjectCounter o) {
@@ -128 +128 @@
                 return 1;
             }
-            
+
             return 0;
         }
-        
+
     }
-    
+
 }