From f91cec5562e296c8450ca3c2c712ea0efb2b13c7 Mon Sep 17 00:00:00 2001
From: fanglei <294531121>
Date: Mon, 20 Feb 2017 14:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java   | 2 +-
 .../src/com/fr/design/beans/location/MoveUtils.java         | 6 +++---
 .../src/com/fr/design/designer/beans/location/Inner.java    | 2 +-
 .../src/com/fr/design/mainframe/WidgetPropertyPane.java     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java b/designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java
index 1a895cbfe..3f063e21d 100644
--- a/designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java
+++ b/designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java
@@ -161,7 +161,7 @@ public class BottomCornerMouseHanlder extends MouseInputAdapter {
 		 * @param isIntersects 是否重叠
 		 */
 		@Override
-		public void setWidgetsIntersects(boolean isIntersects) {
+		public void setWidgetsIntersected(boolean isIntersects) {
 		}
 
 		/**
diff --git a/designer_base/src/com/fr/design/beans/location/MoveUtils.java b/designer_base/src/com/fr/design/beans/location/MoveUtils.java
index 853e37026..d89848446 100644
--- a/designer_base/src/com/fr/design/beans/location/MoveUtils.java
+++ b/designer_base/src/com/fr/design/beans/location/MoveUtils.java
@@ -78,7 +78,7 @@ public class MoveUtils {
 		 * 设置designer内部组件是否重叠的标志位
 		 * @param isIntersects 是否重叠
 		 */
-		void setWidgetsIntersects(boolean isIntersects);
+		void setWidgetsIntersected(boolean isIntersects);
 
 		/**
 		 * 获取designer内部组件是否重叠的标志位
@@ -358,10 +358,10 @@ public class MoveUtils {
 			if(designer.getDesignerLocationOnScreen() != null) {
 				displayForbidWindow(x + designer.getDesignerLocationOnScreen().x, y + designer.getDesignerLocationOnScreen().y);
 			}
-			designer.setWidgetsIntersects(true);
+			designer.setWidgetsIntersected(true);
 		}
 		else{
-			designer.setWidgetsIntersects(false);
+			designer.setWidgetsIntersected(false);
 			hideForbidWindow();
 		}
 	}
diff --git a/designer_form/src/com/fr/design/designer/beans/location/Inner.java b/designer_form/src/com/fr/design/designer/beans/location/Inner.java
index d400a064c..4f475adf0 100644
--- a/designer_form/src/com/fr/design/designer/beans/location/Inner.java
+++ b/designer_form/src/com/fr/design/designer/beans/location/Inner.java
@@ -89,7 +89,7 @@ public class Inner extends AccessDirection {
 		 * @param isIntersects 是否重叠
 		 */
 		@Override
-		public void setWidgetsIntersects(boolean isIntersects) {
+		public void setWidgetsIntersected(boolean isIntersects) {
 			designer.setWidgetsIntersect(isIntersects);
 		}
 
diff --git a/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java b/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java
index 23242e399..33736ac0a 100644
--- a/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java
+++ b/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java
@@ -33,6 +33,8 @@ import java.util.Set;
  */
 public class WidgetPropertyPane extends FormDockView implements BaseWidgetPropertyPane {
 
+    private static final String PARA = "para";
+    private static final String BODY = "body";
     private WidgetPropertyTable propertyTable; // 控件的属性表
     private EventPropertyTable eventTable; // 控件的事件表
     private List<AbstractPropertyTable> widgetPropertyTables; // 这个变量应该是保存控件拓展的属性tab
@@ -46,8 +48,6 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
     private JPanel centerPane; // 此centerPane采用的是cardLayout布局，装载着mobileWidgetTable和mobileBodyWidgetTable
     private CardLayout cardLayout; // 卡片布局，选中参数面板时显示mobileWidgetTable，选中body时显示mobileBodyWidgetTable
     private JTableHeader header;//把表头单独get出来作为一个组件
-    private static final String PARA = "para";
-    private static final String BODY = "body";
 
     public static WidgetPropertyPane getInstance() {
         if (HOLDER.singleton == null) {