From c4e12776d58e050bbba54849aaceeec2444011cd Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 3 Nov 2010 19:24:03 +0300
Subject: [PATCH] unchecking "Confirm window to open project in" works
 (IDEA-60332); some refactoring

---
 java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java   | 2 +-
 .../platform-api/src/com/intellij/ide/GeneralSettings.java   | 4 ++++
 .../src/com/intellij/ide/GeneralSettingsConfigurable.java    | 5 ++++-
 .../platform-impl/src/com/intellij/ide/impl/ProjectUtil.java | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java
index d6fc7c720a39..38821aa31838 100644
--- a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java
+++ b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java
@@ -191,7 +191,7 @@ public class NewProjectUtil {
     if (openProjects.length > 0) {
       final GeneralSettings settings = GeneralSettings.getInstance();
       int exitCode = settings.getConfirmOpenNewProject();
-      if (exitCode < 0) {
+      if (exitCode == GeneralSettings.OPEN_PROJECT_ASK) {
         exitCode = Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.new.project"),
                                            new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe")}, 1, 0,
                                            Messages.getQuestionIcon(), new ProjectNewWindowDoNotAskOption());
diff --git a/platform/platform-api/src/com/intellij/ide/GeneralSettings.java b/platform/platform-api/src/com/intellij/ide/GeneralSettings.java
index 9e42c449a645..142faa3a4637 100644
--- a/platform/platform-api/src/com/intellij/ide/GeneralSettings.java
+++ b/platform/platform-api/src/com/intellij/ide/GeneralSettings.java
@@ -490,6 +490,10 @@ public class GeneralSettings implements NamedJDOMExternalizable, ExportableAppli
     myConfirmOpenNewProject = confirmOpenNewProject;
   }
 
+  public static final int OPEN_PROJECT_ASK = -1;
+  public static final int OPEN_PROJECT_NEW_WINDOW = 0;
+  public static final int OPEN_PROJECT_SAME_WINDOW = 1;
+
   public boolean isSearchInBackground() {
     return mySearchInBackground;
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
index baf6dab0a496..e11111b063b8 100644
--- a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
@@ -51,7 +51,10 @@ public class GeneralSettingsConfigurable extends CompositeConfigurable<Searchabl
     settings.setSaveOnFrameDeactivation(myComponent.myChkSaveOnFrameDeactivation.isSelected());
     settings.setConfirmExit(myComponent.myConfirmExit.isSelected());
     if (myComponent.myConfirmFrameToOpenCheckBox.isSelected()) {
-      settings.setConfirmOpenNewProject(-1);
+      settings.setConfirmOpenNewProject(GeneralSettings.OPEN_PROJECT_ASK);
+    }
+    else if (settings.getConfirmOpenNewProject() == GeneralSettings.OPEN_PROJECT_ASK) {
+      settings.setConfirmOpenNewProject(GeneralSettings.OPEN_PROJECT_NEW_WINDOW);
     }
     // AutoSave in inactive
     settings.setAutoSaveIfInactive(myComponent.myChkAutoSaveIfInactive.isSelected());
diff --git a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java
index 313b92f74a2d..41e3aa895ea9 100644
--- a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java
+++ b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java
@@ -183,7 +183,7 @@ public class ProjectUtil {
 
   public static int confirmOpenNewProject() {
     final GeneralSettings settings = GeneralSettings.getInstance();
-    if (settings.getConfirmOpenNewProject() < 0) {
+    if (settings.getConfirmOpenNewProject() == GeneralSettings.OPEN_PROJECT_ASK) {
       return Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.open.project"),
                                  new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe"),
                                        CommonBundle.getCancelButtonText()}, 1, 0, Messages.getQuestionIcon(),