diff --git a/designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java index 0db58dc36..c08f49d0c 100644 --- a/designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java +++ b/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"})); diff --git a/designer-base/src/com/fr/design/env/DesignerWorkspaceGenerator.java b/designer-base/src/com/fr/design/env/DesignerWorkspaceGenerator.java index b666b0f63..b7b550739 100644 --- a/designer-base/src/com/fr/design/env/DesignerWorkspaceGenerator.java +++ b/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; } } diff --git a/designer-base/src/com/fr/env/RemoteEnv.java b/designer-base/src/com/fr/env/RemoteEnv.java index 1d8aa0de8..1bb606417 100644 --- a/designer-base/src/com/fr/env/RemoteEnv.java +++ b/designer-base/src/com/fr/env/RemoteEnv.java @@ -756,4 +756,4 @@ // return true; // } // -//} \ No newline at end of file +//} diff --git a/designer-realize/pom.xml b/designer-realize/pom.xml index 3731d163e..1e9d72c76 100644 --- a/designer-realize/pom.xml +++ b/designer-realize/pom.xml @@ -11,7 +11,7 @@ com.fr.report designer-realize 10.0-RELEASE-SNAPSHOT - + com.fr.report designer-form diff --git a/designer-realize/src/com/fr/start/module/DesignerActivator.java b/designer-realize/src/com/fr/start/module/DesignerActivator.java index 7fb07e640..079dd1500 100644 --- a/designer-realize/src/com/fr/start/module/DesignerActivator.java +++ b/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"); } -} +} \ No newline at end of file