Changeset 33858 in osm for applications/editors/josm/plugins/turnlanes/src/org/openstreetmap

Timestamp:

2017-11-21T23:54:18+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12636

Location:

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes

Files:

• gui/TurnLanesDialog.java (modified) (5 diffs)
• gui/ValidationPanel.java (modified) (3 diffs)
• model/GenericCommand.java (modified) (3 diffs)

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java

@@ -18 +18 @@
 import javax.swing.JToggleButton;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -34 +33 @@
 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.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
@@ -147 +147 @@
         super(tr("Turn Lanes"), "turnlanes.png", tr("Edit turn lanes"), null, 200);
 
-        Main.getLayerManager().addActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
         DataSet.addSelectionListener(this);
 
@@ -195 +195 @@
             oldLayer.data.removeDataSetListener(dataSetListener);
         }
-        OsmDataLayer newLayer = Main.getLayerManager().getEditLayer();
+        OsmDataLayer newLayer = MainApplication.getLayerManager().getEditLayer();
         if (newLayer != null) {
             newLayer.data.addDataSetListener(dataSetListener);
@@ -215 +215 @@
     public void destroy() {
         super.destroy();
-        Main.getLayerManager().removeActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
         DataSet.removeSelectionListener(this);
         editAction.destroy();

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java

@@ -19 +19 @@
 import javax.swing.table.DefaultTableModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.plugins.turnlanes.model.Issue;
@@ -38 +38 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            setIssues(new Validator().validate(Main.getLayerManager().getEditDataSet()));
+            setIssues(new Validator().validate(MainApplication.getLayerManager().getEditDataSet()));
         }
     };
@@ -63 +63 @@
         public void actionPerformed(ActionEvent e) {
             if (selected.getRelation() == null) {
-                Main.getLayerManager().getEditDataSet().setSelected(selected.getPrimitives());
+                MainApplication.getLayerManager().getEditDataSet().setSelected(selected.getPrimitives());
             } else {
-                Main.getLayerManager().getEditDataSet().setSelected(selected.getRelation());
+                MainApplication.getLayerManager().getEditDataSet().setSelected(selected.getRelation());
             }
         }

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/GenericCommand.java

@@ -33 +33 @@
     }
 
-    private final DataSet dataSet;
     private final String description;
     private final Map<OsmPrimitive, BeforeAfter> beforeAfters = new HashMap<>();
 
     public GenericCommand(DataSet dataSet, String description) {
-        this.dataSet = dataSet;
+        super(dataSet);
         this.description = description;
     }
@@ -71 +70 @@
         for (Entry<OsmPrimitive, BeforeAfter> e : beforeAfters.entrySet()) {
             if (e.getValue().before == null) {
-                dataSet.addPrimitive(e.getValue().afterPrimitive());
+                getAffectedDataSet().addPrimitive(e.getValue().afterPrimitive());
             } else {
                 e.getKey().load(e.getValue().afterData());
@@ -83 +82 @@
         for (Entry<OsmPrimitive, BeforeAfter> e : beforeAfters.entrySet()) {
             if (e.getValue().before == null) {
-                dataSet.removePrimitive(e.getValue().afterPrimitive().getPrimitiveId());
+                getAffectedDataSet().removePrimitive(e.getValue().afterPrimitive().getPrimitiveId());
             } else {
                 e.getKey().load(e.getValue().before);