Pull request #4599: REPORT-51958 远程环境检测及同步

Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0

* commit '2dfe3b125bb07fe48bdab083a5012b17547e6730':
  REPORT-51958 远程环境检测及同步

designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java

@@ -34,11 +34,20 @@ public class RemoteWorkspace implements Workspace {
 
     private volatile Boolean warDeploy;
 
+    private final SwingWorker<Void,Void> swingWorker;
+
     RemoteWorkspace(WorkspaceClient client, WorkspaceConnectionInfo connection) {
 
         this.client = client;
         this.address = connection.getUrl();
         this.connection = connection;
+        this.swingWorker = new SwingWorker<Void, Void>() {
+            @Override
+            protected Void doInBackground() throws Exception {
+                client.close();
+                return null;
+            }
+        };
     }
 
     @Override
@@ -125,13 +134,7 @@ public class RemoteWorkspace implements Workspace {
 
     @Override
     public void close() {
-        new SwingWorker<Void, Void>() {
-            @Override
-            protected Void doInBackground() throws Exception {
-                client.close();
-                return null;
-            }
-        }.execute();
+        swingWorker.execute();
     }
 
     @Override

designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterDialog.java

@@ -147,7 +147,7 @@ public class NotificationCenterDialog extends JDialog {
                     deleteLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear_Notifications") + "(" + NotificationCenter.getInstance().getNotificationsCount() + ")");
                     pack();
                     if (notificationNeedShow.size() == 0) {
-                        centerWindow();
+                        hideDialog();
                     }
                     NotificationCenterPane.getNotificationCenterPane().refreshButton();
                 }

designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java

@@ -41,7 +41,7 @@ public class NotificationCenterPane extends BasicPane {
 
     public void refreshButton() {
         if (NotificationCenter.getInstance().getNotificationsCount() > 0) {
-            notificationCenterButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/notificationcenter/normal.png"));
+            notificationCenterButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/notificationcenter/notificationCenterDot.png"));
         } else {
             notificationCenterButton.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/notificationcenter/notificationCenter.png"));
         }

designer-base/src/main/java/com/fr/env/SyncFailedPluginsDialog.java

@@ -18,7 +18,6 @@ import com.fr.json.JSONObject;
 import com.fr.stable.StringUtils;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.Frame;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -138,9 +137,14 @@ public class SyncFailedPluginsDialog extends JDialog {
         return !restartButton.isEnabled();
     }
 
+    private void hideDialog(){
+        this.dispose();
+    }
+
     private MouseListener restartButtonClickListener = new MouseAdapter() {
         @Override
         public void mouseClicked(MouseEvent e) {
+            hideDialog();
             restartButton.setEnabled(false);
             restartHelper.restartForUpdate(frame);
         }