Changeset 33530 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.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/RelContextDialog.java (modified) (14 diffs)

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

@@ -64 +64 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -70 +71 @@
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -77 +78 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -125 +127 @@
         chosenRelation = new ChosenRelation();
         chosenRelation.addChosenRelationListener(this);
-        Main.getLayerManager().addActiveLayerChangeListener(chosenRelation);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(chosenRelation);
 
         popupMenu = new ChosenRelationPopupMenu(chosenRelation);
@@ -252 +254 @@
                     Relation relation = (Relation) relationsData.getValueAt(row, 0);
                     if (e.getClickCount() > 1) {
-                        Main.getLayerManager().getEditLayer().data.setSelected(relation);
+                        MainApplication.getLayerManager().getEditLayer().data.setSelected(relation);
                     }
                 }
@@ -337 +339 @@
     public void hideNotify() {
         SelectionEventManager.getInstance().removeSelectionListener(this);
-        Main.getLayerManager().removeActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
         DatasetEventManager.getInstance().removeDatasetListener(chosenRelation);
         chosenRelation.clear();
@@ -345 +347 @@
     public void showNotify() {
         SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
-        Main.getLayerManager().addActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
         DatasetEventManager.getInstance().addDatasetListener(chosenRelation, FireMode.IN_EDT);
     }
@@ -358 +360 @@
             chosenRelationPanel.setVisible(newRelation != null);
         }
-        if (Main.getLayerManager().getEditDataSet() != null) {
-            selectionChanged(Main.getLayerManager().getEditDataSet().getSelected());
+        if (MainApplication.getLayerManager().getEditDataSet() != null) {
+            selectionChanged(MainApplication.getLayerManager().getEditDataSet().getSelected());
         }
         roleBoxModel.update();
@@ -409 +411 @@
 
     private void updateSelection() {
-        if (Main.getLayerManager().getEditDataSet() == null) {
+        if (MainApplication.getLayerManager().getEditDataSet() == null) {
             selectionChanged(Collections.<OsmPrimitive>emptyList());
         } else {
-            selectionChanged(Main.getLayerManager().getEditDataSet().getSelected());
+            selectionChanged(MainApplication.getLayerManager().getEditDataSet().getSelected());
         }
     }
@@ -455 +457 @@
             }
         } catch (Exception e) {
-            Main.error("[RelToolbox] Error reading possible roles file.");
-            Main.error(e);
+            Logging.error("[RelToolbox] Error reading possible roles file.");
+            Logging.error(e);
         }
         return result;
@@ -510 +512 @@
         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.getLayerManager().getEditLayer() != null) {
-                    Main.getLayerManager().getEditLayer().data.setSelected(chosenRelation.get());
+                if (SwingUtilities.isLeftMouseButton(e) && chosenRelation.get() != null
+                && MainApplication.getLayerManager().getEditLayer() != null) {
+                    MainApplication.getLayerManager().getEditLayer().data.setSelected(chosenRelation.get());
                 }
         }
@@ -549 +552 @@
     protected void applyRoleToSelection(String role) {
         if (chosenRelation != null && chosenRelation.get() != null
-                && Main.getLayerManager().getEditDataSet() != null && !Main.getLayerManager().getEditDataSet().selectionEmpty()) {
-            Collection<OsmPrimitive> selected = Main.getLayerManager().getEditDataSet().getSelected();
+                && MainApplication.getLayerManager().getEditDataSet() != null
+                && !MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
+            Collection<OsmPrimitive> selected = MainApplication.getLayerManager().getEditDataSet().getSelected();
             Relation r = chosenRelation.get();
             List<Command> commands = new ArrayList<>();
@@ -563 +567 @@
             if (!commands.isEmpty()) {
                 //                Main.main.undoRedo.add(new ChangeCommand(chosenRelation.get(), r));
-                Main.main.undoRedo.add(new SequenceCommand(tr("Change relation member roles to {0}", role), commands));
+                MainApplication.undoRedo.add(new SequenceCommand(tr("Change relation member roles to {0}", role), commands));
             }
         }
@@ -706 +710 @@
             String role = null;
             if (chosenRelation != null && chosenRelation.get() != null
-                    && Main.getLayerManager().getEditDataSet() != null && !Main.getLayerManager().getEditDataSet().selectionEmpty()) {
-                Collection<OsmPrimitive> selected = Main.getLayerManager().getEditDataSet().getSelected();
+                    && MainApplication.getLayerManager().getEditDataSet() != null
+                    && !MainApplication.getLayerManager().getEditDataSet().selectionEmpty()) {
+                Collection<OsmPrimitive> selected = MainApplication.getLayerManager().getEditDataSet().getSelected();
                 for (RelationMember m : chosenRelation.get().getMembers()) {
                     if (selected.contains(m.getMember())) {