isWarDeploy调用增加自定义处理

5 years ago · 282ba7dc2e
2 changed files with 9 additions and 11 deletions
--- a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java
+++ b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java
@ -2,10 +2,9 @@ package com.fr.design.env;

 import com.fr.cluster.engine.base.FineClusterConfig;
 import com.fr.design.i18n.Toolkit;
-import com.fr.invoke.ReflectException;
-import com.fr.log.FineLoggerFactory;
 import com.fr.base.operator.common.CommonOperator;
 import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.stable.AssistUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
@ -51,13 +50,12 @@ public class RemoteWorkspace implements Workspace {
    
    @Override
    public boolean isWarDeploy() {
-
-        try {
-            return WorkContext.getCurrent().get(CommonOperator.class).isWarDeploy();
-        } catch (ReflectException e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            return false;
-        }
+        return WorkContext.getCurrent().get(CommonOperator.class, new ExceptionHandler<Boolean>() {
+            @Override
+            public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
+                return false;
+            }
+         }).isWarDeploy();
    }

    @Override
--- a/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java
+++ b/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java
@ -54,7 +54,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
        font = font.applySize(15).applyStyle(1);
        JLabel label = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Inconsistency"));
        label.setFont(font);
-        label.setPreferredSize(new Dimension(600,30));
+        label.setPreferredSize(new Dimension(650,30));
        JLabel label2 = new JLabel("<html>"+Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Local_Designer")
                + localBranch + "/" + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Remote_Server") + remoteBranch+"</html>");
        label2.setPreferredSize(new Dimension(600,30));
@ -98,7 +98,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
        this.add(topPanel,BorderLayout.NORTH);
        this.add(centerPanel, BorderLayout.CENTER);
        this.add(buttonPanel,BorderLayout.SOUTH);
-        this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US)? 700:600, 500));
+        this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US)? 750:600, 500));

        GUICoreUtils.centerWindow(this);
    }