Merge pull request #1084 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0

* commit 'afdd96c1a36094e1b073695def74b287ffa79e69':
  REPORT-20327 sonar问题修复

designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java

@@ -159,6 +159,7 @@ public class PolyDesignUI extends ComponentUI {
 		return new Rectangle(resx, resy, width, height);
 	}
 
+	@SuppressWarnings("squid:S2142")
     private void scrollWhenCreatorAtCorner(final BlockCreator creator){
     	Thread scrollThread = new Thread(new Runnable() {
 

designer-realize/src/main/java/com/fr/poly/creator/BlockCreator.java

@@ -54,6 +54,9 @@ public abstract class BlockCreator<T extends TemplateBlock> extends JComponent i
 
 				@Override
 				public boolean equals(Object o) {
+					if (o == null) {
+						return false;
+					}
 					return ComparatorUtils.equals(o.getClass().getName(), this.getClass().getName());
 				}
 			});

designer-realize/src/main/java/com/fr/poly/creator/BlockEditor.java

@@ -125,6 +125,9 @@ public abstract class BlockEditor<T extends JComponent,U extends TemplateBlock>
 
 			@Override
 			public boolean equals(Object o) {
+				if (o == null) {
+					return false;
+				}
 				return ComparatorUtils.equals(o.getClass().getName(), this.getClass().getName());
 			}
 		});

designer-realize/src/main/java/com/fr/start/fx/PrismImageLoader2.java

@@ -1,6 +1,7 @@
 package com.fr.start.fx;
 
 import com.fr.concurrent.NamedThreadFactory;
+import com.fr.log.FineLoggerFactory;
 import com.sun.javafx.iio.ImageFrame;
 import com.sun.javafx.iio.ImageLoadListener;
 import com.sun.javafx.iio.ImageLoader;
@@ -79,6 +80,7 @@ class PrismImageLoader2 implements com.sun.javafx.tk.ImageLoader {
     }
 
     @Override
+    @SuppressWarnings("squid:S2142")
     public PlatformImage getFrame(int index) {
         while (images[index] == null) {
             synchronized (this) {
@@ -86,7 +88,7 @@ class PrismImageLoader2 implements com.sun.javafx.tk.ImageLoader {
                     try {
                         this.wait();
                     } catch (InterruptedException e) {
-                        e.printStackTrace();
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
                     }
                 }
             }

designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java

@@ -55,6 +55,7 @@ public class SplashFxWindow extends Application {
      *
      * @return 运行实例
      */
+    @SuppressWarnings("squid:S2142")
     public static SplashFxWindow waitForStartUpTest() {
         try {
             LATCH.await();