Merge pull request #1057 in DESIGN/design from ~HUGH.C/design:feature/10.0 to feature/10.0

* commit '1e874429a706b98ea011b07be9a9632c46a3f2ef':
  REPORT-20329 sonar问题修复

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -1091,6 +1091,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             thread.join();
         } catch (InterruptedException e) {
             FineLoggerFactory.getLogger().error("Map Thread Error");
+            Thread.currentThread().interrupt();
         }
 
         DesignerEnvManager.getEnvManager().setLastOpenFile(

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsLabel.java

@@ -19,12 +19,11 @@ public class VcsLabel extends ActionLabel {
     }
 
     public void paintComponent(Graphics g) {
-        if (ui != null) {
+        if (ui != null && g != null) {
-            Graphics scratchGraphics = (g == null) ? null : g.create();
+            Graphics scratchGraphics = g.create();
             try {
                 ui.update(scratchGraphics, this);
-            }
+            } finally {
-            finally {
                 scratchGraphics.dispose();
             }
         }

designer-base/src/main/java/com/fr/design/style/color/ColorPicker.java

@@ -74,6 +74,7 @@ public class ColorPicker extends JDialog implements ActionListener
                 Thread.sleep(100);  // 等待弹窗关闭
             } catch (InterruptedException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                Thread.currentThread().interrupt();
             }
             colorPickerPanel.captureScreen();
         }

designer-base/src/main/java/com/fr/design/update/actions/FileDownloader.java

@@ -65,6 +65,7 @@ public abstract class FileDownloader extends SwingWorker<Boolean, DownloadItem>
             success = get();
         } catch (InterruptedException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            Thread.currentThread().interrupt();
         } catch (ExecutionException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -385,6 +385,7 @@ public class UpdateMainDialog extends UIDialog {
                     showDownLoadInfo();
                 } catch (InterruptedException e) {
                     stopLoading();
+                    Thread.currentThread().interrupt();
                 } catch (ExecutionException e) {
                     stopLoading();
                 } finally {