Changeset 14154 in josm for trunk/src/org

Timestamp:

2018-08-13T09:08:04+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - fix warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/ChangesetHeaderDownloadTask.java (modified) (1 diff)
• gui/MainApplication.java (modified) (5 diffs)
• gui/MenuScroller.java (modified) (3 diffs)
• io/GeoJSONWriter.java (modified) (1 diff)
• spi/lifecycle/package-info.java (added)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/ChangesetHeaderDownloadTask.java

@@ -73 +73 @@
     /**
      * Creates the download task for a collection of changeset ids. Uses a {@link org.openstreetmap.josm.gui.PleaseWaitDialog}
-     * whose parent is {@link Main#parent}.
+     * whose parent is {@link MainApplication#getMainFrame}.
      *
      * Null ids or or ids <= 0 in the id collection are ignored.

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

@@ -66 +66 @@
 
 import org.jdesktop.swinghelper.debug.CheckThreadViolationRepaintManager;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.DeleteAction;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -150 +149 @@
 import org.openstreetmap.josm.spi.lifecycle.Lifecycle;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.FontsManager;
 import org.openstreetmap.josm.tools.GBC;
@@ -175 +172 @@
  */
 @SuppressWarnings("deprecation")
-public class MainApplication extends Main {
+public class MainApplication extends org.openstreetmap.josm.Main {
 
     /**
@@ -857 +854 @@
         }
         updateSystemProperties();
-        Preferences.main().addPreferenceChangeListener(new PreferenceChangedListener() {
-            @Override
-            public void preferenceChanged(PreferenceChangeEvent e) {
-                updateSystemProperties();
-            }
-        });
+        Preferences.main().addPreferenceChangeListener(e -> updateSystemProperties());
 
         checkIPv6();
@@ -887 +879 @@
         }
         mainPanel = mainFrame.getPanel();
-        Main.parent = mainFrame;
+        org.openstreetmap.josm.Main.parent = mainFrame;
 
         if (args.hasOption(Option.LOAD_PREFERENCES)) {

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

@@ -17 +17 @@
 
 import javax.swing.Icon;
-import javax.swing.JFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -57 +56 @@
         if (menu != null) {
             // Compute max height of current screen
-            int maxHeight = WindowGeometry.getMaxDimensionOnScreen(menu).height - ((JFrame) MainApplication.getMainFrame()).getInsets().top;
+            int maxHeight = WindowGeometry.getMaxDimensionOnScreen(menu).height - MainApplication.getMainFrame().getInsets().top;
 
             // Remove top fixed part height
@@ -312 +311 @@
             }
 
-            int allowedHeight = WindowGeometry.getMaxDimensionOnScreen(menu).height - ((JFrame) MainApplication.getMainFrame()).getInsets().top;
+            int allowedHeight = WindowGeometry.getMaxDimensionOnScreen(menu).height - MainApplication.getMainFrame().getInsets().top;
 
             boolean mustSCroll = allItemsHeight > allowedHeight;

trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java

@@ -165 +165 @@
 
     protected void appendPrimitive(OsmPrimitive p, JsonArrayBuilder array) {
-        if (p.isIncomplete()) {
-            return;
-        } else if (SKIP_EMPTY_NODES.get() && p instanceof Node && p.getKeys().isEmpty()) {
+        if (p.isIncomplete() ||
+            (SKIP_EMPTY_NODES.get() && p instanceof Node && p.getKeys().isEmpty())) {
             return;
         }