jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
author darcy
Tue, 16 Dec 2014 10:09:01 -0800
changeset 28235 0dfebfcb9f8a
parent 25859 3317bb8137f4
child 30469 bac0a7ff7e1e
permissions -rw-r--r--
8067086: Suppress mac-specific deprecation warnings in the java.desktop module Reviewed-by: prr
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
     1
/*
23268
2cdb715ff32d 8029868: Fix KSS issues in sun.lwawt.macosx
pchelko
parents: 23247
diff changeset
     2
 * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
     4
 *
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    10
 *
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    15
 * accompanied this code).
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    16
 *
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    20
 *
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    23
 * questions.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    24
 */
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    25
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    26
package sun.lwawt.macosx;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    27
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14157
diff changeset
    28
import sun.awt.AWTAccessor;
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    29
import sun.awt.SunToolkit;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    30
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    31
import javax.swing.*;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    32
import java.awt.*;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    33
import java.awt.event.*;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    34
import java.awt.geom.Point2D;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    35
import java.awt.image.BufferedImage;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    36
import java.awt.peer.TrayIconPeer;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    37
import java.beans.PropertyChangeEvent;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    38
import java.beans.PropertyChangeListener;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    39
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    40
public class CTrayIcon extends CFRetainedResource implements TrayIconPeer {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    41
    private TrayIcon target;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    42
    private PopupMenu popup;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    43
    private JDialog messageDialog;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    44
    private DialogEventHandler handler;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    45
14157
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    46
    // In order to construct MouseEvent object, we need to specify a
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    47
    // Component target. Because TrayIcon isn't Component's subclass,
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    48
    // we use this dummy frame instead
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    49
    private final Frame dummyFrame;
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    50
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    51
    // A bitmask that indicates what mouse buttons produce MOUSE_CLICKED events
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    52
    // on MOUSE_RELEASE. Click events are only generated if there were no drag
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    53
    // events between MOUSE_PRESSED and MOUSE_RELEASED for particular button
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    54
    private static int mouseClickButtons = 0;
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    55
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    56
    CTrayIcon(TrayIcon target) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    57
        super(0, true);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    58
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    59
        this.messageDialog = null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    60
        this.handler = null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    61
        this.target = target;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    62
        this.popup = target.getPopupMenu();
14157
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
    63
        this.dummyFrame = new Frame();
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    64
        setPtr(createModel());
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    65
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    66
        //if no one else is creating the peer.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    67
        checkAndCreatePopupPeer();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    68
        updateImage();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    69
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    70
28235
0dfebfcb9f8a 8067086: Suppress mac-specific deprecation warnings in the java.desktop module
darcy
parents: 25859
diff changeset
    71
    @SuppressWarnings("deprecation")
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    72
    private CPopupMenu checkAndCreatePopupPeer() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    73
        CPopupMenu menuPeer = null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    74
        if (popup != null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    75
            try {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    76
                menuPeer = (CPopupMenu)popup.getPeer();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    77
                if (menuPeer == null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    78
                    popup.addNotify();
23247
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
    79
                    menuPeer = (CPopupMenu)popup.getPeer();
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    80
                }
23247
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
    81
            } catch (Exception e) {
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    82
                e.printStackTrace();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    83
            }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    84
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    85
        return menuPeer;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    86
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    87
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    88
    private long createModel() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    89
        return nativeCreate();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    90
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    91
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    92
    private long getModel() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    93
        return ptr;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    94
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    95
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    96
    private native long nativeCreate();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    97
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    98
    //invocation from the AWTTrayIcon.m
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
    99
    public long getPopupMenuModel(){
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   100
        if(popup == null) {
23247
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   101
            PopupMenu popupMenu = target.getPopupMenu();
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   102
            if (popupMenu != null) {
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   103
                popup = popupMenu;
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   104
            } else {
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   105
                return 0L;
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   106
            }
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   107
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   108
        return checkAndCreatePopupPeer().getModel();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   109
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   110
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   111
    /**
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   112
     * We display tray icon message as a small dialog with OK button.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   113
     * This is lame, but JDK 1.6 does basically the same. There is a new
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   114
     * kind of window in Lion, NSPopover, so perhaps it could be used it
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   115
     * to implement better looking notifications.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   116
     */
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   117
    public void displayMessage(final String caption, final String text,
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   118
                               final String messageType) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   119
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   120
        if (SwingUtilities.isEventDispatchThread()) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   121
            displayMessageOnEDT(caption, text, messageType);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   122
        } else {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   123
            try {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   124
                SwingUtilities.invokeAndWait(new Runnable() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   125
                    public void run() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   126
                        displayMessageOnEDT(caption, text, messageType);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   127
                    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   128
                });
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   129
            } catch (Exception e) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   130
                throw new AssertionError(e);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   131
            }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   132
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   133
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   134
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   135
    @Override
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   136
    public void dispose() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   137
        if (messageDialog != null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   138
            disposeMessageDialog();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   139
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   140
14157
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   141
        dummyFrame.dispose();
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   142
23247
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   143
        if (popup != null) {
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   144
            popup.removeNotify();
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   145
        }
dd6c58eeb05c 8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents: 18241
diff changeset
   146
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   147
        LWCToolkit.targetDisposedPeer(target, this);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   148
        target = null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   149
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   150
        super.dispose();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   151
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   152
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   153
    @Override
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   154
    public void setToolTip(String tooltip) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   155
        nativeSetToolTip(getModel(), tooltip);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   156
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   157
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   158
    //adds tooltip to the NSStatusBar's NSButton.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   159
    private native void nativeSetToolTip(long trayIconModel, String tooltip);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   160
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   161
    @Override
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   162
    public void showPopupMenu(int x, int y) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   163
        //Not used. The popupmenu is shown from the native code.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   164
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   165
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   166
    @Override
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   167
    public void updateImage() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   168
        Image image = target.getImage();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   169
        if (image == null) return;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   170
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   171
        MediaTracker tracker = new MediaTracker(new Button(""));
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   172
        tracker.addImage(image, 0);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   173
        try {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   174
            tracker.waitForAll();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   175
        } catch (InterruptedException ignore) { }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   176
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   177
        if (image.getWidth(null) <= 0 ||
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   178
            image.getHeight(null) <= 0)
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   179
        {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   180
            return;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   181
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   182
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   183
        CImage cimage = CImage.getCreator().createFromImage(image);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   184
        setNativeImage(getModel(), cimage.ptr, target.isImageAutoSize());
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   185
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   186
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   187
    private native void setNativeImage(final long model, final long nsimage, final boolean autosize);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   188
14157
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   189
    private void postEvent(final AWTEvent event) {
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   190
        SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   191
            public void run() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   192
                SunToolkit.postEvent(SunToolkit.targetToAppContext(target), event);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   193
            }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   194
        });
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   195
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   196
14157
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   197
    //invocation from the AWTTrayIcon.m
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   198
    private void handleMouseEvent(NSEvent nsEvent) {
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   199
        int buttonNumber = nsEvent.getButtonNumber();
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   200
        final SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit();
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   201
        if ((buttonNumber > 2 && !tk.areExtraMouseButtonsEnabled())
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   202
                || buttonNumber > tk.getNumberOfButtons() - 1) {
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   203
            return;
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   204
        }
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   205
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   206
        int jeventType = NSEvent.nsToJavaEventType(nsEvent.getType());
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   207
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   208
        int jbuttonNumber = MouseEvent.NOBUTTON;
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   209
        int jclickCount = 0;
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   210
        if (jeventType != MouseEvent.MOUSE_MOVED) {
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   211
            jbuttonNumber = NSEvent.nsToJavaButton(buttonNumber);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   212
            jclickCount = nsEvent.getClickCount();
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   213
        }
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   214
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   215
        int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   216
                nsEvent.getModifierFlags());
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   217
        boolean isPopupTrigger = NSEvent.isPopupTrigger(jmodifiers);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   218
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   219
        int eventButtonMask = (jbuttonNumber > 0)?
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   220
                MouseEvent.getMaskForButton(jbuttonNumber) : 0;
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   221
        long when = System.currentTimeMillis();
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   222
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   223
        if (jeventType == MouseEvent.MOUSE_PRESSED) {
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   224
            mouseClickButtons |= eventButtonMask;
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   225
        } else if (jeventType == MouseEvent.MOUSE_DRAGGED) {
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   226
            mouseClickButtons = 0;
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   227
        }
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   228
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   229
        // The MouseEvent's coordinates are relative to screen
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   230
        int absX = nsEvent.getAbsX();
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   231
        int absY = nsEvent.getAbsY();
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   232
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   233
        MouseEvent mouseEvent = new MouseEvent(dummyFrame, jeventType, when,
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   234
                jmodifiers, absX, absY, absX, absY, jclickCount, isPopupTrigger,
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   235
                jbuttonNumber);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   236
        mouseEvent.setSource(target);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   237
        postEvent(mouseEvent);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   238
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   239
        // fire ACTION event
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   240
        if (jeventType == MouseEvent.MOUSE_PRESSED && isPopupTrigger) {
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   241
            final String cmd = target.getActionCommand();
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   242
            final ActionEvent event = new ActionEvent(target,
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   243
                    ActionEvent.ACTION_PERFORMED, cmd);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   244
            postEvent(event);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   245
        }
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   246
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   247
        // synthesize CLICKED event
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   248
        if (jeventType == MouseEvent.MOUSE_RELEASED) {
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   249
            if ((mouseClickButtons & eventButtonMask) != 0) {
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   250
                MouseEvent clickEvent = new MouseEvent(dummyFrame,
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   251
                        MouseEvent.MOUSE_CLICKED, when, jmodifiers, absX, absY,
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   252
                        absX, absY, jclickCount, isPopupTrigger, jbuttonNumber);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   253
                clickEvent.setSource(target);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   254
                postEvent(clickEvent);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   255
            }
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   256
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   257
            mouseClickButtons &= ~eventButtonMask;
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   258
        }
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   259
    }
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   260
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   261
    private native Point2D nativeGetIconLocation(long trayIconModel);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   262
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   263
    public void displayMessageOnEDT(String caption, String text,
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   264
                                    String messageType) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   265
        if (messageDialog != null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   266
            disposeMessageDialog();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   267
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   268
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   269
        // obtain icon to show along the message
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   270
        Icon icon = getIconForMessageType(messageType);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   271
        if (icon != null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   272
            icon = new ImageIcon(scaleIcon(icon, 0.75));
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   273
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   274
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   275
        // We want the message dialog text area to be about 1/8 of the screen
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   276
        // size. There is nothing special about this value, it's just makes the
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   277
        // message dialog to look nice
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   278
        Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   279
        int textWidth = screenSize.width / 8;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   280
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   281
        // create dialog to show
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   282
        messageDialog = createMessageDialog(caption, text, textWidth, icon);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   283
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   284
        // finally, show the dialog to user
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   285
        showMessageDialog();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   286
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   287
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   288
    /**
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   289
     * Creates dialog window used to display the message
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   290
     */
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   291
    private JDialog createMessageDialog(String caption, String text,
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   292
                                     int textWidth, Icon icon) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   293
        JDialog dialog;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   294
        handler = new DialogEventHandler();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   295
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   296
        JTextArea captionArea = null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   297
        if (caption != null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   298
            captionArea = createTextArea(caption, textWidth, false, true);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   299
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   300
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   301
        JTextArea textArea = null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   302
        if (text != null){
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   303
            textArea = createTextArea(text, textWidth, true, false);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   304
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   305
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   306
        Object[] panels = null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   307
        if (captionArea != null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   308
            if (textArea != null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   309
                panels = new Object[] {captionArea, new JLabel(), textArea};
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   310
            } else {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   311
                panels = new Object[] {captionArea};
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   312
            }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   313
        } else {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   314
           if (textArea != null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   315
                panels = new Object[] {textArea};
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   316
            }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   317
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   318
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   319
        // We want message dialog with small title bar. There is a client
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   320
        // property property that does it, however, it must be set before
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   321
        // dialog's native window is created. This is why we create option
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   322
        // pane and dialog separately
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   323
        final JOptionPane op = new JOptionPane(panels);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   324
        op.setIcon(icon);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   325
        op.addPropertyChangeListener(handler);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   326
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   327
        // Make Ok button small. Most likely won't work for L&F other then Aqua
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   328
        try {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   329
            JPanel buttonPanel = (JPanel)op.getComponent(1);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   330
            JButton ok = (JButton)buttonPanel.getComponent(0);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   331
            ok.putClientProperty("JComponent.sizeVariant", "small");
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   332
        } catch (Throwable t) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   333
            // do nothing, we tried and failed, no big deal
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   334
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   335
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   336
        dialog = new JDialog((Dialog) null);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   337
        JRootPane rp = dialog.getRootPane();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   338
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   339
        // gives us dialog window with small title bar and not zoomable
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   340
        rp.putClientProperty(CPlatformWindow.WINDOW_STYLE, "small");
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   341
        rp.putClientProperty(CPlatformWindow.WINDOW_ZOOMABLE, "false");
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   342
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   343
        dialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   344
        dialog.setModal(false);
14157
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   345
        dialog.setModalExclusionType(Dialog.ModalExclusionType.TOOLKIT_EXCLUDE);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   346
        dialog.setAlwaysOnTop(true);
5d50d32dd770 7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents: 12047
diff changeset
   347
        dialog.setAutoRequestFocus(false);
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   348
        dialog.setResizable(false);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   349
        dialog.setContentPane(op);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   350
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   351
        dialog.addWindowListener(handler);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   352
18241
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14157
diff changeset
   353
        // suppress security warning for untrusted windows
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14157
diff changeset
   354
        AWTAccessor.getWindowAccessor().setTrayIconWindow(dialog, true);
3e009b5be123 8003559: Update display of applet windows
leonidr
parents: 14157
diff changeset
   355
12047
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   356
        dialog.pack();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   357
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   358
        return dialog;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   359
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   360
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   361
    private void showMessageDialog() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   362
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   363
        Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   364
        Point2D iconLoc = nativeGetIconLocation(getModel());
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   365
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   366
        int dialogY = (int)iconLoc.getY();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   367
        int dialogX = (int)iconLoc.getX();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   368
        if (dialogX + messageDialog.getWidth() > screenSize.width) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   369
            dialogX = screenSize.width - messageDialog.getWidth();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   370
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   371
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   372
        messageDialog.setLocation(dialogX, dialogY);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   373
        messageDialog.setVisible(true);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   374
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   375
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   376
   private void disposeMessageDialog() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   377
        if (SwingUtilities.isEventDispatchThread()) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   378
            disposeMessageDialogOnEDT();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   379
        } else {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   380
            try {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   381
                SwingUtilities.invokeAndWait(new Runnable() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   382
                    public void run() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   383
                        disposeMessageDialogOnEDT();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   384
                    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   385
                });
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   386
            } catch (Exception e) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   387
                throw new AssertionError(e);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   388
            }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   389
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   390
   }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   391
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   392
    private void disposeMessageDialogOnEDT() {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   393
        if (messageDialog != null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   394
            messageDialog.removeWindowListener(handler);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   395
            messageDialog.removePropertyChangeListener(handler);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   396
            messageDialog.dispose();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   397
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   398
            messageDialog = null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   399
            handler = null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   400
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   401
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   402
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   403
    /**
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   404
     * Scales an icon using specified scale factor
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   405
     *
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   406
     * @param icon        icon to scale
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   407
     * @param scaleFactor scale factor to use
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   408
     * @return scaled icon as BuffedredImage
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   409
     */
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   410
    private static BufferedImage scaleIcon(Icon icon, double scaleFactor) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   411
        if (icon == null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   412
            return null;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   413
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   414
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   415
        int w = icon.getIconWidth();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   416
        int h = icon.getIconHeight();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   417
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   418
        GraphicsEnvironment ge =
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   419
                GraphicsEnvironment.getLocalGraphicsEnvironment();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   420
        GraphicsDevice gd = ge.getDefaultScreenDevice();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   421
        GraphicsConfiguration gc = gd.getDefaultConfiguration();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   422
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   423
        // convert icon into image
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   424
        BufferedImage iconImage = gc.createCompatibleImage(w, h,
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   425
                Transparency.TRANSLUCENT);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   426
        Graphics2D g = iconImage.createGraphics();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   427
        icon.paintIcon(null, g, 0, 0);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   428
        g.dispose();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   429
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   430
        // and scale it nicely
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   431
        int scaledW = (int) (w * scaleFactor);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   432
        int scaledH = (int) (h * scaleFactor);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   433
        BufferedImage scaledImage = gc.createCompatibleImage(scaledW, scaledH,
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   434
                Transparency.TRANSLUCENT);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   435
        g = scaledImage.createGraphics();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   436
        g.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   437
                RenderingHints.VALUE_INTERPOLATION_BILINEAR);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   438
        g.drawImage(iconImage, 0, 0, scaledW, scaledH, null);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   439
        g.dispose();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   440
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   441
        return scaledImage;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   442
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   443
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   444
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   445
    /**
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   446
     * Gets Aqua icon used in message dialog.
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   447
     */
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   448
    private static Icon getIconForMessageType(String messageType) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   449
        if (messageType.equals("ERROR")) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   450
            return UIManager.getIcon("OptionPane.errorIcon");
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   451
        } else if (messageType.equals("WARNING")) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   452
            return UIManager.getIcon("OptionPane.warningIcon");
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   453
        } else {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   454
            // this is just an application icon
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   455
            return UIManager.getIcon("OptionPane.informationIcon");
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   456
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   457
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   458
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   459
    private static JTextArea createTextArea(String text, int width,
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   460
                                            boolean isSmall, boolean isBold) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   461
        JTextArea textArea = new JTextArea(text);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   462
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   463
        textArea.setLineWrap(true);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   464
        textArea.setWrapStyleWord(true);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   465
        textArea.setEditable(false);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   466
        textArea.setFocusable(false);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   467
        textArea.setBorder(null);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   468
        textArea.setBackground(new JLabel().getBackground());
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   469
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   470
        if (isSmall) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   471
            textArea.putClientProperty("JComponent.sizeVariant", "small");
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   472
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   473
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   474
        if (isBold) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   475
            Font font = textArea.getFont();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   476
            Font boldFont = new Font(font.getName(), Font.BOLD, font.getSize());
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   477
            textArea.setFont(boldFont);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   478
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   479
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   480
        textArea.setSize(width, 1);
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   481
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   482
        return textArea;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   483
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   484
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   485
    /**
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   486
     * Implements all the Listeners needed by message dialog
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   487
     */
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   488
    private final class DialogEventHandler extends WindowAdapter
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   489
            implements PropertyChangeListener {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   490
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   491
        public void windowClosing(WindowEvent we) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   492
                disposeMessageDialog();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   493
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   494
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   495
        public void propertyChange(PropertyChangeEvent e) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   496
            if (messageDialog == null) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   497
                return;
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   498
            }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   499
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   500
            String prop = e.getPropertyName();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   501
            Container cp = messageDialog.getContentPane();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   502
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   503
            if (messageDialog.isVisible() && e.getSource() == cp &&
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   504
                    (prop.equals(JOptionPane.VALUE_PROPERTY))) {
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   505
                disposeMessageDialog();
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   506
            }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   507
        }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   508
    }
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   509
}
320a714614e9 7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
diff changeset
   510