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

designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderAttrPane.java

@@ -24,7 +24,7 @@ public abstract class LabelBorderAttrPane extends ConditionAttrSingleConditionPa
     public LabelBorderAttrPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove, String label) {
         super(conditionAttributesPane, isRemove);
         nameLabel = new UILabel(label);
-        linePane = new BorderAttriPane();
+        linePane = initBorderAttrPane();
 
         if (isRemove) {
             this.add(nameLabel);
@@ -33,6 +33,10 @@ public abstract class LabelBorderAttrPane extends ConditionAttrSingleConditionPa
         this.labelName = label;
     }
 
+    protected BorderAttriPane initBorderAttrPane(){
+        return new BorderAttriPane();
+    }
+
     @Override
     public String nameForPopupMenuItem() {
         return labelName;

designer_chart/src/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java

@@ -12,7 +12,7 @@ import com.fr.general.Inter;
 */
 public class LabelBorderPane extends LabelBorderAttrPane {
 
-    private AttrBorder attrBorder = new AttrBorder();
+    protected AttrBorder attrBorder = new AttrBorder();
 
     public LabelBorderPane(ConditionAttributesPane conditionAttributesPane) {
         super(conditionAttributesPane, true, Inter.getLocText(new String[]{"Border", "Format"}));