From 7b6dd4bde3a5aaaa404153cfb252b2feeae6afbd Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Wed, 3 Jan 2018 13:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8Crelease?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=B0feature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/grid/selection/FloatSelection.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer/src/com/fr/grid/selection/FloatSelection.java b/designer/src/com/fr/grid/selection/FloatSelection.java
index 0d441a1f7a..cff3a4a642 100644
--- a/designer/src/com/fr/grid/selection/FloatSelection.java
+++ b/designer/src/com/fr/grid/selection/FloatSelection.java
@@ -149,8 +149,9 @@ public class FloatSelection extends Selection {
         TemplateElementCase ec = ePane.getEditingElementCase();
         FloatElement fe = ec.getFloatElement(selectedFloatName);
         if (fe != null) {
-            ec.removeFloatElement(fe);
+            //  REPORT-5955 [Report]删除悬浮元素后，设计器卡死；之前wu做了释放内存，删除悬浮元素会报npe；删除悬浮元素逻辑改为先setSelection 再 remove
             ePane.setSelection(new CellSelection(0, 0, 1, 1));
+            ec.removeFloatElement(fe);
 
             return true;
         }
@@ -240,7 +241,6 @@ public class FloatSelection extends Selection {
     }
 
     public void populateWidgetPropertyPane(ElementCasePane ePane){
-        return;
     }
 
 }
\ No newline at end of file