From d901af1d2bb4adadadf95731c500537b5a70f876 Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 7 Aug 2018 17:10:16 +0800 Subject: [PATCH 1/3] . --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 3 +-- .../main/java/com/fr/design/actions/file/SwitchExistEnv.java | 4 ++++ .../java/com/fr/design/env/DesignerWorkspaceGenerator.java | 3 ++- .../src/main/java/com/fr/design/mainframe/TemplatePane.java | 4 ++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 60f6cab3c..a03bb3541 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/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; @@ -565,7 +564,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { DesignTableDataManager.fireDSChanged(new HashMap()); } }); - } catch (AuthException e) { + } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index cbb21faa0..6a5d4e4b3 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -17,6 +17,7 @@ import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; import com.fr.workspace.Workspace; import com.fr.workspace.connect.AuthException; +import com.fr.workspace.connect.RemoteDesignVT4FRException; import javax.swing.JOptionPane; import javax.swing.UIManager; @@ -113,6 +114,9 @@ public class SwitchExistEnv extends MenuDef { } catch (AuthException exception) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); + } catch (RemoteDesignVT4FRException e1) { + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"), + null, 0, UIManager.getIcon("OptionPane.errorIcon")); } } } diff --git a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java index 7b70c957c..cff9f413c 100644 --- a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java +++ b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java @@ -3,6 +3,7 @@ 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.RemoteDesignVT4FRException; import com.fr.workspace.connect.WorkspaceClient; /** @@ -10,7 +11,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 AuthException, RemoteDesignVT4FRException { if (config == null || config.getType() == null) { return null; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index a3459ad3d..66d25f7bc 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -20,6 +20,7 @@ import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; import com.fr.workspace.Workspace; import com.fr.workspace.connect.AuthException; +import com.fr.workspace.connect.RemoteDesignVT4FRException; import javax.swing.BorderFactory; import javax.swing.Icon; @@ -167,6 +168,9 @@ public class TemplatePane extends JPanel implements MouseListener { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; + } catch (RemoteDesignVT4FRException e) { + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"), + null, 0, UIManager.getIcon("OptionPane.errorIcon")); } TemplateTreePane.getInstance().refreshDockingView(); DesignModelAdapter model = DesignModelAdapter.getCurrentModelAdapter(); From a5097256d24d54471ee88d30ec906da6b4d9721a Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 7 Aug 2018 17:24:35 +0800 Subject: [PATCH 2/3] . --- .../java/com/fr/design/actions/file/SwitchExistEnv.java | 6 +++++- .../java/com/fr/design/env/DesignerWorkspaceGenerator.java | 2 +- .../main/java/com/fr/design/mainframe/TemplatePane.java | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index 6a5d4e4b3..0386937cb 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/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; @@ -114,9 +116,11 @@ public class SwitchExistEnv extends MenuDef { } catch (AuthException exception) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); - } catch (RemoteDesignVT4FRException e1) { + } 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); } } } diff --git a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java index cff9f413c..fc5783b10 100644 --- a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java +++ b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java @@ -11,7 +11,7 @@ import com.fr.workspace.connect.WorkspaceClient; */ public class DesignerWorkspaceGenerator { - public static Workspace generate(DesignerWorkspaceInfo config) throws AuthException, RemoteDesignVT4FRException { + public static Workspace generate(DesignerWorkspaceInfo config) throws Exception { if (config == null || config.getType() == null) { return null; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index 66d25f7bc..8f1a38974 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -15,12 +15,13 @@ 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; import com.fr.workspace.Workspace; import com.fr.workspace.connect.AuthException; -import com.fr.workspace.connect.RemoteDesignVT4FRException; import javax.swing.BorderFactory; import javax.swing.Icon; @@ -168,9 +169,11 @@ public class TemplatePane extends JPanel implements MouseListener { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; - } catch (RemoteDesignVT4FRException e) { + } 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(); From 9423a5feb413f77efc79b68c0f17006a9a93f5ba Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 7 Aug 2018 17:26:27 +0800 Subject: [PATCH 3/3] . --- .../main/java/com/fr/design/actions/file/SwitchExistEnv.java | 1 - .../main/java/com/fr/design/env/DesignerWorkspaceGenerator.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index 0386937cb..eac8dc694 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -19,7 +19,6 @@ import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; import com.fr.workspace.Workspace; import com.fr.workspace.connect.AuthException; -import com.fr.workspace.connect.RemoteDesignVT4FRException; import javax.swing.JOptionPane; import javax.swing.UIManager; diff --git a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java index fc5783b10..1174a8a73 100644 --- a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java +++ b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java @@ -2,8 +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.RemoteDesignVT4FRException; import com.fr.workspace.connect.WorkspaceClient; /**