Changeset 33530 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

Timestamp:

2017-08-26T02:16:05+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12663

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java (modified) (6 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

@@ -13 +13 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.Node;
@@ -28 +27 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
@@ -49 +49 @@
         chosenRelation = rel;
         analyse();
-        Main.map.mapView.repaint();
+        MainApplication.getMap().mapView.repaint();
         fireRelationChanged(oldRel);
     }
@@ -124 +124 @@
         // todo: dim chosen relation when changing layer
         // todo: check this WTF!
-        OsmDataLayer newLayer = Main.getLayerManager().getEditLayer();
+        OsmDataLayer newLayer = MainApplication.getLayerManager().getEditLayer();
         clear();
         if (newLayer != null && e.getPreviousEditLayer() == null) {
-            Main.map.mapView.addTemporaryLayer(this);
+            MainApplication.getMap().mapView.addTemporaryLayer(this);
         } else if (newLayer == null) {
-            Main.map.mapView.removeTemporaryLayer(this);
+            MainApplication.getMap().mapView.removeTemporaryLayer(this);
         }
     }
@@ -159 +159 @@
             visitedRelations.add(rel);
             for (OsmPrimitive element : rel.getMemberPrimitives()) {
-                if (null != element.getType()) switch(element.getType()) {
+                if (null != element.getType()) {
+                    switch(element.getType()) {
                     case NODE:
                         Node node = (Node) element;
@@ -185 +186 @@
                     default:
                         break;
+                    }
                 }
             }