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 getConfigList(); + List 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 getConfigList() { - return new ArrayList(); + public List getConfigList() { + return new ArrayList(); } @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