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

notnull, cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-04-04 11:23:48 +04:00
parent abb732babb
commit 63af1a9f54
2 changed files with 3 additions and 4 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
+1 -4
View File
@@ -197,7 +197,6 @@ public class FileBasedStorage extends XmlElementStorage {
@Override
protected void loadState(final StorageData result, final Element element) throws StateStorageException {
((FileStorageData)result).myFileName = myFile.getAbsolutePath();
((FileStorageData)result).myFilePath = myFile.getAbsolutePath();
super.loadState(result, element);
}
@@ -210,7 +209,6 @@ public class FileBasedStorage extends XmlElementStorage {
public static class FileStorageData extends StorageData {
String myFilePath;
String myFileName;
public FileStorageData(final String rootElementName) {
super(rootElementName);
@@ -218,7 +216,6 @@ public class FileBasedStorage extends XmlElementStorage {
protected FileStorageData(FileStorageData storageData) {
super(storageData);
myFileName = storageData.myFileName;
myFilePath = storageData.myFilePath;
}
@@ -229,7 +226,7 @@ public class FileBasedStorage extends XmlElementStorage {
@NonNls
public String toString() {
return "FileStorageData[" + myFileName + "]";
return "FileStorageData[" + myFilePath + "]";
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelfManagerConfigurationMerger.java
+2
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.options.StreamProvider;
import org.jdom.Attribute;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.util.*;
@@ -41,6 +42,7 @@ public class ShelfManagerConfigurationMerger implements XmlConfigurationMerger {
myFileProcessor = new CompoundShelfFileProcessor(streamProviders, configPath);
}
@NotNull
public Element merge(final Element serverElement, final Element localElement) {
Map<Date, ShelvedChangeList> result = new LinkedHashMap<Date, ShelvedChangeList>();