From b908fad40e3b2780a45db53dd473b01968613e7d Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Tue, 16 Jan 2018 14:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/form/mobile/FormMobileTemplateSettingsPane.java | 7 ++++---
 designer_form/src/com/fr/design/mainframe/FormArea.java    | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java b/designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java
index 399f217f4b..719f958fa7 100644
--- a/designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java
+++ b/designer_form/src/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java
@@ -26,6 +26,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
     private UICheckBox mobileOnlyCheck;  // 设置为手机端专属模版
     private UICheckBox mobileCanvasSizeCheck;  // 设置为手机模版画布大小
     private UICheckBox adaptivePropertyAutoMatchCheck;  // 自适应属性自动匹配
+    private JPanel mobileSettingsPane;
 
     public FormMobileTemplateSettingsPane() {
         this.initComponents();
@@ -38,7 +39,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
         JPanel contentPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
         contentPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L2, 0));
 
-        JPanel mobileSettingsPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
+        mobileSettingsPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
         mobileSettingsPane.setVisible(false);
         mobileSettingsPane.add(getMobileCanvasSizeCheckPane(), BorderLayout.NORTH);
         mobileSettingsPane.add(getAdaptivePropertyAutoMatchCheckPane(), BorderLayout.CENTER);
@@ -73,8 +74,8 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
 
     private JPanel getAdaptivePropertyAutoMatchCheckPane() {
         JPanel panel = new JPanel(FRGUIPaneFactory.createBorderLayout());
-        String selectedDesc = Inter.getLocText("FR-Designer_Adaptive_Property_Auto_Match");
-        String unselectedDesc = Inter.getLocText("FR-Designer_Open_Adaptive_Property_Auto_Match");
+        final String selectedDesc = Inter.getLocText("FR-Designer_Adaptive_Property_Auto_Match");
+        final String unselectedDesc = Inter.getLocText("FR-Designer_Open_Adaptive_Property_Auto_Match");
         adaptivePropertyAutoMatchCheck = new UICheckBox();
         adaptivePropertyAutoMatchCheck.registerChangeListener(new UIObserverListener() {
             @Override
diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java
index 1786337dfe..37f05cfcb1 100644
--- a/designer_form/src/com/fr/design/mainframe/FormArea.java
+++ b/designer_form/src/com/fr/design/mainframe/FormArea.java
@@ -42,6 +42,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
     private static final int MOBILE_ONLY_WIDTH = 375;
     private static final int MOBILE_ONLY_HEIGHT = 560;
     private FormDesigner designer;
+    private JForm jForm;
     private int horizontalValue = 0;
     private int verticalValue = 0;
     private int verticalMax = 0;
@@ -81,6 +82,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
     public FormArea(FormDesigner designer, JForm jForm, boolean useScrollBar) {
         this.designer = designer;
         this.designer.setParent(this);
+        this.jForm = jForm;
         isValid = useScrollBar;
         verScrollBar = new FormScrollBar(Adjustable.VERTICAL, this);
         horScrollBar = new FormScrollBar(Adjustable.HORIZONTAL, this);
@@ -100,10 +102,10 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         }
         this.setFocusTraversalKeysEnabled(false);
         this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener);
-        initMobileAttrModifiedListener(jForm);
+        initMobileAttrModifiedListener();
     }
 
-    private void initMobileAttrModifiedListener(JForm jForm) {
+    private void initMobileAttrModifiedListener() {
         if (jForm == null) {
             return;
         }