From 9a7e6541d765f1e1fd52abac2f5d23ca0fc8168b Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 26 Dec 2014 11:12:51 +0100 Subject: [PATCH] cleanup --- .../openapi/ui/MessageDialogBuilder.java | 4 ++++ .../impl/stores/ProjectStoreImpl.java | 18 +++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MessageDialogBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/MessageDialogBuilder.java index 5f68821508eb..e6a2e956947e 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MessageDialogBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MessageDialogBuilder.java @@ -107,6 +107,10 @@ public abstract class MessageDialogBuilder { return Messages.showDialog(myProject, myMessage, myTitle, new String[]{yesText, noText}, 0, myIcon, myDoNotAskOption) == 0 ? Messages.YES : Messages.NO; } + + public boolean is() { + return show() == Messages.YES; + } } public static final class YesNoCancel extends MessageDialogBuilder { diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java index 404512c9f34a..7616898347e2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java @@ -30,6 +30,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.project.impl.ProjectImpl; import com.intellij.openapi.project.impl.ProjectManagerImpl; +import com.intellij.openapi.ui.MessageDialogBuilder; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.Pair; @@ -116,21 +117,16 @@ class ProjectStoreImpl extends BaseFileConfigurableStoreImpl implements IProject private void backup(final VirtualFile projectDir, final VirtualFile vile) throws IOException { final String oldName = vile.getNameWithoutExtension() + OLD_PROJECT_SUFFIX + vile.getExtension(); - final VirtualFile oldFile = projectDir.findOrCreateChildData(this, oldName); - assert oldFile != null : projectDir + ", " + oldName; - VfsUtil.saveText(oldFile, VfsUtilCore.loadText(vile)); + VfsUtil.saveText(projectDir.findOrCreateChildData(this, oldName), VfsUtilCore.loadText(vile)); } }); } - if (originalVersion > ProjectManagerImpl.CURRENT_FORMAT_VERSION) { - String message = - ProjectBundle.message("project.load.new.version.warning", myProject.getName(), ApplicationNamesInfo.getInstance().getProductName()); - - if (Messages.showYesNoDialog(message, CommonBundle.getWarningTitle(), Messages.getWarningIcon()) != Messages.YES) return false; - } - - return true; + return originalVersion <= ProjectManagerImpl.CURRENT_FORMAT_VERSION || + MessageDialogBuilder.yesNo(CommonBundle.getWarningTitle(), + ProjectBundle.message("project.load.new.version.warning", myProject.getName(), ApplicationNamesInfo.getInstance().getProductName())) + .icon(Messages.getWarningIcon()) + .project(myProject).is(); } @Override