Merge pull request #5057 in DESIGN/design from release/11.0 to feature/x

* commit '3387d82ebe1135432253cb1925f77ecbddf53dfe':
  REPORT-55509 & REPORT-54844 按钮灰化和弹框关闭问题
  REPORT-55509 & REPORT-54844 按钮灰化和弹框关闭问题

designer-base/src/main/java/com/fr/design/versioncheck/VersionCheckUtils.java

@@ -26,6 +26,8 @@ import com.fr.plugin.manage.control.PluginTaskCallback;
 import com.fr.plugin.manage.control.PluginTaskResult;
 import com.fr.plugin.manage.control.ProgressCallback;
 import com.fr.report.ReportHelper;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.rpc.Result;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
@@ -35,6 +37,7 @@ import com.fr.workspace.engine.base.FineObjectPool;
 import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
 import com.fr.workspace.engine.exception.WorkspaceConnectionException;
 import com.fr.workspace.engine.rpc.WorkspaceProxyPool;
+import com.fr.workspace.server.check.VersionInfoOperator;
 import java.lang.reflect.Method;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
@@ -160,15 +163,22 @@ public class VersionCheckUtils {
     }
 
     public static String getRemoteBranch(DesignerWorkspaceInfo selectedEnv) {
-        String remoteBranch = StringUtils.EMPTY;
+        String remoteBranch;
-        WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection();
+        remoteBranch = WorkContext.getCurrent().get(VersionInfoOperator.class, new ExceptionHandler<String>() {
-        try {
+            @Override
-            remoteBranch = new FunctionalHttpRequest(connectionInfo).getServerBranch();
+            public String callHandler(RPCInvokerExceptionInfo exceptionInfo) {
-        } catch (WorkspaceConnectionException e) {
+                WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection();
-            remoteBranch = Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Is_Old") + formatBranch(GeneralUtils.readFullBuildNO());
+                String remoteBranch = StringUtils.EMPTY; 
-        } catch (Exception e) {
+                try {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    remoteBranch = new FunctionalHttpRequest(connectionInfo).getServerBranch();
-        }
+                } catch (WorkspaceConnectionException e) {
+                    remoteBranch = Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Is_Old") + formatBranch(GeneralUtils.readFullBuildNO());
+                } catch (Exception e) {
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                }
+                return remoteBranch;
+            }
+        }).getFullBuildNO();
         return remoteBranch;
     }
 
@@ -252,7 +262,7 @@ public class VersionCheckUtils {
         Map<String, String> pluginsNameMap = ReportHelper.getPluginNameMap();
         for (int i = 0; i < remotePlugins.size(); i++) {
             remotePlugin = remotePlugins.getJSONObject(i);
-            if (ComparatorUtils.equals(remotePlugin.getString("running"), "false")) {
+            if (ComparatorUtils.equals(remotePlugin.getString("running"), "false") || (remotePlugin.containsKey("sync") && !remotePlugin.getBoolean("sync"))) {
                 continue;
             }
             String remotePluginID = remotePlugin.getString(ID);

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

@@ -36,6 +36,8 @@ import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.util.List;
 import javax.swing.BorderFactory;
@@ -172,7 +174,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
             ignoreButton.addActionListener(this);
             syncButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Sync_To_Local"));
             syncButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Sync_To_Local_Tip"));
-            syncButton.addMouseListener(syncButtonClickListener);
+            syncButton.addActionListener(syncButtonActionListener);
             if(jarConsistency && differentPlugins.isEmpty()){
                 syncButton.setEnabled(false);
             }
@@ -186,8 +188,10 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
             buttonPanel.add(progressBar, BorderLayout.CENTER);
             buttonPanel.add(syncButton, BorderLayout.EAST);
         } else {
-            UILabel adviceLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Sync_Suggestion"));
+            if (!(jarConsistency && differentPlugins.isEmpty())) {
-            centerPanel.add(adviceLabel, BorderLayout.SOUTH);
+                UILabel adviceLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Sync_Suggestion"));
+                centerPanel.add(adviceLabel, BorderLayout.SOUTH);
+            }
             UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Button_Confirm"));
             okButton.addActionListener(this);
             buttonPanel.add(okButton, BorderLayout.EAST);
@@ -198,6 +202,12 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         this.add(centerPanel, BorderLayout.CENTER);
         this.add(buttonPanel, BorderLayout.SOUTH);
         this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US) ? 750 : 600, 500));
+        this.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                close();
+            }
+        });
         GUICoreUtils.centerWindow(this);
     }
 
@@ -308,10 +318,10 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         }
     };
 
-    private MouseListener syncButtonClickListener = new MouseAdapter() {
+    private ActionListener syncButtonActionListener = new ActionListener() {
         @Override
-        public void mouseClicked(MouseEvent e) {
+        public void actionPerformed(ActionEvent e) {
-             sync();
+            sync();
         }
     };
 
@@ -352,6 +362,9 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
                         helper.restartForUpdate(frame);
                     }
                 }.execute();
+            } else {
+                ignoreButton.setEnabled(true);
+                syncButton.setEnabled(true);
             }
         } else {
             //到这边说明主jar是一致的，就只尝试同步插件
@@ -389,7 +402,6 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         }
     }
 
-
     private boolean deletePreviousPropertyFile() {
         File moveFile = new File(RestartHelper.MOVE_FILE);
         File delFile = new File(RestartHelper.RECORD_FILE);

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

@@ -21,6 +21,8 @@ import java.awt.Dimension;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.util.Locale;
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -96,6 +98,12 @@ public class SyncFailedPluginsDialog extends JDialog {
         this.setResizable(false);
         this.add(body, BorderLayout.CENTER);
         this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US) ? 400 : 380, 225));
+        this.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                hideDialog();
+            }
+        });
         GUICoreUtils.centerWindow(this);
     }