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

* commit '21f9dd2f30bf310f22fcc378785511651da9a387':
  .
  .
  REPORT-8933
  .
  env
  env
  env
  env

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

@@ -114,7 +114,6 @@ public class SwitchExistEnv extends MenuDef {
 
                 @Override
                 public void fail() {
-                    TemplatePane.getInstance().editItems();
                     JOptionPane.showMessageDialog(
                             DesignerContext.getDesignerFrame(),
                             Inter.getLocText(new String[]{"M-SwitchWorkspace", "Failed"}));

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

@@ -23,7 +23,9 @@ public class DesignerWorkspaceGenerator {
             }
             case Remote: {
                 WorkspaceClient client = WorkContext.getConnector().connect(config.getConnection());
+                if (client != null) {
                     workspace = new RemoteWorkspace(client, config.getConnection());
+                }
                 break;
             }
         }

designer-realize/src/com/fr/start/module/DesignerActivator.java

@@ -305,7 +305,6 @@ public class DesignerActivator extends Activator implements Prepare {
         });
     }
 
-    
     private static void designerRegister() {
         registerCellEditor();
         registerFloatEditor();