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

recreate content of project/module files if it was truncated to 0 size (PY-7543)

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-09-11 15:27:23 +02:00
parent a34e75a3f9
commit 533686a01a
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java
+13 -7
View File
@@ -256,6 +256,9 @@ public class FileBasedStorage extends XmlElementStorage {
LOG.info("Document was not loaded for " + myFileSpec + " file is " + (file == null ? "null" : "directory"));
return null;
}
else if (file.getLength() == 0) {
return processReadException(null);
}
else {
return loadDocumentImpl(file);
}
@@ -269,12 +272,15 @@ public class FileBasedStorage extends XmlElementStorage {
}
@Nullable
private Document processReadException(final Exception e) {
myBlockSavingTheContent = isProjectOrModuleFile();
private Document processReadException(@Nullable final Exception e) {
boolean contentTruncated = e == null;
myBlockSavingTheContent = isProjectOrModuleFile() && !contentTruncated;
if (!ApplicationManager.getApplication().isUnitTestMode() && !ApplicationManager.getApplication().isHeadlessEnvironment()) {
LOG.info(e);
final String message = "Cannot load settings from file '" + myFile.getPath() + "': " + e.getLocalizedMessage() + "\n" +
getInvalidContentMessage();
if (e != null) {
LOG.info(e);
}
final String message = "Cannot load settings from file '" + myFile.getPath() + "': " + (e == null ? "content truncated" : e.getLocalizedMessage()) + "\n" +
getInvalidContentMessage(contentTruncated);
Notifications.Bus.notify(
new Notification(Notifications.SYSTEM_MESSAGES_GROUP_ID, "Load Settings", message, NotificationType.WARNING));
}
@@ -286,8 +292,8 @@ public class FileBasedStorage extends XmlElementStorage {
return myIsProjectSettings || myFileSpec.equals("$MODULE_FILE$");
}
private String getInvalidContentMessage() {
return isProjectOrModuleFile() ? "Please correct the file content" : "File content will be recreated";
private String getInvalidContentMessage(boolean contentTruncated) {
return isProjectOrModuleFile() && !contentTruncated ? "Please correct the file content" : "File content will be recreated";
}
private static Document loadDocumentImpl(final VirtualFile file) throws IOException, JDOMException {