From c5e72eceb201dd3bbd99a850ea62a7ee6d5e467d Mon Sep 17 00:00:00 2001
From: Maksim <Maksim@fanruan.com>
Date: Wed, 21 Aug 2019 11:06:59 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-20323=20sonar=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/icombobox/UIComboBoxButton.java    | 12 ------------
 .../design/gui/icontainer/UIResizableContainer.java  |  5 -----
 .../com/fr/design/gui/ilable/MultilineLabel.java     |  6 +++---
 .../com/fr/design/gui/imenu/UIBasicMenuItemUI.java   |  2 +-
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxButton.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxButton.java
index a5ebf7b56..9f96f655e 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBoxButton.java
@@ -127,10 +127,6 @@ public class UIComboBoxButton extends JButton {
         boolean savedOpaque = false;
 
         paintRender(g, c, mustResetOpaque, savedOpaque, leftToRight, width, insets, iconWidth, left, top, height);
-        if (mustResetOpaque) {
-            JComponent jc = (JComponent) c;
-            jc.setOpaque(savedOpaque);
-        }
     }
 
     private void paintRender(Graphics g, Component c, boolean mustResetOpaque, boolean savedOpaque, boolean leftToRight,
@@ -152,14 +148,6 @@ public class UIComboBoxButton extends JButton {
             } else {
                 rendererPane.paintComponent(g, c, this, left + iconWidth, top, cWidth, height, shouldValidate);
             }
-            if (paintFocus && ThemeUtils.COMBO_FOCUS) {
-                g.setColor(Color.black);
-                Graphics2D g2d = (Graphics2D) g;
-                Rectangle r = new Rectangle(left, top, 2, 2);
-                TexturePaint tp = new TexturePaint(focusImg, r);
-                g2d.setPaint(tp);
-                g2d.draw(new Rectangle(left, top, cWidth, height));
-            }
         }
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java
index 73199d2ab..0a8529abf 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java
@@ -438,11 +438,6 @@ public class UIResizableContainer extends JPanel {
 
                     containerWidth = containerWidth > MAX_WIDTH ? MAX_WIDTH : containerWidth;
                     containerWidth = containerWidth < MIN_WIDTH ? MIN_WIDTH : containerWidth;
-                    if (containerWidth < MIN_WIDTH) {
-                        upPane.setVisible(false);
-                        downPane.setVisible(false);
-                        containerWidth = toolPaneHeight;
-                    }
                     refreshContainer();
                     if (DesignerMode.isAuthorityEditing()) {
                         DesignerContext.getDesignerFrame().doResize();
diff --git a/designer-base/src/main/java/com/fr/design/gui/ilable/MultilineLabel.java b/designer-base/src/main/java/com/fr/design/gui/ilable/MultilineLabel.java
index bb890447f..8934e862a 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ilable/MultilineLabel.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ilable/MultilineLabel.java
@@ -19,15 +19,15 @@ import com.fr.design.gui.itextarea.UITextArea;
  */
 public class MultilineLabel extends UITextArea {
     public MultilineLabel() {
-        initComponents();
+        initCurrentComponents();
     }
 
     public MultilineLabel(String s) {
         super(s);
-        initComponents();
+        initCurrentComponents();
     }
 
-    private void initComponents() {
+    private void initCurrentComponents() {
         adjustUI();
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java
index 61587beef..1c07c8260 100644
--- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIBasicMenuItemUI.java
@@ -579,7 +579,7 @@ public class UIBasicMenuItemUI extends MenuItemUI {
      */
     private boolean isInternalFrameSystemMenu() {
         String actionCommand = menuItem.getActionCommand();
-        return (actionCommand == "Close") || (actionCommand == "Minimize") || (actionCommand == "Restore") || (actionCommand == "Maximize");
+        return (actionCommand.equals("Close")) || (actionCommand.equals("Minimize")) || (actionCommand.equals("Restore")) || (actionCommand.equals("Maximize"));
     }
 
     //////////////////////////////////////////////////////////