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

Timestamp:

2020-10-07T07:46:55+02:00 (5 years ago)

Author:

simon04

Message:

fix #18200 - Update to JMockit 1.49 (patch by taylor.smock, modified)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapViewState.java (modified) (2 diffs)
• util/GuiHelper.java (modified) (1 diff)

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

@@ -132 +132 @@
     }
 
-    private static Point findTopLeftInWindow(JComponent position) {
+    /**
+     * This is visible for JMockit.
+     *
+     * @param position The component to get the top left position of its window
+     * @return the top left point in window
+     */
+    static Point findTopLeftInWindow(JComponent position) {
         Point result = new Point();
         // better than using swing utils, since this allows us to use the method if no screen is present.
@@ -144 +150 @@
     }
 
-    private static Point findTopLeftOnScreen(JComponent position) {
+    /**
+     * This is visible for JMockit.
+     *
+     * @param position The component to get the top left position of its screen
+     * @return the top left point on screen
+     */
+    static Point findTopLeftOnScreen(JComponent position) {
         try {
             return position.getLocationOnScreen();

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

@@ -204 +204 @@
     }
 
-    private static void handleEDTException(Throwable t) {
+    /**
+     * Handle exceptions in the EDT. This should only be used in {@link GuiHelper}
+     * and {@code org.openstreetmap.josm.testutils.mockers.EDTAssertionMocker}.
+     *
+     * @param t The throwable to handle
+     */
+    static void handleEDTException(Throwable t) {
         Logging.logWithStackTrace(Logging.LEVEL_ERROR, t, "Exception raised in EDT");
     }