Changeset 30145 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

Timestamp:

2013-12-22T12:27:11+01:00 (11 years ago)

Author:

donvip

Message:

[josm-plugins] global replacement of Main.map.mapview.getEditLayer() by Main.main.getEditLayer() (avoids NPEs)

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (modified) (2 diffs)

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

@@ -243 +243 @@
                     Relation relation = (Relation)relationsData.getValueAt(row, 0);
                     if( e.getClickCount() > 1 ) {
-                        Main.map.mapView.getEditLayer().data.setSelected(relation);
+                        Main.main.getEditLayer().data.setSelected(relation);
                     }
                 }
@@ -487 +487 @@
         public void mouseClicked( MouseEvent e ) {
             if( e.isControlDown() || !(e.getComponent() instanceof JComboBox ) ) // do not use left click handler on combo box
-            if( SwingUtilities.isLeftMouseButton(e) && chosenRelation.get() != null && Main.map.mapView.getEditLayer() != null ) {
-                Main.map.mapView.getEditLayer().data.setSelected(chosenRelation.get());
+            if( SwingUtilities.isLeftMouseButton(e) && chosenRelation.get() != null && Main.main.getEditLayer() != null ) {
+                Main.main.getEditLayer().data.setSelected(chosenRelation.get());
             }
         }