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

Timestamp:

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

Author:

donvip

Message:

update to JOSM 12856

File:

• applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java (modified) (8 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);
         }