Merge pull request #135 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0

* commit 'e3ac9513f3a1dea27c3a43aa0f87161c3616fab2':
  module to activator
  CHART-2399 10.0启动不带用envchange widgetoptions在chartdesignermodule注册

designer-chart/src/com/fr/design/ChartTypeInterfaceManager.java

@@ -27,7 +27,6 @@ import com.fr.design.chartinterface.RangeIndependentChartInterface;
 import com.fr.design.chartinterface.StockIndependentChartInterface;
 import com.fr.design.chartinterface.XYScatterIndependentChartInterface;
 import com.fr.design.condition.ConditionAttributesPane;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
@@ -60,7 +59,6 @@ import com.fr.plugin.chart.radar.VanChartRadarPlot;
 import com.fr.plugin.chart.scatter.VanChartScatterPlot;
 import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.treemap.VanChartTreeMapPlot;
-import com.fr.plugin.chart.vanchart.imgevent.design.DesignImageEvent;
 import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
@@ -69,7 +67,6 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.StringUtils;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
-import com.fr.van.chart.DownloadOnlineSourcesHelper;
 import com.fr.van.chart.area.AreaIndependentVanChartInterface;
 import com.fr.van.chart.bar.BarIndependentVanChartInterface;
 import com.fr.van.chart.bubble.BubbleIndependentVanChartInterface;
@@ -133,13 +130,11 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
             public void envChanged() {
                 //重新注册designModuleFactory
                 DesignModuleFactory.registerExtraWidgetOptions(initWidgetOption());
-                DesignImageEvent.registerDefaultCallbackEvent(HistoryTemplateListPane.getInstance());
-                DesignImageEvent.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper());
             }
         });
     }
     
-    private static WidgetOption[] initWidgetOption() {
+    public static WidgetOption[] initWidgetOption() {
 
         ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
         ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];

designer-chart/src/com/fr/design/module/ChartDesignerModule.java

@@ -9,15 +9,18 @@ import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.chart.ChartDialog;
 import com.fr.design.chart.gui.ChartComponent;
 import com.fr.design.chart.gui.ChartWidgetOption;
+import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.mainframe.App;
 import com.fr.design.mainframe.ChartPropertyPane;
 import com.fr.form.ui.ChartEditor;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
+import com.fr.plugin.chart.vanchart.imgevent.design.DesignImageEvent;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
+import com.fr.van.chart.DownloadOnlineSourcesHelper;
 import com.fr.van.chart.map.server.ChartMapEditorAction;
 
 import javax.swing.Icon;
@@ -30,19 +33,11 @@ import javax.swing.Icon;
  * Time: 上午9:13
  */
 public class ChartDesignerModule extends DesignModule {
-    public void start() {
-        super.start();
-        dealBeforeRegister();
-        register();
-        registerFloatEditor();
-    }
 
-    protected void dealBeforeRegister(){
+    public static void register(){
         StableFactory.registerMarkedClass(ExtraChartDesignClassManagerProvider.XML_TAG, ChartTypeInterfaceManager.class);
         StableFactory.getStaticMarkedInstanceObjectFromClass(ExtraChartDesignClassManagerProvider.XML_TAG, ExtraChartDesignClassManagerProvider.class);
-    }
 
-    private void register(){
         DesignModuleFactory.registerHyperlinkGroupType(new ChartHyperlinkGroup());
 
         DesignModuleFactory.registerChartEditorClass(ChartEditor.class);
@@ -54,10 +49,13 @@ public class ChartDesignerModule extends DesignModule {
 
         ActionFactory.registerChartPreStyleAction(new ChartPreStyleAction());
         ActionFactory.registerChartMapEditorAction(new ChartMapEditorAction());
-    }
 
-    protected void registerFloatEditor() {
         ActionFactory.registerChartCollection(ChartCollection.class);
+
+        DesignModuleFactory.registerExtraWidgetOptions(ChartTypeInterfaceManager.initWidgetOption());
+
+        DesignImageEvent.registerDefaultCallbackEvent(HistoryTemplateListPane.getInstance());
+        DesignImageEvent.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper());
     }
 
     /**

designer-realize/src/com/fr/start/module/DesignerModuleActivator.java

@@ -1,6 +1,7 @@
 package com.fr.start.module;
 
 import com.fr.design.mainframe.loghandler.socketio.DesignerSocketIO;
+import com.fr.design.module.ChartDesignerModule;
 import com.fr.design.module.DesignerModule;
 import com.fr.general.ModuleContext;
 import com.fr.locale.InterMutableKey;
@@ -19,6 +20,8 @@ public class DesignerModuleActivator extends Activator implements Prepare {
         
         ModuleContext.startModule(DesignerModule.class.getName());
         DesignerSocketIO.init();
+
+        ChartDesignerModule.register();
     }
 
     @Override