MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-12-29 10:48:29 +01:00
parent 855659f6f9
commit 9a7e6541d7
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/ui/MessageDialogBuilder.java
+4
View File
@@ -107,6 +107,10 @@ public abstract class MessageDialogBuilder<T extends 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<YesNoCancel> {
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java
+7 -11
View File
@@ -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