Pull request #1688: REPORT-32088【组件加密】@harrison集群安装出现初始化失败

Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0

* commit '5eadee7e22fc2a4e27869baa9d84007cd8b2a2f6':
  REPORT-32088【组件加密】@harrison集群安装出现初始化失败 插件接口的位置有点问题， 不能放到 form 下， 要放到 design 下

designer-form/src/main/java/com/fr/design/designer/beans/events/CreatorEventListenerTable.java

@@ -1,8 +1,8 @@
 package com.fr.design.designer.beans.events;
 
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.designer.creator.XComponent;
 import com.fr.design.fun.DesignerEditListenerProvider;
-import com.fr.form.main.ExtraFormClassManager;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.injectable.PluginModule;
 
@@ -44,7 +44,7 @@ public class CreatorEventListenerTable {
         }
     
         //触发插件的事件
-        ExtraFormClassManager manager = PluginModule.getAgent(PluginModule.ExtraForm);
+        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
         Set<DesignerEditListenerProvider> providers = manager.getArray(DesignerEditListenerProvider.XML_TAG);
         for (DesignerEditListenerProvider provider : providers) {
             provider.fireCreatorModified(evt);

designer-form/src/test/java/com/fr/design/designer/beans/models/SelectionModelTest.java

@@ -6,7 +6,6 @@ import com.fr.design.designer.creator.XCreator;
 import com.fr.design.fun.ClipboardHandlerProvider;
 import com.fr.design.fun.impl.AbstractClipboardHandlerProvider;
 import com.fr.design.mainframe.FormDesigner;
-import com.fr.form.main.ExtraFormClassManager;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.stable.fun.mark.Mutable;
 import org.easymock.EasyMock;
@@ -59,18 +58,15 @@ public class SelectionModelTest {
         EasyMock.expect(designManager.getArray(ClipboardHandlerProvider.XML_TAG))
                 .andReturn(providers)
                 .anyTimes();
-        ExtraFormClassManager formManager = EasyMock.mock(ExtraFormClassManager.class);
-        EasyMock.expect(formManager.getArray("DesignerEditListenerProvider"))
+        EasyMock.expect(designManager.getArray("DesignerEditListenerProvider"))
                 .andReturn(new HashSet<Mutable>())
                 .anyTimes();
-        EasyMock.replay(designManager, formManager);
+        EasyMock.replay(designManager);
     
         PowerMock.mockStatic(PluginModule.class);
         EasyMock.expect(PluginModule.getAgent(PluginModule.ExtraDesign))
                 .andReturn(designManager)
                 .anyTimes();
-        EasyMock.expect(PluginModule.getAgent(PluginModule.ExtraForm))
-                .andReturn(formManager).anyTimes();
         PowerMock.replayAll();
     }