|
|
@ -83,8 +83,6 @@ public class EnvChangeEntrance { |
|
|
|
|
|
|
|
|
|
|
|
private boolean envListOkAction(EnvListPane envListPane, PopTipStrategy strategy) { |
|
|
|
private boolean envListOkAction(EnvListPane envListPane, PopTipStrategy strategy) { |
|
|
|
final String selectedName = envListPane.updateEnvManager(); |
|
|
|
final String selectedName = envListPane.updateEnvManager(); |
|
|
|
SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(envListPane)); |
|
|
|
|
|
|
|
saveSomeTemplatePane.showSavePane(); |
|
|
|
|
|
|
|
return switch2Env(selectedName, strategy); |
|
|
|
return switch2Env(selectedName, strategy); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -391,6 +389,11 @@ public class EnvChangeEntrance { |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void doOk() { |
|
|
|
public void doOk() { |
|
|
|
|
|
|
|
SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(true, SwingUtilities.getWindowAncestor(envListPane)); |
|
|
|
|
|
|
|
if (!saveSomeTemplatePane.showSavePane()) { |
|
|
|
|
|
|
|
// 用户取消保存时,取消切换目录操作
|
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
boolean changeResult = envListOkAction(envListPane, PopTipStrategy.LATER); |
|
|
|
boolean changeResult = envListOkAction(envListPane, PopTipStrategy.LATER); |
|
|
|
// 切换完成后清理密码
|
|
|
|
// 切换完成后清理密码
|
|
|
|
updateNotRememberPwdEnv(); |
|
|
|
updateNotRememberPwdEnv(); |
|
|
|