From 84122ebe93978e250237b2e4d6ab2d5fb1c2d45f Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Fri, 18 Aug 2017 15:24:06 +0800
Subject: [PATCH] =?UTF-8?q?alphafine=20=E7=BB=86=E8=8A=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/alphafine/component/AlphaFineDialog.java | 4 ++--
 .../design/mainframe/alphafine/component/AlphaFinePane.java   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
index 83945d324..1d5faa3b6 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
@@ -354,11 +354,11 @@ public class AlphaFineDialog extends UIDialog {
      * 重置结果面板
      */
     private void replaceLeftPane() {
-        if (searchListModel.getSize() == 0 && defaultPane == null) {
+        if (searchListModel.getSize() == 0 && searchResultPane != null) {
             defaultPane = new NoResultPane(Inter.getLocText("FR-Designer-AlphaFine_NO_Result"), IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/no_result.png"));
             searchResultPane.remove(leftSearchResultPane);
             searchResultPane.add(defaultPane, BorderLayout.WEST);
-        } else if (searchListModel.getSize() > 0 && defaultPane != null) {
+        } else if (searchResultPane != null && searchListModel.getSize() > 0 && defaultPane != null) {
             searchResultPane.remove(defaultPane);
             defaultPane = null;
             searchResultPane.add(leftSearchResultPane, BorderLayout.WEST);
diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java
index cfd37479e..8c962a001 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java
@@ -30,6 +30,7 @@ public class AlphaFinePane extends BasicPane {
         refreshButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/smallsearch.png"));
         refreshButton.setToolTipText(Inter.getLocText("FR-Designer_AlphaFine"));
         refreshButton.set4ToolbarButton();
+        refreshButton.setRolloverEnabled(false);
         this.add(refreshButton);
         this.setBackground(ThemeUtils.WHITE_BORDER_COLOR);
         refreshButton.addActionListener(new ActionListener() {