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

Timestamp:

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

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/indoorhelper

Files:

• build.xml (modified) (1 diff)
• src/controller/IndoorHelperController.java (modified) (4 diffs)
• src/model/IndoorHelperModel.java (modified) (6 diffs)

applications/editors/josm/plugins/indoorhelper/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Inital commit"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="9759"/>
+    <property name="plugin.main.version" value="10279"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

@@ -23 +23 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31 +30 @@
 
 import javax.swing.JOptionPane;
-import javax.xml.stream.XMLStreamException;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ValidateAction;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.preferences.MapListSetting;
 import org.openstreetmap.josm.data.preferences.Setting;
-import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
@@ -43 +41 @@
 import org.openstreetmap.josm.gui.dialogs.FilterTableModel;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.xml.sax.SAXException;
 
 import model.IndoorHelperModel;
@@ -59 +56 @@
  *
  */
-
 public class IndoorHelperController {
 

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();
         }
-        
-        
-
 }