Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -36,10 +36,12 @@ import com.fr.stable.xml.XMLTools;
 import com.fr.stable.xml.XMLWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.connect.AuthException;
 
-import javax.swing.*;
+import javax.swing.SwingWorker;
 import javax.swing.SwingWorker.StateValue;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Rectangle;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
@@ -478,7 +480,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * @return 是默认则返回true
      */
     public boolean isCurrentEnvDefault() {
-    
+
         DesignerWorkspaceInfo current = this.getWorkspaceInfo(curEnvName);
         String defaultEnvPath = StableUtils.pathJoin(new String[]{StableUtils.getInstallHome(), ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
         return ComparatorUtils.equals(new File(defaultEnvPath).getPath(), current.getPath());
@@ -532,7 +534,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if (isCurrentEnvDefault()) {
             return;
         }
-        WorkContext.switchTo(DesignerWorkspaceGenerator.generate(getDefaultConfig()));
+        try {
+            WorkContext.switchTo(DesignerWorkspaceGenerator.generate(getDefaultConfig()));
+        } catch (AuthException e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
     }
 
     /**
@@ -710,7 +716,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * @param info 对应的环境信息
      */
     public void putEnv(String name, DesignerWorkspaceInfo info) {
-    
+
         this.nameEnvMap.put(name, info);
     }
 

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -10,7 +10,6 @@ import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.TemplatePane;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
@@ -20,6 +19,8 @@ import com.fr.general.Inter;
 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 javax.swing.JOptionPane;
 import java.awt.event.ActionEvent;
@@ -103,7 +104,16 @@ public class SwitchExistEnv extends MenuDef {
             DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
             final String envName = getName();
             DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(envName);
-            WorkContext.switchTo(DesignerWorkspaceGenerator.generate(selectedEnv), new WorkContextCallback() {
+            Workspace workspace;
+            try {
+                workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
+            } catch (AuthException exception) {
+                JOptionPane.showMessageDialog(
+                        DesignerContext.getDesignerFrame(),
+                        Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed"}));
+                return;
+            }
+            WorkContext.switchTo(workspace, new WorkContextCallback() {
                 @Override
                 public void success() {
                     DesignerEnvManager.getEnvManager().setCurEnvName(envName);