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

Timestamp:

2018-08-18T18:12:13+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 14153

File:

• applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java (modified) (9 diffs)

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

@@ -27 +27 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmDataManager;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -79 +80 @@
      */
     public void addTagsToOSM(IndoorObject object, List<Tag> userTags) {
-        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
-
-            DataSet ds = Main.main.getEditDataSet();
+        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() &&
+                !OsmDataManager.getInstance().getInProgressSelection().isEmpty()) {
+
+            DataSet ds = OsmDataManager.getInstance().getEditDataSet();
             List<Tag> tags = this.getObjectTags(object);
             Collection<Relation> relations = ds.getRelations();
@@ -97 +99 @@
                 //Add tags to relation
                 for (Tag t : tags) {
-                        Main.main.undoRedo.add(new ChangePropertyCommand(relationToAdd, t.getKey(), t.getValue()));
+                        UndoRedoHandler.getInstance().add(new ChangePropertyCommand(relationToAdd, t.getKey(), t.getValue()));
                 }
             } else {
                 //Add tags to ways or nodes
                 for (Tag t : tags) {
-                    Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue()));
+                    UndoRedoHandler.getInstance().add(new ChangePropertyCommand(
+                            OsmDataManager.getInstance().getInProgressSelection(), t.getKey(), t.getValue()));
                 }
             }
@@ -119 +122 @@
     public void addTagsToOSM(IndoorObject object) {
 
-        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
+        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() &&
+                !OsmDataManager.getInstance().getInProgressSelection().isEmpty()) {
             List<Tag> tags = this.getObjectTags(object);
 
@@ -127 +131 @@
             //Add the tags to the current selection
             for (Tag t : tags) {
-                Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue()));
+                UndoRedoHandler.getInstance().add(new ChangePropertyCommand(
+                        OsmDataManager.getInstance().getInProgressSelection(), t.getKey(), t.getValue()));
             }
         //If the selected dataset ist empty
@@ -143 +148 @@
     public void addTagsToOSM(List<Tag> userTags) {
 
-        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()) {
+        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() &&
+                !OsmDataManager.getInstance().getInProgressSelection().isEmpty()) {
 
             //Add the tags to the current selection
             for (Tag t : userTags) {
-                Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue()));
+                UndoRedoHandler.getInstance().add(new ChangePropertyCommand(
+                        OsmDataManager.getInstance().getInProgressSelection(), t.getKey(), t.getValue()));
             }
         } else if (MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
@@ -163 +170 @@
         Relation newRelation = new Relation();
         RelationMember newMember;
-        DataSet ds = Main.main.getEditDataSet();
+        DataSet ds = OsmDataManager.getInstance().getEditDataSet();
 
         // Create new relation and add a new member with specific role
@@ -173 +180 @@
         }
         // Add relation to OSM data
-        MainApplication.undoRedo.add(new AddCommand(MainApplication.getLayerManager().getEditDataSet(), newRelation));
+        UndoRedoHandler.getInstance().add(new AddCommand(MainApplication.getLayerManager().getEditDataSet(), newRelation));
     }
 
@@ -186 +193 @@
 
         RelationMember newMember;
-        DataSet ds = Main.main.getEditDataSet();
+        DataSet ds = OsmDataManager.getInstance().getEditDataSet();
         Collection<Relation> relations = ds.getRelations();
         Relation relation = getRelationFromDataSet(ds, relations);
 
-        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty() &&
+        if (!MainApplication.getLayerManager().getEditDataSet().selectionEmpty() &&
+                !OsmDataManager.getInstance().getInProgressSelection().isEmpty() &&
                 !innerRelation.isEmpty() && getRole(ds, relations).equals("outer")) {