换一个扩展性更好的方式

designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java

@@ -23,6 +23,7 @@ import com.fr.plugin.AbstractExtraClassManager;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
 import com.fr.plugin.solution.closeable.CloseableContainedSet;
+import com.fr.stable.Filter;
 import com.fr.stable.plugin.ExtraDesignClassManagerProvider;
 
 import java.util.ArrayList;
@@ -113,29 +114,27 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
         return result.toArray(new WidgetOption[result.size()]);
     }
 
-
-    /**
-     * 获取插件注册的工具栏按钮（严格区分决策报表与普通模板）
-     * @return
-     */
-    public WidgetOption[] getStrictWebWidgetOptions() {
-        return createWebWidgetOptions(true);
-    }
-
     public WidgetOption[] getWebWidgetOptions() {
-        return createWebWidgetOptions(false);
+        return getWebWidgetOptions(new Filter<ToolbarItemProvider>() {
+            @Override
+            public boolean accept(ToolbarItemProvider toolbarItemProvider) {
+                return true;
+            }
+        });
     }
 
-    private WidgetOption[] createWebWidgetOptions(boolean filterByTemplateType) {
+    public WidgetOption[] getWebWidgetOptions(Filter<ToolbarItemProvider> filter) {
         Set<ToolbarItemProvider> set = getArray(ToolbarItemProvider.XML_TAG);
-        if (set.isEmpty()) {
+        return getWebWidgetOptions(set, filter);
+    }
+
+    public WidgetOption[] getWebWidgetOptions(Set<ToolbarItemProvider> set, Filter<ToolbarItemProvider> filter) {
+        if (set == null || set.isEmpty()) {
             return new WidgetOption[0];
         }
         List<WidgetOption> list = new ArrayList<>();
         for (ToolbarItemProvider provider : set) {
-            if (filterByTemplateType && !provider.accept()) {
-                continue;
-            }
+            if (filter != null && filter.accept(provider)) {
                 WidgetOption option = WidgetOptionFactory.createByWidgetClass(
                         provider.nameForWidget(),
                         IOUtils.readIcon(provider.iconPathForWidget()),
@@ -143,6 +142,7 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
                 );
                 list.add(option);
             }
+        }
         return list.toArray(new WidgetOption[list.size()]);
     }
 

designer-base/src/main/java/com/fr/design/fun/ToolbarItemProvider.java

@@ -1,6 +1,8 @@
 package com.fr.design.fun;
 
+import com.fr.design.mainframe.JTemplate;
 import com.fr.form.ui.Widget;
+import com.fr.stable.Filter;
 import com.fr.stable.fun.mark.Mutable;
 
 /**
@@ -8,7 +10,7 @@ import com.fr.stable.fun.mark.Mutable;
  * @since : 8.0
  * 自定义web工具栏菜单
  */
-public interface ToolbarItemProvider extends Mutable {
+public interface ToolbarItemProvider extends Mutable, Filter<JTemplate> {
 
     String XML_TAG = "ToolbarItemProvider";
 
@@ -37,9 +39,11 @@ public interface ToolbarItemProvider extends Mutable {
     String nameForWidget();
 
     /**
-     * 当前编辑的模板类型（决策报表 or cpt）是否支持
-     * @return 支持返回true,否则false
+     * 模板（决策报表 or cpt）是否支持此工具栏按钮
+     * JTemplate  模板
+     * @return 支持返回true, 否则false
      */
-    boolean accept();
+    @Override
+    boolean accept(JTemplate template);
 
 }

designer-base/src/main/java/com/fr/design/fun/impl/AbstractToolbarItem.java

@@ -24,8 +24,10 @@ public abstract class AbstractToolbarItem extends AbstractProvider implements To
     }
 
     @Override
-    public boolean accept() {
-        JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        return currentTemplate == null || currentTemplate.isJWorkBook() || currentTemplate instanceof JVirtualTemplate;
+    public boolean accept(JTemplate jTemplate) {
+        if (jTemplate == null) {
+            jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        }
+        return jTemplate == null || jTemplate.isJWorkBook() || jTemplate instanceof JVirtualTemplate;
     }
 }

designer-base/src/test/java/com/fr/design/ExtraDesignClassManagerTest.java

@@ -0,0 +1,70 @@
+package com.fr.design;
+
+import com.fr.config.dao.DaoContext;
+import com.fr.config.dao.impl.LocalClassHelperDao;
+import com.fr.config.dao.impl.LocalEntityDao;
+import com.fr.config.dao.impl.LocalXmlEntityDao;
+import com.fr.design.fun.ToolbarItemProvider;
+import com.fr.design.gui.core.WidgetOption;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.JVirtualTemplate;
+import com.fr.general.ModuleContext;
+import com.fr.log.FineLoggerFactory;
+import com.fr.report.restriction.CellCountRestriction;
+import com.fr.report.restriction.ReportRestrictionScene;
+import com.fr.restriction.Restrictions;
+import com.fr.stable.Filter;
+import com.fr.stable.module.Module;
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author zack
+ * @version 10.0
+ *          Created by zack on 2019/9/17
+ */
+public class ExtraDesignClassManagerTest extends TestCase {
+    @Override
+    protected void setUp() throws Exception {
+        DaoContext.setEntityDao(new LocalEntityDao());
+        DaoContext.setClassHelperDao(new LocalClassHelperDao());
+        DaoContext.setXmlEntityDao(new LocalXmlEntityDao());
+        ModuleContext.startModule(Module.PAGE_MODULE);
+        Restrictions.register(ReportRestrictionScene.CELL_COUNT, new CellCountRestriction());
+    }
+
+    public void testGetWebOption() {
+        try {
+            final JTemplate jTemplate = new JVirtualTemplate(null);
+            ToolbarItemProvider item = EasyMock.mock(ToolbarItemProvider.class);
+            ToolbarItemProvider item1 = EasyMock.mock(ToolbarItemProvider.class);
+            EasyMock.expect(item.accept(jTemplate)).andReturn(false).anyTimes();
+            EasyMock.expect(item.classForWidget()).andReturn(null).anyTimes();
+            EasyMock.expect(item.iconPathForWidget()).andReturn("").anyTimes();
+            EasyMock.expect(item.nameForWidget()).andReturn("1").anyTimes();
+            EasyMock.expect(item1.accept(jTemplate)).andReturn(true).anyTimes();
+            EasyMock.expect(item1.classForWidget()).andReturn(null).anyTimes();
+            EasyMock.expect(item1.iconPathForWidget()).andReturn("").anyTimes();
+            EasyMock.expect(item1.nameForWidget()).andReturn("2").anyTimes();
+            EasyMock.replay(item);
+            EasyMock.replay(item1);
+
+            Set<ToolbarItemProvider> set = new HashSet<>();
+            set.add(item);
+            set.add(item1);
+            WidgetOption[] widgetOptions = ExtraDesignClassManager.getInstance().getWebWidgetOptions(set, new Filter<ToolbarItemProvider>() {
+                @Override
+                public boolean accept(ToolbarItemProvider toolbarItemProvider) {
+                    return toolbarItemProvider.accept(jTemplate);
+                }
+            });
+            Assert.assertEquals(1, widgetOptions.length);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+    }
+}

designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java

@@ -3,12 +3,15 @@ package com.fr.design.mainframe.widget.accessibles;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.fun.ToolbarItemProvider;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.mainframe.FormWebWidgetConstants;
 import com.fr.design.mainframe.widget.editors.ElementCaseToolBarPane;
 import com.fr.design.mainframe.widget.wrappers.ElementCaseToolBarWrapper;
 import com.fr.form.web.FormToolBarManager;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.Filter;
 
 import javax.swing.SwingUtilities;
 import java.util.ArrayList;
@@ -53,7 +56,12 @@ public class AccessibleElementCaseToolBarEditor extends UneditableAccessibleEdit
         List<WidgetOption> defaultOptions = Arrays.asList(FormWebWidgetConstants.getFormElementCaseToolBarInstance());
         List<WidgetOption> options = new ArrayList<WidgetOption>();
         options.addAll(defaultOptions);
-        WidgetOption[] widgetOptions = ExtraDesignClassManager.getInstance().getStrictWebWidgetOptions();
+        WidgetOption[] widgetOptions = ExtraDesignClassManager.getInstance().getWebWidgetOptions(new Filter<ToolbarItemProvider>() {
+            @Override
+            public boolean accept(ToolbarItemProvider toolbarItemProvider) {
+                return toolbarItemProvider.accept(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate());
+            }
+        });
         options.addAll(Arrays.asList(widgetOptions));
         return options.toArray(new WidgetOption[options.size()]);
     }