Merge pull request #176 in BA/design from ~XIAOHU/design:dev to dev

* commit '67e6c176153c129f3fa63b5ad45722eba9356228':
  update
  update
  update
  updae
  update
  update
  插件读取顺序
  迭代-凸显新图表

designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java

@@ -25,6 +25,7 @@ import com.fr.stable.EnvChangedListener;
 import com.fr.stable.StringUtils;
 import com.fr.stable.fun.Authorize;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
+import com.fr.stable.plugin.PluginReadListener;
 import com.fr.stable.plugin.PluginSimplify;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
@@ -49,7 +50,6 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         if (classManager == null) {
             classManager = new ChartTypeInterfaceManager();
             chartTypeInterfaces.clear();
-            classManager.readDefault();
             classManager.readXMLFile();
         }
         return classManager;
@@ -63,6 +63,17 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         });
     }
 
+    static {
+        GeneralContext.addPluginReadListener(new PluginReadListener() {
+            @Override
+            public void success() {
+                if (chartTypeInterfaces != null) {
+                    readDefault();
+                }
+            }
+        });
+    }
+
     private synchronized static void envChanged() {
         classManager = null;
     }
@@ -91,7 +102,11 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
     }
 
     public String getIconPath(String plotID) {
-        return chartTypeInterfaces.get(plotID).getIconPath();
+        if (chartTypeInterfaces.get(plotID) != null) {
+            return chartTypeInterfaces.get(plotID).getIconPath();
+        }else {
+            return StringUtils.EMPTY;
+        }
     }
 
     /**