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

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java

@@ -46,8 +46,8 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan
 		double[] rowSize = { p, p, p};
 		
 		Component[][] components = new Component[][]{
-				new Component[]{new UILabel(CATENAME), getSingCatePane()},
+				new Component[]{new UILabel(getCateNameString()), getSingCatePane()},
-				new Component[]{new UILabel(NVALUE), singValuePane = new TinyFormulaPane()},
+				new Component[]{new UILabel(getNValueString()), singValuePane = new TinyFormulaPane()},
 				new Component[]{null, null}
 		};
 		
@@ -67,6 +67,14 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan
 		this.add(pane, BorderLayout.CENTER);
 	}
 
+	protected String getCateNameString() {
+		return CATENAME;
+	}
+
+	protected String getNValueString() {
+		return NVALUE;
+	}
+	
 	public void populateBean(ChartCollection collection) {
 		TopDefinitionProvider definition = collection.getSelectedChart().getFilterDefinition();
 		if(definition instanceof MeterReportDefinition) {