Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -55 +55 @@
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
@@ -208 +207 @@
         // the listener, projection change listeners are managed as WeakReferences.
         Main.addProjectionChangeListener(this);
-        addSelectionListener((DataSelectionListener) e -> fireDeprecatedSelectionChange(e.getSelection()));
+        addSelectionListener((DataSelectionListener) e -> fireSelectionChange(e.getSelection()));
     }
 
@@ -335 +334 @@
 
     /**
-     * Returns the autocompletion manager, which maintains a list of used tags for autocompletion.
-     * @return the autocompletion manager
-     * @deprecated to be removed end of 2017. Use {@link AutoCompletionManager#of(DataSet)} instead.
-     */
-    @Deprecated
-    public AutoCompletionManager getAutoCompletionManager() {
-        return AutoCompletionManager.of(this);
-    }
-
-    /**
      * The API version that created this data set, if any.
      */
@@ -365 +354 @@
     public void setVersion(String version) {
         this.version = version;
-    }
-
-    /**
-     * Determines if upload is being discouraged.
-     * (i.e. this dataset contains private data which should not be uploaded)
-     * @return {@code true} if upload is being discouraged, {@code false} otherwise
-     * @see #setUploadDiscouraged
-     * @deprecated use {@link #getUploadPolicy()}
-     */
-    @Deprecated
-    public boolean isUploadDiscouraged() {
-        return uploadPolicy == UploadPolicy.DISCOURAGED || uploadPolicy == UploadPolicy.BLOCKED;
-    }
-
-    /**
-     * Sets the "upload discouraged" flag.
-     * @param uploadDiscouraged {@code true} if this dataset contains private data which should not be uploaded
-     * @see #isUploadDiscouraged
-     * @deprecated use {@link #setUploadPolicy(UploadPolicy)}
-     */
-    @Deprecated
-    public void setUploadDiscouraged(boolean uploadDiscouraged) {
-        if (uploadPolicy != UploadPolicy.BLOCKED) {
-            this.uploadPolicy = uploadDiscouraged ? UploadPolicy.DISCOURAGED : UploadPolicy.NORMAL;
-        }
     }
 
@@ -676 +640 @@
     }
 
-    /**
-     * Notifies all registered {@link SelectionChangedListener} about the current selection in
-     * this dataset.
-     * @deprecated You should never need to do this from the outside.
-     */
-    @Deprecated
-    public void fireSelectionChanged() {
-        fireDeprecatedSelectionChange(getAllSelected());
-    }
-
-    private static void fireDeprecatedSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
+    private static void fireSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
         for (SelectionChangedListener l : selListeners) {
             l.selectionChanged(currentSelection);
@@ -827 +781 @@
         highlightedWaySegments = waySegments;
         fireHighlightingChanged();
-    }
-
-    /**
-     * Sets the current selection to the primitives in <code>selection</code>.
-     * Notifies all {@link SelectionChangedListener} if <code>fireSelectionChangeEvent</code> is true.
-     *
-     * @param selection the selection
-     * @param fireSelectionChangeEvent true, if the selection change listeners are to be notified; false, otherwise
-     * @deprecated Use {@link #setSelected(Collection)} instead. To be removed end of 2017. Does not seem to be used by plugins.
-     */
-    @Deprecated
-    public void setSelected(Collection<? extends PrimitiveId> selection, boolean fireSelectionChangeEvent) {
-        setSelected(selection);
     }