Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)

* commit 'b641a8863a0f627950c7c318508beef0ac816144':
  REPORT-20328 sonar
  REPORT-20981 模板版本管理减少磁盘占用（远程没有更新jar时，提示相应信息）
  image icon
  接口评审出的两个问题 1.demopath放到typeUI接口中 2.typepane.tipPath 默认调用1
  报错
  接口抽象类
  删除 typepane的tipName title4pop plottypeid
  CHART-10225 兼容扩展图表插件
  CHART-10247 图表选择界面不去chart对象里面拿图片 直接去ChartTypeUIProvider拿

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -897,17 +897,13 @@ public class PreferencePane extends BasicPane {
             protected void done() {
                 try {
                     get();
-                } catch (InterruptedException | ExecutionException e) {
+                } catch (ExecutionException e) {
+                    updateGcDialogPanelInfo(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Need_Update_Remote_Server_Jar"));
+                    return;
+                } catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error(e, e.getMessage());
                 }
-                stopGcProgressTimer();
+                updateGcDialogPanelInfo(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Reduce_File_Size") + fileSizeConvert(size));
-                gcMessage.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Reduce_File_Size") + fileSizeConvert(size));
-                if (null != gcProgressBar) {
-                    gcProgressBarPanel.remove(gcProgressBar);
-                }
-                if (null != gcDialog) {
-                    gcDialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"));
-                }
                 gcDialogDownPane.revalidate();
                 gcDialogDownPane.repaint();
                 gcDialogDownPane.add(gcOkButton);
@@ -932,6 +928,22 @@ public class PreferencePane extends BasicPane {
         gcDialog.dispose();
     }
 
+    /**
+     * gc 后更新进度条面板信息
+     *
+     * @param message
+     */
+    private void updateGcDialogPanelInfo(String message) {
+        stopGcProgressTimer();
+        gcMessage.setText(message);
+        if (null != gcProgressBar) {
+            gcProgressBarPanel.remove(gcProgressBar);
+        }
+        if (null != gcDialog) {
+            gcDialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"));
+        }
+    }
+
     /**
      * 初始化 gc 对话框
      */

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java

@@ -3016,11 +3016,6 @@ private boolean fractionalFontMetricsEnabled;
 			return he;
 		}
 
-		private final boolean equal(LinkGeneratorResult e1,
-				LinkGeneratorResult e2) {
-			return e1.getSourceOffset()==e2.getSourceOffset();
-		}
-
 		@Override
 		public void mouseClicked(MouseEvent e) {
 			if (getHyperlinksEnabled() && isScanningForLinks &&
@@ -3080,8 +3075,7 @@ private boolean fractionalFontMetricsEnabled;
 							isLinkAtOffset(RSyntaxTextArea.this, offs);
 					if (newResult!=null) {
 						// Repaint if we're at a new link now.
-						if (linkGeneratorResult==null ||
+						if (linkGeneratorResult==null || newResult.getSourceOffset() != linkGeneratorResult.getSourceOffset()) {
-								!equal(newResult, linkGeneratorResult)) {
 							repaint();
 						}
 						linkGeneratorResult = newResult;
@@ -3120,4 +3114,4 @@ private boolean fractionalFontMetricsEnabled;
 	}
 
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/Style.java

@@ -9,6 +9,7 @@
  */
 package com.fr.design.gui.syntax.ui.rsyntaxtextarea;
 
+import com.fr.log.FineLoggerFactory;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -123,15 +124,15 @@ public class Style implements Cloneable {
 		Style clone = null;
 		try {
 			clone = (Style)super.clone();
+			clone.foreground = foreground;
+			clone.background = background;
+			clone.font = font;
+			clone.underline = underline;
+			clone.fontMetrics = fontMetrics;
 		} catch (CloneNotSupportedException cnse) { // Never happens
-			cnse.printStackTrace();
+			FineLoggerFactory.getLogger().error(cnse.getMessage(), cnse);
-			return null;
+			clone = null;
 		}
-		clone.foreground = foreground;
-		clone.background = background;
-		clone.font = font;
-		clone.underline = underline;
-		clone.fontMetrics = fontMetrics;
 		return clone;
 	}
 
@@ -193,4 +194,4 @@ public class Style implements Cloneable {
 	}
 
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxScheme.java

@@ -9,6 +9,7 @@
  */
 package com.fr.design.gui.syntax.ui.rsyntaxtextarea;
 
+import com.fr.log.FineLoggerFactory;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
@@ -121,17 +122,17 @@ public class SyntaxScheme implements Cloneable, TokenTypes {
 	public Object clone() {
 		SyntaxScheme shcs = null;
 		try {
-			shcs = (SyntaxScheme)super.clone();
+			shcs = (SyntaxScheme) super.clone();
-		} catch (CloneNotSupportedException cnse) { // Never happens
+			shcs.styles = new Style[styles.length];
-			cnse.printStackTrace();
+			for (int i = 0; i < styles.length; i++) {
-			return null;
+				Style s = styles[i];
-		}
+				if (s != null) {
-		shcs.styles = new Style[styles.length];
+					shcs.styles[i] = (Style) s.clone();
-		for (int i=0; i<styles.length; i++) {
+				}
-			Style s = styles[i];
-			if (s!=null) {
-				shcs.styles[i] = (Style)s.clone();
 			}
+		} catch (CloneNotSupportedException cnse) { // Never happens
+			FineLoggerFactory.getLogger().error(cnse.getMessage(), cnse);
+			shcs = null;
 		}
 		return shcs;
 	}
@@ -712,4 +713,4 @@ public class SyntaxScheme implements Cloneable, TokenTypes {
 	}
 
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/HtmlFoldParser.java

@@ -149,7 +149,7 @@ public class HtmlFoldParser implements FoldParser {
 						}
 
 						// ?> or %>
-						else if (t.startsWith(LANG_END[language])) {
+						else if (currentFold != null && t.startsWith(LANG_END[language])) {
 							int phpEnd = t.getEndOffset() - 1;
 							currentFold.setEndOffset(phpEnd);
 							Fold parentFold = currentFold.getParent();
@@ -400,4 +400,4 @@ public class HtmlFoldParser implements FoldParser {
 	}
 
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RTextAreaBase.java

@@ -723,37 +723,13 @@ int currentCaretY;							// Used to know when to rehighlight current line.
 		// If we're wrapping lines we need to check the actual y-coordinate
 		// of the caret, not just the line number, since a single logical
 		// line can span multiple physical lines.
-		if (getLineWrap()) {
+		try {
-			try {
+			Rectangle temp = modelToView(dot);
-				Rectangle temp = modelToView(dot);
+			if (temp != null) {
-				if (temp!=null) {
+				currentCaretY = temp.y;
-					currentCaretY = temp.y;
-				}
-			} catch (BadLocationException ble) {
-				ble.printStackTrace(); // Should never happen.
 			}
-		}
+		} catch (BadLocationException ble) {
-
+			ble.printStackTrace(); // Should never happen.
-		// No line wrap - we can simply check the line number (quicker).
-		else {
-//			Document doc = getDocument();
-//			if (doc!=null) {
-//				Element map = doc.getDefaultRootElement();
-//				int caretLine = map.getElementIndex(dot);
-//				Rectangle alloc = ((RTextAreaUI)getUI()).
-//											getVisibleEditorRect();
-//				if (alloc!=null)
-//					currentCaretY = alloc.y + caretLine*lineHeight;
-//			}
-// Modified for code folding requirements
-try {
-	Rectangle temp = modelToView(dot);
-	if (temp!=null) {
-		currentCaretY = temp.y;
-	}
-} catch (BadLocationException ble) {
-	ble.printStackTrace(); // Should never happen.
-}
 		}
 
 		// Repaint current line (to fill in entire highlight), and old line
@@ -1211,4 +1187,4 @@ try {
 	}
 
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/SearchEngine.java

@@ -25,6 +25,7 @@ import javax.swing.text.Caret;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.DocumentRange;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.folding.FoldManager;
+import org.jetbrains.annotations.NotNull;
 
 
 /**
@@ -174,6 +175,7 @@ public class SearchEngine {
 	 * @param forward Whether we're searching forward or backward.
 	 * @return The character sequence.
 	 */
+	@NotNull
 	private static CharSequence getFindInCharSequence(RTextArea textArea,
 			int start, boolean forward) {
 		RDocument doc = (RDocument)textArea.getDocument();
@@ -752,7 +754,6 @@ public class SearchEngine {
 		int start = makeMarkAndDotEqual(textArea, forward);
 
 		CharSequence findIn = getFindInCharSequence(textArea, start, forward);
-		if (findIn==null) return new SearchResult();
 
 		int markAllCount = 0;
 		if (context.getMarkAll()) {
@@ -1014,4 +1015,4 @@ public class SearchEngine {
 	}
 
 
-}
+}

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/VolatileImageBackgroundPainterStrategy.java

@@ -103,6 +103,9 @@ public class VolatileImageBackgroundPainterStrategy
 				} finally {
 					tracker.removeImage(i, 1);
 				}
+				if(bgImage == null) {
+					continue;
+				}
 				bgImage.getGraphics().drawImage(i, 0,0, null);
 				tracker.addImage(bgImage, 0);
 				try {
@@ -114,7 +117,7 @@ public class VolatileImageBackgroundPainterStrategy
 				} finally {
 					tracker.removeImage(bgImage, 0);
 				}
-			} while (bgImage.contentsLost());
+			} while (bgImage != null && bgImage.contentsLost());
 		} // End of if (master!=null).
 		else {
 			bgImage = null;
@@ -137,4 +140,4 @@ public class VolatileImageBackgroundPainterStrategy
 	}
 
 
-}
+}

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

@@ -1,13 +1,15 @@
 package com.fr.design;
 
 import com.fr.chart.base.ChartConstants;
-import com.fr.chart.base.ChartInternationalNameContentBean;
+import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.charttypes.ChartTypeManager;
+import com.fr.chart.fun.ChartTypeProvider;
 import com.fr.chartx.attr.ChartProvider;
+import com.fr.common.annotations.Compatible;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.beans.FurtherBasicBeanPane;
-import com.fr.design.chart.fun.IndependentChartUIProvider;
+import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.chart.gui.ChartWidgetOption;
 import com.fr.design.chartinterface.AreaIndependentChartInterface;
 import com.fr.design.chartinterface.BarIndependentChartInterface;
@@ -38,10 +40,13 @@ import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPa
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.module.DesignModuleFactory;
+import com.fr.extended.chart.AbstractChart;
 import com.fr.form.ui.ChartEditor;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
+import com.fr.invoke.Reflect;
 import com.fr.locale.InterProviderFactory;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
@@ -111,9 +116,9 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
 
     private static ChartTypeInterfaceManager classManager = new ChartTypeInterfaceManager();
-    
+
-    private static LinkedHashMap<String, CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>> chartTypeInterfaces =
+    private static LinkedHashMap<String, CloseableContainedMap<String, ChartTypeUIProvider, LinkedHashMap>> chartTypeInterfaces =
-        new LinkedHashMap<String, CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>>();
+            new LinkedHashMap<String, CloseableContainedMap<String, ChartTypeUIProvider, LinkedHashMap>>();
 
     private static Map<String, String> idAndPriorityMap = new HashMap<String, String>();
 
@@ -156,18 +161,18 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     
     public static WidgetOption[] initWidgetOption() {
 
-        ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
+        String[] chartIDs = ChartTypeManager.getInstance().getAllChartIDs();
-        ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
+        ChartWidgetOption[] child = new ChartWidgetOption[chartIDs.length];
         int index = 0;
-        for (ChartInternationalNameContentBean bean : typeName) {
+        for (String chartID : chartIDs) {
-            String plotID = bean.getChartID();
+            ChartProvider[] rowChart = ChartTypeManager.getInstance().getChartTypes(chartID);
-            ChartProvider[] rowChart = ChartTypeManager.getInstance().getChartTypes(plotID);
+            if (ArrayUtils.isEmpty(rowChart) && !ChartTypeManager.innerChart(chartID)) {
-            if (ArrayUtils.isEmpty(rowChart) && !ChartTypeManager.innerChart(plotID)) {
                 continue;
             }
-            String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
+            String name = ChartTypeInterfaceManager.getInstance().getName(chartID);
+            String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(chartID);
             Icon icon = IOUtils.readIcon(iconPath);
-            child[index] = new ChartWidgetOption(InterProviderFactory.getProvider().getLocText(bean.getName()), icon, ChartEditor.class, plotID);
+            child[index] = new ChartWidgetOption(name, icon, ChartEditor.class, chartID);
             index++;
         }
 
@@ -218,18 +223,18 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface());
         addChartTypeInterface(DEPRECATED_CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface());
     }
-    
+
-    private static void addChartTypeInterface(String priority, String plotID, IndependentChartUIProvider provider) {
+    private static void addChartTypeInterface(String priority, String plotID, ChartTypeUIProvider provider) {
         
         if (chartTypeInterfaces != null) {
             if (!chartTypeInterfaces.containsKey(priority)) {
                 //新建一个具体图表列表
-                CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap> chartUIList
+                CloseableContainedMap<String, ChartTypeUIProvider, LinkedHashMap> chartUIList
-                    = new CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>(LinkedHashMap.class);
+                        = new CloseableContainedMap<String, ChartTypeUIProvider, LinkedHashMap>(LinkedHashMap.class);
                 chartUIList.put(plotID, provider);
                 chartTypeInterfaces.put(priority, chartUIList);
             } else {
-                Map<String, IndependentChartUIProvider> chartUIList = chartTypeInterfaces.get(priority);
+                Map<String, ChartTypeUIProvider> chartUIList = chartTypeInterfaces.get(priority);
                 if (!chartUIList.containsKey(plotID)) {
                     chartUIList.put(plotID, provider);
                 }
@@ -238,7 +243,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         }
     }
 
-    private IndependentChartUIProvider getChartTypeInterface(String plotID) {
+    private ChartTypeUIProvider getChartTypeInterface(String plotID) {
         if (idAndPriorityMap.containsKey(plotID)) {
             String priority = idAndPriorityMap.get(plotID);
             if (chartTypeInterfaces.containsKey(priority)) {
@@ -267,66 +272,35 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
         if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority)) {
 
-            Map<String, IndependentChartUIProvider> chartUIList = chartTypeInterfaces.get(priority);
+            Map<String, ChartTypeUIProvider> chartUIList = chartTypeInterfaces.get(priority);
 
-            Iterator<Map.Entry<String, IndependentChartUIProvider>> iterator = chartUIList.entrySet().iterator();
+            Iterator<Map.Entry<String, ChartTypeUIProvider>> iterator = chartUIList.entrySet().iterator();
             while (iterator.hasNext()) {
-                Map.Entry<String, IndependentChartUIProvider> entry = iterator.next();
+                try {
-                String plotID = entry.getKey();
+                    Map.Entry<String, ChartTypeUIProvider> entry = iterator.next();
-
+                    String plotID = entry.getKey();
-                AbstractChartTypePane pane = entry.getValue().getPlotTypePane();
+
-                if (AssistUtils.equals(pane.title4PopupWindow(), TYPE_PANE_DEFAULT_TITLE)) {
+                    AbstractChartTypePane pane = entry.getValue().getPlotTypePane();
-                    continue;
+                    if (AssistUtils.equals(pane.title4PopupWindow(), TYPE_PANE_DEFAULT_TITLE)) {
-                }
+                        continue;
-                pane.setPlotID(plotID);
+                    }
-                paneList.add(pane);
+                    pane.reLayout(plotID);
-
+                    paneList.add(pane);
-                if (allChartTypePane.get(priority) == null) {
+
-                    allChartTypePane.put(priority, new LinkedHashMap<String, FurtherBasicBeanPane<? extends ChartProvider>>());
+                    if (allChartTypePane.get(priority) == null) {
+                        allChartTypePane.put(priority, new LinkedHashMap<String, FurtherBasicBeanPane<? extends ChartProvider>>());
+                    }
+                    allChartTypePane.get(priority).put(plotID, pane);
+                } catch (Throwable e) {
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
-                allChartTypePane.get(priority).put(plotID, pane);
             }
         }
     }
 
-    private String getChartName(String plotID, IndependentChartUIProvider provider) {
+    @Compatible
-        String name = provider.getPlotTypeTitle4PopupWindow();
-        if (StringUtils.isEmpty(name)) {
-            name = ChartTypeManager.getInstance().getChartName(plotID);
-        }
-        return name;
-    }
-
     public String getTitle4PopupWindow(String plotID) {
-        IndependentChartUIProvider provider = getChartTypeInterface(plotID);
+        return getName(plotID);
-        if (provider != null) {
-            return provider.getPlotTypeTitle4PopupWindow();
-        }
-        return StringUtils.EMPTY;
-    }
-    
-    /**
-     * 获取指定图表的标题
-     */
-    public String getTitle4PopupWindow(String priority, String plotID) {
-        
-        if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority) && chartTypeInterfaces.get(priority).containsKey(plotID)) {
-            IndependentChartUIProvider provider = chartTypeInterfaces.get(priority).get(plotID);
-            return getChartName(plotID, provider);
-        }
-        
-        //兼容老的插件
-        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 getChartName(plotID, chartTypeInterfaces.get(defaultPriority).get(plotID));
-                }
-            }
-        }
-        return StringUtils.EMPTY;
     }
     
     private List<Integer> getPriorityInOrder() {
@@ -346,16 +320,153 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     public String getIconPath(String plotID) {
 
         if (chartTypeInterfaces != null) {
-            IndependentChartUIProvider provider = getChartTypeInterface(plotID);
+            ChartTypeUIProvider provider = getChartTypeInterface(plotID);
             if (provider != null) {
                 return provider.getIconPath();
             }
         }
         return StringUtils.EMPTY;
     }
+
+    public String[] getDemoImagePath(String chartID) {
+
+        if (chartTypeInterfaces != null) {
+            ChartTypeUIProvider provider = getChartTypeInterface(chartID);
+            if (provider != null) {
+                String[] result = null;
+                try {
+                    result = provider.getDemoImagePath();
+                } catch (Throwable e) {
+                    //do nothing
+                }
+                return ArrayUtils.isEmpty(result) ? getCompatibleDemoImagePath(chartID) : result;
+            }
+        }
+
+        return new String[0];
+    }
+
+    private String[] getCompatibleDemoImagePath(String chartID) {
+        String[] result = null;
+        try {
+            //AbstractIndependentChartsProvider
+            ChartTypeProvider chartTypeProvider = Reflect.on(ChartTypeManager.getInstanceWithCheck()).call("getChartType", chartID).get();
+            result = new String[]{
+                    Reflect.on(chartTypeProvider).call("getChartImagePath").get()
+            };
+
+            if (ArrayUtils.isNotEmpty(result)) {
+                return result;
+            }
+        } catch (Exception e) {
+            //do nothing
+        }
+
+        try {
+            //兼容 图表类型选择界面会调到这边
+            ChartProvider[] charts = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID);
+            result = new String[charts.length];
+            for (int i = 0; i < charts.length; i++) {
+                //Chart && AbstractChart
+                ChartProvider chart = charts[i];
+                if (!(chart instanceof AbstractChart)) {//扩展图表
+                    chart = Reflect.on(chart).field("subChart").get();
+                }
+                result[i] = Reflect.on(chart).call("demoImagePath").get();
+            }
+        } catch (Exception e) {
+            //do nothing
+        }
+
+        return new String[0];
+    }
+
+    public String[] getSubName(String chartID) {
+        if (chartTypeInterfaces != null) {
+            ChartTypeUIProvider provider = getChartTypeInterface(chartID);
+            if (provider != null) {
+                String[] subNames = null;
+                try {
+                    subNames = provider.getSubName();
+                } catch (Throwable throwable) {
+                    //do nothing
+                }
+                return ArrayUtils.isEmpty(subNames) ? getCompatibleSubName(chartID, provider) : subNames;
+            }
+        }
+        return new String[0];
+    }
+
+    //兼容
+    private String[] getCompatibleSubName(String chartID, ChartTypeUIProvider provider) {
+        ChartProvider[] chartProviders = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID);
+
+        if (chartProviders.length == 1) {
+            return new String[]{getName(chartID)};
+        }
+        String[] result = new String[chartProviders.length];
+        for (int i = 0; i < chartProviders.length; i++) {
+            if (chartProviders[i] instanceof Chart) {
+                //Chart && AbstractChart
+                result[i] = ((Chart) chartProviders[i]).getChartName();
+            }
+        }
+        return result;
+    }
+
+    public String getName(String chartID) {
+        if (chartTypeInterfaces != null) {
+            ChartTypeUIProvider provider = getChartTypeInterface(chartID);
+            if (provider != null) {
+                String name = null;
+                try {
+                    name = provider.getName();
+                } catch (Throwable throwable) {
+                    //do nothing
+                }
+
+                return StringUtils.isEmpty(name) ? getCompatibleName(chartID, provider) : name;
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+
+    //兼容
+    private static String getCompatibleName(String chartID, ChartTypeUIProvider provider) {
+
+        String result = null;
+        try {
+            //AbstractIndependentChartsProvider
+            ChartTypeProvider chartTypeProvider = Reflect.on(ChartTypeManager.getInstanceWithCheck()).call("getChartType", chartID).get();
+            result = Reflect.on(chartTypeProvider).call("getChartName").get();//国际化的key
+            result = InterProviderFactory.getProvider().getLocText(result);
+            if (StringUtils.isNotEmpty(result)) {
+                return result;
+            }
+        } catch (Exception e) {
+            //do nothing
+        }
+
+
+        try {
+            ChartProvider chartProvider = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID)[0];
+            if (chartProvider instanceof Chart) {
+                //AbstractExtendedChartUIProvider
+                result = ((Chart) chartProvider).getChartName();
+            }
+            if (StringUtils.isNotEmpty(result) && !"Charts".equals(result)) {
+                return result;
+            }
+
+        } catch (Exception e) {
+            //do nothing
+        }
+
+        return provider.getPlotTypePane().title4PopupWindow();
+    }
     
     public ChartDataPane getChartDataPane(String plotID, AttributeChangeListener listener) {
-        IndependentChartUIProvider provider = getChartTypeInterface(plotID);
+        ChartTypeUIProvider provider = getChartTypeInterface(plotID);
         if (provider != null) {
             return provider.getChartDataPane(listener);
         }
@@ -363,20 +474,8 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         return new ChartDataPane(listener);
     }
     
-    /**
-     * 获取对应ID的图表数量
-     *
-     */
-    private int getChartSize(String key) {
-        
-        if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(key)) {
-            return chartTypeInterfaces.get(key).size();
-        }
-        return 0;
-    }
-    
     public AbstractChartAttrPane[] getAttrPaneArray(String plotID, AttributeChangeListener listener) {
-        IndependentChartUIProvider provider = getChartTypeInterface(plotID);
+        ChartTypeUIProvider provider = getChartTypeInterface(plotID);
         if (provider != null) {
             return provider.getAttrPaneArray(listener);
         }
@@ -387,7 +486,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     
     public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
 
-        IndependentChartUIProvider provider = getChartTypeInterface(plot.getPlotID());
+        ChartTypeUIProvider provider = getChartTypeInterface(plot.getPlotID());
         if (provider != null) {
             return provider.getTableDataSourcePane(plot, parent);
         }
@@ -397,7 +496,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     
     public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
 
-        IndependentChartUIProvider provider = getChartTypeInterface(plot.getPlotID());
+        ChartTypeUIProvider provider = getChartTypeInterface(plot.getPlotID());
         if (provider != null) {
             return provider.getReportDataSourcePane(plot, parent);
         }
@@ -405,17 +504,9 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         return null;
     }
     
-    private boolean plotInChart(String plotID, String priority) {
-        
-        return chartTypeInterfaces != null
-            && chartTypeInterfaces.containsKey(priority)
-            && chartTypeInterfaces.get(priority).containsKey(plotID);
-    }
-    
-    
     public ConditionAttributesPane getPlotConditionPane(Plot plot) {
 
-        IndependentChartUIProvider provider = getChartTypeInterface(plot.getPlotID());
+        ChartTypeUIProvider provider = getChartTypeInterface(plot.getPlotID());
         if (provider != null) {
             return provider.getPlotConditionPane(plot);
         }
@@ -425,7 +516,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
 
-        IndependentChartUIProvider provider = getChartTypeInterface(plot.getPlotID());
+        ChartTypeUIProvider provider = getChartTypeInterface(plot.getPlotID());
         if (provider != null) {
             return provider.getPlotSeriesPane(parent, plot);
         }
@@ -441,7 +532,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
      */
     public boolean isUseDefaultPane(String plotID) {
 
-        IndependentChartUIProvider provider = getChartTypeInterface(plotID);
+        ChartTypeUIProvider provider = getChartTypeInterface(plotID);
         if (provider != null) {
             return provider.isUseDefaultPane();
         }
@@ -452,7 +543,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     public boolean needChartChangePane(ChartProvider chart) {
         if (chart != null) {
             String chartID = chart.getID();
-            IndependentChartUIProvider provider = getChartTypeInterface(chartID);
+            ChartTypeUIProvider provider = getChartTypeInterface(chartID);
             if (provider != null) {
                 return provider.needChartChangePane();
             }
@@ -467,7 +558,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         if (isIndependentChartUIProvider(injection)) {
             String priority = injection.getAttribute("priority", DEFAULT_PRIORITY);
             String plotID = injection.getAttribute("plotID");
-            IndependentChartUIProvider instance = (IndependentChartUIProvider) injection.getObject();
+            ChartTypeUIProvider instance = (ChartTypeUIProvider) injection.getObject();
             addChartTypeInterface(priority, plotID, instance);
         }
     }
@@ -487,7 +578,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         
         if (chartTypeInterfaces != null) {
             if (chartTypeInterfaces.containsKey(priority)) {
-                Map<String, IndependentChartUIProvider> chartUIList = chartTypeInterfaces.get(priority);
+                Map<String, ChartTypeUIProvider> chartUIList = chartTypeInterfaces.get(priority);
                 chartUIList.remove(plotID);
             }
         }
@@ -495,13 +586,13 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     
     
     private boolean isIndependentChartUIProvider(PluginSingleInjection injection) {
-        
+
-        return !(injection == null || injection.getObject() == null) && IndependentChartUIProvider.XML_TAG.equals(injection.getName()) && injection.getObject() instanceof IndependentChartUIProvider;
+        return !(injection == null || injection.getObject() == null) && ChartTypeUIProvider.XML_TAG.equals(injection.getName()) && injection.getObject() instanceof ChartTypeUIProvider;
     }
 
 
     public ChartEditPane getChartEditPane(String plotID) {
-        IndependentChartUIProvider provider = getChartTypeInterface(plotID);
+        ChartTypeUIProvider provider = getChartTypeInterface(plotID);
         if (provider != null) {
             return provider.getChartEditPane(plotID);
         }
@@ -509,7 +600,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     }
 
     public ChartsConfigPane getChartConfigPane(String plotID) {
-        IndependentChartUIProvider provider = getChartTypeInterface(plotID);
+        ChartTypeUIProvider provider = getChartTypeInterface(plotID);
         if (provider != null) {
             return provider.getChartConfigPane(plotID);
         }

designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java

@@ -3,14 +3,13 @@ package com.fr.design.chart;
  * the Pane of the Chart
  */
 
-import com.fr.chart.base.ChartInternationalNameContentBean;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.attr.ChartProvider;
+import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 
 import javax.swing.BorderFactory;
@@ -28,29 +27,7 @@ import java.awt.Component;
 public class ChartTypePane extends ChartCommonWizardPane {
     private static final long serialVersionUID = -1175602484968520546L;
 
-    private ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstanceWithCheck().getAllChartBaseNames();
+    private String[] chartIDs = ChartTypeManager.getInstanceWithCheck().getAllChartIDs();
-    private ChartProvider[][] charts4Icon = null;
-
-    {
-        charts4Icon = new ChartProvider[this.typeName.length][];
-        for (int i = 0; i < this.typeName.length; i++) {
-            ChartProvider[] rowCharts = ChartTypeManager.getInstanceWithCheck().getChartTypes(this.typeName[i].getChartID());
-            int rowChartsCount = rowCharts.length;
-            charts4Icon[i] = new ChartProvider[rowChartsCount];
-            for (int j = 0; j < rowChartsCount; j++) {
-                try {
-                    charts4Icon[i][j] = (ChartProvider) rowCharts[j].clone();
-                    //todo@shinerefactor 老图表也是提供一张图片 这边就不用setTitle(null) 然后实时去画
-//                    charts4Icon[i][j].setTitle(null);
-//                    if(charts4Icon[i][j].getPlot() != null){
-//                        charts4Icon[i][j].getPlot().setLegend(null);
-//                    }
-                } catch (CloneNotSupportedException e) {
-                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                }
-            }
-        }
-    }
 
     private JList mainTypeList = null;
     private JList iconViewList = null;
@@ -61,8 +38,8 @@ public class ChartTypePane extends ChartCommonWizardPane {
         DefaultListModel defaultListModel = new DefaultListModel();
         mainTypeList = new JList(defaultListModel);
 
-        for (int i = 0; i < typeName.length; i++) {
+        for (int i = 0; i < chartIDs.length; i++) {
-            defaultListModel.insertElementAt(InterProviderFactory.getProvider().getLocText(typeName[i].getName()), i);
+            defaultListModel.insertElementAt(ChartTypeInterfaceManager.getInstance().getName(chartIDs[i]), i);
         }
         mainTypeList.addListSelectionListener(listSelectionListener);
 
@@ -115,11 +92,15 @@ public class ChartTypePane extends ChartCommonWizardPane {
     protected ListSelectionListener listSelectionListener = new ListSelectionListener() {
         public void valueChanged(ListSelectionEvent e) {
             int main_index = mainTypeList.getSelectedIndex();
-            ChartProvider[] sub_charts = ChartTypePane.this.charts4Icon[main_index];
+            String id = ChartTypePane.this.chartIDs[main_index];
+
+            String[] demoImagePath = ChartTypeInterfaceManager.getInstance().getDemoImagePath(id);
+            String[] subName = ChartTypeInterfaceManager.getInstance().getSubName(id);
+
             ChartTypePane.this.iconListModel.clear();
-            for (int i = 0; i < sub_charts.length; i++) {
+            for (int i = 0, len = demoImagePath.length; i < len; i++) {
-                String ImagePath = sub_charts[i].demoImagePath();
+                String ImagePath = demoImagePath[i];
-                String chartName = sub_charts[i].getChartName();
+                String chartName = subName[i];
                 ChartTypePane.this.iconListModel.addElement(new ChartIcon(ImagePath, chartName));
             }
             iconViewList.setSelectedIndex(0);
@@ -143,7 +124,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
 
         ChartProvider chart4Update = cc.getSelectedChartProvider();
         if (chart4Update == null) {
-            String plotID = typeName[mainTypeList.getSelectedIndex()].getChartID();
+            String plotID = this.chartIDs[mainTypeList.getSelectedIndex()];
             ChartProvider chart = ChartTypeManager.getInstance().getChartTypes(plotID)[iconViewList.getSelectedIndex()];
             try {
                 chart4Update = (ChartProvider) chart.clone();

designer-chart/src/main/java/com/fr/design/chart/fun/ChartTypeUIProvider.java

@@ -0,0 +1,139 @@
+package com.fr.design.chart.fun;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.mainframe.chart.AbstractChartAttrPane;
+import com.fr.design.mainframe.chart.ChartEditPane;
+import com.fr.design.mainframe.chart.ChartsConfigPane;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.ChartStylePane;
+import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.plugin.injectable.SpecialLevel;
+import com.fr.stable.fun.Level;
+
+/**
+ * Created by eason on 14/12/29.
+ *
+ * @since 8.0
+ * 自定义 图表类型 界面接口
+ */
+public interface ChartTypeUIProvider extends Level {
+    
+    String XML_TAG = SpecialLevel.IndependentChartUIProvider.getTagName();
+
+    int CURRENT_API_LEVEL = 3;
+
+    /**
+     * 图表 类型定义界面类型，就是属性表的第一个界面
+     * 可以返回null 代表没有 图表类型切换界面
+     *
+     * @return 图表的类型定义界面类型
+     */
+    AbstractChartTypePane getPlotTypePane();
+
+    /**
+     * 图表 数据配置界面 即属性表的第二个界面
+     * 可以返回null 代表没有数据配置界面
+     */
+    ChartDataPane getChartDataPane(AttributeChangeListener listener);
+
+    /**
+     * 图表 属性界面数组 其他样式界面数组
+     * 可以返回空数组 代表没有其他样式界面
+     *
+     * @return 属性界面
+     */
+    AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener);
+
+    /**
+     * 图表 名称
+     * eg:柱形图
+     *
+     * @return 图表 名称
+     */
+    String getName();
+
+    /**
+     * 图表 名称
+     * 柱形图 堆积柱形图 等
+     *
+     * @return 图表 名称
+     */
+    String[] getSubName();
+
+    /**
+     * 图表 demo图片路径
+     * 400*225
+     * 1.图表选择界面的图的路径 原样渲染
+     * 2.图表属性第一个界面 类型界面 缩放渲染
+     *
+     * @return demo图片路径
+     */
+    String[] getDemoImagePath();
+
+    /**
+     * 小图标路径
+     * 表单 工具栏 图表小图标
+     * 16*16
+     *
+     * @return 图标路径
+     */
+    String getIconPath();
+
+
+    //todo:把下面这些接口删除
+    @Deprecated
+    boolean needChartChangePane();
+
+    /**
+     * 数据集数据源的界面
+     *
+     * @return 数据集数据源的界面
+     */
+    @Deprecated
+    AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent);
+
+
+    /**
+     * 单元格数据源的界面
+     *
+     * @return 单元格数据源的界面
+     */
+    @Deprecated
+    AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent);
+
+    /**
+     * 条件属性界面
+     *
+     * @return 条件属性界面
+     */
+    @Deprecated
+    ConditionAttributesPane getPlotConditionPane(Plot plot);
+
+    /**
+     * 系列界面
+     *
+     * @return 系列界面
+     */
+    @Deprecated
+    BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot);
+
+    /**
+     * 是否使用默认的界面，为了避免界面来回切换
+     *
+     * @return 是否使用默认的界面
+     */
+    @Deprecated
+    boolean isUseDefaultPane();
+
+    @Deprecated
+    ChartEditPane getChartEditPane(String plotID);
+
+    @Deprecated
+    ChartsConfigPane getChartConfigPane(String plotID);
+
+}

designer-chart/src/main/java/com/fr/design/chart/fun/IndependentChartUIProvider.java

@@ -1,102 +1,11 @@
 package com.fr.design.chart.fun;
 
-import com.fr.chart.chartattr.Plot;
+import com.fr.common.annotations.Compatible;
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.condition.ConditionAttributesPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.mainframe.chart.AbstractChartAttrPane;
-import com.fr.design.mainframe.chart.ChartEditPane;
-import com.fr.design.mainframe.chart.ChartsConfigPane;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
-import com.fr.design.mainframe.chart.gui.ChartStylePane;
-import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
-import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
-import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
-import com.fr.plugin.injectable.SpecialLevel;
-import com.fr.stable.fun.Level;
 
 /**
- * Created by eason on 14/12/29.
+ * Created by shine on 2019/09/05.
- *
- * @since 8.0
- * 自定义图表类型设设计界面接口
  */
-public interface IndependentChartUIProvider extends Level {
+@Compatible
-    
+public interface IndependentChartUIProvider extends ChartTypeUIProvider {
-    String XML_TAG = SpecialLevel.IndependentChartUIProvider.getTagName();
 
-    int CURRENT_API_LEVEL = 3;
+}
-
-    boolean needChartChangePane();
-
-    /**
-     * 图表的类型定义界面类型，就是属性表的第一个界面
-     *
-     * @return 图表的类型定义界面类型
-     */
-    AbstractChartTypePane getPlotTypePane();
-
-    /**
-     * 数据集数据源的界面
-     *
-     * @return 数据集数据源的界面
-     */
-    AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent);
-
-
-    /**
-     * 单元格数据源的界面
-     *
-     * @return 单元格数据源的界面
-     */
-    AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent);
-
-    /**
-     * 条件属性界面
-     *
-     * @return 条件属性界面
-     */
-    ConditionAttributesPane getPlotConditionPane(Plot plot);
-
-    /**
-     * 系列界面
-     *
-     * @return 系列界面
-     */
-    BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot);
-
-
-    /**
-     * 图表的属性界面数组
-     *
-     * @return 属性界面
-     */
-    AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener);
-
-    ChartDataPane getChartDataPane(AttributeChangeListener listener);
-
-    /**
-     * 是否使用默认的界面，为了避免界面来回切换
-     *
-     * @return 是否使用默认的界面
-     */
-    boolean isUseDefaultPane();
-
-    /**
-     * 图标路径
-     *
-     * @return 图标路径
-     */
-    String getIconPath();
-
-    /**
-     * plot面板的标题
-     */
-    String getPlotTypeTitle4PopupWindow();
-
-    ChartEditPane getChartEditPane(String plotID);
-
-
-    ChartsConfigPane getChartConfigPane(String plotID);
-
-}

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractChartTypeUI.java

@@ -0,0 +1,91 @@
+package com.fr.design.chart.fun.impl;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.fun.ChartTypeUIProvider;
+import com.fr.design.chartx.impl.AbstractDataPane;
+import com.fr.design.chartx.impl.AbstractOtherPane;
+import com.fr.design.chartx.impl.DefaultTypePane;
+import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.mainframe.chart.ChartEditPane;
+import com.fr.design.mainframe.chart.ChartsConfigPane;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.design.mainframe.chart.gui.ChartStylePane;
+import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
+import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
+import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.stable.fun.impl.AbstractProvider;
+
+/**
+ * Created by shine on 2019/09/03.
+ */
+public abstract class AbstractChartTypeUI extends AbstractProvider implements ChartTypeUIProvider {
+
+    @Override
+    public AbstractChartTypePane getPlotTypePane() {
+        return new DefaultTypePane();
+    }
+
+    @Override
+    public abstract AbstractDataPane getChartDataPane(AttributeChangeListener listener);
+
+    @Override
+    public abstract AbstractOtherPane[] getAttrPaneArray(AttributeChangeListener listener);
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{getName()};
+    }
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_API_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+
+    @Override
+    public boolean needChartChangePane() {
+        return false;
+    }
+
+    @Override
+    public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
+        return null;
+    }
+
+    @Override
+    public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
+        return null;
+    }
+
+    @Override
+    public boolean isUseDefaultPane() {
+        return false;
+    }
+
+    @Override
+    public ChartEditPane getChartEditPane(String plotID) {
+        return new ChartEditPane();
+    }
+
+    @Override
+    public ConditionAttributesPane getPlotConditionPane(Plot plot) {
+        return null;
+    }
+
+    @Override
+    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
+        return null;
+    }
+
+    @Override
+    public ChartsConfigPane getChartConfigPane(String plotID) {
+        return null;
+    }
+
+}

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUI.java

@@ -1,66 +0,0 @@
-package com.fr.design.chart.fun.impl;
-
-import com.fr.chart.chartattr.Plot;
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chart.fun.IndependentChartUIProvider;
-import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
-import com.fr.design.condition.ConditionAttributesPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.mainframe.chart.AbstractChartAttrPane;
-import com.fr.design.mainframe.chart.ChartEditPane;
-import com.fr.design.mainframe.chart.ChartsConfigPane;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
-import com.fr.design.mainframe.chart.gui.ChartStylePane;
-import com.fr.general.ComparatorUtils;
-import com.fr.stable.StableUtils;
-
-
-/**
- * Created by eason on 15/4/23.
- */
-@Deprecated
-public abstract class AbstractIndependentChartUI implements IndependentChartUIProvider {
-
-    @Override
-    public int currentAPILevel() {
-        return -1;
-    }
-
-    public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener){
-        return new AbstractChartAttrPane[0];
-    }
-
-    public ChartDataPane getChartDataPane(AttributeChangeListener listener){
-        return new ChartDataPane(listener);
-    }
-
-    /**
-     * 是否使用默认的界面，为了避免界面来回切换
-     * @return 是否使用默认的界面
-     */
-    public boolean isUseDefaultPane(){
-        return true;
-    }
-
-    public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
-        return getPlotSeriesPane();
-    }
-
-    public BasicBeanPane<Plot> getPlotSeriesPane(){
-        return null;
-    }
-
-    public boolean equals(Object obj) {
-        return obj != null && ComparatorUtils.equals(obj.getClass(), this.getClass());
-    }
-
-    public ConditionAttributesPane getPlotConditionPane(Plot plot){
-        return new DataSeriesConditionPane();
-    }
-
-    public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);}
-
-    public ChartsConfigPane getChartConfigPane(String plotID){return null;}
-
-
-}

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java

@@ -2,7 +2,7 @@ package com.fr.design.chart.fun.impl;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chart.fun.IndependentChartUIProvider;
+import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.chart.series.SeriesCondition.DataSeriesConditionPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
@@ -17,7 +17,7 @@ import com.fr.stable.StableUtils;
 /**
  * Created by Mitisky on 16/3/7.
  */
-public abstract class AbstractIndependentChartUIWithAPILevel implements IndependentChartUIProvider {
+public abstract class AbstractIndependentChartUIWithAPILevel implements ChartTypeUIProvider {
     //这个不能改,是做兼容用的
     //2016.10.14-11.24号的8.0jar因为改了这个为3,不会提示5.26号之前的插件更新
     private static final int OLD_PLUGIN_LEVEL = -2;
@@ -37,6 +37,22 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements Independ
         return new ChartDataPane(listener);
     }
 
+    //todo@bjornrefactor 适配旧版本图表后 删掉下面两个方法
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[0];
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[0];
+    }
+
     /**
      * 是否使用默认的界面，为了避免界面来回切换
      * @return 是否使用默认的界面
@@ -66,14 +82,6 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements Independ
         return new DataSeriesConditionPane();
     }
 
-    /**
-     * plot面板的标题
-     * 插件兼容
-     */
-    public String getPlotTypeTitle4PopupWindow(){
-        return getPlotTypePane().title4PopupWindow();
-    }
-
     public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);}
 
     public ChartsConfigPane getChartConfigPane(String plotID){return null;}

designer-chart/src/main/java/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java

@@ -3,7 +3,7 @@ package com.fr.design.chart.fun.impl;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chart.fun.IndependentChartUIProvider;
+import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
@@ -26,8 +26,19 @@ import com.fr.stable.fun.mark.API;
  * 用户使用第三方图表需要继承的面板抽象类
  */
 
-@API(level = IndependentChartUIProvider.CURRENT_API_LEVEL)
+@Deprecated
-public abstract class AbstractIndependentChartsUI extends AbstractProvider implements IndependentChartUIProvider {
+@API(level = ChartTypeUIProvider.CURRENT_API_LEVEL)
+public abstract class AbstractIndependentChartsUI extends AbstractProvider implements ChartTypeUIProvider {
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[0];
+    }
 
     public String mark4Provider() {
         return getClass().getName();
@@ -96,16 +107,6 @@ public abstract class AbstractIndependentChartsUI extends AbstractProvider imple
         return "com/fr/design/images/form/toolbar/ChartF-Column.png";
     }
 
-    @Override
-
-    /**
-     * plot面板的标题
-     * 插件兼容
-     */
-    public String getPlotTypeTitle4PopupWindow(){
-        return getPlotTypePane().title4PopupWindow();
-    }
-
     @Override
     public ChartEditPane getChartEditPane(String plotID) {
         return new ChartsEditPane();

designer-chart/src/main/java/com/fr/design/chartx/AbstractVanSingleDataPane.java

@@ -1,24 +1,30 @@
 package com.fr.design.chartx;
 
 import com.fr.chartx.data.AbstractDataDefinition;
-import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane;
-import com.fr.design.chartx.fields.diff.MultiCategoryDataSetFieldsPane;
 import com.fr.design.chartx.single.SingleDataPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 
 import javax.swing.JPanel;
 
 /**
- * Created by shine on 2019/5/22.
+ * Created by shine on 2019/09/06.
  */
-public class MultiCategoryChartDataPane extends AbstractChartDataPane<AbstractDataDefinition> {
+public abstract class AbstractVanSingleDataPane extends AbstractChartDataPane<AbstractDataDefinition> {
-
     private SingleDataPane singleDataPane;
 
-    public MultiCategoryChartDataPane(AttributeChangeListener listener) {
+
+    public AbstractVanSingleDataPane(AttributeChangeListener listener) {
         super(listener);
     }
 
+    @Override
+    protected JPanel createContentPane() {
+        singleDataPane = createSingleDataPane();
+        return singleDataPane;
+    }
+
+    protected abstract SingleDataPane createSingleDataPane();
+
     @Override
     protected void populate(AbstractDataDefinition dataDefinition) {
         singleDataPane.populateBean(dataDefinition);
@@ -28,16 +34,4 @@ public class MultiCategoryChartDataPane extends AbstractChartDataPane<AbstractDa
     protected AbstractDataDefinition update() {
         return singleDataPane.updateBean();
     }
-
-    @Override
-    protected JPanel createContentPane() {
-        singleDataPane = createSingleDataPane();
-        return singleDataPane;
-    }
-
-    protected SingleDataPane createSingleDataPane() {
-        return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
-    }
-
-
 }

designer-chart/src/main/java/com/fr/design/chartx/GanttChartDataPane.java

@@ -1,6 +1,9 @@
 package com.fr.design.chartx;
 
 import com.fr.chartx.data.GanttChartDataDefinition;
+import com.fr.design.chartx.fields.diff.MultiCategoryCellDataFieldsPane;
+import com.fr.design.chartx.fields.diff.MultiCategoryDataSetFieldsPane;
+import com.fr.design.chartx.single.SingleDataPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.van.chart.map.designer.VanChartGroupPane;
 
@@ -11,13 +14,23 @@ import javax.swing.JPanel;
  */
 public class GanttChartDataPane extends AbstractChartDataPane<GanttChartDataDefinition> {
 
-    private MultiCategoryChartDataPane dataPane;
+    private AbstractVanSingleDataPane dataPane;
-    private MultiCategoryChartDataPane linkPane;
+    private AbstractVanSingleDataPane linkPane;
 
     @Override
     protected JPanel createContentPane() {
-        dataPane = new MultiCategoryChartDataPane(listener);
+        dataPane = new AbstractVanSingleDataPane(listener) {
-        linkPane = new MultiCategoryChartDataPane(listener);
+            @Override
+            protected SingleDataPane createSingleDataPane() {
+                return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
+            }
+        };
+        linkPane = new AbstractVanSingleDataPane(listener) {
+            @Override
+            protected SingleDataPane createSingleDataPane() {
+                return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
+            }
+        };
         return new VanChartGroupPane(new String[]{"data", "link"}, new JPanel[]{dataPane, linkPane}) {
         };
     }
@@ -27,13 +40,13 @@ public class GanttChartDataPane extends AbstractChartDataPane<GanttChartDataDefi
     }
 
     @Override
-    protected void populate(GanttChartDataDefinition ganttChartDataDefinition) {
+    public void populate(GanttChartDataDefinition ganttChartDataDefinition) {
         dataPane.populate(ganttChartDataDefinition.getDataDefinition());
         linkPane.populate(ganttChartDataDefinition.getLinkDefinition());
     }
 
     @Override
-    protected GanttChartDataDefinition update() {
+    public GanttChartDataDefinition update() {
         return null;
     }
 }

designer-chart/src/main/java/com/fr/design/chartx/MultiPieChartDataPane.java

@@ -1,21 +0,0 @@
-package com.fr.design.chartx;
-
-import com.fr.design.chartx.fields.diff.MultiPieCellDataFieldsPane;
-import com.fr.design.chartx.fields.diff.MultiPieDataSetFieldsPane;
-import com.fr.design.chartx.single.SingleDataPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-
-/**
- * Created by shine on 2019/6/18.
- */
-public class MultiPieChartDataPane extends MultiCategoryChartDataPane {
-
-    public MultiPieChartDataPane(AttributeChangeListener listener) {
-        super(listener);
-    }
-
-    @Override
-    protected SingleDataPane createSingleDataPane() {
-        return new SingleDataPane(new MultiPieDataSetFieldsPane(), new MultiPieCellDataFieldsPane());
-    }
-}

designer-chart/src/main/java/com/fr/design/chartx/StructureChartDataPane.java

@@ -1,23 +0,0 @@
-package com.fr.design.chartx;
-
-import com.fr.design.chartx.fields.diff.StructureCellDataFieldsPane;
-import com.fr.design.chartx.fields.diff.StructureDataSetFieldsPane;
-import com.fr.design.chartx.single.SingleDataPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-
-/**
- * @author Bjorn
- * @version 10.0
- * Created by Bjorn on 2019-09-02
- */
-public class StructureChartDataPane extends MultiCategoryChartDataPane {
-
-    public StructureChartDataPane(AttributeChangeListener listener) {
-        super(listener);
-    }
-
-    @Override
-    protected SingleDataPane createSingleDataPane() {
-        return new SingleDataPane(new StructureDataSetFieldsPane(), new StructureCellDataFieldsPane());
-    }
-}

designer-chart/src/main/java/com/fr/design/chartx/WordCloudChartDataPane.java

@@ -1,20 +0,0 @@
-package com.fr.design.chartx;
-
-import com.fr.design.chartx.fields.diff.WordCloudCellDataFieldsPane;
-import com.fr.design.chartx.fields.diff.WordCloudDataSetFieldsPane;
-import com.fr.design.chartx.single.SingleDataPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-
-/**
- * Created by shine on 2019/5/22.
- */
-public class WordCloudChartDataPane extends MultiCategoryChartDataPane {
-    public WordCloudChartDataPane(AttributeChangeListener listener) {
-        super(listener);
-    }
-
-    @Override
-    protected SingleDataPane createSingleDataPane() {
-        return new SingleDataPane(new WordCloudDataSetFieldsPane(), new WordCloudCellDataFieldsPane());
-    }
-}

designer-chart/src/main/java/com/fr/design/chartx/impl/AbstractDataPane.java

@@ -0,0 +1,68 @@
+package com.fr.design.chartx.impl;
+
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.impl.AbstractChartWithData;
+import com.fr.chartx.data.AbstractDataDefinition;
+import com.fr.chartx.data.ChartDataDefinitionProvider;
+import com.fr.design.chartx.single.SingleDataPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.mainframe.chart.gui.ChartDataPane;
+import com.fr.plugin.chart.vanchart.VanChart;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+
+/**
+ * Created by shine on 2019/09/04.
+ */
+public abstract class AbstractDataPane extends ChartDataPane {
+
+    private SingleDataPane singleDataPane;
+
+    public AbstractDataPane(AttributeChangeListener listener) {
+        super(listener);
+    }
+
+    @Override
+    protected JPanel createContentPane() {
+        singleDataPane = createSingleDataPane();
+        return singleDataPane;
+    }
+
+    protected abstract SingleDataPane createSingleDataPane();
+
+    @Override
+    public void populate(ChartCollection collection) {
+        if (collection == null) {
+            return;
+        }
+        AbstractChartWithData chart = collection.getSelectedChart(AbstractChartWithData.class);
+        if (chart == null) {
+            return;
+        }
+
+        this.removeAll();
+        this.add(createContentPane(), BorderLayout.CENTER);
+
+        ChartDataDefinitionProvider dataDefinition = chart.getChartDataDefinition();
+
+        singleDataPane.populateBean((AbstractDataDefinition) dataDefinition);
+
+        this.initAllListeners();
+        this.validate();
+    }
+
+
+    @Override
+    public void update(ChartCollection collection) {
+        if (collection == null) {
+            return;
+        }
+        VanChart chart = collection.getSelectedChart(VanChart.class);
+        if (chart == null) {
+            return;
+        }
+
+        chart.setChartDataDefinition(singleDataPane.updateBean());
+    }
+}

designer-chart/src/main/java/com/fr/design/chartx/impl/AbstractOtherPane.java

@@ -0,0 +1,42 @@
+package com.fr.design.chartx.impl;
+
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.impl.AbstractChartWithData;
+import com.fr.design.mainframe.chart.AbstractChartAttrPane;
+
+/**
+ * Created by shine on 2019/09/04.
+ */
+public abstract class AbstractOtherPane<T extends AbstractChartWithData> extends AbstractChartAttrPane {
+
+    protected abstract void populate(T chart);
+
+    protected abstract void update(T chart);
+
+    @Override
+    public void populate(ChartCollection collection) {
+        if (collection == null) {
+            return;
+        }
+        AbstractChartWithData chart = collection.getSelectedChart(AbstractChartWithData.class);
+        if (chart == null) {
+            return;
+        }
+
+        populate((T) chart);
+    }
+
+    @Override
+    public void update(ChartCollection collection) {
+
+        if (collection == null) {
+            return;
+        }
+        AbstractChartWithData chart = collection.getSelectedChart(AbstractChartWithData.class);
+        if (chart == null) {
+            return;
+        }
+
+        update((T) chart);
+    }
+}

designer-chart/src/main/java/com/fr/design/chartx/impl/DefaultTypePane.java

@@ -0,0 +1,79 @@
+package com.fr.design.chartx.impl;
+
+import com.fr.chart.charttypes.ChartTypeManager;
+import com.fr.chart.impl.AbstractChartWithData;
+import com.fr.chartx.attr.ChartProvider;
+import com.fr.design.ChartTypeInterfaceManager;
+import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
+import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
+
+/**
+ * Created by shine on 2019/09/04.
+ */
+public class DefaultTypePane<T extends AbstractChartWithData> extends AbstractChartTypePane<AbstractChartWithData> {
+
+    @Override
+    protected String[] getTypeIconPath() {
+        return ChartTypeInterfaceManager.getInstance().getDemoImagePath(getPlotID());
+    }
+
+    @Override
+    protected String[] getTypeTipName() {
+        return ChartTypeInterfaceManager.getInstance().getSubName(getPlotID());
+    }
+
+    @Override
+    public ChartProvider getDefaultChart() {
+        return ChartTypeManager.getInstance().getChartTypes(getPlotID())[0];
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return ChartTypeInterfaceManager.getInstance().getName(getPlotID());
+    }
+
+    protected int getSelectIndexInChart(T chart) {
+        return 0;
+    }
+
+    protected void setSelectIndexInChart(T chart, int index) {
+    }
+
+    @Override
+    public void populateBean(AbstractChartWithData ob) {
+        if (getTypeIconPath().length > 0) {
+            for (ChartImagePane imagePane : typeDemo) {
+                imagePane.isPressing = false;
+            }
+            typeDemo.get(getSelectIndexInChart((T) ob)).isPressing = true;
+            checkDemosBackground();
+        }
+    }
+
+    @Override
+    public void updateBean(AbstractChartWithData ob) {
+        if (getTypeIconPath().length > 0) {
+            for (int index = 0, len = typeDemo.size(); index < len; index++) {
+                if (typeDemo.get(index).isPressing) {
+                    setSelectIndexInChart((T) ob, index);
+                    return;
+                }
+            }
+        }
+    }
+
+    @Override
+    protected String[] getTypeLayoutPath() {
+        return new String[0];
+    }
+
+    @Override
+    protected String[] getTypeLayoutTipName() {
+        return new String[0];
+    }
+
+    @Override
+    protected String getPlotTypeID() {
+        return null;
+    }
+}

designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsEditPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.chart;
 
 import com.fr.chart.chartattr.Chart;
+import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 
@@ -30,15 +31,16 @@ public class ChartsEditPane extends ChartEditPane {
      * 重新构造面板
      * @param currentChart 图表
      */
-    public void reLayout(Chart currentChart) {
+    public void reLayout(ChartProvider currentChart) {
         if (currentChart != null) {
+            Chart chart = (Chart) currentChart;
             this.removeAll();
             this.setLayout(new BorderLayout());
             paneList = new ArrayList<AbstractChartAttrPane>();
 
             String plotID = "";
-            if (currentChart.getPlot() != null) {
+            if (chart.getPlot() != null) {
-                plotID = currentChart.getPlot().getPlotID();
+                plotID = chart.getPlot().getPlotID();
             }
 
             dataPane4SupportCell = createChartDataPane(plotID);

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

@@ -178,9 +178,8 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
      */
     public ChartProvider getChangeStateNewChart() {
         ChartProvider chart = editingCollection.getSelectedChartProvider();
-        String priority = ChartTypeManager.VAN_CHART_PRIORITY;
+        String chartID = chart.getID();
-        //todo@shinerefactor
+        String priority = ChartTypeManager.getInstanceWithCheck().getPriority(chartID);
-        // chart.getPriority();
         return ChartTypeManager.getInstanceWithCheck().getFirstChart(priority);
     }
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe.chart.gui;
 
-import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.SwitchState;
 import com.fr.chart.charttypes.ChartTypeManager;
@@ -146,12 +145,6 @@ public class ChartTypePane extends AbstractChartAttrPane{
 			//chartID改变的话图表类型就算改变了
 			if (StringUtils.isNotEmpty(chartID)) {
 
-				if (chart instanceof Chart) {
-					//todo@shinerefactor: 这边看下是否可以删除
-					((Chart) chart).setWrapperName(ChartTypeManager.getInstanceWithCheck().getWrapperName(chartID));
-					((Chart) chart).setChartImagePath(ChartTypeManager.getInstanceWithCheck().getChartImagePath(chartID));
-				}
-
 				boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(chartID);
 
 				if (editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, chartID))) {
@@ -217,12 +210,10 @@ public class ChartTypePane extends AbstractChartAttrPane{
 		private void relayout(ChartCollection collection){
 			//重构需要重构下拉框选项和cardNames
 			ChartProvider chart = collection.getSelectedChartProvider();
-			String priority = ChartTypeManager.VAN_CHART_PRIORITY;
+			String chartID = chart.getID();
-			//TODO@shinerefactor
+			String priority = ChartTypeManager.getInstanceWithCheck().getPriority(chartID);
-			//	chart.getPriority();
+			boolean enabledChart = ChartTypeManager.enabledChart(chartID);
-			String plotID = chart.getID();
+			String item = ChartTypeInterfaceManager.getInstance().getName(chartID);
-			boolean enabledChart = ChartTypeManager.enabledChart(plotID);
-			String item = ChartTypeInterfaceManager.getInstance().getTitle4PopupWindow(priority, plotID);
 
 			//第一步就是重构cards
 			cards.clear();
@@ -233,7 +224,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
 					addOnePriorityCards(priority);
 				}
 			} else {
-				addOnePlotIDCards(priority, plotID);
+				addOnePlotIDCards(priority, chartID);
 			}
 
 			//下拉框重构开始。为了防止重构是触发update

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@@ -60,6 +60,11 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
     }
 
     public AbstractChartTypePane() {
+    }
+
+    public void reLayout(String chartID) {
+        this.plotID = chartID;
+
         double vs = 4;
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
@@ -156,9 +161,11 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
             }
         }
 
-        for(int i = 0; i < typeDemo.size(); i++) {
+        if (this.typeDemo != null && !typeDemo.isEmpty()) {
-            typeDemo.get(i).checkBorder();
+            for (int i = 0; i < typeDemo.size(); i++) {
-            typeDemo.get(i).repaint();
+                typeDemo.get(i).checkBorder();
+                typeDemo.get(i).repaint();
+            }
         }
     }
 
@@ -197,22 +204,14 @@ public abstract class AbstractChartTypePane<T extends ChartProvider> extends Fur
         return plotID;
     }
 
-    public void setPlotID(String plotID) {
-        this.plotID = plotID;
-    }
-
     /**
      *
      * @param ob 对象
      * @return
      */
     public boolean accept(Object ob) {
-        if(ob instanceof Chart){
+        if (ob instanceof ChartProvider) {
-            Chart chart = (Chart)ob;
+            return ComparatorUtils.equals(((ChartProvider) ob).getID(), getPlotID());
-            Plot plot = chart.getPlot();
-            if(plot != null && ComparatorUtils.equals(plot.getPlotID(), getPlotID())){
-                return true;
-            }
         }
         return false;
     }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java

@@ -5,9 +5,13 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.IOUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
 import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
 
 public class ChartImagePane extends ChartSelectDemoPane {
 	private static final long serialVersionUID = -2785128245790568603L;
@@ -33,9 +37,18 @@ public class ChartImagePane extends ChartSelectDemoPane {
         constructImagePane(fullIconPath, tipName, isDrawRightLine);
     }
 
-    private void constructImagePane(String fullIconPath, String tipName, boolean isDrawRightLine){
+    private void constructImagePane(final String fullIconPath, String tipName, boolean isDrawRightLine) {
-    
+
-        UILabel image = new UILabel(IOUtils.readIcon(fullIconPath));
+        UILabel image = new UILabel() {
+            @Override
+            public void paint(Graphics g) {
+                super.paint(g);
+
+                BufferedImage image1 = IOUtils.readImageWithCache(fullIconPath);
+                g.drawImage(image1, 0, 0, IMAGE_WIDTH, IMAGE_HIGTH, null);
+            }
+        };
+
         this.setLayout(new BorderLayout());
         this.add(image, BorderLayout.CENTER);
         addMouseListener(this);

designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartUIProvider.java

@@ -2,7 +2,7 @@ package com.fr.extended.chart;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chart.fun.IndependentChartUIProvider;
+import com.fr.design.chart.fun.ChartTypeUIProvider;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
@@ -13,18 +13,27 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
-import com.fr.stable.StringUtils;
 import com.fr.stable.fun.impl.AbstractProvider;
 
 /**
  * Created by shine on 2018/3/2.
  */
-public abstract class AbstractExtendedChartUIProvider extends AbstractProvider implements IndependentChartUIProvider {
+public abstract class AbstractExtendedChartUIProvider extends AbstractProvider implements ChartTypeUIProvider {
 
     protected abstract AbstractExtendedChartTableDataPane getTableDataSourcePane();
 
     protected abstract AbstractReportDataContentPane getReportDataSourcePane();
 
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[0];
+    }
+
     @Override
     public boolean needChartChangePane() {
         return false;
@@ -85,10 +94,6 @@ public abstract class AbstractExtendedChartUIProvider extends AbstractProvider i
         return null;
     }
 
-    public String getPlotTypeTitle4PopupWindow(){
-        return StringUtils.EMPTY;
-    }
-
     @Override
     public ChartsConfigPane getChartConfigPane(String plotID) {
         return null;

designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java

@@ -2,6 +2,7 @@ package com.fr.extended.chart;
 
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.attr.ChartProvider;
+import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 
@@ -71,7 +72,7 @@ public class ExtendedTypePane<T extends AbstractChart> extends AbstractChartType
 
     @Override
     public String title4PopupWindow() {
-        return ChartTypeManager.getInstance().getChartName(getPlotID());
+        return ChartTypeInterfaceManager.getInstance().getName(getPlotID());
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/area/AreaIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.area;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
@@ -16,6 +17,34 @@ public class AreaIndependentVanChartInterface extends AbstractMultiCategoryVanCh
         return "com/fr/design/images/form/toolbar/area.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Area");
+    }
+
+    @Override
+    public String[] getSubName() {
+        String area = Toolkit.i18nText("Fine-Design_Chart_New_Area");
+        String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
+        String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
+        return new String[]{
+                area,
+                stack + area,
+                percent + stack + area,
+                Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/14.png",
+                "com/fr/plugin/chart/demo/image/15.png",
+                "com/fr/plugin/chart/demo/image/16.png",
+                "com/fr/plugin/chart/demo/image/17.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartAreaPlotPane();
@@ -29,12 +58,4 @@ public class AreaIndependentVanChartInterface extends AbstractMultiCategoryVanCh
         return new VanChartAreaSeriesPane(parent, plot);
     }
 
-    /**
-     * plot面板的标题
-     * 插件兼容
-     */
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartAreaPlotPane.TITLE;
-    }
-
 }

designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.area;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.area.AreaIndependentVanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
@@ -12,8 +11,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 15/11/18.
  */
 public class VanChartAreaPlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area");
-    private static final long serialVersionUID = -8161581682558781651L;
 
     @Override
     protected String[] getTypeIconPath() {
@@ -25,40 +22,6 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        String area = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area");
-        String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
-        String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
-        return new String[]{
-                area,
-                stack + area,
-                percent + stack + area,
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")
-        };
-    }
-
-    /**
-     * 返回界面标题
-     *
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area");
-    }
-
-
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartAreaPlot.VAN_CHART_AREA_PLOT_ID;
-    }
-
     protected Plot getSelectedClonedPlot() {
         VanChartAreaPlot newPlot = null;
         Chart[] areaChart = AreaIndependentVanChart.AreaVanChartTypes;

designer-chart/src/main/java/com/fr/van/chart/bar/BarIndependentVanChartInterface.java

@@ -4,6 +4,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
@@ -17,6 +18,35 @@ import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
  * Created by Mitisky on 15/10/20.
  */
 public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanChartUI {
+
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Bar");
+    }
+
+    @Override
+    public String[] getSubName() {
+        String bar = Toolkit.i18nText("Fine-Design_Chart_New_Bar");
+        String stack = Toolkit.i18nText("Fine-Design_Chart_Stacked");
+        String percent = Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
+        return new String[]{
+                bar,
+                stack + bar,
+                percent + stack + bar,
+                Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/7.png",
+                "com/fr/plugin/chart/demo/image/8.png",
+                "com/fr/plugin/chart/demo/image/9.png",
+                "com/fr/plugin/chart/demo/image/10.png",
+        };
+    }
+
     @Override
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/bar.png";
@@ -45,12 +75,4 @@ public class BarIndependentVanChartInterface extends AbstractMultiCategoryVanCha
         return new AbstractChartAttrPane[]{stylePane, otherPane};
     }
 
-    /**
-     * plot面板的标题
-     * 插件兼容
-     */
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartBarPlotPane.TITLE;
-    }
-
 }

designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.bar;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.bar.BarIndependentVanChart;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
@@ -12,9 +11,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 15/10/20.
  */
 public class VanChartBarPlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar");
-
-    private static final long serialVersionUID = 2879689884048643002L;
 
     @Override
     protected String[] getTypeIconPath() {
@@ -25,38 +21,6 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        String bar = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar");
-        String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
-        String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
-        return new String[]{
-                bar,
-                stack + bar,
-                percent + stack + bar,
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")
-        };
-    }
-
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar");
-    }
-
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartColumnPlot.VAN_CHART_BAR_PLOT_ID;
-    }
-
     protected Plot getSelectedClonedPlot(){
         VanChartColumnPlot newPlot = null;
         Chart[] barChart = BarIndependentVanChart.BarVanChartTypes;

designer-chart/src/main/java/com/fr/van/chart/bubble/BubbleIndependentVanChartInterface.java

@@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
@@ -22,6 +23,27 @@ import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
  * Created by Mitisky on 16/3/31.
  */
 public class BubbleIndependentVanChartInterface extends AbstractIndependentVanChartUI {
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Bubble");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart"),
+                Toolkit.i18nText("Fine-Design_Chart_New_Force_Bubble")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/26.png",
+                "com/fr/plugin/chart/demo/image/27.png"
+        };
+    }
+
     /**
      * 图表的类型定义界面类型，就是属性表的第一个界面
      *
@@ -79,8 +101,4 @@ public class BubbleIndependentVanChartInterface extends AbstractIndependentVanCh
     public ConditionAttributesPane getPlotConditionPane(Plot plot){
         return new VanChartBubbleConditionPane(plot);
     }
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartBubblePlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java

@@ -7,7 +7,6 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.base.VanChartZoom;
 import com.fr.plugin.chart.bubble.BubbleIndependentVanChart;
@@ -20,7 +19,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 16/3/31.
  */
 public class VanChartBubblePlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bubble");;
 
     private static final long serialVersionUID = -3481633368542654247L;
 
@@ -35,23 +33,6 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Force_Bubble")
-        };
-    }
-
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bubble");
-    }
-
-
     private void removeDefaultAttr(ConditionAttr conditionAttr, Class <? extends DataSeriesCondition> targetClass) {
         DataSeriesCondition attr = conditionAttr.getExisted(targetClass);
         if (attr != null){
@@ -59,16 +40,6 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane {
         }
     }
 
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartBubblePlot.VAN_CHART_BUBBLE_PLOT_ID;
-    }
-
     protected Plot getSelectedClonedPlot(){
         VanChartBubblePlot newPlot = null;
         Chart[] bubbleChart = BubbleIndependentVanChart.BubbleVanChartTypes;

designer-chart/src/main/java/com/fr/van/chart/column/ColumnIndependentVanChartInterface.java

@@ -2,10 +2,8 @@ package com.fr.van.chart.column;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chartx.MultiCategoryChartDataPane;
 import com.fr.design.condition.ConditionAttributesPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
@@ -14,6 +12,35 @@ import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
  * Created by Mitisky on 15/9/24.
  */
 public class ColumnIndependentVanChartInterface extends AbstractMultiCategoryVanChartUI {
+
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Column");
+    }
+
+    @Override
+    public String[] getSubName() {
+        String column = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column");
+        String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
+        String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
+        return new String[]{
+                column,
+                stack + column,
+                percent + stack + column,
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/3.png",
+                "com/fr/plugin/chart/demo/image/4.png",
+                "com/fr/plugin/chart/demo/image/5.png",
+                "com/fr/plugin/chart/demo/image/6.png",
+        };
+    }
+
     @Override
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/column.png";
@@ -33,12 +60,13 @@ public class ColumnIndependentVanChartInterface extends AbstractMultiCategoryVan
         return new VanChartColumnSeriesPane(parent, plot);
     }
 
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartColumnPlotPane.TITLE;
-    }
-
 //    @Override
 //    public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
-//        return new MultiCategoryChartDataPane(listener);
+//        return new AbstractDataPane(listener) {
+//            @Override
+//            protected SingleDataPane createSingleDataPane() {
+//                return new SingleDataPane(new MultiCategoryDataSetFieldsPane(), new MultiCategoryCellDataFieldsPane());
+//            }
+//        };
 //    }
 }

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.column;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.column.ColumnIndependentVanChart;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
@@ -12,10 +11,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 15/9/24.
  */
 public class VanChartColumnPlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column");
-
-    private static final long serialVersionUID = 5950923001789733745L;
-
 
     @Override
     protected String[] getTypeIconPath() {
@@ -26,38 +21,6 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        String column = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column");
-        String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked");
-        String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
-        return new String[]{
-                column,
-                stack + column,
-                percent + stack + column,
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")
-        };
-    }
-
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column");
-    }
-
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID;
-    }
-
     protected Plot getSelectedClonedPlot(){
         VanChartColumnPlot newPlot = null;
         Chart[] columnChart = ColumnIndependentVanChart.ColumnVanChartTypes;

designer-chart/src/main/java/com/fr/van/chart/custom/CustomIndependentVanChartInterface.java

@@ -1,6 +1,7 @@
 package com.fr.van.chart.custom;
 
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
@@ -14,6 +15,31 @@ import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
  * Created by Mitisky on 16/2/16.
  */
 public class CustomIndependentVanChartInterface extends AbstractIndependentVanChartUI {
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Combine");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_New_Column_Line"),
+                Toolkit.i18nText("Fine-Design_Chart_New_Column_Area"),
+                Toolkit.i18nText("Fine-Design_Chart_New_StackColumn_Line"),
+                Toolkit.i18nText("Fine-Design_Chart_New_Custom_Combine")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/28.png",
+                "com/fr/plugin/chart/demo/image/29.png",
+                "com/fr/plugin/chart/demo/image/30.png",
+                "com/fr/plugin/chart/demo/image/31.png"
+        };
+    }
+
     /**
      * 图表的类型定义界面类型，就是属性表的第一个界面
      *
@@ -49,8 +75,4 @@ public class CustomIndependentVanChartInterface extends AbstractIndependentVanCh
     public ChartDataPane getChartDataPane(AttributeChangeListener listener){
         return new VanChartCustomDataPane(listener);
     }
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartCustomPlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/custom/VanChartCustomPlotPane.java

@@ -10,7 +10,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.base.VanChartAttrLine;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.custom.CustomDefinition;
@@ -35,7 +34,6 @@ import java.util.Map;
  * Created by Mitisky on 16/2/16.
  */
 public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Combine");
 
     //是否选择自定义
     private boolean isCustom = false;
@@ -114,26 +112,6 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column_Line"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column_Area"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_StackColumn_Line"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Custom_Combine")
-        };
-    }
-
-    @Override
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Combine");
-    }
-
-
     @Override
     public void updateBean(Chart chart) {
 
@@ -241,16 +219,6 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
 
     }
 
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartCustomPlot.VAN_CHART_CUSTOM_PLOT_ID;
-    }
-
     protected Plot getSelectedClonedPlot() {
         VanChartCustomPlot newPlot = null;
         Chart[] customChart = CustomIndependentVanChart.CustomVanChartTypes;

designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java

@@ -7,6 +7,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.chart.chartglyph.DataSheet;
+import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.MultilineLabel;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
@@ -45,6 +46,21 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Cha
         return new String[0];
     }
 
+    @Override
+    protected String[] getTypeTipName() {
+        return ChartTypeInterfaceManager.getInstance().getSubName(getPlotID());
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return ChartTypeInterfaceManager.getInstance().getName(getPlotID());
+    }
+
+    @Override
+    protected String getPlotTypeID() {
+        return getPlotID();
+    }
+
     protected Component[][] getComponentsWithLargeData(JPanel typePane){
         largeModelCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open_Large_Data_Model"));
         MultilineLabel prompt = new MultilineLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Large_Data_Model_Prompt"));

designer-chart/src/main/java/com/fr/van/chart/drillmap/DrillMapIndependentVanChartInterface.java

@@ -1,6 +1,7 @@
 package com.fr.van.chart.drillmap;
 
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
@@ -16,6 +17,28 @@ import com.fr.van.chart.map.designer.style.VanChartMapStylePane;
  * Created by Mitisky on 16/6/20.
  */
 public class DrillMapIndependentVanChartInterface extends MapIndependentVanChartInterface {
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Drill_Map");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Region_Map"),
+                Toolkit.i18nText("Fine-Design_Chart_PointMap"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom_Map")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/37.png",
+                "com/fr/plugin/chart/demo/image/38.png",
+                "com/fr/plugin/chart/demo/image/39.png"
+        };
+    }
 
     /**
      * 图标路径
@@ -50,8 +73,4 @@ public class DrillMapIndependentVanChartInterface extends MapIndependentVanChart
         VanChartOtherPane otherPane = new VanChartDrillMapOtherPane();
         return new AbstractChartAttrPane[]{stylePane, otherPane};
     }
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartDrillMapPlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/type/VanChartDrillMapPlotPane.java

@@ -2,7 +2,6 @@ package com.fr.van.chart.drillmap.designer.type;
 
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
-
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.drillmap.DrillMapIndependentVanChart;
 import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
@@ -18,8 +17,6 @@ import java.util.ArrayList;
  */
 public class VanChartDrillMapPlotPane extends VanChartMapPlotPane {
 
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Map");
-
     @Override
     protected String[] getTypeIconPath() {
         return new String[]{"/com/fr/van/chart/drillmap/images/area-map.png",
@@ -38,14 +35,6 @@ public class VanChartDrillMapPlotPane extends VanChartMapPlotPane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PointMap"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Map")
-        };
-    }
 
     //钻取地图不全屏
     @Override
@@ -57,26 +46,6 @@ public class VanChartDrillMapPlotPane extends VanChartMapPlotPane {
         return tools;
     }
 
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartDrillMapPlot.VAN_CHART_DRILL_MAP_ID;
-    }
-
-    /**
-     * title应该是一个属性，不只是对话框的标题时用到，与其他组件结合时，也会用得到
-     *
-     * @return 绥化狂标题
-     */
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Map");
-    }
-
 
     protected Chart[] getDefaultCharts() {
         return DrillMapIndependentVanChart.DrillMapVanCharts;

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/FunnelIndependentVanChartInterface.java

@@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
@@ -25,6 +26,18 @@ import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
  * Created by Mitisky on 16/10/10.
  */
 public class FunnelIndependentVanChartInterface extends AbstractIndependentVanChartUI {
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Funnel");
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/41.png"
+        };
+    }
+
     /**
      * 图表的类型定义界面类型，就是属性表的第一个界面
      *
@@ -77,7 +90,4 @@ public class FunnelIndependentVanChartInterface extends AbstractIndependentVanCh
         return "com/fr/design/images/form/toolbar/funnel.png";
     }
 
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartFunnelTypePane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.funnel.designer.type;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.funnel.FunnelIndependentVanChart;
 import com.fr.plugin.chart.funnel.VanChartFunnelPlot;
@@ -13,7 +12,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 16/10/10.
  */
 public class VanChartFunnelTypePane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel");
 
     @Override
     protected String[] getTypeIconPath() {
@@ -22,33 +20,6 @@ public class VanChartFunnelTypePane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel")
-        };
-    }
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartFunnelPlot.VAN_CHART_FUNNEL_PLOT_ID;
-    }
-
-    /**
-     * title应该是一个属性，不只是对话框的标题时用到，与其他组件结合时，也会用得到
-     *
-     * @return 绥化狂标题
-     */
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel");
-    }
-
     protected Plot getSelectedClonedPlot(){
         Chart chart = getDefaultChart();
         VanChartFunnelPlot newPlot = (VanChartFunnelPlot) chart.getPlot();

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/GanttIndependentVanChartInterface.java

@@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
@@ -27,6 +28,18 @@ import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
  * Created by hufan on 2017/1/9.
  */
 public class GanttIndependentVanChartInterface extends AbstractIndependentVanChartUI {
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Gantt");
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/44.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartGanttPlotPane();
@@ -59,11 +72,6 @@ public class GanttIndependentVanChartInterface extends AbstractIndependentVanCha
         return "com/fr/design/images/form/toolbar/gantt.png";
     }
 
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartGanttPlotPane.TITLE;
-    }
-
     /**
      * 图表的属性界面数组
      * @return 属性界面

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.gantt.designer.type;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.gantt.GanttIndependentVanChart;
 import com.fr.plugin.chart.gantt.VanChartGanttPlot;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
@@ -12,33 +11,12 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by hufan on 2017/1/9.
  */
 public class VanChartGanttPlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gantt");
     @Override
     protected String[] getTypeIconPath() {
         return new String[]{"/com/fr/van/chart/gantt/images/gantt.png"
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart")
-        };
-    }
-
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartGanttPlot.VAN_CHART_GANTT_PLOT_ID;
-    }
-
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gantt");
-    }
-
     public Chart getDefaultChart() {
         return GanttIndependentVanChart.ganttVanChartTypes[0];
     }

designer-chart/src/main/java/com/fr/van/chart/gauge/GaugeIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.gauge;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
@@ -31,6 +32,33 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha
         return "com/fr/design/images/form/toolbar/gauge.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Gauge");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Gauge_Pointer"),
+                Toolkit.i18nText("Fine-Design_Chart_Gauge_Pointer180"),
+                Toolkit.i18nText("Fine-Design_Chart_Gauge_Ring"),
+                Toolkit.i18nText("Fine-Design_Chart_Gauge_Slot"),
+                Toolkit.i18nText("Fine-Design_Chart_Gauge_Cuvette")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/18.png",
+                "com/fr/plugin/chart/demo/image/19.png",
+                "com/fr/plugin/chart/demo/image/20.png",
+                "com/fr/plugin/chart/demo/image/21.png",
+                "com/fr/plugin/chart/demo/image/22.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartGaugePlotPane();
@@ -79,8 +107,4 @@ public class GaugeIndependentVanChartInterface extends AbstractIndependentVanCha
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
         return new VanChartGaugeSeriesPane(parent, plot);
     }
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartGaugePlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.gauge;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.gauge.GaugeIndependentVanChart;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
@@ -12,7 +11,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 15/11/27.
  */
 public class VanChartGaugePlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge");
 
     private static final long serialVersionUID = -4599483879031804911L;
 
@@ -26,24 +24,6 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Pointer"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Pointer180"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Ring"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Slot"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Cuvette")
-        };
-    }
-
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge");
-    }
-
     protected Plot getSelectedClonedPlot(){
         VanChartGaugePlot newPlot = null;
         Chart[] GaugeChart = GaugeIndependentVanChart.GaugeVanChartTypes;
@@ -78,16 +58,6 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane {
         }
     }
 
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartGaugePlot.VAN_CHART_GAUGE_PLOT;
-    }
-
     protected void cloneOldConditionCollection(Plot oldPlot, Plot newPlot) throws CloneNotSupportedException{
     }
 

designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/HeatMapIndependentVanChartInterface.java

@@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
@@ -32,6 +33,18 @@ public class HeatMapIndependentVanChartInterface extends MapIndependentVanChartI
         return "com/fr/design/images/form/toolbar/heatmap.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_HeatMap");
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/42.png"
+        };
+    }
+
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartHeatMapTypePane();
     }
@@ -62,8 +75,4 @@ public class HeatMapIndependentVanChartInterface extends MapIndependentVanChartI
         };
         return new AbstractChartAttrPane[]{stylePane, otherPane};
     }
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartHeatMapTypePane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapTypePane.java

@@ -4,7 +4,6 @@ import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.heatmap.HeatMapIndependentVanChart;
 import com.fr.plugin.chart.heatmap.VanChartHeatMapPlot;
@@ -16,7 +15,6 @@ import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane;
  * Created by Mitisky on 16/10/20.
  */
 public class VanChartHeatMapTypePane extends VanChartMapPlotPane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_HeatMap");
 
     @Override
     protected String[] getTypeIconPath() {
@@ -24,33 +22,6 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_HeatMap")
-        };
-    }
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartHeatMapPlot.VAN_CHART_HEAT_MAP_ID;
-    }
-
-    /**
-     * title应该是一个属性，不只是对话框的标题时用到，与其他组件结合时，也会用得到
-     *
-     * @return 绥化狂标题
-     */
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_HeatMap");
-    }
-
     @Override
     protected VanChartMapSourceChoosePane createSourceChoosePane() {
         return new VanChartHeatMapSourceChoosePane();

designer-chart/src/main/java/com/fr/van/chart/line/LineIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.line;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.van.chart.vanchart.AbstractMultiCategoryVanChartUI;
@@ -16,6 +17,29 @@ public class LineIndependentVanChartInterface extends AbstractMultiCategoryVanCh
         return "com/fr/design/images/form/toolbar/line.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Line");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Line_Chart"),
+                Toolkit.i18nText("Fine-Design_Chart_Stacked_Line"),
+                Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/11.png",
+                "com/fr/plugin/chart/demo/image/12.png",
+                "com/fr/plugin/chart/demo/image/13.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartLinePlotPane();
@@ -29,8 +53,4 @@ public class LineIndependentVanChartInterface extends AbstractMultiCategoryVanCh
         return new VanChartLineSeriesPane(parent, plot);
     }
 
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartLinePlotPane.TITLE;
-    }
-
 }

designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.line;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.line.LineIndependentVanChart;
 import com.fr.plugin.chart.line.VanChartLinePlot;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
@@ -12,8 +11,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 15/11/5.
  */
 public class VanChartLinePlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Line");
-    private static final long serialVersionUID = -8161581682558781651L;
 
     @Override
     protected String[] getTypeIconPath() {
@@ -23,33 +20,6 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked_Line"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom")
-        };
-    }
-
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Line");
-    }
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartLinePlot.VAN_CHART_LINE_PLOT;
-    }
-
     protected Plot getSelectedClonedPlot(){
         VanChartLinePlot newPlot = null;
         Chart[] lineChart = LineIndependentVanChart.LineVanChartTypes;

designer-chart/src/main/java/com/fr/van/chart/map/MapIndependentVanChartInterface.java

@@ -4,6 +4,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
@@ -32,6 +33,33 @@ import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
  */
 public class MapIndependentVanChartInterface extends AbstractIndependentVanChartUI {
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Map");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Region_Map"),
+                Toolkit.i18nText("Fine-Design_Chart_PointMap"),
+                Toolkit.i18nText("Fine-Design_Chart_LineMap"),
+                Toolkit.i18nText("Fine-Design_Chart_Combine_Map")
+        };
+    }
+
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/33.png",
+                "com/fr/plugin/chart/demo/image/34.png",
+                "com/fr/plugin/chart/demo/image/35.png",
+                "com/fr/plugin/chart/demo/image/36.png"
+        };
+    }
+
+
     /**
      * 图表的类型定义界面类型，就是属性表的第一个界面
      *
@@ -93,8 +121,4 @@ public class MapIndependentVanChartInterface extends AbstractIndependentVanChart
     public ConditionAttributesPane getPlotConditionPane(Plot plot){
         return new VanChartMapConditionPane(plot);
     }
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartMapPlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java

@@ -19,7 +19,6 @@ import java.awt.Component;
  * Created by Mitisky on 16/5/4.
  */
 public class VanChartMapPlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Map");
 
     private VanChartMapSourceChoosePane sourceChoosePane;
 
@@ -32,36 +31,6 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PointMap"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LineMap"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Map")
-        };
-    }
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartMapPlot.VAN_CHART_MAP_ID;
-    }
-
-    /**
-     * title应该是一个属性，不只是对话框的标题时用到，与其他组件结合时，也会用得到
-     *
-     * @return 绥化狂标题
-     */
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Map");
-    }
-
     protected Component[][] getPaneComponents(JPanel typePane){
         try {
             sourceChoosePane = createSourceChoosePane();

designer-chart/src/main/java/com/fr/van/chart/multilayer/MultiPieIndependentVanChartInterface.java

@@ -2,10 +2,8 @@ package com.fr.van.chart.multilayer;
 
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chartx.MultiPieChartDataPane;
 import com.fr.design.condition.ConditionAttributesPane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.van.chart.multilayer.other.VanChartMultiPieConditionPane;
@@ -26,9 +24,26 @@ public class MultiPieIndependentVanChartInterface extends AbstractIndependentVan
         return "com/fr/design/images/form/toolbar/multiPie.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_MultiPie");
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/32.png"
+        };
+    }
+
 //    @Override
 //    public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
-//        return new MultiPieChartDataPane(listener);
+//        return new AbstractDataPane(listener) {
+//            @Override
+//            protected SingleDataPane createSingleDataPane() {
+//                return new SingleDataPane(new MultiPieDataSetFieldsPane(), new MultiPieCellDataFieldsPane());
+//            }
+//        };
 //    }
 
     public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot){
@@ -39,7 +54,4 @@ public class MultiPieIndependentVanChartInterface extends AbstractIndependentVan
         return new VanChartMultiPieConditionPane(plot);
     }
 
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartMultiPiePlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/multilayer/VanChartMultiPiePlotPane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.multilayer;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.multilayer.MultiPieIndependentVanChart;
 import com.fr.plugin.chart.multilayer.VanChartMultiPiePlot;
@@ -14,30 +13,12 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Fangjie on 2016/6/15.
  */
 public class VanChartMultiPiePlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_MultiPie");
     @Override
     protected String[] getTypeIconPath() {
         return new String[]{"/com/fr/van/chart/multilayer/image/multiPie.png"
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Chart")
-        };
-    }
-
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartMultiPiePlot.VAN_CHART_MULTILAYER_PLOT_ID;
-    }
-
-    @Deprecated
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_MultiPie");
-    }
-
     @Override
     protected Plot getSelectedClonedPlot(){
         VanChartMultiPiePlot newPlot = null;

designer-chart/src/main/java/com/fr/van/chart/pie/PieIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.pie;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
@@ -23,6 +24,30 @@ public class PieIndependentVanChartInterface extends AbstractIndependentVanChart
         return "com/fr/design/images/form/toolbar/pie.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Pie");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SameArc_Pie"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DifferArc_Pie")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/0.png",
+                "com/fr/plugin/chart/demo/image/1.png",
+                "com/fr/plugin/chart/demo/image/2.png"
+        };
+    }
+
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartPiePlotPane();
@@ -48,8 +73,4 @@ public class PieIndependentVanChartInterface extends AbstractIndependentVanChart
     public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent){
         return (parent instanceof VanChartDataPane) ? new CategoryCustomPlotTableDataContentPane(parent) : new CategoryPlotTableDataContentPane(parent);
     }
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartPiePlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java

@@ -4,7 +4,6 @@ package com.fr.van.chart.pie;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.pie.PieIndependentVanChart;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
@@ -13,7 +12,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * 饼图(新特性) 属性表 选择类型 布局界面.
  */
 public class VanChartPiePlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie");
 
     private static final long serialVersionUID = 6163246902689597259L;
 
@@ -25,33 +23,6 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SameArc_Pie"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DifferArc_Pie")
-        };
-    }
-
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie");
-    }
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return PiePlot4VanChart.VAN_CHART_PIE_PLOT;
-    }
-
     protected Plot getSelectedClonedPlot(){
         PiePlot4VanChart newPlot = null;
         Chart[] pieChart = PieIndependentVanChart.newPieChartTypes;

designer-chart/src/main/java/com/fr/van/chart/radar/RadarIndependentVanChartInterface.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.radar;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.van.chart.vanchart.AbstractIndependentVanChartUI;
@@ -16,6 +17,27 @@ public class RadarIndependentVanChartInterface extends AbstractIndependentVanCha
         return "com/fr/design/images/form/toolbar/radar.png";
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Radar");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Radar_Chart"),
+                Toolkit.i18nText("Fine-Design_Chart_StackColumn_Radar")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/23.png",
+                "com/fr/plugin/chart/demo/image/24.png"
+        };
+    }
+
     @Override
     public AbstractChartTypePane getPlotTypePane() {
         return new VanChartRadarPlotPane();
@@ -28,8 +50,4 @@ public class RadarIndependentVanChartInterface extends AbstractIndependentVanCha
     public ConditionAttributesPane getPlotConditionPane(Plot plot){
         return new VanChartRadarConditionPane(plot);
     }
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartRadarPlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.radar;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.radar.RadarIndependentVanChart;
 import com.fr.plugin.chart.radar.VanChartRadarPlot;
 import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
@@ -12,7 +11,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 15/12/28.
  */
 public class VanChartRadarPlotPane  extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Radar");
 
     private static final long serialVersionUID = -4599483879031804911L;
 
@@ -23,32 +21,6 @@ public class VanChartRadarPlotPane  extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StackColumn_Radar")
-        };
-    }
-
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Radar");
-    }
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartRadarPlot.VAN_CHART_RADAR_PLOT;
-    }
-
     protected Plot getSelectedClonedPlot(){
         VanChartRadarPlot newPlot = null;
         Chart[] RadarChart = RadarIndependentVanChart.RadarVanChartTypes;

designer-chart/src/main/java/com/fr/van/chart/scatter/ScatterIndependentVanChartInterface.java

@@ -6,6 +6,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
@@ -34,6 +35,18 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
         return new VanChartScatterPlotPane();
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Scatter");
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/25.png"
+        };
+    }
+
     /**
      * 图标路径
      *
@@ -78,8 +91,4 @@ public class ScatterIndependentVanChartInterface extends AbstractIndependentVanC
     public ConditionAttributesPane getPlotConditionPane(Plot plot){
         return new VanChartScatterConditionPane(plot);
     }
-
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartScatterPlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterPlotPane.java

@@ -6,7 +6,6 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.base.VanChartAttrLine;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.scatter.ScatterIndependentVanChart;
@@ -17,8 +16,6 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 16/2/16.
  */
 public class VanChartScatterPlotPane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Scatter");
-
     private static final long serialVersionUID = -3481633368542654247L;
 
     @Override
@@ -27,31 +24,6 @@ public class VanChartScatterPlotPane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Scatter")
-        };
-    }
-
-    /**
-     * 返回界面标题
-     * @return 界面标题
-     */
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Scatter");
-    }
-
-    /**
-     * 获取各图表类型界面ID, 本质是plotID
-     *
-     * @return 图表类型界面ID
-     */
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartScatterPlot.VAN_CHART_SCATTER_PLOT_ID;
-    }
-
     protected Plot getSelectedClonedPlot(){
         VanChartScatterPlot newPlot = null;
         Chart[] scatterChart = ScatterIndependentVanChart.ScatterVanChartTypes;

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java

@@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
@@ -31,6 +32,29 @@ public class StructureIndependentVanChartInterface extends AbstractIndependentVa
         return new VanChartStructureTypePane();
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_Structure");
+    }
+
+    @Override
+    public String[] getSubName() {
+        return new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Vertical_Structure"),
+                Toolkit.i18nText("Fine-Design_Chart_Horizontal_Structure"),
+                Toolkit.i18nText("Fine-Design_Chart_Radial_Structure")
+        };
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/45.png",
+                "com/fr/plugin/chart/demo/image/46.png",
+                "com/fr/plugin/chart/demo/image/47.png"
+        };
+    }
+
     @Override
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/structure.png";

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/type/VanChartStructureTypePane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.structure.desinger.type;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.structure.StructureIndependentVanChart;
 import com.fr.plugin.chart.structure.VanChartStructurePlot;
@@ -23,30 +22,6 @@ public class VanChartStructureTypePane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Vertical_Structure"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horizontal_Structure"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radial_Structure")
-        };
-    }
-
-    @Override
-    protected String getPlotTypeID() {
-        return VanChartStructurePlot.STRUCTURE_PLOT_ID;
-    }
-
-    /**
-     * title应该是一个属性，不只是对话框的标题时用到，与其他组件结合时，也会用得到
-     *
-     * @return 绥化狂标题
-     */
-    @Override
-    public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Structure");
-    }
-    
     protected Plot getSelectedClonedPlot(){
         VanChartStructurePlot newPlot = null;
         Chart[] charts = StructureIndependentVanChart.StructureVanCharts;

designer-chart/src/main/java/com/fr/van/chart/treemap/TreeMapIndependentVanChartInterface.java

@@ -4,6 +4,7 @@ import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
@@ -22,6 +23,18 @@ public class TreeMapIndependentVanChartInterface extends MultiPieIndependentVanC
         return new VanChartTreeMapPlotPane();
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_New_TreeMap");
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/40.png"
+        };
+    }
+
     @Override
     public String getIconPath() {
         return "com/fr/design/images/form/toolbar/treeMap.png";
@@ -43,7 +56,4 @@ public class TreeMapIndependentVanChartInterface extends MultiPieIndependentVanC
         return new AbstractChartAttrPane[]{stylePane, otherPane};
     }
 
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartTreeMapPlotPane.TITLE;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/treemap/VanChartTreeMapPlotPane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.treemap;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.treemap.TreeMapIndependentVanChart;
 import com.fr.plugin.chart.treemap.VanChartTreeMapPlot;
 import com.fr.van.chart.multilayer.VanChartMultiPiePlotPane;
@@ -12,19 +11,12 @@ import com.fr.van.chart.multilayer.VanChartMultiPiePlotPane;
  * Created by Fangjie on 2016/7/11.
  */
 public class VanChartTreeMapPlotPane extends VanChartMultiPiePlotPane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_TreeMap");
+
     protected String[] getTypeIconPath() {
         return new String[]{"/com/fr/van/chart/treemap/images/treeMap.png"
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TreeMap_Chart")
-        };
-    }
-
     @Override
     protected String getPlotTypeID() {
         return VanChartTreeMapPlot.VAN_CHART_TREE_MAP_PLOT_ID;

designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java

@@ -3,12 +3,11 @@ package com.fr.van.chart.wordcloud.designer;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chartx.WordCloudChartDataPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.AbstractChartAttrPane;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.plugin.chart.base.VanChartConstants;
@@ -36,6 +35,18 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa
         return new VanChartWordCloudTypePane();
     }
 
+    @Override
+    public String getName() {
+        return Toolkit.i18nText("Fine-Design_Chart_Word_Cloud");
+    }
+
+    @Override
+    public String[] getDemoImagePath() {
+        return new String[]{
+                "com/fr/plugin/chart/demo/image/43.png"
+        };
+    }
+
     /**
      * 图标路径
      *
@@ -87,12 +98,13 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa
         return new AbstractChartAttrPane[]{stylePane, otherPane};
     }
 
-    public String getPlotTypeTitle4PopupWindow(){
-        return VanChartWordCloudTypePane.TITLE;
-    }
-
 //    @Override
 //    public ChartDataPane getChartDataPane(AttributeChangeListener listener) {
-//        return new WordCloudChartDataPane(listener);
+//        return new AbstractDataPane(listener) {
+//            @Override
+//            protected SingleDataPane createSingleDataPane() {
+//                return new SingleDataPane(new WordCloudDataSetFieldsPane(), new WordCloudCellDataFieldsPane());
+//            }
+//        };
 //    }
 }

designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/type/VanChartWordCloudTypePane.java

@@ -3,7 +3,6 @@ package com.fr.van.chart.wordcloud.designer.type;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.log.FineLoggerFactory;
-
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot;
 import com.fr.plugin.chart.wordcloud.WordCloudIndependentVanChart;
@@ -13,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
  * Created by Mitisky on 16/11/29.
  */
 public class VanChartWordCloudTypePane extends AbstractVanChartTypePane {
-    public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Cloud");
+
     @Override
     protected String[] getTypeIconPath() {
         return new String[]{
@@ -21,13 +20,6 @@ public class VanChartWordCloudTypePane extends AbstractVanChartTypePane {
         };
     }
 
-    @Override
-    protected String[] getTypeTipName() {
-        return new String[]{
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Cloud")
-        };
-    }
-
     /**
      * 获取各图表类型界面ID, 本质是plotID
      *

designer-realize/src/main/java/com/fr/poly/PolyComponentsBar.java

@@ -3,8 +3,8 @@ package com.fr.poly;
 import com.fr.base.BaseUtils;
 import com.fr.base.chart.BaseChartCollection;
 import com.fr.base.chart.BaseChartGetter;
-import com.fr.base.chart.BaseChartNameID;
 import com.fr.base.vcs.DesignerMode;
+import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
@@ -12,7 +12,6 @@ import com.fr.design.gui.itooltip.MultiLineToolTip;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.dnd.SerializableTransferable;
-import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.poly.PolyECBlock;
 import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
@@ -54,8 +53,8 @@ public class PolyComponentsBar extends JToolBar {
         setFloatable(false);
         setBackground(UIConstants.TOOLBARUI_BACKGROUND);
         setLayout(FRGUIPaneFactory.create1ColumnGridLayout());
-        BaseChartNameID[] typeName = BaseChartGetter.getStaticAllChartBaseNames();
+        String[] iDs = ChartTypeManager.getInstance().getAllChartIDs();
-        int typeLen = typeName.length < MAX_BAR_NUM ? typeName.length : MAX_BAR_NUM;
+        int typeLen = iDs.length < MAX_BAR_NUM ? iDs.length : MAX_BAR_NUM;
         serIcons = new SerIcon[typeLen + 1];
         serIcons[0] = new SerIcon(
                 PolyECBlock.class,
@@ -64,10 +63,10 @@ public class PolyComponentsBar extends JToolBar {
         );
         this.add(serIcons[0]);
         for (int i = 0; i < typeLen; i++) {
-            String chartID = typeName[i].getChartID();
+            String chartID = iDs[i];
             String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(chartID);
             BaseChartCollection chartCollection = BaseChartGetter.createChartCollection(chartID);
-            serIcons[i + 1] = new SerIcon(chartCollection, InterProviderFactory.getProvider().getLocText(typeName[i].getName()), iconPath);
+            serIcons[i + 1] = new SerIcon(chartCollection, ChartTypeInterfaceManager.getInstance().getName(chartID), iconPath);
             this.add(serIcons[i + 1]);
         }