Index: trunk/src/org/openstreetmap/josm/command/Command.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/Command.java	(revision 13173)
+++ trunk/src/org/openstreetmap/josm/command/Command.java	(revision 13174)
@@ -10,5 +10,4 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
Index: trunk/src/org/openstreetmap/josm/data/StructUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/StructUtils.java	(revision 13173)
+++ trunk/src/org/openstreetmap/josm/data/StructUtils.java	(revision 13174)
@@ -197,5 +197,4 @@
      * @return an object of class T, initialized as described above
      */
-    @SuppressWarnings("deprecation")
     public static <T> T deserializeStruct(Map<String, String> hash, Class<T> klass) {
         T struct = null;
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 13173)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 13174)
@@ -181,5 +181,4 @@
  * @author imi
  */
-@SuppressWarnings("deprecation")
 public class MainApplication extends Main {
 
@@ -472,5 +471,4 @@
      * Should set {@link #menu} and {@link #mainPanel}
      */
-    @SuppressWarnings("deprecation")
     protected void initializeMainWindow() {
         if (mainFrame != null) {
@@ -572,5 +570,4 @@
      * @since 12636 (as a replacement to {@code Main.getLayerManager()})
      */
-    @SuppressWarnings("deprecation")
     public static MainLayerManager getLayerManager() {
         return layerManager;
@@ -625,5 +622,4 @@
      * @since 12630 (as a replacement to {@code Main.isDisplayingMapView()})
      */
-    @SuppressWarnings("deprecation")
     public static boolean isDisplayingMapView() {
         return map != null && map.mapView != null;
@@ -663,5 +659,4 @@
      * @since 12639 (as a replacement to {@code Main.addAndFireMapFrameListener})
      */
-    @SuppressWarnings("deprecation")
     public static boolean addAndFireMapFrameListener(MapFrameListener listener) {
         return mainPanel != null && mainPanel.addAndFireMapFrameListener(listener);
@@ -675,5 +670,4 @@
      * @since 12639 (as a replacement to {@code Main.addMapFrameListener})
      */
-    @SuppressWarnings("deprecation")
     public static boolean addMapFrameListener(MapFrameListener listener) {
         return mainPanel != null && mainPanel.addMapFrameListener(listener);
@@ -686,5 +680,4 @@
      * @since 12639 (as a replacement to {@code Main.removeMapFrameListener})
      */
-    @SuppressWarnings("deprecation")
     public static boolean removeMapFrameListener(MapFrameListener listener) {
         return mainPanel != null && mainPanel.removeMapFrameListener(listener);
@@ -696,5 +689,4 @@
      * @since 12639 (as a replacement to {@code Main.registerActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static void registerActionShortcut(JosmAction action) {
         registerActionShortcut(action, action.getShortcut());
@@ -707,5 +699,4 @@
      * @since 12639 (as a replacement to {@code Main.registerActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static void registerActionShortcut(Action action, Shortcut shortcut) {
         KeyStroke keyStroke = shortcut.getKeyStroke();
@@ -728,5 +719,4 @@
      * @since 12639 (as a replacement to {@code Main.unregisterShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static void unregisterShortcut(Shortcut shortcut) {
         contentPanePrivate.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(shortcut.getKeyStroke());
@@ -738,5 +728,4 @@
      * @since 12639 (as a replacement to {@code Main.unregisterActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static void unregisterActionShortcut(JosmAction action) {
         unregisterActionShortcut(action, action.getShortcut());
@@ -749,5 +738,4 @@
      * @since 12639 (as a replacement to {@code Main.unregisterActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static void unregisterActionShortcut(Action action, Shortcut shortcut) {
         unregisterShortcut(shortcut);
@@ -761,5 +749,4 @@
      * @since 12639 (as a replacement to {@code Main.getRegisteredActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static Action getRegisteredActionShortcut(Shortcut shortcut) {
         KeyStroke keyStroke = shortcut.getKeyStroke();
@@ -845,5 +832,4 @@
      * @param argArray Command-line arguments
      */
-    @SuppressWarnings("deprecation")
     public static void main(final String[] argArray) {
         I18n.init();
Index: trunk/src/org/openstreetmap/josm/gui/MainPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainPanel.java	(revision 13173)
+++ trunk/src/org/openstreetmap/josm/gui/MainPanel.java	(revision 13174)
@@ -44,5 +44,4 @@
      * @param showMap If the map should be displayed.
      */
-    @SuppressWarnings("deprecation")
     protected synchronized void updateContent(boolean showMap) {
         GuiHelper.assertCallFromEdt();
@@ -84,5 +83,4 @@
     }
 
-    @SuppressWarnings("deprecation")
     private MapFrame createNewMapFrame() {
         MapFrame mapFrame = new MapFrame(null);
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 13173)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 13174)
@@ -245,5 +245,4 @@
      */
     @Override
-    @SuppressWarnings("deprecation")
     public void configureEditor(ComboBoxEditor cbEditor, Object item) {
         if (item == null) {
@@ -262,5 +261,4 @@
      */
     @Override
-    @SuppressWarnings("deprecation")
     public void setSelectedItem(Object item) {
         if (item == null) {
Index: trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java	(revision 13173)
+++ trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java	(revision 13174)
@@ -147,5 +147,4 @@
 
     @Override
-    @SuppressWarnings("deprecation")
     public void eventDispatched(AWTEvent e) {
         if (!(e instanceof KeyEvent)) {