From 6b626aaa3cb5bf2b95918852d63b11c72139b67f Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Mon, 11 Nov 2019 12:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/fun/MultiStyleUIConfigProvider.java  |  2 +-
 ...IConfigProvider.java => StyleUIConfigProvider.java} |  2 +-
 .../fun/impl/AbstractMultiStyleUIConfigProvider.java   |  6 +++---
 ...rovider.java => AbstractStyleUIConfigProvider.java} |  6 +++---
 .../src/main/java/com/fr/design/style/StylePane.java   | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename designer-base/src/main/java/com/fr/design/fun/{CustomStyleUIConfigProvider.java => StyleUIConfigProvider.java} (92%)
 rename designer-base/src/main/java/com/fr/design/fun/impl/{AbstractCustomStyleUIConfigProvider.java => AbstractStyleUIConfigProvider.java} (79%)

diff --git a/designer-base/src/main/java/com/fr/design/fun/MultiStyleUIConfigProvider.java b/designer-base/src/main/java/com/fr/design/fun/MultiStyleUIConfigProvider.java
index d76c703773..d00138effb 100644
--- a/designer-base/src/main/java/com/fr/design/fun/MultiStyleUIConfigProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/MultiStyleUIConfigProvider.java
@@ -19,5 +19,5 @@ public interface MultiStyleUIConfigProvider extends Mutable {
      *
      * @return 配置项list
      */
-    List<CustomStyleUIConfigProvider> getConfigList();
+    List<StyleUIConfigProvider> getConfigList();
 }
diff --git a/designer-base/src/main/java/com/fr/design/fun/CustomStyleUIConfigProvider.java b/designer-base/src/main/java/com/fr/design/fun/StyleUIConfigProvider.java
similarity index 92%
rename from designer-base/src/main/java/com/fr/design/fun/CustomStyleUIConfigProvider.java
rename to designer-base/src/main/java/com/fr/design/fun/StyleUIConfigProvider.java
index 9bb23d9ab8..a28d276df2 100644
--- a/designer-base/src/main/java/com/fr/design/fun/CustomStyleUIConfigProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/StyleUIConfigProvider.java
@@ -11,7 +11,7 @@ import javax.swing.event.ChangeListener;
  * Created by kerry on 2019-11-11
  */
 @Open
-public interface CustomStyleUIConfigProvider extends Mutable {
+public interface StyleUIConfigProvider extends Mutable {
     String XML_TAG = "CustomStyleUIConfigProvider";
 
     int CURRENT_LEVEL = 1;
diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiStyleUIConfigProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiStyleUIConfigProvider.java
index 9c9c8d2aea..1ae4b7b07e 100644
--- a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiStyleUIConfigProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiStyleUIConfigProvider.java
@@ -1,6 +1,6 @@
 package com.fr.design.fun.impl;
 
-import com.fr.design.fun.CustomStyleUIConfigProvider;
+import com.fr.design.fun.StyleUIConfigProvider;
 import com.fr.design.fun.MultiStyleUIConfigProvider;
 import com.fr.stable.fun.mark.API;
 
@@ -13,8 +13,8 @@ import java.util.List;
 @API(level = MultiStyleUIConfigProvider.CURRENT_LEVEL)
 public abstract class AbstractMultiStyleUIConfigProvider implements MultiStyleUIConfigProvider {
     @Override
-    public List<CustomStyleUIConfigProvider> getConfigList() {
-        return new ArrayList<CustomStyleUIConfigProvider>();
+    public List<StyleUIConfigProvider> getConfigList() {
+        return new ArrayList<StyleUIConfigProvider>();
     }
 
     @Override
diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractCustomStyleUIConfigProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractStyleUIConfigProvider.java
similarity index 79%
rename from designer-base/src/main/java/com/fr/design/fun/impl/AbstractCustomStyleUIConfigProvider.java
rename to designer-base/src/main/java/com/fr/design/fun/impl/AbstractStyleUIConfigProvider.java
index ceda5621cf..2425df2ba2 100644
--- a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractCustomStyleUIConfigProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractStyleUIConfigProvider.java
@@ -1,7 +1,7 @@
 package com.fr.design.fun.impl;
 
 import com.fr.base.Style;
-import com.fr.design.fun.CustomStyleUIConfigProvider;
+import com.fr.design.fun.StyleUIConfigProvider;
 import com.fr.stable.StringUtils;
 import com.fr.stable.fun.mark.API;
 
@@ -11,8 +11,8 @@ import javax.swing.event.ChangeListener;
 /**
  * Created by kerry on 2019-11-11
  */
-@API(level = CustomStyleUIConfigProvider.CURRENT_LEVEL)
-public class AbstractCustomStyleUIConfigProvider implements CustomStyleUIConfigProvider {
+@API(level = StyleUIConfigProvider.CURRENT_LEVEL)
+public class AbstractStyleUIConfigProvider implements StyleUIConfigProvider {
     @Override
     public int currentAPILevel() {
         return CURRENT_LEVEL;
diff --git a/designer-realize/src/main/java/com/fr/design/style/StylePane.java b/designer-realize/src/main/java/com/fr/design/style/StylePane.java
index 64d3a0f667..928cd04d15 100644
--- a/designer-realize/src/main/java/com/fr/design/style/StylePane.java
+++ b/designer-realize/src/main/java/com/fr/design/style/StylePane.java
@@ -10,7 +10,7 @@ import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.fun.CustomStyleUIConfigProvider;
+import com.fr.design.fun.StyleUIConfigProvider;
 import com.fr.design.fun.MultiStyleUIConfigProvider;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -63,7 +63,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
 	private FRFontPane frFontPane = null;
 	private BorderPane borderPane = null;
 	private BackgroundPane backgroundPane = null;
-	private static List<CustomStyleUIConfigProvider> configList = PluginSandboxCollections.newSandboxList();
+	private static List<StyleUIConfigProvider> configList = PluginSandboxCollections.newSandboxList();
 	private PreivewArea previewArea;
 	private JPanel previewPane;
 
@@ -99,7 +99,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
 		mainTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane());
 		mainTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane());
 
-		for (CustomStyleUIConfigProvider config : configList) {
+		for (StyleUIConfigProvider config : configList) {
 			mainTabbedPane.addTab(config.configName(), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane());
 		}
 		mainTabbedPane.addChangeListener(tabChangeActionListener);
@@ -362,7 +362,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
 		if (this.backgroundPane != null) {
 			this.backgroundPane.populate(editing.getBackground());
 		}
-		for(CustomStyleUIConfigProvider tabConfig : configList){
+		for(StyleUIConfigProvider tabConfig : configList){
 			tabConfig.populateConfig(this.editing);
 		}
 		updatePreviewArea();
@@ -399,7 +399,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
 		if (this.backgroundPane != null) {
 			style = style.deriveBackground(this.backgroundPane.update());
 		}
-		for(CustomStyleUIConfigProvider tabConfig : configList){
+		for(StyleUIConfigProvider tabConfig : configList){
 			style = tabConfig.updateConfig();
 		}