Index: trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (revision 12678) @@ -39,4 +39,5 @@ import org.openstreetmap.josm.gui.MapFrameListener; import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.AbstractFileChooser; import org.openstreetmap.josm.io.session.SessionLayerExporter; @@ -47,5 +48,4 @@ import org.openstreetmap.josm.tools.UserCancelException; import org.openstreetmap.josm.tools.Utils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 12678) @@ -22,5 +22,5 @@ import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.OsmPrimitivRenderer; -import org.openstreetmap.josm.tools.WindowGeometry; +import org.openstreetmap.josm.gui.util.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 12678) @@ -36,4 +36,5 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.JMultilineLabel; import org.openstreetmap.josm.io.OnlineResource; @@ -43,5 +44,4 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Utils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 12678) @@ -27,9 +27,9 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.JMultilineLabel; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.InputMapUtils; import org.openstreetmap.josm.tools.Logging; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/IExtendedDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/IExtendedDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/IExtendedDialog.java (revision 12678) @@ -7,5 +7,5 @@ import javax.swing.JOptionPane; -import org.openstreetmap.josm.tools.WindowGeometry; +import org.openstreetmap.josm.gui.util.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 12678) @@ -95,4 +95,5 @@ import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.gui.util.RedirectInputMap; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.io.CertificateAmendment; import org.openstreetmap.josm.io.DefaultProxySelector; @@ -121,5 +122,4 @@ import org.openstreetmap.josm.tools.Territories; import org.openstreetmap.josm.tools.Utils; -import org.openstreetmap.josm.tools.WindowGeometry; import org.openstreetmap.josm.tools.bugreport.BugReport; import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler; Index: trunk/src/org/openstreetmap/josm/gui/MainFrame.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainFrame.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/MainFrame.java (revision 12678) @@ -27,7 +27,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.layer.OsmDataLayer.LayerStateChangeListener; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.Logging; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/MenuScroller.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 12678) @@ -29,6 +29,6 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.Logging; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/SplashScreen.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 12678) @@ -37,4 +37,5 @@ import org.openstreetmap.josm.gui.progress.ProgressTaskId; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.JosmEditorPane; import org.openstreetmap.josm.tools.GBC; @@ -42,5 +43,4 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Utils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 12678) @@ -44,4 +44,5 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.AutoAdjustingSplitPane; import org.openstreetmap.josm.tools.CheckParameterUtil; @@ -50,5 +51,4 @@ import org.openstreetmap.josm.tools.StreamUtils; import org.openstreetmap.josm.tools.UserCancelException; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 12678) @@ -40,7 +40,7 @@ import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.InputMapUtils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 12678) @@ -41,8 +41,8 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.HtmlPanel; import org.openstreetmap.josm.tools.I18n; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 12678) @@ -39,7 +39,7 @@ import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.JosmTextArea; import org.openstreetmap.josm.tools.GBC; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 12678) @@ -28,4 +28,5 @@ import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.HtmlPanel; import org.openstreetmap.josm.gui.widgets.JosmTextField; @@ -33,5 +34,4 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Utils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 12678) @@ -66,4 +66,6 @@ import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; +import org.openstreetmap.josm.gui.util.WindowGeometry.WindowGeometryException; import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; import org.openstreetmap.josm.tools.Destroyable; @@ -72,6 +74,4 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Shortcut; -import org.openstreetmap.josm.tools.WindowGeometry; -import org.openstreetmap.josm.tools.WindowGeometry.WindowGeometryException; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 12678) @@ -61,4 +61,5 @@ import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; import org.openstreetmap.josm.io.ChangesetQuery; @@ -68,5 +69,4 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.StreamUtils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 12678) @@ -23,9 +23,9 @@ import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction; import org.openstreetmap.josm.gui.help.HelpUtil; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.io.ChangesetQuery; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.InputMapUtils; import org.openstreetmap.josm.tools.Logging; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 12678) @@ -88,4 +88,5 @@ import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; import org.openstreetmap.josm.io.XmlWriter; @@ -94,5 +95,4 @@ import org.openstreetmap.josm.tools.Shortcut; import org.openstreetmap.josm.tools.Utils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 12678) @@ -98,9 +98,9 @@ import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.CheckParameterUtil; import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Shortcut; import org.openstreetmap.josm.tools.Utils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 12678) @@ -45,4 +45,5 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.io.OnlineResource; import org.openstreetmap.josm.plugins.PluginHandler; @@ -52,5 +53,4 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.OsmUrlToBounds; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 12678) @@ -47,4 +47,5 @@ import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.MainMenu; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.JosmEditorPane; import org.openstreetmap.josm.gui.widgets.JosmHTMLEditorKit; @@ -55,5 +56,4 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.OpenBrowser; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 12678) @@ -28,7 +28,7 @@ import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent; import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.JosmRuntimeException; import org.openstreetmap.josm.tools.SubclassFilteredCollection; -import org.openstreetmap.josm.tools.WindowGeometry; import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler; Index: trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 12678) @@ -29,7 +29,7 @@ import org.openstreetmap.josm.gui.SideButton; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.InputMapUtils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 12678) @@ -33,4 +33,5 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.JMultilineLabel; import org.openstreetmap.josm.gui.widgets.JosmPasswordField; @@ -40,5 +41,4 @@ import org.openstreetmap.josm.tools.InputMapUtils; import org.openstreetmap.josm.tools.Logging; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 12678) @@ -52,4 +52,5 @@ import org.openstreetmap.josm.gui.progress.swing.SwingRenderingProgressMonitor; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; @@ -58,5 +59,4 @@ import org.openstreetmap.josm.tools.UserCancelException; import org.openstreetmap.josm.tools.Utils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 12678) @@ -55,4 +55,5 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.io.OsmApi; import org.openstreetmap.josm.tools.GBC; @@ -63,5 +64,4 @@ import org.openstreetmap.josm.tools.MultiLineFlowLayout; import org.openstreetmap.josm.tools.Utils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 12678) @@ -40,7 +40,7 @@ import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.InputMapUtils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 12678) @@ -38,8 +38,8 @@ import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.layer.GpxLayer; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.OpenBrowser; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 12678) @@ -43,4 +43,5 @@ import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.gui.widgets.HtmlPanel; import org.openstreetmap.josm.io.OsmApi; @@ -50,5 +51,4 @@ import org.openstreetmap.josm.tools.OpenBrowser; import org.openstreetmap.josm.tools.UserCancelException; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 12678) @@ -27,8 +27,8 @@ import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener; import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.gui.util.WindowGeometry; import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.InputMapUtils; -import org.openstreetmap.josm.tools.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AbstractListEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AbstractListEditor.java (revision 12676) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AbstractListEditor.java (revision 12678) @@ -11,5 +11,5 @@ import org.openstreetmap.josm.gui.ExtendedDialog; -import org.openstreetmap.josm.tools.WindowGeometry; +import org.openstreetmap.josm.gui.util.WindowGeometry; /** Index: trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java (revision 12678) +++ trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java (revision 12678) @@ -0,0 +1,519 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.util; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.Dimension; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; +import java.awt.IllegalComponentStateException; +import java.awt.Insets; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Window; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.swing.JComponent; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.tools.CheckParameterUtil; +import org.openstreetmap.josm.tools.JosmRuntimeException; +import org.openstreetmap.josm.tools.Logging; + +/** + * This is a helper class for persisting the geometry of a JOSM window to the preference store + * and for restoring it from the preference store. + * @since 12678 (moved from {@code tools} package + * @since 2008 + */ +public class WindowGeometry { + + /** the top left point */ + private Point topLeft; + /** the size */ + private Dimension extent; + + /** + * Creates a window geometry from a position and dimension + * + * @param topLeft the top left point + * @param extent the extent + */ + public WindowGeometry(Point topLeft, Dimension extent) { + this.topLeft = topLeft; + this.extent = extent; + } + + /** + * Creates a window geometry from a rectangle + * + * @param rect the position + */ + public WindowGeometry(Rectangle rect) { + this(rect.getLocation(), rect.getSize()); + } + + /** + * Creates a window geometry from the position and the size of a window. + * + * @param window the window + * @throws IllegalComponentStateException if the window is not showing on the screen + */ + public WindowGeometry(Window window) { + this(window.getLocationOnScreen(), window.getSize()); + } + + /** + * Creates a window geometry from the values kept in the preference store under the + * key preferenceKey + * + * @param preferenceKey the preference key + * @throws WindowGeometryException if no such key exist or if the preference value has + * an illegal format + */ + public WindowGeometry(String preferenceKey) throws WindowGeometryException { + initFromPreferences(preferenceKey); + } + + /** + * Creates a window geometry from the values kept in the preference store under the + * key preferenceKey. Falls back to the defaultGeometry if + * something goes wrong. + * + * @param preferenceKey the preference key + * @param defaultGeometry the default geometry + * + */ + public WindowGeometry(String preferenceKey, WindowGeometry defaultGeometry) { + try { + initFromPreferences(preferenceKey); + } catch (WindowGeometryException e) { + Logging.debug(e); + initFromWindowGeometry(defaultGeometry); + } + } + + /** + * Replies a window geometry object for a window with a specific size which is + * centered on screen, where main window is + * + * @param extent the size + * @return the geometry object + */ + public static WindowGeometry centerOnScreen(Dimension extent) { + return centerOnScreen(extent, "gui.geometry"); + } + + /** + * Replies a window geometry object for a window with a specific size which is + * centered on screen where the corresponding window is. + * + * @param extent the size + * @param preferenceKey the key to get window size and position from, null value format + * for whole virtual screen + * @return the geometry object + */ + public static WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) { + Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey) : getFullScreenInfo(); + Point topLeft = new Point( + size.x + Math.max(0, (size.width - extent.width) /2), + size.y + Math.max(0, (size.height - extent.height) /2) + ); + return new WindowGeometry(topLeft, extent); + } + + /** + * 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 + */ + public static WindowGeometry centerInWindow(Component reference, Dimension extent) { + while (reference != null && !(reference instanceof Window)) { + reference = reference.getParent(); + } + if (reference == null) + return new WindowGeometry(new Point(0, 0), extent); + Window parentWindow = (Window) reference; + Point topLeft = new Point( + Math.max(0, (parentWindow.getSize().width - extent.width) /2), + Math.max(0, (parentWindow.getSize().height - extent.height) /2) + ); + topLeft.x += parentWindow.getLocation().x; + topLeft.y += parentWindow.getLocation().y; + return new WindowGeometry(topLeft, extent); + } + + /** + * Exception thrown by the WindowGeometry class if something goes wrong + */ + public static class WindowGeometryException extends Exception { + WindowGeometryException(String message, Throwable cause) { + super(message, cause); + } + + WindowGeometryException(String message) { + super(message); + } + } + + /** + * Fixes a window geometry to shift to the correct screen. + * + * @param window the window + */ + public void fixScreen(Window window) { + Rectangle oldScreen = getScreenInfo(getRectangle()); + Rectangle newScreen = getScreenInfo(new Rectangle(window.getLocationOnScreen(), window.getSize())); + if (oldScreen.x != newScreen.x) { + this.topLeft.x += newScreen.x - oldScreen.x; + } + if (oldScreen.y != newScreen.y) { + this.topLeft.y += newScreen.y - oldScreen.y; + } + } + + protected int parseField(String preferenceKey, String preferenceValue, String field) throws WindowGeometryException { + String v = ""; + try { + Pattern p = Pattern.compile(field + "=(-?\\d+)", Pattern.CASE_INSENSITIVE); + Matcher m = p.matcher(preferenceValue); + if (!m.find()) + throw new WindowGeometryException( + tr("Preference with key ''{0}'' does not include ''{1}''. Cannot restore window geometry from preferences.", + preferenceKey, field)); + v = m.group(1); + return Integer.parseInt(v); + } catch (WindowGeometryException e) { + throw e; + } catch (NumberFormatException e) { + throw new WindowGeometryException( + tr("Preference with key ''{0}'' does not provide an int value for ''{1}''. Got {2}. " + + "Cannot restore window geometry from preferences.", + preferenceKey, field, v), e); + } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) { + throw new WindowGeometryException( + tr("Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: {2}. " + + "Cannot restore window geometry from preferences.", + preferenceKey, field, e.toString()), e); + } + } + + protected final void initFromPreferences(String preferenceKey) throws WindowGeometryException { + String value = Main.pref.get(preferenceKey); + if (value.isEmpty()) + throw new WindowGeometryException( + tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey)); + topLeft = new Point(); + extent = new Dimension(); + topLeft.x = parseField(preferenceKey, value, "x"); + topLeft.y = parseField(preferenceKey, value, "y"); + extent.width = parseField(preferenceKey, value, "width"); + extent.height = parseField(preferenceKey, value, "height"); + } + + protected final void initFromWindowGeometry(WindowGeometry other) { + this.topLeft = other.topLeft; + this.extent = other.extent; + } + + /** + * Gets the geometry of the main window + * @param preferenceKey The preference key to use + * @param arg The command line geometry arguments + * @param maximize If the user requested to maximize the window + * @return The geometry for the main window + */ + public static WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) { + Rectangle screenDimension = getScreenInfo("gui.geometry"); + if (arg != null) { + final Matcher m = Pattern.compile("(\\d+)x(\\d+)(([+-])(\\d+)([+-])(\\d+))?").matcher(arg); + if (m.matches()) { + int w = Integer.parseInt(m.group(1)); + int h = Integer.parseInt(m.group(2)); + int x = screenDimension.x; + int y = screenDimension.y; + if (m.group(3) != null) { + x = Integer.parseInt(m.group(5)); + y = Integer.parseInt(m.group(7)); + if ("-".equals(m.group(4))) { + x = screenDimension.x + screenDimension.width - x - w; + } + if ("-".equals(m.group(6))) { + y = screenDimension.y + screenDimension.height - y - h; + } + } + return new WindowGeometry(new Point(x, y), new Dimension(w, h)); + } else { + Logging.warn(tr("Ignoring malformed geometry: {0}", arg)); + } + } + WindowGeometry def; + if (maximize) { + def = new WindowGeometry(screenDimension); + } else { + Point p = screenDimension.getLocation(); + p.x += (screenDimension.width-1000)/2; + p.y += (screenDimension.height-740)/2; + def = new WindowGeometry(p, new Dimension(1000, 740)); + } + return new WindowGeometry(preferenceKey, def); + } + + /** + * Remembers a window geometry under a specific preference key + * + * @param preferenceKey the preference key + */ + public void remember(String preferenceKey) { + StringBuilder value = new StringBuilder(32); + value.append("x=").append(topLeft.x).append(",y=").append(topLeft.y) + .append(",width=").append(extent.width).append(",height=").append(extent.height); + Main.pref.put(preferenceKey, value.toString()); + } + + /** + * Replies the top left point for the geometry + * + * @return the top left point for the geometry + */ + public Point getTopLeft() { + return topLeft; + } + + /** + * Replies the size specified by the geometry + * + * @return the size specified by the geometry + */ + public Dimension getSize() { + return extent; + } + + /** + * Replies the size and position specified by the geometry + * + * @return the size and position specified by the geometry + */ + private Rectangle getRectangle() { + return new Rectangle(topLeft, extent); + } + + /** + * Applies this geometry to a window. Makes sure that the window is not + * placed outside of the coordinate range of all available screens. + * + * @param window the window + */ + public void applySafe(Window window) { + Point p = new Point(topLeft); + Dimension size = new Dimension(extent); + + Rectangle virtualBounds = getVirtualScreenBounds(); + + // Ensure window fit on screen + + if (p.x < virtualBounds.x) { + p.x = virtualBounds.x; + } else if (p.x > virtualBounds.x + virtualBounds.width - size.width) { + p.x = virtualBounds.x + virtualBounds.width - size.width; + } + + if (p.y < virtualBounds.y) { + p.y = virtualBounds.y; + } else if (p.y > virtualBounds.y + virtualBounds.height - size.height) { + p.y = virtualBounds.y + virtualBounds.height - size.height; + } + + int deltax = (p.x + size.width) - (virtualBounds.x + virtualBounds.width); + if (deltax > 0) { + size.width -= deltax; + } + + int deltay = (p.y + size.height) - (virtualBounds.y + virtualBounds.height); + if (deltay > 0) { + size.height -= deltay; + } + + // Ensure window does not hide taskbar + + Rectangle maxbounds = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds(); + + if (!isBugInMaximumWindowBounds(maxbounds)) { + deltax = size.width - maxbounds.width; + if (deltax > 0) { + size.width -= deltax; + } + + deltay = size.height - maxbounds.height; + if (deltay > 0) { + size.height -= deltay; + } + } + window.setLocation(p); + window.setSize(size); + } + + /** + * Determines if the bug affecting getMaximumWindowBounds() occured. + * + * @param maxbounds result of getMaximumWindowBounds() + * @return {@code true} if the bug happened, {@code false otherwise} + * + * @see JOSM-9699 + * @see Ubuntu-1171563 + * @see IcedTea-1669 + * @see JDK-8034224 + */ + protected static boolean isBugInMaximumWindowBounds(Rectangle maxbounds) { + return maxbounds.width <= 0 || maxbounds.height <= 0; + } + + /** + * Computes the virtual bounds of graphics environment, as an union of all screen bounds. + * @return The virtual bounds of graphics environment, as an union of all screen bounds. + * @since 6522 + */ + public static Rectangle getVirtualScreenBounds() { + Rectangle virtualBounds = new Rectangle(); + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + if (!GraphicsEnvironment.isHeadless()) { + for (GraphicsDevice gd : ge.getScreenDevices()) { + if (gd.getType() == GraphicsDevice.TYPE_RASTER_SCREEN) { + virtualBounds = virtualBounds.union(gd.getDefaultConfiguration().getBounds()); + } + } + } + return virtualBounds; + } + + /** + * Computes the maximum dimension for a component to fit in screen displaying {@code component}. + * @param component The component to get current screen info from. Must not be {@code null} + * @return the maximum dimension for a component to fit in current screen + * @throws IllegalArgumentException if {@code component} is null + * @since 7463 + */ + public static Dimension getMaxDimensionOnScreen(JComponent component) { + CheckParameterUtil.ensureParameterNotNull(component, "component"); + // Compute max dimension of current screen + Dimension result = new Dimension(); + GraphicsConfiguration gc = component.getGraphicsConfiguration(); + if (gc == null && Main.parent != null) { + gc = Main.parent.getGraphicsConfiguration(); + } + if (gc != null) { + // Max displayable dimension (max screen dimension - insets) + Rectangle bounds = gc.getBounds(); + Insets insets = component.getToolkit().getScreenInsets(gc); + result.width = bounds.width - insets.left - insets.right; + result.height = bounds.height - insets.top - insets.bottom; + } + return result; + } + + /** + * Find the size and position of the screen for given coordinates. Use first screen, + * when no coordinates are stored or null is passed. + * + * @param preferenceKey the key to get size and position from + * @return bounds of the screen + */ + public static Rectangle getScreenInfo(String preferenceKey) { + Rectangle g = new WindowGeometry(preferenceKey, + /* default: something on screen 1 */ + new WindowGeometry(new Point(0, 0), new Dimension(10, 10))).getRectangle(); + return getScreenInfo(g); + } + + /** + * Find the size and position of the screen for given coordinates. Use first screen, + * when no coordinates are stored or null is passed. + * + * @param g coordinates to check + * @return bounds of the screen + */ + private static Rectangle getScreenInfo(Rectangle g) { + Rectangle bounds = null; + if (!GraphicsEnvironment.isHeadless()) { + int intersect = 0; + for (GraphicsDevice gd : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) { + if (gd.getType() == GraphicsDevice.TYPE_RASTER_SCREEN) { + Rectangle b = gd.getDefaultConfiguration().getBounds(); + if (b.height > 0 && b.width / b.height >= 3) /* multiscreen with wrong definition */ { + b.width /= 2; + Rectangle is = b.intersection(g); + int s = is.width * is.height; + if (bounds == null || intersect < s) { + intersect = s; + bounds = b; + } + b = new Rectangle(b); + b.x += b.width; + is = b.intersection(g); + s = is.width * is.height; + if (intersect < s) { + intersect = s; + bounds = b; + } + } else { + Rectangle is = b.intersection(g); + int s = is.width * is.height; + if (bounds == null || intersect < s) { + intersect = s; + bounds = b; + } + } + } + } + } + return bounds != null ? bounds : g; + } + + /** + * Find the size of the full virtual screen. + * @return size of the full virtual screen + */ + public static Rectangle getFullScreenInfo() { + return new Rectangle(new Point(0, 0), GuiHelper.getScreenSize()); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((extent == null) ? 0 : extent.hashCode()); + result = prime * result + ((topLeft == null) ? 0 : topLeft.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + WindowGeometry other = (WindowGeometry) obj; + if (extent == null) { + if (other.extent != null) + return false; + } else if (!extent.equals(other.extent)) + return false; + if (topLeft == null) { + if (other.topLeft != null) + return false; + } else if (!topLeft.equals(other.topLeft)) + return false; + return true; + } + + @Override + public String toString() { + return "WindowGeometry{topLeft="+topLeft+",extent="+extent+'}'; + } +} Index: trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 12676) +++ (revision ) @@ -1,516 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.tools; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.Component; -import java.awt.Dimension; -import java.awt.GraphicsConfiguration; -import java.awt.GraphicsDevice; -import java.awt.GraphicsEnvironment; -import java.awt.IllegalComponentStateException; -import java.awt.Insets; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.Window; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.swing.JComponent; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.gui.util.GuiHelper; - -/** - * This is a helper class for persisting the geometry of a JOSM window to the preference store - * and for restoring it from the preference store. - * @since 2008 - */ -public class WindowGeometry { - - /** the top left point */ - private Point topLeft; - /** the size */ - private Dimension extent; - - /** - * Creates a window geometry from a position and dimension - * - * @param topLeft the top left point - * @param extent the extent - */ - public WindowGeometry(Point topLeft, Dimension extent) { - this.topLeft = topLeft; - this.extent = extent; - } - - /** - * Creates a window geometry from a rectangle - * - * @param rect the position - */ - public WindowGeometry(Rectangle rect) { - this(rect.getLocation(), rect.getSize()); - } - - /** - * Creates a window geometry from the position and the size of a window. - * - * @param window the window - * @throws IllegalComponentStateException if the window is not showing on the screen - */ - public WindowGeometry(Window window) { - this(window.getLocationOnScreen(), window.getSize()); - } - - /** - * Creates a window geometry from the values kept in the preference store under the - * key preferenceKey - * - * @param preferenceKey the preference key - * @throws WindowGeometryException if no such key exist or if the preference value has - * an illegal format - */ - public WindowGeometry(String preferenceKey) throws WindowGeometryException { - initFromPreferences(preferenceKey); - } - - /** - * Creates a window geometry from the values kept in the preference store under the - * key preferenceKey. Falls back to the defaultGeometry if - * something goes wrong. - * - * @param preferenceKey the preference key - * @param defaultGeometry the default geometry - * - */ - public WindowGeometry(String preferenceKey, WindowGeometry defaultGeometry) { - try { - initFromPreferences(preferenceKey); - } catch (WindowGeometryException e) { - Logging.debug(e); - initFromWindowGeometry(defaultGeometry); - } - } - - /** - * Replies a window geometry object for a window with a specific size which is - * centered on screen, where main window is - * - * @param extent the size - * @return the geometry object - */ - public static WindowGeometry centerOnScreen(Dimension extent) { - return centerOnScreen(extent, "gui.geometry"); - } - - /** - * Replies a window geometry object for a window with a specific size which is - * centered on screen where the corresponding window is. - * - * @param extent the size - * @param preferenceKey the key to get window size and position from, null value format - * for whole virtual screen - * @return the geometry object - */ - public static WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) { - Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey) : getFullScreenInfo(); - Point topLeft = new Point( - size.x + Math.max(0, (size.width - extent.width) /2), - size.y + Math.max(0, (size.height - extent.height) /2) - ); - return new WindowGeometry(topLeft, extent); - } - - /** - * 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 - */ - public static WindowGeometry centerInWindow(Component reference, Dimension extent) { - while (reference != null && !(reference instanceof Window)) { - reference = reference.getParent(); - } - if (reference == null) - return new WindowGeometry(new Point(0, 0), extent); - Window parentWindow = (Window) reference; - Point topLeft = new Point( - Math.max(0, (parentWindow.getSize().width - extent.width) /2), - Math.max(0, (parentWindow.getSize().height - extent.height) /2) - ); - topLeft.x += parentWindow.getLocation().x; - topLeft.y += parentWindow.getLocation().y; - return new WindowGeometry(topLeft, extent); - } - - /** - * Exception thrown by the WindowGeometry class if something goes wrong - */ - public static class WindowGeometryException extends Exception { - WindowGeometryException(String message, Throwable cause) { - super(message, cause); - } - - WindowGeometryException(String message) { - super(message); - } - } - - /** - * Fixes a window geometry to shift to the correct screen. - * - * @param window the window - */ - public void fixScreen(Window window) { - Rectangle oldScreen = getScreenInfo(getRectangle()); - Rectangle newScreen = getScreenInfo(new Rectangle(window.getLocationOnScreen(), window.getSize())); - if (oldScreen.x != newScreen.x) { - this.topLeft.x += newScreen.x - oldScreen.x; - } - if (oldScreen.y != newScreen.y) { - this.topLeft.y += newScreen.y - oldScreen.y; - } - } - - protected int parseField(String preferenceKey, String preferenceValue, String field) throws WindowGeometryException { - String v = ""; - try { - Pattern p = Pattern.compile(field + "=(-?\\d+)", Pattern.CASE_INSENSITIVE); - Matcher m = p.matcher(preferenceValue); - if (!m.find()) - throw new WindowGeometryException( - tr("Preference with key ''{0}'' does not include ''{1}''. Cannot restore window geometry from preferences.", - preferenceKey, field)); - v = m.group(1); - return Integer.parseInt(v); - } catch (WindowGeometryException e) { - throw e; - } catch (NumberFormatException e) { - throw new WindowGeometryException( - tr("Preference with key ''{0}'' does not provide an int value for ''{1}''. Got {2}. " + - "Cannot restore window geometry from preferences.", - preferenceKey, field, v), e); - } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) { - throw new WindowGeometryException( - tr("Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: {2}. " + - "Cannot restore window geometry from preferences.", - preferenceKey, field, e.toString()), e); - } - } - - protected final void initFromPreferences(String preferenceKey) throws WindowGeometryException { - String value = Main.pref.get(preferenceKey); - if (value.isEmpty()) - throw new WindowGeometryException( - tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey)); - topLeft = new Point(); - extent = new Dimension(); - topLeft.x = parseField(preferenceKey, value, "x"); - topLeft.y = parseField(preferenceKey, value, "y"); - extent.width = parseField(preferenceKey, value, "width"); - extent.height = parseField(preferenceKey, value, "height"); - } - - protected final void initFromWindowGeometry(WindowGeometry other) { - this.topLeft = other.topLeft; - this.extent = other.extent; - } - - /** - * Gets the geometry of the main window - * @param preferenceKey The preference key to use - * @param arg The command line geometry arguments - * @param maximize If the user requested to maximize the window - * @return The geometry for the main window - */ - public static WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) { - Rectangle screenDimension = getScreenInfo("gui.geometry"); - if (arg != null) { - final Matcher m = Pattern.compile("(\\d+)x(\\d+)(([+-])(\\d+)([+-])(\\d+))?").matcher(arg); - if (m.matches()) { - int w = Integer.parseInt(m.group(1)); - int h = Integer.parseInt(m.group(2)); - int x = screenDimension.x; - int y = screenDimension.y; - if (m.group(3) != null) { - x = Integer.parseInt(m.group(5)); - y = Integer.parseInt(m.group(7)); - if ("-".equals(m.group(4))) { - x = screenDimension.x + screenDimension.width - x - w; - } - if ("-".equals(m.group(6))) { - y = screenDimension.y + screenDimension.height - y - h; - } - } - return new WindowGeometry(new Point(x, y), new Dimension(w, h)); - } else { - Logging.warn(tr("Ignoring malformed geometry: {0}", arg)); - } - } - WindowGeometry def; - if (maximize) { - def = new WindowGeometry(screenDimension); - } else { - Point p = screenDimension.getLocation(); - p.x += (screenDimension.width-1000)/2; - p.y += (screenDimension.height-740)/2; - def = new WindowGeometry(p, new Dimension(1000, 740)); - } - return new WindowGeometry(preferenceKey, def); - } - - /** - * Remembers a window geometry under a specific preference key - * - * @param preferenceKey the preference key - */ - public void remember(String preferenceKey) { - StringBuilder value = new StringBuilder(32); - value.append("x=").append(topLeft.x).append(",y=").append(topLeft.y) - .append(",width=").append(extent.width).append(",height=").append(extent.height); - Main.pref.put(preferenceKey, value.toString()); - } - - /** - * Replies the top left point for the geometry - * - * @return the top left point for the geometry - */ - public Point getTopLeft() { - return topLeft; - } - - /** - * Replies the size specified by the geometry - * - * @return the size specified by the geometry - */ - public Dimension getSize() { - return extent; - } - - /** - * Replies the size and position specified by the geometry - * - * @return the size and position specified by the geometry - */ - private Rectangle getRectangle() { - return new Rectangle(topLeft, extent); - } - - /** - * Applies this geometry to a window. Makes sure that the window is not - * placed outside of the coordinate range of all available screens. - * - * @param window the window - */ - public void applySafe(Window window) { - Point p = new Point(topLeft); - Dimension size = new Dimension(extent); - - Rectangle virtualBounds = getVirtualScreenBounds(); - - // Ensure window fit on screen - - if (p.x < virtualBounds.x) { - p.x = virtualBounds.x; - } else if (p.x > virtualBounds.x + virtualBounds.width - size.width) { - p.x = virtualBounds.x + virtualBounds.width - size.width; - } - - if (p.y < virtualBounds.y) { - p.y = virtualBounds.y; - } else if (p.y > virtualBounds.y + virtualBounds.height - size.height) { - p.y = virtualBounds.y + virtualBounds.height - size.height; - } - - int deltax = (p.x + size.width) - (virtualBounds.x + virtualBounds.width); - if (deltax > 0) { - size.width -= deltax; - } - - int deltay = (p.y + size.height) - (virtualBounds.y + virtualBounds.height); - if (deltay > 0) { - size.height -= deltay; - } - - // Ensure window does not hide taskbar - - Rectangle maxbounds = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds(); - - if (!isBugInMaximumWindowBounds(maxbounds)) { - deltax = size.width - maxbounds.width; - if (deltax > 0) { - size.width -= deltax; - } - - deltay = size.height - maxbounds.height; - if (deltay > 0) { - size.height -= deltay; - } - } - window.setLocation(p); - window.setSize(size); - } - - /** - * Determines if the bug affecting getMaximumWindowBounds() occured. - * - * @param maxbounds result of getMaximumWindowBounds() - * @return {@code true} if the bug happened, {@code false otherwise} - * - * @see JOSM-9699 - * @see Ubuntu-1171563 - * @see IcedTea-1669 - * @see JDK-8034224 - */ - protected static boolean isBugInMaximumWindowBounds(Rectangle maxbounds) { - return maxbounds.width <= 0 || maxbounds.height <= 0; - } - - /** - * Computes the virtual bounds of graphics environment, as an union of all screen bounds. - * @return The virtual bounds of graphics environment, as an union of all screen bounds. - * @since 6522 - */ - public static Rectangle getVirtualScreenBounds() { - Rectangle virtualBounds = new Rectangle(); - GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); - if (!GraphicsEnvironment.isHeadless()) { - for (GraphicsDevice gd : ge.getScreenDevices()) { - if (gd.getType() == GraphicsDevice.TYPE_RASTER_SCREEN) { - virtualBounds = virtualBounds.union(gd.getDefaultConfiguration().getBounds()); - } - } - } - return virtualBounds; - } - - /** - * Computes the maximum dimension for a component to fit in screen displaying {@code component}. - * @param component The component to get current screen info from. Must not be {@code null} - * @return the maximum dimension for a component to fit in current screen - * @throws IllegalArgumentException if {@code component} is null - * @since 7463 - */ - public static Dimension getMaxDimensionOnScreen(JComponent component) { - CheckParameterUtil.ensureParameterNotNull(component, "component"); - // Compute max dimension of current screen - Dimension result = new Dimension(); - GraphicsConfiguration gc = component.getGraphicsConfiguration(); - if (gc == null && Main.parent != null) { - gc = Main.parent.getGraphicsConfiguration(); - } - if (gc != null) { - // Max displayable dimension (max screen dimension - insets) - Rectangle bounds = gc.getBounds(); - Insets insets = component.getToolkit().getScreenInsets(gc); - result.width = bounds.width - insets.left - insets.right; - result.height = bounds.height - insets.top - insets.bottom; - } - return result; - } - - /** - * Find the size and position of the screen for given coordinates. Use first screen, - * when no coordinates are stored or null is passed. - * - * @param preferenceKey the key to get size and position from - * @return bounds of the screen - */ - public static Rectangle getScreenInfo(String preferenceKey) { - Rectangle g = new WindowGeometry(preferenceKey, - /* default: something on screen 1 */ - new WindowGeometry(new Point(0, 0), new Dimension(10, 10))).getRectangle(); - return getScreenInfo(g); - } - - /** - * Find the size and position of the screen for given coordinates. Use first screen, - * when no coordinates are stored or null is passed. - * - * @param g coordinates to check - * @return bounds of the screen - */ - private static Rectangle getScreenInfo(Rectangle g) { - Rectangle bounds = null; - if (!GraphicsEnvironment.isHeadless()) { - int intersect = 0; - for (GraphicsDevice gd : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) { - if (gd.getType() == GraphicsDevice.TYPE_RASTER_SCREEN) { - Rectangle b = gd.getDefaultConfiguration().getBounds(); - if (b.height > 0 && b.width / b.height >= 3) /* multiscreen with wrong definition */ { - b.width /= 2; - Rectangle is = b.intersection(g); - int s = is.width * is.height; - if (bounds == null || intersect < s) { - intersect = s; - bounds = b; - } - b = new Rectangle(b); - b.x += b.width; - is = b.intersection(g); - s = is.width * is.height; - if (intersect < s) { - intersect = s; - bounds = b; - } - } else { - Rectangle is = b.intersection(g); - int s = is.width * is.height; - if (bounds == null || intersect < s) { - intersect = s; - bounds = b; - } - } - } - } - } - return bounds != null ? bounds : g; - } - - /** - * Find the size of the full virtual screen. - * @return size of the full virtual screen - */ - public static Rectangle getFullScreenInfo() { - return new Rectangle(new Point(0, 0), GuiHelper.getScreenSize()); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((extent == null) ? 0 : extent.hashCode()); - result = prime * result + ((topLeft == null) ? 0 : topLeft.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - WindowGeometry other = (WindowGeometry) obj; - if (extent == null) { - if (other.extent != null) - return false; - } else if (!extent.equals(other.extent)) - return false; - if (topLeft == null) { - if (other.topLeft != null) - return false; - } else if (!topLeft.equals(other.topLeft)) - return false; - return true; - } - - @Override - public String toString() { - return "WindowGeometry{topLeft="+topLeft+",extent="+extent+'}'; - } -}