Changeset 13174 in josm for trunk/src

Timestamp:

2017-11-28T02:52:05+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - fix unit tests, warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/Command.java (modified) (1 diff)
• data/StructUtils.java (modified) (1 diff)
• gui/MainApplication.java (modified) (14 diffs)
• gui/MainPanel.java (modified) (2 diffs)
• gui/tagging/ac/AutoCompletingComboBox.java (modified) (2 diffs)
• gui/util/AdvancedKeyPressDetector.java (modified) (1 diff)

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

@@ -10 +10 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;

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

@@ -197 +197 @@
      * @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;

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

@@ -181 +181 @@
  * @author imi
  */
-@SuppressWarnings("deprecation")
 public class MainApplication extends Main {
 
@@ -472 +471 @@
      * Should set {@link #menu} and {@link #mainPanel}
      */
-    @SuppressWarnings("deprecation")
     protected void initializeMainWindow() {
         if (mainFrame != null) {
@@ -572 +570 @@
      * @since 12636 (as a replacement to {@code Main.getLayerManager()})
      */
-    @SuppressWarnings("deprecation")
     public static MainLayerManager getLayerManager() {
         return layerManager;
@@ -625 +622 @@
      * @since 12630 (as a replacement to {@code Main.isDisplayingMapView()})
      */
-    @SuppressWarnings("deprecation")
     public static boolean isDisplayingMapView() {
         return map != null && map.mapView != null;
@@ -663 +659 @@
      * @since 12639 (as a replacement to {@code Main.addAndFireMapFrameListener})
      */
-    @SuppressWarnings("deprecation")
     public static boolean addAndFireMapFrameListener(MapFrameListener listener) {
         return mainPanel != null && mainPanel.addAndFireMapFrameListener(listener);
@@ -675 +670 @@
      * @since 12639 (as a replacement to {@code Main.addMapFrameListener})
      */
-    @SuppressWarnings("deprecation")
     public static boolean addMapFrameListener(MapFrameListener listener) {
         return mainPanel != null && mainPanel.addMapFrameListener(listener);
@@ -686 +680 @@
      * @since 12639 (as a replacement to {@code Main.removeMapFrameListener})
      */
-    @SuppressWarnings("deprecation")
     public static boolean removeMapFrameListener(MapFrameListener listener) {
         return mainPanel != null && mainPanel.removeMapFrameListener(listener);
@@ -696 +689 @@
      * @since 12639 (as a replacement to {@code Main.registerActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static void registerActionShortcut(JosmAction action) {
         registerActionShortcut(action, action.getShortcut());
@@ -707 +699 @@
      * @since 12639 (as a replacement to {@code Main.registerActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static void registerActionShortcut(Action action, Shortcut shortcut) {
         KeyStroke keyStroke = shortcut.getKeyStroke();
@@ -728 +719 @@
      * @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 +728 @@
      * @since 12639 (as a replacement to {@code Main.unregisterActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static void unregisterActionShortcut(JosmAction action) {
         unregisterActionShortcut(action, action.getShortcut());
@@ -749 +738 @@
      * @since 12639 (as a replacement to {@code Main.unregisterActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static void unregisterActionShortcut(Action action, Shortcut shortcut) {
         unregisterShortcut(shortcut);
@@ -761 +749 @@
      * @since 12639 (as a replacement to {@code Main.getRegisteredActionShortcut})
      */
-    @SuppressWarnings("deprecation")
     public static Action getRegisteredActionShortcut(Shortcut shortcut) {
         KeyStroke keyStroke = shortcut.getKeyStroke();
@@ -845 +832 @@
      * @param argArray Command-line arguments
      */
-    @SuppressWarnings("deprecation")
     public static void main(final String[] argArray) {
         I18n.init();

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

@@ -44 +44 @@
      * @param showMap If the map should be displayed.
      */
-    @SuppressWarnings("deprecation")
     protected synchronized void updateContent(boolean showMap) {
         GuiHelper.assertCallFromEdt();
@@ -84 +83 @@
     }
 
-    @SuppressWarnings("deprecation")
     private MapFrame createNewMapFrame() {
         MapFrame mapFrame = new MapFrame(null);

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -245 +245 @@
      */
     @Override
-    @SuppressWarnings("deprecation")
     public void configureEditor(ComboBoxEditor cbEditor, Object item) {
         if (item == null) {
@@ -262 +261 @@
      */
     @Override
-    @SuppressWarnings("deprecation")
     public void setSelectedItem(Object item) {
         if (item == null) {

trunk/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java

@@ -147 +147 @@
 
     @Override
-    @SuppressWarnings("deprecation")
     public void eventDispatched(AWTEvent e) {
         if (!(e instanceof KeyEvent)) {