changeset 11937:ec3d09b179c7

8161141: correct bugId for JDK-8158994 fix push Reviewed-by: prr, mschoene
author ssadetsky
date Mon, 11 Jul 2016 19:17:15 +0300
parents b4e28ad9dfd1
children f75edc10277f
files src/windows/classes/sun/awt/windows/WMenuItemPeer.java src/windows/classes/sun/awt/windows/WMenuPeer.java src/windows/classes/sun/awt/windows/WObjectPeer.java src/windows/classes/sun/awt/windows/WPopupMenuPeer.java src/windows/native/sun/windows/awt_Frame.cpp src/windows/native/sun/windows/awt_MenuBar.cpp src/windows/native/sun/windows/awt_MenuBar.h
diffstat 7 files changed, 7 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/classes/sun/awt/windows/WMenuItemPeer.java	Mon Jul 11 12:59:59 2016 +0300
+++ b/src/windows/classes/sun/awt/windows/WMenuItemPeer.java	Mon Jul 11 19:17:15 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, 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
@@ -107,7 +107,6 @@
         this.target = target;
         this.parent = (WMenuPeer) WToolkit.targetToPeer(target.getParent());
         this.isCheckbox = isCheckbox;
-        parent.addChildPeer(this);
         create(parent);
         // fix for 5088782: check if menu object is created successfully
         checkMenuCreation();
--- a/src/windows/classes/sun/awt/windows/WMenuPeer.java	Mon Jul 11 12:59:59 2016 +0300
+++ b/src/windows/classes/sun/awt/windows/WMenuPeer.java	Mon Jul 11 19:17:15 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, 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
@@ -51,12 +51,10 @@
         if (parent instanceof MenuBar) {
             WMenuBarPeer mbPeer = (WMenuBarPeer) WToolkit.targetToPeer(parent);
             this.parent = mbPeer;
-            mbPeer.addChildPeer(this);
             createMenu(mbPeer);
         }
         else if (parent instanceof Menu) {
             this.parent = (WMenuPeer) WToolkit.targetToPeer(parent);
-            this.parent.addChildPeer(this);
             createSubMenu(this.parent);
         }
         else {
--- a/src/windows/classes/sun/awt/windows/WObjectPeer.java	Mon Jul 11 12:59:59 2016 +0300
+++ b/src/windows/classes/sun/awt/windows/WObjectPeer.java	Mon Jul 11 19:17:15 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2008, 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
@@ -24,9 +24,6 @@
  */
 package sun.awt.windows;
 
-import java.util.Map;
-import java.util.WeakHashMap;
-
 abstract class WObjectPeer {
 
     static {
@@ -48,8 +45,6 @@
     // used to synchronize the state of this peer
     private final Object stateLock = new Object();
 
-    private volatile Map<WObjectPeer, WObjectPeer> childPeers;
-
     public static WObjectPeer getPeerForTarget(Object t) {
         WObjectPeer peer = (WObjectPeer) WToolkit.targetToPeer(t);
         return peer;
@@ -82,9 +77,6 @@
         }
 
         if (call_disposeImpl) {
-            if (childPeers != null) {
-                disposeChildPeers();
-            }
             disposeImpl();
         }
     }
@@ -96,33 +88,4 @@
      * Initialize JNI field and method IDs
      */
     private static native void initIDs();
-
-    // if a child peer existence depends on this peer, add it to this collection
-    final void addChildPeer(WObjectPeer child) {
-        synchronized (getStateLock()) {
-            if (childPeers == null) {
-                childPeers = new WeakHashMap<>();
-            }
-            if (isDisposed()) {
-                throw new IllegalStateException("Parent peer is disposed");
-            }
-            childPeers.put(child, this);
-        }
-    }
-
-    // called to dispose dependent child peers
-    private void disposeChildPeers() {
-        synchronized (getStateLock()) {
-            for (WObjectPeer child : childPeers.keySet()) {
-                if (child != null) {
-                    try {
-                        child.dispose();
-                    }
-                    catch (Exception e) {
-                        // ignored
-                    }
-                }
-            }
-        }
-    }
 }
--- a/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java	Mon Jul 11 12:59:59 2016 +0300
+++ b/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java	Mon Jul 11 19:17:15 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, 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
@@ -58,7 +58,6 @@
                 parent = WToolkit.getNativeContainer((Component)parent);
                 parentPeer = (WComponentPeer) WToolkit.targetToPeer(parent);
             }
-            parentPeer.addChildPeer(this);
             createMenu(parentPeer);
             // fix for 5088782: check if menu object is created successfully
             checkMenuCreation();
--- a/src/windows/native/sun/windows/awt_Frame.cpp	Mon Jul 11 12:59:59 2016 +0300
+++ b/src/windows/native/sun/windows/awt_Frame.cpp	Mon Jul 11 19:17:15 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -1113,19 +1113,11 @@
 
 void AwtFrame::SetMenuBar(AwtMenuBar* mb)
 {
-    if (menuBar) {
-        menuBar->SetFrame(NULL);
-    }
     menuBar = mb;
     if (mb == NULL) {
         // Remove existing menu bar, if any.
         ::SetMenu(GetHWnd(), NULL);
     } else {
-        AwtFrame* oldFrame = menuBar->GetFrame();
-        if (oldFrame && oldFrame != this) {
-            oldFrame->SetMenuBar(NULL);
-        }
-        menuBar->SetFrame(this);
         if (menuBar->GetHMenu() != NULL) {
             ::SetMenu(GetHWnd(), menuBar->GetHMenu());
         }
--- a/src/windows/native/sun/windows/awt_MenuBar.cpp	Mon Jul 11 12:59:59 2016 +0300
+++ b/src/windows/native/sun/windows/awt_MenuBar.cpp	Mon Jul 11 19:17:15 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, 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
@@ -58,9 +58,6 @@
 
 void AwtMenuBar::Dispose()
 {
-    if (m_frame != NULL && m_frame->GetMenuBar() == this) {
-        m_frame->SetMenuBar(NULL);
-    }
     m_frame = NULL;
 
     AwtMenu::Dispose();
--- a/src/windows/native/sun/windows/awt_MenuBar.h	Mon Jul 11 12:59:59 2016 +0300
+++ b/src/windows/native/sun/windows/awt_MenuBar.h	Mon Jul 11 19:17:15 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, 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
@@ -63,9 +63,6 @@
 
     virtual AwtMenuBar* GetMenuBar() { return this; }
     INLINE AwtFrame* GetFrame() { return m_frame; }
-    INLINE void SetFrame(AwtFrame* frame) {
-        m_frame = frame;
-    }
 
     virtual HWND GetOwnerHWnd();
     virtual void RedrawMenuBar();