Changeset 2688 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2009-12-28T00:15:22+01:00 (14 years ago)

Author:

Gubaer

Message:

Partial commit due to issue described in #4137
Breaks the build

File:

• trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified) (4 diffs)

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

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Frame;
 import java.awt.Point;
 import java.awt.Toolkit;
@@ -12 +11 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
-import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -40 +37 @@
 
     /**
-     * Replies a window geometry object for a window which a specific size which is centered
-     * relative to a parent window
-     *
-     * @param parent the parent window
+     * Replies a window geometry object for a window with a specific size which is centered
+     * relative to the parent window of a reference component.
+     *
+     * @param reference the reference component.
      * @param extent the size
      * @return the geometry object
      */
-    static public WindowGeometry centerInWindow(Component parent, Dimension extent) {
-        Frame parentWindow = JOptionPane.getFrameForComponent(parent);
+    static public WindowGeometry centerInWindow(Component reference, Dimension extent) {
+        Window parentWindow = null;
+        while(reference != null && ! (reference instanceof Window) ) {
+            reference = reference.getParent();
+        }
+        if (reference == null || ! (reference instanceof Window))
+            return new WindowGeometry(new Point(0,0), extent);
+        parentWindow = (Window)reference;
         Point topLeft = new Point(
                 Math.max(0, (parentWindow.getSize().width - extent.width) /2),
@@ -156 +159 @@
             initFromPreferences(preferenceKey);
         } catch(WindowGeometryException e) {
-//            System.out.println(tr("Warning: Failed to restore window geometry from key ''{0}''. Falling back to default geometry. Details: {1}", preferenceKey, e.getMessage()));
+            //            System.out.println(tr("Warning: Failed to restore window geometry from key ''{0}''. Falling back to default geometry. Details: {1}", preferenceKey, e.getMessage()));
             initFromWindowGeometry(defaultGeometry);
         }