From 7ea83ebbe914f427fd7c02d82e6feaf3a2bbe89d Mon Sep 17 00:00:00 2001
From: Maksim <Maksim@fanruan.com>
Date: Thu, 5 Sep 2019 10:09:29 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-20323=20sonar=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/FormCreatorDropTarget.java | 2 +-
 .../src/main/java/com/fr/design/mainframe/FormDesigner.java | 1 +
 .../src/main/java/com/fr/design/mainframe/FormToolBar.java  | 2 +-
 .../main/java/com/fr/design/mainframe/FormToolBarPane.java  | 2 +-
 .../src/main/java/com/fr/design/mainframe/JForm.java        | 1 +
 .../java/com/fr/design/mainframe/widget/UITreeComboBox.java | 6 +++++-
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java b/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java
index 0e8e77ed7..05d33cccb 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java
@@ -252,7 +252,7 @@ public class FormCreatorDropTarget extends DropTarget {
      *
      * @param dtde 事件
      */
-    public void drop(DropTargetDropEvent dtde) {
+    public synchronized void drop(DropTargetDropEvent dtde) {
         Point loc = dtde.getLocation();
         this.adding(loc.x, loc.y);
         //针对在表单中拖入一个控件直接ctrl+s无反应
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
index 99883fff3..fbf52d021 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
@@ -1368,6 +1368,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
                         Thread.sleep(1500);
                     } catch (InterruptedException e) {
                         FRLogger.getLogger().error(e.getMessage(), e);
+                        Thread.currentThread().interrupt();
                     }
 
                     pane.setLayout(new BorderLayout());
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormToolBar.java
index 860144dc8..71a93e9bc 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormToolBar.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormToolBar.java
@@ -20,7 +20,7 @@ public class FormToolBar {
     }
 
     public void setButtonlist(List<FormToolBarButton> buttonlist) {
-        if (buttonlist == null || buttonlist.size() < 0) {
+        if (buttonlist == null) {
             this.buttonlist = new ArrayList<FormToolBarButton>();
         } else {
             this.buttonlist = buttonlist;
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormToolBarPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormToolBarPane.java
index e64259b27..17d620829 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormToolBarPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormToolBarPane.java
@@ -118,7 +118,7 @@ public class FormToolBarPane extends BasicBeanPane<ToolBar> {
     }
 
     private void setToolBar(List<FormToolBarButton> list) {
-        if (list == null || list.size() < 0) {
+        if (list == null) {
             return;
         }
         this.removeAll();
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index bcf761fac..6b8cbbe5d 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -765,6 +765,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
                         Thread.sleep(1500);
                     } catch (InterruptedException e) {
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                        Thread.currentThread().interrupt();
                     }
                     JPanel pane = new JPanel();
                     pane.setLayout(new BorderLayout());
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/UITreeComboBox.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/UITreeComboBox.java
index 749bdceb7..4a59484e1 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/UITreeComboBox.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/UITreeComboBox.java
@@ -192,7 +192,11 @@ public class UITreeComboBox extends UIComboBox {
 
         @Override
         public boolean equals(Object o) {
-            return o.getClass() == this.getClass();
+            if (o != null) {
+                return o.getClass() == this.getClass();
+            } else {
+                return false;
+            }
         }
     }