From e24156166b53d1e928f22e281eb46db3b5d2f67e Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Mon, 14 Aug 2017 18:01:58 +0800
Subject: [PATCH 1/2] chart demo image

---
 .../com/fr/design/ChartTypeInterfaceManager.java  | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
index 8ef36de4c..64a2acb1f 100644
--- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
@@ -70,6 +70,7 @@ import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.plugin.solution.closeable.CloseableContainedMap;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.EnvChangedListener;
 import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
@@ -100,21 +101,13 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     }
     
     static {
-    
-        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
-        
+
+        GeneralContext.addEnvChangedListener(new EnvChangedListener() {
             @Override
-            public void on(PluginEvent event) {
+            public void envChanged() {
                 //重新注册designModuleFactory
                 DesignModuleFactory.registerExtraWidgetOptions(initWidgetOption());
             }
-        }, new PluginFilter() {
-        
-            @Override
-            public boolean accept(PluginContext context) {
-            
-                return context.contain(PluginModule.ExtraChartType);
-            }
         });
     }
     

From 845f78e8d5752dd238f23ce3fe354cce33470dea Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Mon, 14 Aug 2017 19:03:17 +0800
Subject: [PATCH 2/2] update

---
 .../fr/design/ChartTypeInterfaceManager.java  | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
index 64a2acb1f..6730fd124 100644
--- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
@@ -9,7 +9,23 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.chart.fun.IndependentChartUIProvider;
 import com.fr.design.chart.gui.ChartWidgetOption;
-import com.fr.design.chartinterface.*;
+import com.fr.design.chartinterface.AreaIndependentChartInterface;
+import com.fr.design.chartinterface.BarIndependentChartInterface;
+import com.fr.design.chartinterface.BubbleIndependentChartInterface;
+import com.fr.design.chartinterface.ColumnIndependentChartInterface;
+import com.fr.design.chartinterface.CustomIndependentChartInterface;
+import com.fr.design.chartinterface.DonutIndependentChartInterface;
+import com.fr.design.chartinterface.FunnelIndependentChartInterface;
+import com.fr.design.chartinterface.GanttIndependentChartInterface;
+import com.fr.design.chartinterface.GisMapIndependentChartInterface;
+import com.fr.design.chartinterface.LineIndependentChartInterface;
+import com.fr.design.chartinterface.MapIndependentChartInterface;
+import com.fr.design.chartinterface.MeterIndependentChartInterface;
+import com.fr.design.chartinterface.PieIndependentChartInterface;
+import com.fr.design.chartinterface.RadarIndependentChartInterface;
+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.gui.core.WidgetOption;
 import com.fr.design.gui.frpane.AttributeChangeListener;
@@ -62,12 +78,7 @@ import com.fr.plugin.chart.treemap.TreeMapIndependentVanChartInterface;
 import com.fr.plugin.chart.treemap.VanChartTreeMapPlot;
 import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot;
 import com.fr.plugin.chart.wordcloud.designer.WordCloudIndependentVanChartInterface;
-import com.fr.plugin.context.PluginContext;
-import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
-import com.fr.plugin.manage.PluginFilter;
-import com.fr.plugin.observer.PluginEvent;
-import com.fr.plugin.observer.PluginEventListener;
 import com.fr.plugin.solution.closeable.CloseableContainedMap;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.EnvChangedListener;
@@ -76,7 +87,11 @@ import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
 
 import javax.swing.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by eason on 14/12/29.