Changeset 3225 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-05-09T14:41:39+02:00 (14 years ago)

Author:

jttt

Message:

Remove long deprecated data change listener

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadReferrersTask.java (modified) (1 diff)
• data/UndoRedoHandler.java (modified) (4 diffs)
• gui/dialogs/relation/ChildRelationBrowser.java (modified) (5 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)
• gui/dialogs/relation/ParentRelationLoadingTask.java (modified) (1 diff)
• gui/io/UploadLayerTask.java (modified) (1 diff)
• gui/io/UploadPrimitivesTask.java (modified) (1 diff)
• gui/layer/DataChangeListener.java (deleted)
• gui/layer/OsmDataLayer.java (modified) (5 diffs)
• gui/preferences/MapPaintPreference.java (modified) (1 diff)
• io/OsmImporter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

@@ -164 +164 @@
                 new Runnable() {
                     public void run() {
-                        targetLayer.fireDataChange();
                         targetLayer.onPostDownloadFromServer();
                         Main.map.mapView.repaint();

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
 
@@ -48 +47 @@
 
     public void afterAdd() {
-        if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
-            OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer();
-            data.fireDataChange();
-        }
         fireCommandsChanged();
 
@@ -76 +71 @@
         c.undoCommand();
         redoCommands.push(c);
-        if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
-            OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer();
-            data.fireDataChange();
-        }
         fireCommandsChanged();
         Collection<? extends OsmPrimitive> newSelection = Main.main.getCurrentDataSet().getSelected();
@@ -98 +89 @@
         c.executeCommand();
         commands.add(c);
-        if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
-            OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer();
-            data.fireDataChange();
-        }
         fireCommandsChanged();
         Collection<? extends OsmPrimitive> newSelection = Main.main.getCurrentDataSet().getSelected();

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -23 +23 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
@@ -330 +329 @@
                                 "There were {0} conflicts during import.",
                                 conflictsCount, conflictsCount),
-                        trn("Conflict in data", "Conflicts in data", conflictsCount),
-                        JOptionPane.WARNING_MESSAGE
+                                trn("Conflict in data", "Conflicts in data", conflictsCount),
+                                JOptionPane.WARNING_MESSAGE
                 );
             }
@@ -384 +383 @@
                 final DataSetMerger visitor = new DataSetMerger(getLayer().data, ds);
                 visitor.merge();
-                // FIXME: this is necessary because there are dialogs listening
-                // for DataChangeEvents which manipulate Swing components on this
-                // thread.
-                //
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        getLayer().fireDataChange();
-                    }
-                });
                 if (!visitor.getConflicts().isEmpty()) {
                     getLayer().getConflicts().add(visitor.getConflicts());
@@ -485 +475 @@
                                 "There were {0} conflicts during import.",
                                 conflictsCount, conflictsCount),
-                        trn("Conflict in data", "Conflicts in data", conflictsCount),
-                        JOptionPane.WARNING_MESSAGE
+                                trn("Conflict in data", "Conflicts in data", conflictsCount),
+                                JOptionPane.WARNING_MESSAGE
                 );
             }
@@ -495 +485 @@
                 final DataSetMerger visitor = new DataSetMerger(getLayer().data, dataSet);
                 visitor.merge();
-                // FIXME: this is necessary because there are dialogs listening
-                // for DataChangeEvents which manipulate Swing components on this
-                // thread.
-                //
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        getLayer().fireDataChange();
-                    }
-                });
                 if (!visitor.getConflicts().isEmpty()) {
                     getLayer().getConflicts().add(visitor.getConflicts());

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -69 +69 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -1074 +1073 @@
             Main.main.undoRedo.add(new ChangeCommand(getRelation(), editedRelation));
             getLayer().data.fireSelectionChanged();
-            getLayer().fireDataChange();
             // this will refresh the snapshot and update the dialog title
             //

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

@@ -174 +174 @@
                         new Runnable() {
                             public void run() {
-                                getLayer().fireDataChange();
                                 getLayer().onPostDownloadFromServer();
                             }

trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

@@ -146 +146 @@
             return;
         layer.cleanupAfterUpload(processedPrimitives);
-        layer.fireDataChange();
         layer.onPostUploadToServer();
 

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -212 +212 @@
             public void run() {
                 layer.cleanupAfterUpload(processedPrimitives);
-                layer.fireDataChange();
                 layer.onPostUploadToServer();
                 ChangesetCache.getInstance().update(changeset);

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -25 +25 @@
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.Map;
 
@@ -165 +164 @@
 
     /**
-     * @deprecated Use {@link DataSet#addDataSetListener(org.openstreetmap.josm.data.osm.event.DataSetListener)} instead
-     * @see DataSetListener, DatasetEventManager
-     */
-    @Deprecated
-    public final LinkedList<DataChangeListener> listenerDataChanged = new LinkedList<DataChangeListener>();
-
-    /**
      * a paint texture for non-downloaded area
      */
@@ -330 +322 @@
             Main.main.undoRedo.add(cmd);
         }
-        fireDataChange();
         // repaint to make sure new data is displayed properly.
         Main.map.mapView.repaint();
@@ -546 +537 @@
     }
 
-    public void fireDataChange() {
-        setRequiresSaveToFile(true);
-        setRequiresUploadToServer(true);
-        for (DataChangeListener dcl : listenerDataChanged) {
-            dcl.dataChanged(this);
-        }
-    }
-
     public static GpxData toGpxData(DataSet data, File file) {
         GpxData gpxData = new GpxData();
@@ -739 +722 @@
     public void processDatasetEvent(AbstractDatasetChangedEvent event) {
         isChanged = true;
+        setRequiresSaveToFile(true);
+        setRequiresUploadToServer(true);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java

@@ -83 +83 @@
 
     public boolean ok() {
-        Boolean restart = Main.pref.put("mappaint.style.enable-defaults", enableDefault.getSelectedObjects() != null);
-        if(Main.pref.put("mappaint.icon.enable-defaults", enableIconDefault.getSelectedObjects() != null)) {
+        Boolean restart = Main.pref.put("mappaint.style.enable-defaults", enableDefault.isSelected());
+        if(Main.pref.put("mappaint.icon.enable-defaults", enableIconDefault.isSelected())) {
             restart = true;
         }

trunk/src/org/openstreetmap/josm/io/OsmImporter.java

@@ -47 +47 @@
             public void run() {
                 Main.main.addLayer(layer);
-                layer.fireDataChange();
                 layer.onPostLoadFromFile();
             }