From 2e9cb4b1f6ebba75cffa407f5142fdd95ed9bd88 Mon Sep 17 00:00:00 2001
From: SWinxy <swinxythecat@gmail.com>
Date: Thu, 19 Jan 2023 05:05:20 +0000
Subject: [PATCH] 8267582: BasicLookAndFeel should not call
 getComponentPopupMenu twice to get a popup menu

Reviewed-by: psadhukhan
---
 .../swing/plaf/basic/BasicLookAndFeel.java    | 99 ++++++++++---------
 1 file changed, 54 insertions(+), 45 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
index 8cc733c2fd3..72f68fc59e7 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, 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
@@ -25,26 +25,60 @@
 
 package javax.swing.plaf.basic;
 
-import java.awt.Font;
-import java.awt.Color;
-import java.awt.SystemColor;
-import java.awt.event.*;
-import java.awt.Insets;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.FocusTraversalPolicy;
 import java.awt.AWTEvent;
-import java.awt.Toolkit;
-import java.awt.Point;
-import java.net.URL;
-import java.io.*;
+import java.awt.Color;
+import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.KeyboardFocusManager;
+import java.awt.Font;
+import java.awt.Point;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.AWTEventListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyVetoException;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import java.util.*;
-import java.lang.reflect.*;
-import javax.sound.sampled.*;
+import java.util.HashSet;
+import java.util.Locale;
+
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+import javax.sound.sampled.DataLine;
+import javax.sound.sampled.LineEvent;
+import javax.sound.sampled.LineListener;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ActionMap;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JComponent;
+import javax.swing.JInternalFrame;
+import javax.swing.JPopupMenu;
+import javax.swing.JTextField;
+import javax.swing.LookAndFeel;
+import javax.swing.MenuElement;
+import javax.swing.MenuSelectionManager;
+import javax.swing.SwingUtilities;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.border.BevelBorder;
+import javax.swing.plaf.ActionMapUIResource;
+import javax.swing.plaf.BorderUIResource;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.DimensionUIResource;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.InsetsUIResource;
+import javax.swing.text.DefaultEditorKit;
 
 import sun.awt.AppContext;
 import sun.awt.SunToolkit;
@@ -52,33 +86,7 @@ import sun.swing.SwingAccessor;
 import sun.swing.SwingUtilities2;
 import sun.swing.icon.SortArrowIcon;
 
-import javax.swing.LookAndFeel;
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.ActionMap;
-import javax.swing.BorderFactory;
-import javax.swing.JComponent;
-import javax.swing.ImageIcon;
-import javax.swing.UIDefaults;
-import javax.swing.UIManager;
-import javax.swing.KeyStroke;
-import javax.swing.JTextField;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.FocusManager;
-import javax.swing.LayoutFocusTraversalPolicy;
-import javax.swing.SwingUtilities;
-import javax.swing.MenuSelectionManager;
-import javax.swing.MenuElement;
-import javax.swing.border.*;
-import javax.swing.plaf.*;
-import javax.swing.text.JTextComponent;
-import javax.swing.text.DefaultEditorKit;
-import javax.swing.JInternalFrame;
 import static javax.swing.UIDefaults.LazyValue;
-import java.beans.PropertyVetoException;
-import java.awt.Window;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
 
 
 /**
@@ -2221,14 +2229,15 @@ public abstract class BasicLookAndFeel extends LookAndFeel implements Serializab
                             ((BasicSplitPaneDivider)c).getParent();
                     }
                     if(src != null) {
-                        if(src.getComponentPopupMenu() != null) {
+                        JPopupMenu componentPopupMenu = src.getComponentPopupMenu();
+                        if(componentPopupMenu != null) {
                             Point pt = src.getPopupLocation(me);
                             if(pt == null) {
                                 pt = me.getPoint();
                                 pt = SwingUtilities.convertPoint((Component)c,
                                                                   pt, src);
                             }
-                            src.getComponentPopupMenu().show(src, pt.x, pt.y);
+                            componentPopupMenu.show(src, pt.x, pt.y);
                             me.consume();
                         }
                     }