Browse Source

Merge pull request #90 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0

* commit 'c15e9541929b3c7c89a796c49d9ed1c0ebbb8813':
  CORE-76 Activator重复启动内置服务器、切换环境的支持 环境监听的逻辑弄完整
master
superman 7 years ago
parent
commit
96a1b93aee
  1. 7
      designer-base/src/com/fr/env/SignIn.java

7
designer-base/src/com/fr/env/SignIn.java vendored

@ -5,7 +5,6 @@ import com.fr.core.env.EnvConfig;
import com.fr.core.env.EnvContext; import com.fr.core.env.EnvContext;
import com.fr.core.env.EnvEvent; import com.fr.core.env.EnvEvent;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrame;
import com.fr.design.utils.DesignUtils; import com.fr.design.utils.DesignUtils;
import com.fr.event.Event; import com.fr.event.Event;
import com.fr.event.EventDispatcher; import com.fr.event.EventDispatcher;
@ -14,7 +13,7 @@ import com.fr.event.Null;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import javax.swing.JOptionPane; import javax.swing.*;
public class SignIn { public class SignIn {
@ -35,10 +34,10 @@ public class SignIn {
* @throws Exception 异常 * @throws Exception 异常
*/ */
public static void signIn(EnvConfig selectedEnv) throws Exception { public static void signIn(EnvConfig selectedEnv) throws Exception {
if (EnvContext.currentEnv() != null && !ComparatorUtils.equals(EnvContext.currentEnv(), selectedEnv)) { if (EnvContext.currentEnv() != null && !ComparatorUtils.equals(EnvContext.currentEnv(), selectedEnv)) {
EnvContext.signOut(); EnvContext.signOut();
}
DesignUtils.switchToEnv(selectedEnv); DesignUtils.switchToEnv(selectedEnv);
} }
}
} }
Loading…
Cancel
Save