Changeset 32493 in osm for applications/editors/josm/plugins/namemanager

Timestamp:

2016-07-01T09:54:34+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/namemanager

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java (modified) (1 diff)

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

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

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/dialog/NameManagerDialog.java

@@ -13 +13 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -179 +179 @@
         tagNameAM = new AutoCompletingTextField();
         AutoCompletionList list = new AutoCompletionList();
-        Main.main.getEditLayer().data.getAutoCompletionManager().populateWithKeys(list);
+        Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithKeys(list);
         tagNameAM.setAutoCompletionList(list);
         labelTagValueAM = new JLabel(tr(TAG_VALUE));
         tagValueAM = new AutoCompletingTextField();
-        tagNameAM.addKeyListener(new KeyListener() {
+        tagNameAM.addKeyListener(new KeyAdapter() {
             @Override
             public void keyTyped(KeyEvent arg0) {
@@ -192 +192 @@
                     }
                     list.clear();
-                    Main.main.getEditLayer().data.getAutoCompletionManager().populateWithTagValues(list, tagNameAM.getText());
+                    Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithTagValues(list, tagNameAM.getText());
                     tagValueAM.setAutoCompletionList(list);
                 }
-            }
-
-            @Override
-            public void keyReleased(KeyEvent arg0) {
-            }
-
-            @Override
-            public void keyPressed(KeyEvent arg0) {
             }
         });

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java

@@ -6 +6 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -51 +50 @@
         }
         NameManagerDialog dialog = NameManagerDialog.getInstance();
-        Way selectedWay = (Way) Main.main.getCurrentDataSet().getSelectedWays().iterator().next();
+        Way selectedWay = (Way) getLayerManager().getEditDataSet().getSelectedWays().iterator().next();
         dialog.setSelectedWay(selectedWay);
         dialog.setWaysInsideSelectedArea(NameManagerUtils.getWaysInsideSelectedArea(selectedWay));
@@ -71 +70 @@
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
         boolean enabledState = false;
-        DataSet ds = Main.main.getCurrentDataSet();
+        DataSet ds = getLayerManager().getEditDataSet();
         if (newSelection != null && ds != null) {
             Collection<Way> selectedWays = ds.getSelectedWays();

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/utils/NameManagerUtils.java

@@ -47 +47 @@
             Coordinate topLeftCorner = getTopLeftCorener(areaBorder);
             List<Pair<Node, Node>> areaBorderLines = areaBorder.getNodePairs(true);
-            Collection<Way> ways = Main.main.getCurrentDataSet().getWays();
+            Collection<Way> ways = Main.getLayerManager().getEditDataSet().getWays();
             ways: for (Way way : ways) {
                 if (areaBorder == way) {