From f2ef53ee2bbac30c4e880655c75dee7ec6e0d7c4 Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Thu, 12 Oct 2017 14:48:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/gui/other/ChartInteractivePane.java | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
index 13dbd5ea7a..e5f9a8a7d2 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
@@ -449,16 +449,14 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
     private Component[] getChartAnimatePane(Plot plot, double[] row, double[] col) {
         if (plot.isSupportAnimate() && plot.isSupportSeriesDrag()) {
             return new Component[]{TableLayoutHelper.createTableLayoutPane(
-                    new Component[][]{
-                            new Component[]{isChartAnimation},
+                    new Component[][]{new Component[]{isChartAnimation},
                             new Component[]{isSeriesDragEnable},
                             new Component[]{new JSeparator()}
                     }, row, col)
             };
         } else if (plot.isSupportAnimate() && !plot.isSupportSeriesDrag()) {
             return new Component[]{TableLayoutHelper.createTableLayoutPane(
-                    new Component[][]{
-                            new Component[]{isChartAnimation},
+                    new Component[][]{new Component[]{isChartAnimation},
                             new Component[]{new JSeparator()}
                     }, row, col)
             };
@@ -487,15 +485,13 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
         boolean isNeedTimeSwitch = plot.getxAxis() != null && plot.getxAxis().isDate();
         if (plot.isSupportZoomCategoryAxis() && !isNeedTimeSwitch) {
             return new Component[]{TableLayoutHelper.createTableLayoutPane(
-                    new Component[][]{
-                            new Component[]{isAxisZoom},
+                    new Component[][]{new Component[]{isAxisZoom},
                             new Component[]{new JSeparator()}
                     }, row, col)
             };
         } else if (plot.isSupportZoomCategoryAxis() && isNeedTimeSwitch) {
             return new Component[]{TableLayoutHelper.createTableLayoutPane(
-                    new Component[][]{
-                            new Component[]{isAxisZoom},
+                    new Component[][]{new Component[]{isAxisZoom},
                             new Component[]{timeSwitchContainer},
                             new Component[]{new JSeparator()}
                     }, row, col)
@@ -525,8 +521,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
     private Component[] getAutoRefreshPane(Plot plot, double[] row, double[] col) {
         if (plot.isSupportAutoRefresh()) {
             return new Component[]{TableLayoutHelper.createTableLayoutPane(
-                    new Component[][]{
-                            new Component[]{autoRefreshPane},
+                    new Component[][]{new Component[]{autoRefreshPane},
                             new Component[]{new JSeparator()}
                     }, row, col)
             };
@@ -760,10 +755,8 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
             }
 
             seriesAttrContents.setFormat(valueFormat);
-            if (plot.isSupportValuePercent()) {
-                if (percentFormat != null) {
-                    seriesAttrContents.setPercentFormat(percentFormat);
-                }
+            if (plot.isSupportValuePercent() && percentFormat != null) {
+                seriesAttrContents.setPercentFormat(percentFormat);
             }
         }
     }