From 7760d8331a403e744dfb6a0deb54595d9ef05821 Mon Sep 17 00:00:00 2001
From: zack <zack@finreport.com>
Date: Fri, 27 Jul 2018 15:50:15 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-10055=20=E3=80=9010.0=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E3=80=91=E5=AE=89=E8=A3=85=E7=BC=A9=E8=BF=9B=E6=AF=94=E4=BE=8B?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=8E=A7=E4=BB=B6=E5=90=8E=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=8D=E8=83=BD=E5=8D=B3=E6=97=B6=E7=94=9F?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/style/AlignmentPane.java    | 40 +++++++++++++++----
 .../com/fr/design/condition/PaddingPane.java  | 24 ++++++++++-
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
index 2f1f458fa..8cc752cb1 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
@@ -21,14 +21,25 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.ComparatorUtils;
-
+import com.fr.general.GeneralContext;
 import com.fr.plugin.ExtraClassManager;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.manage.PluginFilter;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
 import com.fr.report.fun.VerticalTextProcessor;
 import com.fr.report.fun.impl.DefaultVerticalTextProcessor;
 import com.fr.stable.Constants;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
@@ -103,13 +114,28 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         initOtherComponent();
         initAllNames();
 
-        indentationUnitProcessor = ExtraDesignClassManager.getInstance().getSingle(IndentationUnitProcessor.MARK_STRING);
-        if (null == indentationUnitProcessor) {
-            indentationUnitProcessor = new DefaultIndentationUnitProcessor();
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+
+            @Override
+            public void on(PluginEvent event) {
+                refreshIndentationUnit();
+            }
+        }, new PluginFilter() {
+
+            @Override
+            public boolean accept(PluginContext context) {
+                return context.contain(IndentationUnitProcessor.MARK_STRING);
+            }
+        });
+        refreshIndentationUnit();
+    }
+    private void refreshIndentationUnit() {
+        this.indentationUnitProcessor = ExtraDesignClassManager.getInstance().getSingle(IndentationUnitProcessor.MARK_STRING);
+        if (null == this.indentationUnitProcessor) {
+            this.indentationUnitProcessor = new DefaultIndentationUnitProcessor();
         }
     }
 
-
     private void initOtherComponent() {
         hPaneContainer.add(hAlignmentPane);
         vPaneContainer.add(vAlignmentPane);
diff --git a/designer-realize/src/main/java/com/fr/design/condition/PaddingPane.java b/designer-realize/src/main/java/com/fr/design/condition/PaddingPane.java
index c94f8c7a0..a3c7fe69a 100644
--- a/designer-realize/src/main/java/com/fr/design/condition/PaddingPane.java
+++ b/designer-realize/src/main/java/com/fr/design/condition/PaddingPane.java
@@ -7,11 +7,15 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.gui.style.DefaultIndentationUnitProcessor;
 import com.fr.design.utils.gui.GUICoreUtils;
-
+import com.fr.general.GeneralContext;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.manage.PluginFilter;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
 import com.fr.report.cell.cellattr.highlight.HighlightAction;
 import com.fr.report.cell.cellattr.highlight.PaddingHighlightAction;
 
-import javax.swing.*;
+import javax.swing.SpinnerNumberModel;
 
 /**
 * @author richie
@@ -45,7 +49,23 @@ public class PaddingPane extends ConditionAttrSingleConditionPane<HighlightActio
         this.add(this.paddingScopeComboBox);
         this.paddingLeftSpinner.setValue(new Integer(0));
         this.paddingRightSpinner.setValue(new Integer(0));
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+
+            @Override
+            public void on(PluginEvent event) {
+                refreshIndentationUnit();
+            }
+        }, new PluginFilter() {
+
+            @Override
+            public boolean accept(PluginContext context) {
+                return context.contain(IndentationUnitProcessor.MARK_STRING);
+            }
+        });
+        refreshIndentationUnit();
+    }
 
+    private void refreshIndentationUnit() {
         this.indentationUnitProcessor = ExtraDesignClassManager.getInstance().getSingle(IndentationUnitProcessor.MARK_STRING);
         if (null == this.indentationUnitProcessor) {
             this.indentationUnitProcessor = new DefaultIndentationUnitProcessor();