Changeset 34116 in osm for applications/editors

Timestamp:

2018-03-25T17:20:53+02:00 (6 years ago)

Author:

donvip

Message:

remove non-working diff support

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDiffLayer.java (deleted)

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

@@ -12 +12 @@
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
-    
+
     <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
         <include name="apache-commons.jar"/>

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java

@@ -76 +76 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (MainApplication.getLayerManager().getEditLayer() instanceof OdLayer) {
-                dataLayer.makeDiff();
-            }
+            // TODO
         }
     }
@@ -146 +144 @@
             if (dataLayer.osmLayer == null) {
                 downloadButton.setEnabled(true);
-            } else if (dataLayer.diffLayer == null) {
-                diffButton.setEnabled(true);
             }
             toolsButton.setEnabled(dataLayer.handler != null && !dataLayer.handler.getTools().isEmpty());

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java

@@ -34 +34 @@
 public class OdDataLayer extends OsmDataLayer implements OdLayer, LayerChangeListener, ActiveLayerChangeListener {
 
-    public OdDiffLayer diffLayer;
     public OdOsmDataLayer osmLayer;
 
@@ -75 +74 @@
     }
 
-    public void addDiffLayer(OdDiffLayer layer) {
-        removeDiffLayer();
-        diffLayer = layer;
-        MainApplication.getLayerManager().addLayer(diffLayer);
-    }
-
-    public void removeDiffLayer() {
-        if (diffLayer != null) {
-            MainApplication.getLayerManager().removeLayer(diffLayer);
-            diffLayer = null;
-        }
-    }
-
     public final void downloadOsmData() {
         if (handler != null) {
@@ -123 +109 @@
         if (e.getRemovedLayer() == this) {
             removeOsmLayer();
-            removeDiffLayer();
         } else if (e.getRemovedLayer() == osmLayer) {
             osmLayer = null;
-        } else if (e.getRemovedLayer() == diffLayer) {
-            diffLayer = null;
         }
     }
@@ -180 +163 @@
         return this;
     }
-
-    public void makeDiff() {
-        final OdDiffLayer layer = new OdDiffLayer(this, getName()+"/Diff");
-        addDiffLayer(layer);
-        MainApplication.getLayerManager().setActiveLayer(diffLayer);
-    }
 }