From c0488d7e014d052c640d3bde660e8734c15dff1f Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 11 Sep 2017 14:47:39 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-4366=20=E8=A1=A8=E5=8D=95=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E5=B8=83=E5=B1=80=EF=BC=8Cbody=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98=EF=BC=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=8B=E5=91=BD=E5=90=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/designer/layout/FRFitLayoutDefinePane.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java index 7f45a1f98a..4b8b89d839 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java @@ -44,7 +44,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { private UIComboBox adaptComboBox; private UISpinner componentIntervel; private PaddingBoundPane paddingBound; - private AccessibleWLayoutBorderStyleEditor background; + private AccessibleWLayoutBorderStyleEditor stylePane; public FRFitLayoutDefinePane(XCreator xCreator) { super(xCreator); @@ -65,9 +65,9 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { public JPanel createAdvancePane() { JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - background = new AccessibleWLayoutBorderStyleEditor(); + stylePane = new AccessibleWLayoutBorderStyleEditor(); paddingBound = new PaddingBoundPane(); - JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background")), background}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); + JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), stylePane}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 5, 0)); jPanel.add(paddingBound, BorderLayout.CENTER); jPanel.add(jp2, BorderLayout.NORTH); @@ -119,7 +119,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { layoutComboBox.setSelectedIndex(ob.getBodyLayoutType().getTypeValue()); adaptComboBox.setSelectedIndex(ob.getCompState()); componentIntervel.setValue(ob.getCompInterval()); - background.setValue(ob.getBorderStyle()); + stylePane.setValue(ob.getBorderStyle()); } @@ -127,7 +127,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { public WFitLayout updateBean() { WFitLayout layout = (WFitLayout) creator.toData(); paddingBound.update(layout); - LayoutBorderStyle borderStyle = (LayoutBorderStyle) background.getValue(); + LayoutBorderStyle borderStyle = (LayoutBorderStyle) stylePane.getValue(); if(borderStyle != null){ layout.setBorderStyle(borderStyle); }