Changeset 5002 in josm for trunk/src/org/openstreetmap/josm/command/PseudoCommand.java

Timestamp:

2012-02-19T19:43:23+01:00 (12 years ago)

Author:

stoecker

Message:

remove deprecations, all plugins are updated and release, external plugins should break, so they get updated

File:

• trunk/src/org/openstreetmap/josm/command/PseudoCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/PseudoCommand.java

@@ -15 +15 @@
 abstract public class PseudoCommand {
     /**
-     * Provide a description that can be presented in a list or tree view.
-     * @deprecated This abstract method is deprecated.
-     * On 2012-03-01, this abstract method will be removed.
-     * At the same moment, the methods {@link #getDescrpitionText()} and {@link #getDescrpitionIcon()}
-     * will be made abstract.
-     * For a smooth transition, replace {@link #getDescription()} by implementations of
-     * {@link #getDescrpitionText()} and {@link #getDescrpitionIcon()} as early as possible.
-     * {@link #getDescription()} is no longer abstract and can therefore be removed.
-     */
-    @Deprecated
-    public Object getDescription() {
-        return null;
-    }
-
-    /**
      * Provides a description text representing this command.
      */
-    public String getDescriptionText() {
-        Object o = getDescription();
-        if (o instanceof JLabel) {
-            return ((JLabel) o).getText();
-        } else {
-            return o.toString();
-        }
-    }
+    abstract public String getDescriptionText();
 
     /**
@@ -45 +23 @@
      */
     public Icon getDescriptionIcon() {
-        Object o = getDescription();
-        if (o instanceof JLabel) {
-            return ((JLabel) o).getIcon();
-        } else {
-            return null;
-        }
+        return null;
     }