Merge pull request #338 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0

* commit '9423a5feb413f77efc79b68c0f17006a9a93f5ba':
  .
  .
  .

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -40,7 +40,6 @@ import com.fr.stable.xml.XMLWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
-import com.fr.workspace.connect.AuthException;
 
 import javax.swing.*;
 import javax.swing.SwingWorker.StateValue;
@@ -550,7 +549,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                     DesignTableDataManager.fireDSChanged(new HashMap<String, String>());
                 }
             });
-        } catch (AuthException e) {
+        } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -13,6 +13,8 @@ import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.utils.DesignUtils;
+import com.fr.license.exception.RegistEditionException;
+import com.fr.log.FineLoggerFactory;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
 import com.fr.workspace.Workspace;
@@ -113,6 +115,11 @@ public class SwitchExistEnv extends MenuDef {
             } catch (AuthException exception) {
                 JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"),
                         null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+            } catch (RegistEditionException exception) {
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"),
+                        null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+            } catch (Exception exception) {
+                FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
             }
         }
     }

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

@@ -2,7 +2,6 @@ package com.fr.design.env;
 
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
-import com.fr.workspace.connect.AuthException;
 import com.fr.workspace.connect.WorkspaceClient;
 
 /**
@@ -10,7 +9,7 @@ import com.fr.workspace.connect.WorkspaceClient;
  */
 public class DesignerWorkspaceGenerator {
 
-    public static Workspace generate(DesignerWorkspaceInfo config) throws AuthException {
+    public static Workspace generate(DesignerWorkspaceInfo config) throws Exception {
 
         if (config == null || config.getType() == null) {
             return null;

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

@@ -15,6 +15,8 @@ import com.fr.design.utils.DesignUtils;
 import com.fr.env.EnvListPane;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
+import com.fr.license.exception.RegistEditionException;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.EnvChangedListener;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
@@ -167,6 +169,11 @@ public class TemplatePane extends JPanel implements MouseListener {
             JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"),
                     null, 0, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
+        } catch (RegistEditionException e) {
+            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"),
+                    null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+        } catch (Exception exception) {
+            FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
         }
         TemplateTreePane.getInstance().refreshDockingView();
         DesignModelAdapter<?, ?> model = DesignModelAdapter.getCurrentModelAdapter();