Merge branch 'master' of http://www.finedevelop.com:2015/scm/~xiaoxia/design

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

@@ -163,7 +163,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
                 Map.Entry entry = (Map.Entry) iterator.next();
                 String priority = (String) entry.getKey();
                 String imagePath = getIconPath(priority, plotID);
-                if (!StringUtils.isEmpty(imagePath)) {
+                if (StringUtils.isNotEmpty(imagePath)) {
                     return imagePath;
                 }
             }
@@ -273,10 +273,20 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
      */
     public String getTitle4PopupWindow(String priority, String plotID){
         if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority) && chartTypeInterfaces.get(priority).containsKey(plotID)){
-            HashMap<String, IndependentChartUIProvider> chartUIList = chartTypeInterfaces.get(priority);
             IndependentChartUIProvider provider = chartTypeInterfaces.get(priority).get(plotID);
-            return   provider.getPlotTypePane().title4PopupWindow();
+            return provider.getPlotTypePane().title4PopupWindow();
+        }
 
+        //兼容老的插件
+        if (chartTypeInterfaces != null) {
+            Iterator iterator = chartTypeInterfaces.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                String defaultPriority = (String) entry.getKey();
+                if (chartTypeInterfaces.get(defaultPriority).containsKey(plotID)) {
+                    return chartTypeInterfaces.get(defaultPriority).get(plotID).getPlotTypePane().title4PopupWindow();
+                }
+            }
         }
         return new String();
     }