src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java
Print this page
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -35,10 +35,12 @@
import java.awt.image.BufferedImage;
import java.awt.peer.TrayIconPeer;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import static sun.awt.AWTAccessor.*;
+
public class CTrayIcon extends CFRetainedResource implements TrayIconPeer {
private TrayIcon target;
private PopupMenu popup;
private JDialog messageDialog;
private DialogEventHandler handler;
@@ -66,19 +68,19 @@
//if no one else is creating the peer.
checkAndCreatePopupPeer();
updateImage();
}
- @SuppressWarnings("deprecation")
private CPopupMenu checkAndCreatePopupPeer() {
CPopupMenu menuPeer = null;
if (popup != null) {
try {
- menuPeer = (CPopupMenu)popup.getPeer();
+ final MenuComponentAccessor acc = getMenuComponentAccessor();
+ menuPeer = acc.getPeer(popup);
if (menuPeer == null) {
popup.addNotify();
- menuPeer = (CPopupMenu)popup.getPeer();
+ menuPeer = acc.getPeer(popup);
}
} catch (Exception e) {
e.printStackTrace();
}
}