Ignore:
Timestamp:
2016-04-07T00:02:22+02:00 (4 years ago)
Author:
Don-vip
Message:

fix coverity 1011666, 1011667, 1011836, 1011837, 1011838

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

    r9576 r10115  
    4949     */
    5050    public static WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) {
    51         Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey)
    52             : getFullScreenInfo();
     51        Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey) : getFullScreenInfo();
    5352        Point topLeft = new Point(
    5453                size.x + Math.max(0, (size.width - extent.width) /2),
     
    117116     */
    118117    public WindowGeometry(Rectangle rect) {
    119         this.topLeft = rect.getLocation();
    120         this.extent = rect.getSize();
     118        this(rect.getLocation(), rect.getSize());
    121119    }
    122120
     
    426424     */
    427425    private static Rectangle getScreenInfo(Rectangle g) {
    428         GraphicsEnvironment ge = GraphicsEnvironment
    429                 .getLocalGraphicsEnvironment();
    430         GraphicsDevice[] gs = ge.getScreenDevices();
     426        GraphicsDevice[] gs = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
    431427        int intersect = 0;
    432428        Rectangle bounds = null;
     
    446442                    is = b.intersection(g);
    447443                    s = is.width * is.height;
    448                     if (bounds == null || intersect < s) {
     444                    if (intersect < s) {
    449445                        intersect = s;
    450446                        bounds = b;
     
    460456            }
    461457        }
    462         return bounds;
     458        return bounds != null ? bounds : g;
    463459    }
    464460
Note: See TracChangeset for help on using the changeset viewer.