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

Timestamp:

2013-03-07T22:11:36+01:00 (12 years ago)

Author:

stoecker

Message:

remove some deprecated and unused stuff

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/SideButton.java (modified) (2 diffs)
• gui/layer/markerlayer/MarkerLayer.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/SideButton.java

@@ -84 +84 @@
     }
 
-    // Used constructor with Action
-    @Deprecated
-    public SideButton(String imagename, String property, String tooltip, ActionListener actionListener)
-    {
-        super(makeIcon(imagename));
-        doStyle();
-        setActionCommand(imagename);
-        addActionListener(actionListener);
-        setToolTipText(tooltip);
-    }
-
-    // Used constructor with Action
-    @Deprecated
-    public SideButton(String name, String imagename, String property, String tooltip, Shortcut shortcut, ActionListener actionListener)
-    {
-        super(tr(name), makeIcon(imagename));
-        if(shortcut != null)
-        {
-            shortcut.setMnemonic(this);
-            if(tooltip != null) {
-                tooltip = Main.platform.makeTooltip(tooltip, shortcut);
-            }
-        }
-        setup(name, property, tooltip, actionListener);
-    }
-
-    // Used constructor with Action
-    @Deprecated
-    public SideButton(String name, String imagename, String property, String tooltip, ActionListener actionListener)
-    {
-        super(tr(name), makeIcon(imagename));
-        setup(name, property, tooltip, actionListener);
-    }
     private void setup(String name, String property, String tooltip, ActionListener actionListener)
     {
@@ -125 +92 @@
         putClientProperty("help", "Dialog/"+property+"/"+name);
     }
+
     private void doStyle()
     {

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -71 +71 @@
     private Marker currentMarker;
 
-    @Deprecated
-    public MarkerLayer(GpxData indata, String name, File associatedFile, GpxLayer fromLayer, boolean addMouseHandlerInConstructor) {
-        this(indata, name, associatedFile, fromLayer);
-    }
-
     public MarkerLayer(GpxData indata, String name, File associatedFile, GpxLayer fromLayer) {
         super(name);

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -729 +729 @@
     }
 
-    @Deprecated
-    public static ImageIcon overlay(Icon ground, String overlayImage, OverlayPosition pos) {
-        return overlay(ground, ImageProvider.get(overlayImage), pos);
-    }
-
     /**
      * Decorate one icon with an overlay icon.