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

@@ -8,13 +8,13 @@ import com.fr.workspace.connect.WorkspaceClient;
  * 根据配置生成运行环境
  */
 public class DesignerWorkspaceGenerator {
-    
+
     public static Workspace generate(DesignerWorkspaceInfo config) {
-        
+
         if (config == null || config.getType() == null) {
             return null;
         }
-        
+
         Workspace workspace = null;
         switch (config.getType()) {
             case Local: {
@@ -23,7 +23,9 @@ public class DesignerWorkspaceGenerator {
             }
             case Remote: {
                 WorkspaceClient client = WorkContext.getConnector().connect(config.getConnection());
-                workspace = new RemoteWorkspace(client, config.getConnection());
+                if (client != null) {
+                    workspace = new RemoteWorkspace(client, config.getConnection());
+                }
                 break;
             }
         }

designer-base/src/com/fr/env/RemoteEnv.java

@@ -756,4 +756,4 @@
 //        return true;
 //    }
 //
-//}
+//}

designer-realize/pom.xml

@@ -11,7 +11,7 @@
     <groupId>com.fr.report</groupId>
     <artifactId>designer-realize</artifactId>
     <version>10.0-RELEASE-SNAPSHOT</version>
-      <dependencies>
+    <dependencies>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-form</artifactId>

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

@@ -304,8 +304,7 @@ public class DesignerActivator extends Activator implements Prepare {
             }
         });
     }
-    
+
-    
     private static void designerRegister() {
         registerCellEditor();
         registerFloatEditor();
@@ -394,4 +393,4 @@ public class DesignerActivator extends Activator implements Prepare {
 
         addMutable(InterMutableKey.Path, "com/fr/design/i18n/main", "com/fr/design/i18n/chart");
     }
-}
+}