diff --git a/designer-base/src/main/java/com/fr/design/fun/CellExpandAttrProvider.java b/designer-base/src/main/java/com/fr/design/fun/CellExpandAttrPanelProvider.java similarity index 60% rename from designer-base/src/main/java/com/fr/design/fun/CellExpandAttrProvider.java rename to designer-base/src/main/java/com/fr/design/fun/CellExpandAttrPanelProvider.java index 9e0c37355..ec37e1600 100644 --- a/designer-base/src/main/java/com/fr/design/fun/CellExpandAttrProvider.java +++ b/designer-base/src/main/java/com/fr/design/fun/CellExpandAttrPanelProvider.java @@ -8,11 +8,14 @@ import com.fr.stable.fun.mark.Mutable; * @author yaohwu * created by yaohwu at 2020/4/26 15:50 */ -public interface CellExpandAttrProvider extends Mutable { +public interface CellExpandAttrPanelProvider extends Mutable { - String MARK_STRING = "CellExpandAttrProvider"; + String MARK_STRING = "CellExpandAttrPanelProvider"; int CURRENT_LEVEL = 1; + /** + * @return 创建单元格属性-扩展设置中的额外面板 + */ BasicBeanPane createPanel(); } diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractCellExpandAttrProvider.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractCellExpandAttrPanelProvider.java similarity index 74% rename from designer-base/src/main/java/com/fr/design/fun/impl/AbstractCellExpandAttrProvider.java rename to designer-base/src/main/java/com/fr/design/fun/impl/AbstractCellExpandAttrPanelProvider.java index 57f54db6c..3ec730862 100644 --- a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractCellExpandAttrProvider.java +++ b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractCellExpandAttrPanelProvider.java @@ -1,7 +1,7 @@ package com.fr.design.fun.impl; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.fun.CellExpandAttrProvider; +import com.fr.design.fun.CellExpandAttrPanelProvider; import com.fr.report.cell.TemplateCellElement; import com.fr.stable.fun.mark.API; @@ -9,8 +9,8 @@ import com.fr.stable.fun.mark.API; * @author yaohwu * created by yaohwu at 2020/4/26 16:08 */ -@API(level = CellExpandAttrProvider.CURRENT_LEVEL) -public class AbstractCellExpandAttrProvider implements CellExpandAttrProvider { +@API(level = CellExpandAttrPanelProvider.CURRENT_LEVEL) +public class AbstractCellExpandAttrPanelProvider implements CellExpandAttrPanelProvider { /** * 当前接口的API等级,用于判断是否需要升级插件 @@ -19,7 +19,7 @@ public class AbstractCellExpandAttrProvider implements CellExpandAttrProvider { */ @Override public int currentAPILevel() { - return CellExpandAttrProvider.CURRENT_LEVEL; + return CellExpandAttrPanelProvider.CURRENT_LEVEL; } /** diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandExtraAttrPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandExtraAttrPane.java index 72427a156..e6a48bd65 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandExtraAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandExtraAttrPane.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe.cell.settingpane; import com.fr.design.ExtraDesignClassManager; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.fun.CellExpandAttrProvider; +import com.fr.design.fun.CellExpandAttrPanelProvider; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.event.EventDispatcher; @@ -49,7 +49,7 @@ public class CellExpandExtraAttrPane extends JPanel { PluginFilter filter = new PluginFilter() { @Override public boolean accept(PluginContext pluginContext) { - return pluginContext.contain(PluginModule.ExtraDesign, CellExpandAttrProvider.MARK_STRING); + return pluginContext.contain(PluginModule.ExtraDesign, CellExpandAttrPanelProvider.MARK_STRING); } }; PluginEventListener listener = new PluginEventListener() { @@ -103,9 +103,9 @@ public class CellExpandExtraAttrPane extends JPanel { extras = new ArrayList<>(); } extras.clear(); - Set attrProviders = ExtraDesignClassManager.getInstance().getArray(CellExpandAttrProvider.MARK_STRING); + Set attrProviders = ExtraDesignClassManager.getInstance().getArray(CellExpandAttrPanelProvider.MARK_STRING); if (attrProviders != null) { - for (CellExpandAttrProvider attrProvider : attrProviders) { + for (CellExpandAttrPanelProvider attrProvider : attrProviders) { BasicBeanPane extra = attrProvider.createPanel(); if (extra != null) { extras.add(extra);