Merge pull request #763 in BA/design from ~ZHENG/design:dev to dev

* commit '6b6c4c43e026728eb3cffb7e36ed56475b110e2f':
  控件名称更改

designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -33,7 +33,7 @@ import java.util.List;
 * @version 创建时间：2012-12-26 上午10:56:51
  */
 public class ChartTypePane extends AbstractChartAttrPane{
-	private ComboBoxPane chartTypePane;
+	private ComboBoxPane chartTypeComBox;
 	private ChartTypeButtonPane buttonPane;
     private ChartEditPane editPane;
     private ChartCollection editingCollection;
@@ -72,13 +72,13 @@ public class ChartTypePane extends AbstractChartAttrPane{
 		if (editingCollection != null) {
 			relayoutChartTypePane(editingCollection);
 		}else {
-			chartTypePane = new ComboBoxPane();
+			chartTypeComBox = new ComboBoxPane();
 		}
 
 		BasicScrollPane scrollPane = new BasicScrollPane() {
 			@Override
 			protected JPanel createContentPane() {
-				return chartTypePane;
+				return chartTypeComBox;
 			}
 
 			@Override
@@ -99,7 +99,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
 		};
 		content.add(scrollPane, BorderLayout.CENTER);
 		
-		buttonPane.setEditingChartPane(chartTypePane);
+		buttonPane.setEditingChartPane(chartTypeComBox);
 		
 		return content;
 	}
@@ -286,7 +286,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
 
 	public void relayoutChartTypePane(ChartCollection collection){
 		if (needRelayout(collection)) {
-			chartTypePane.relayout(collection);
+			chartTypeComBox.relayout(collection);
 			//设置面板切换状态
 			updatePaneState(collection);
 		}
@@ -314,7 +314,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
 		initContentPane();
 
 		buttonPane.populateBean(collection);
-		chartTypePane.populateBean(chart);
+		chartTypeComBox.populateBean(chart);
 
 		this.initAllListeners();
 	}
@@ -326,7 +326,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
         editingCollection = collection;
 		buttonPane.update(collection);// 内部操作时 已经做过处理.
 		Chart chart = collection.getSelectedChart();
-		chartTypePane.updateBean(chart);
+		chartTypeComBox.updateBean(chart);
 	}
 
     /**
@@ -334,7 +334,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
      * @return 类型界面
      */
     public FurtherBasicBeanPane[] getPaneList(){
-        return chartTypePane.getCards().toArray(new FurtherBasicBeanPane[0]);
+        return chartTypeComBox.getCards().toArray(new FurtherBasicBeanPane[0]);
     }
 
     /**
@@ -342,7 +342,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
      * @return 当前选中的图表的index
      */
     public int getSelectedIndex(){
-        return chartTypePane.getSelectedIndex();
+        return chartTypeComBox.getSelectedIndex();
     }
 
     /**
@@ -350,7 +350,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
      * @return 选中的图标的序号
      */
     public int getSelectedChartIndex(){
-        return chartTypePane.getSelectedIndex();
+        return chartTypeComBox.getSelectedIndex();
     }
 
     /**