From 4f20da587e7dfa481149d14e142f76f03ee41f88 Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Mon, 25 Jun 2018 09:15:45 +0800
Subject: [PATCH] update

---
 .../com/fr/design/module/DesignerModule.java  | 20 ++++++++++---------
 .../start/module/DesignerModuleActivator.java |  1 +
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/designer-realize/src/com/fr/design/module/DesignerModule.java b/designer-realize/src/com/fr/design/module/DesignerModule.java
index 0b88782a2..08df15c2c 100644
--- a/designer-realize/src/com/fr/design/module/DesignerModule.java
+++ b/designer-realize/src/com/fr/design/module/DesignerModule.java
@@ -131,25 +131,27 @@ public class DesignerModule extends DesignModule {
         GeneralXMLTools.Object_XML_Writer_Finder = startObjectXMLWriterFinder();
         addAdapterForPlate();
 
-        registerCellEditor();
-        registerFloatEditor();
-        registerData4Form();
-        registerOtherPane();
-
         InformationCollector.getInstance().collectStartTime();
 
         ExtraDesignClassManager.getInstance().getFeedback().didFeedback();
         StableFactory.registerMarkedObject(LogProvider.MARK_STRING, DesignerLogImpl.getInstance());
     }
 
-    private void registerOtherPane() {
+    public static void register() {
+        registerCellEditor();
+        registerFloatEditor();
+        registerData4Form();
+        registerOtherPane();
+    }
+
+    private static void registerOtherPane() {
         StableFactory.registerMarkedClass(BBSGuestPaneProvider.XML_TAG, BBSGuestPane.class);
     }
 
     /**
      * kunsnat:注册单元格选中Editor
      */
-    private void registerCellEditor() {
+    private static void registerCellEditor() {
 
         ActionFactory.registerCellEditor(String.class, new CellStringQuickEditor());
         ActionFactory.registerCellEditor(Number.class, new CellStringQuickEditor());
@@ -184,7 +186,7 @@ public class DesignerModule extends DesignModule {
     /**
      * kunnat: 注册悬浮选中Editor
      */
-    private void registerFloatEditor() {
+    private static void registerFloatEditor() {
 
         ActionFactory.registerFloatEditor(String.class, new FloatStringQuickEditor());
         ActionFactory.registerFloatEditor(Formula.class, new FloatStringQuickEditor());
@@ -494,7 +496,7 @@ public class DesignerModule extends DesignModule {
     }
 
 
-    private void registerData4Form() {
+    private static void registerData4Form() {
         StableFactory.registerMarkedClass(FormECDesignerProvider.XML_TAG, FormElementCaseDesigner.class);
         StableFactory.registerMarkedClass(FormECCompositeProvider.XML_TAG, FormReportComponentComposite.class);
         DesignModuleFactory.registerParameterReader(new WorkBookParameterReader());
diff --git a/designer-realize/src/com/fr/start/module/DesignerModuleActivator.java b/designer-realize/src/com/fr/start/module/DesignerModuleActivator.java
index 08c488df2..e6b0e1ab0 100644
--- a/designer-realize/src/com/fr/start/module/DesignerModuleActivator.java
+++ b/designer-realize/src/com/fr/start/module/DesignerModuleActivator.java
@@ -19,6 +19,7 @@ public class DesignerModuleActivator extends Activator implements Prepare {
         
         ModuleContext.startModule(DesignerModule.class.getName());
 
+        DesignerModule.register();
         ChartDesignerModule.register();
     }