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

* commit 'a3707779f1130392fd777a3c939f23ccbc73ab43':
  update
  update
  update
  接口

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

@@ -143,6 +143,10 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
 
     }
 
+    public ChartDataPane getChartDataPane(String plotID, AttributeChangeListener listener) {
+        return chartTypeInterfaces.get(plotID).getChartDataPane(listener);
+    }
+
     public AbstractChartAttrPane[] getAttrPaneArray(String plotID, AttributeChangeListener listener) {
         return chartTypeInterfaces.get(plotID).getAttrPaneArray(listener);
     }

designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java

@@ -68,6 +68,8 @@ public interface IndependentChartUIProvider extends Level {
      */
     AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener);
 
+    ChartDataPane getChartDataPane(AttributeChangeListener listener);
+
     /**
      * 是否使用默认的界面，为了避免界面来回切换
      *

designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI.java

@@ -7,6 +7,7 @@ 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.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.general.ComparatorUtils;
 
@@ -26,6 +27,9 @@ public abstract class AbstractIndependentChartUI implements IndependentChartUIPr
         return new AbstractChartAttrPane[0];
     }
 
+    public ChartDataPane getChartDataPane(AttributeChangeListener listener){
+        return new ChartDataPane(listener);
+    }
     /**
      * 是否使用默认的界面，为了避免界面来回切换
      * @return 是否使用默认的界面

designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java

@@ -7,6 +7,7 @@ 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.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.general.ComparatorUtils;
 
@@ -23,6 +24,10 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements Independ
         return new AbstractChartAttrPane[0];
     }
 
+    public ChartDataPane getChartDataPane(AttributeChangeListener listener){
+        return new ChartDataPane(listener);
+    }
+
     /**
      * 是否使用默认的界面，为了避免界面来回切换
      * @return 是否使用默认的界面

designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -154,6 +154,8 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
                 paneList.add(otherPane);
                 this.isDefaultPane = true;
             }else{
+                ChartDataPane chartDataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener);
+                paneList.add(chartDataPane);
                 AbstractChartAttrPane[] otherPaneList = ChartTypeInterfaceManager.getInstance().getAttrPaneArray(plotID, listener);
                 for(int i = 0; i < otherPaneList.length; i++){
                     otherPaneList[i].addAttributeChangeListener(listener);

designer_chart/src/com/fr/design/mainframe/chart/ChartHyperEditPane.java

@@ -39,11 +39,9 @@ public class ChartHyperEditPane  extends ChartEditPane {
 	}
 
 
-    protected void addTypeAndDataPane() {
+    protected void addTypePane() {
         paneList.add(attrPane);
         paneList.add(typePane);
-        paneList.add(dataPane4SupportCell);
-
     }