module代码质量

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -6,6 +6,7 @@ import com.fr.base.MultiFieldParameter;
 import com.fr.base.process.ProcessOperator;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.actions.NewFormAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.insert.cell.BiasCellAction;
 import com.fr.design.actions.insert.cell.ChartCellAction;
@@ -42,7 +43,6 @@ import com.fr.design.mainframe.InformationCollector;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.WidgetToolBarPane;
-import com.fr.design.actions.NewFormAction;
 import com.fr.design.mainframe.bbs.BBSGuestPane;
 import com.fr.design.mainframe.bbs.UserInfoPane;
 import com.fr.design.mainframe.form.FormECCompositeProvider;
@@ -57,9 +57,9 @@ import com.fr.design.parameter.FormParameterReader;
 import com.fr.design.parameter.ParameterPropertyPane;
 import com.fr.design.parameter.WorkBookParameterReader;
 import com.fr.design.widget.ui.btn.FormSubmitButtonDetailPane;
+import com.fr.form.module.FormBaseActivator;
 import com.fr.form.stable.ElementCaseThumbnailProcessor;
 import com.fr.form.ui.WidgetInfoConfig;
-import com.fr.general.ModuleContext;
 import com.fr.general.xml.GeneralXMLTools;
 import com.fr.js.EmailJavaScript;
 import com.fr.js.JavaScriptImpl;
@@ -89,6 +89,7 @@ import com.fr.report.cell.cellattr.core.SubReport;
 import com.fr.report.cell.cellattr.core.group.DSColumn;
 import com.fr.report.cell.painter.BiasTextPainter;
 import com.fr.report.cell.painter.CellImagePainter;
+import com.fr.report.module.ReportBaseActivator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.bridge.StableFactory;
@@ -100,7 +101,7 @@ import com.fr.stable.xml.ObjectXMLWriterFinder;
 import com.fr.start.BBSGuestPaneProvider;
 import com.fr.xml.ReportXMLUtils;
 
-import java.awt.*;
+import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
@@ -108,8 +109,6 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import static com.fr.stable.module.Module.ENGINE_MODULE;
-
 /**
  * Created by juhaoyu on 2018/1/31.
  * 触发原来的DesignerModule的启动
@@ -152,7 +151,7 @@ public class DesignerActivator extends Activator {
         }
     }
 
-    private static void designerModuleStart() {
+    private void designerModuleStart() {
 
         StableFactory.registerMarkedClass(ExtraDesignClassManagerProvider.XML_TAG, ExtraDesignClassManager.class);
         ActionFactory.registerCellInsertActionClass(actionsForInsertCellElement());
@@ -264,8 +263,9 @@ public class DesignerActivator extends Activator {
      * kunsnat: 一些模块信息 必须跟随设计器启动,
      * 比如 读取CC.XML, 设计器启动之后, 马上会读取XML, 需要Chart_Module中的注册信息
      */
-    private static void justStartModules4Engine() {
-        ModuleContext.startModule(ENGINE_MODULE);
+    private void justStartModules4Engine() {
+        startSub(ReportBaseActivator.class);
+        startSub(FormBaseActivator.class);
     }
 
     private static void justStartModules4Designer() {