From 361455e4c681bcec9e751629987e8f15fa4d8d74 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Fri, 29 Dec 2017 10:41:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89import=20*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/start/Designer.java                   | 8 ++++++--
 .../src/com/fr/design/actions/core/ActionFactory.java     | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/start/Designer.java b/designer/src/com/fr/start/Designer.java
index 17c01527e7..e52530c8e6 100644
--- a/designer/src/com/fr/start/Designer.java
+++ b/designer/src/com/fr/start/Designer.java
@@ -45,9 +45,13 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.xml.XMLTools;
 
-import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
 import javax.swing.border.MatteBorder;
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
diff --git a/designer_base/src/com/fr/design/actions/core/ActionFactory.java b/designer_base/src/com/fr/design/actions/core/ActionFactory.java
index ecce774da7..f89e9ed843 100644
--- a/designer_base/src/com/fr/design/actions/core/ActionFactory.java
+++ b/designer_base/src/com/fr/design/actions/core/ActionFactory.java
@@ -9,7 +9,8 @@ import com.fr.design.menu.MenuKeySet;
 import com.fr.design.selection.QuickEditor;
 import com.fr.general.FRLogger;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
 import java.awt.event.KeyEvent;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;

From ab93803d25684fdda431d084b6b3921878e5f217 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Fri, 29 Dec 2017 11:07:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?CHART-1882=20=20=20=E5=A0=86=E7=A7=AF?=
 =?UTF-8?q?=E5=92=8C=E5=9D=90=E6=A0=87=E8=BD=B4=E7=95=8C=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/module/ChartEmptyDataStylePane.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java b/designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java
index 65a61e7bff..42de5bacdf 100644
--- a/designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java
+++ b/designer_chart/src/com/fr/design/module/ChartEmptyDataStylePane.java
@@ -21,11 +21,20 @@ import com.fr.general.Inter;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import javax.swing.BorderFactory;
+import javax.swing.JFileChooser;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ButtonGroup;
+import java.awt.Image;
+import java.awt.Dimension;
+import java.awt.Component;
+import java.awt.GridLayout;
 
 /**
  * Created by mengao on 2017/11/23.