From dcc4c63bdf5f8db27c6e17bb98560c8ff3a0d417 Mon Sep 17 00:00:00 2001
From: Fangjie Hu <Fangjie Hu>
Date: Fri, 16 Dec 2016 14:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96plotTypePane=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/beans/FurtherBasicBeanPane.java     | 8 ++++++--
 .../src/com/fr/design/ChartTypeInterfaceManager.java      | 8 ++++----
 .../fr/design/chart/fun/IndependentChartUIProvider.java   | 5 +++++
 .../fun/impl/AbstractIndependentChartUIWithAPILevel.java  | 8 ++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/designer_base/src/com/fr/design/beans/FurtherBasicBeanPane.java b/designer_base/src/com/fr/design/beans/FurtherBasicBeanPane.java
index 9129c2b87..8c61c96db 100644
--- a/designer_base/src/com/fr/design/beans/FurtherBasicBeanPane.java
+++ b/designer_base/src/com/fr/design/beans/FurtherBasicBeanPane.java
@@ -1,5 +1,7 @@
 package com.fr.design.beans;
 
+import com.fr.stable.StringUtils;
+
 /**
  * 
  * @author zhou
@@ -17,8 +19,10 @@ public abstract class FurtherBasicBeanPane<T> extends BasicBeanPane<T> {
 	 * title应该是一个属性，不只是对话框的标题时用到，与其他组件结合时，也会用得到
 	 * @return 绥化狂标题
 	 */
-	@Override
-	public abstract String title4PopupWindow();
+	@Deprecated
+	public String title4PopupWindow(){
+		return StringUtils.EMPTY;
+	}
 
 	/**
 	 * 重置
diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
index 2ddb5b05f..3bf990880 100644
--- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java
@@ -259,7 +259,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
             while (iterator.hasNext()){
                 Map.Entry entry = (Map.Entry) iterator.next();
                 IndependentChartUIProvider provider = (IndependentChartUIProvider) entry.getValue();
-                names[i++] = provider.getPlotTypePane().title4PopupWindow();
+                names[i++] = provider.getPlotTypeTitle4PopupWindow();
             }
             return names;
         }
@@ -274,7 +274,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
     public String getTitle4PopupWindow(String priority, String plotID){
         if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority) && chartTypeInterfaces.get(priority).containsKey(plotID)){
             IndependentChartUIProvider provider = chartTypeInterfaces.get(priority).get(plotID);
-            return provider.getPlotTypePane().title4PopupWindow();
+            return provider.getPlotTypeTitle4PopupWindow();
         }
 
         //兼容老的插件
@@ -284,7 +284,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
                 Map.Entry entry = (Map.Entry) iterator.next();
                 String defaultPriority = (String) entry.getKey();
                 if (chartTypeInterfaces.get(defaultPriority).containsKey(plotID)) {
-                    return chartTypeInterfaces.get(defaultPriority).get(plotID).getPlotTypePane().title4PopupWindow();
+                    return chartTypeInterfaces.get(defaultPriority).get(plotID).getPlotTypeTitle4PopupWindow();
                 }
             }
         }
@@ -332,7 +332,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
         while (chartUI.hasNext()) {
             Map.Entry chartUIEntry = (Map.Entry) chartUI.next();
             IndependentChartUIProvider provider = (IndependentChartUIProvider) chartUIEntry.getValue();
-            names[index++] = provider.getPlotTypePane().title4PopupWindow();
+            names[index++] = provider.getPlotTypeTitle4PopupWindow();
         }
         return index;
     }
diff --git a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java
index a91914396..1b90382d6 100644
--- a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java
+++ b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java
@@ -84,5 +84,10 @@ public interface IndependentChartUIProvider extends Level {
      */
     String getIconPath();
 
+    /**
+     * plot面板的标题
+     */
+    String getPlotTypeTitle4PopupWindow();
+
 
 }
\ No newline at end of file
diff --git a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java
index 2a1e6b4c4..ff0eaa81d 100644
--- a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java
+++ b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java
@@ -57,4 +57,12 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements Independ
     public ConditionAttributesPane getPlotConditionPane(Plot plot){
         return new DataSeriesConditionPane();
     }
+
+    /**
+     * plot面板的标题
+     * 插件兼容
+     */
+    public String getPlotTypeTitle4PopupWindow(){
+        return getPlotTypePane().title4PopupWindow();
+    }
 }