Browse Source

.

research/10.0
hzzz 6 years ago
parent
commit
d901af1d2b
  1. 3
      designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
  2. 4
      designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
  3. 3
      designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java
  4. 4
      designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java

3
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<String, String>());
}
});
} catch (AuthException e) {
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}

4
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"));
}
}
}

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

@ -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;

4
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();

Loading…
Cancel
Save