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

Timestamp:

2016-06-30T20:10:45+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

File:

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

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

@@ -39 +39 @@
  * @author egru
  */
-
 public class IndoorHelperModel{
 
@@ -261 +260 @@
          */
         public void addTagsToOSM(IndoorObject object, List<Tag> userTags){
-                if(!Main.main.getCurrentDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){
+                if(!Main.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){
                         
                         List<Tag> tags = this.getObjectTags(object);
@@ -279 +278 @@
                         }
                         
-                } else if(Main.main.getCurrentDataSet().selectionEmpty()){
+                } else if(Main.getLayerManager().getEditDataSet().selectionEmpty()){
                         
                         JOptionPane.showMessageDialog(null, "No data selected.", "Error", JOptionPane.ERROR_MESSAGE);
-                        
-                }
-                
+                }
         }
         
@@ -295 +292 @@
         public void addTagsToOSM(IndoorObject object){
                 
-                if(!Main.main.getCurrentDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){
+                if(!Main.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){
                         List<Tag> tags = this.getObjectTags(object);
                         tags.add(new Tag("indoor:level", Integer.toString(workingLevel)));
@@ -306 +303 @@
                                 Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue()));
                         }
-                } else if(Main.main.getCurrentDataSet().selectionEmpty()){
+                } else if(Main.getLayerManager().getEditDataSet().selectionEmpty()){
                         JOptionPane.showMessageDialog(null, "No data selected.", "Error", JOptionPane.ERROR_MESSAGE);
                 }
-                
-                
         }
         
@@ -321 +316 @@
                 return counter.getRanking();
         }
-        
-        
-
 }