From bb622b1fd718eb9c6f7dadbda81b150e647d5656 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 25 Nov 2016 16:04:18 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-842=20=E6=8A=A5=E8=A1=A8=E5=9D=97?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E5=9C=86=E8=A7=92=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/designer/creator/XBorderStyleWidgetCreator.java | 2 +-
 .../src/com/fr/design/gui/xpane/LayoutBorderPane.java         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java b/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java
index 07a61f0d4d..1b532f7f99 100644
--- a/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java
+++ b/designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java
@@ -58,7 +58,7 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
     protected void initBorderStyle() {
     	LayoutBorderStyle style = toData().getBorderStyle();
         if (style != null && style.getBorder() != Constants.LINE_NONE) {
-            this.setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.isCorner() ? style.getRoundRadius() : noneSize));
+            this.setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.isCorner() ? style.getBorderRadius() : noneSize));
         } else {
             this.setBorder(DEFALUTBORDER);
         }
diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java
index 9c4385b6ed..1a1dd071ce 100644
--- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java
+++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPane.java
@@ -505,7 +505,7 @@ public class LayoutBorderPane extends BasicPane {
         LayoutBorderStyle style = new LayoutBorderStyle();
         style.setType(borderTypeCombo.getSelectedIndex());
         style.setBorderStyle(borderStyleCombo.getSelectedIndex());
-        style.setRoundRadius((int)borderCornerSpinner.getValue());
+        style.setBorderRadius((int)borderCornerSpinner.getValue());
         style.setBorder(currentLineCombo.getSelectedLineStyle());
         style.setColor(currentLineColorPane.getColor());
         style.setBackground(backgroundPane.update());
@@ -573,7 +573,7 @@ public class LayoutBorderPane extends BasicPane {
                 paintPreviewPane();
             }
         });
-        this.borderCornerSpinner.setValue(borderStyle.getRoundRadius());
+        this.borderCornerSpinner.setValue(borderStyle.getBorderRadius());
         this.borderCornerSpinner.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {