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

* commit '269d6a97ec3980666b68568420361de71bbf4118':
  editlabel not append origin label

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

@@ -161,35 +161,47 @@ public class UIEditLabel extends JPanel implements UIObserver{
         return text;
     }
 
+    protected boolean appendOriginalLabel() {
+        return true;
+    }
+
     private void stopEditing(){
         isEditingStopped = true;
         this.removeAll();
-        String text =this.showLabel.getText();
+        if(appendOriginalLabel()) {
-        text = StringUtils.cutStringEndWith(text,":");
+            String text = this.showLabel.getText();
+            text = StringUtils.cutStringEndWith(text, ":");
             text = !ComparatorUtils.equals(text, this.originalLabel) ?
-                StringUtils.perfectEnd(text, "(" + this.originalLabel + ")"): this.originalLabel;
+                    StringUtils.perfectEnd(text, "(" + this.originalLabel + ")") : this.originalLabel;
-        showLabel.setText(StringUtils.perfectEnd(text,":"));
+            showLabel.setText(StringUtils.perfectEnd(text, ":"));
+        }
         this.add(showLabel, BorderLayout.CENTER);
         this.revalidate();
         this.repaint();
     }
 
     public String getText(){
-        String text =this.showLabel.getText();
+        if(appendOriginalLabel()) {
-        text = StringUtils.cutStringEndWith(text,":");
+            String text = this.showLabel.getText();
-        return StringUtils.cutStringEndWith(text,"("+this.originalLabel+")");
+            text = StringUtils.cutStringEndWith(text, ":");
+            return StringUtils.cutStringEndWith(text, "(" + this.originalLabel + ")");
+        } else {
+            return this.showLabel.getText();
+        }
     }
 
     public void setText(String text){
-        if(text == null || StringUtils.isEmpty(text)){
+        if(appendOriginalLabel()) {
+            if (text == null || StringUtils.isEmpty(text)) {
                 this.showLabel.setText(this.originalLabel);
                 return;
             }
-        if(!ComparatorUtils.equals(text,originalLabel)){
+            if (!ComparatorUtils.equals(text, originalLabel)) {
                 text = StringUtils.cutStringEndWith(text, ":");
-            text = StringUtils.perfectEnd(text,"("+originalLabel+")");
+                text = StringUtils.perfectEnd(text, "(" + originalLabel + ")");
+            }
+            text = StringUtils.perfectEnd(text, ":");
         }
-        text = StringUtils.perfectEnd(text,":");
         this.showLabel.setText(text);
     }