From 01129f08c302ab6acaf6f049152bb76cd9406caa Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 6 May 2013 20:27:51 +0400 Subject: [PATCH] notnull --- .../impl/stores/CompoundExternalizationSession.java | 5 ++++- .../components/impl/stores/DefaultProjectStoreImpl.java | 4 ++-- .../openapi/components/impl/stores/DefaultsStateStorage.java | 4 ++-- .../components/impl/stores/DirectoryBasedStorage.java | 4 ++-- .../openapi/components/impl/stores/XmlElementStorage.java | 4 ++-- .../src/com/intellij/openapi/components/StateStorage.java | 4 ++-- .../openapi/components/StorageAnnotationsDefaultValues.java | 4 ++-- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/CompoundExternalizationSession.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/CompoundExternalizationSession.java index 9e1b202676ac..c31c21841ec4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/CompoundExternalizationSession.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/CompoundExternalizationSession.java @@ -17,6 +17,7 @@ package com.intellij.openapi.components.impl.stores; import com.intellij.openapi.components.StateStorage; import gnu.trove.THashMap; +import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.Map; @@ -27,7 +28,8 @@ import java.util.Map; public class CompoundExternalizationSession { private final Map mySessions = new THashMap(1); - public StateStorage.ExternalizationSession getExternalizationSession(StateStorage stateStore) { + @NotNull + public StateStorage.ExternalizationSession getExternalizationSession(@NotNull StateStorage stateStore) { StateStorage.ExternalizationSession session = mySessions.get(stateStore); if (session == null) { mySessions.put(stateStore, session = stateStore.startExternalization()); @@ -37,6 +39,7 @@ public class CompoundExternalizationSession { } + @NotNull public Collection getStateStorages() { return mySessions.keySet(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DefaultProjectStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DefaultProjectStoreImpl.java index d474217c022b..b4d1de84e771 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DefaultProjectStoreImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DefaultProjectStoreImpl.java @@ -209,9 +209,9 @@ public class DefaultProjectStoreImpl extends ProjectStoreImpl { } private static class MyExternalizationSession implements StateStorageManager.ExternalizationSession { - StateStorage.ExternalizationSession externalizationSession; + @NotNull final StateStorage.ExternalizationSession externalizationSession; - public MyExternalizationSession(final XmlElementStorage storage) { + public MyExternalizationSession(@NotNull XmlElementStorage storage) { externalizationSession = storage.startExternalization(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DefaultsStateStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DefaultsStateStorage.java index d51ddb62d182..b62db63b73c2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DefaultsStateStorage.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DefaultsStateStorage.java @@ -81,11 +81,11 @@ class DefaultsStateStorage implements StateStorage { } @NotNull - public SaveSession startSave(ExternalizationSession externalizationSession) { + public SaveSession startSave(@NotNull ExternalizationSession externalizationSession) { throw new UnsupportedOperationException("Method startSave not implemented in " + getClass()); } - public void finishSave(SaveSession saveSession) { + public void finishSave(@NotNull SaveSession saveSession) { throw new UnsupportedOperationException("Method finishSave not implemented in " + getClass()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java index c1f4d7fad39c..9a066058f8ee 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java @@ -148,7 +148,7 @@ public class DirectoryBasedStorage implements StateStorage, Disposable { @Override @NotNull - public SaveSession startSave(final ExternalizationSession externalizationSession) { + public SaveSession startSave(@NotNull final ExternalizationSession externalizationSession) { assert mySession == externalizationSession; final MySaveSession session = @@ -158,7 +158,7 @@ public class DirectoryBasedStorage implements StateStorage, Disposable { } @Override - public void finishSave(final SaveSession saveSession) { + public void finishSave(@NotNull final SaveSession saveSession) { try { LOG.assertTrue(mySession == saveSession); } finally { diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java index 9a0e9ab64333..e9e5630a2d0a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java @@ -236,7 +236,7 @@ public abstract class XmlElementStorage implements StateStorage, Disposable { @Override @NotNull - public SaveSession startSave(final ExternalizationSession externalizationSession) { + public SaveSession startSave(@NotNull final ExternalizationSession externalizationSession) { assert mySession == externalizationSession; final SaveSession saveSession = mySavingDisabled ? createNullSession() : createSaveSession((MyExternalizationSession)externalizationSession); @@ -273,7 +273,7 @@ public abstract class XmlElementStorage implements StateStorage, Disposable { protected abstract MySaveSession createSaveSession(final MyExternalizationSession externalizationSession); @Override - public void finishSave(final SaveSession saveSession) { + public void finishSave(@NotNull final SaveSession saveSession) { try { if (mySession != saveSession) { LOG.error("mySession=" + mySession + " saveSession=" + saveSession); diff --git a/platform/projectModel-api/src/com/intellij/openapi/components/StateStorage.java b/platform/projectModel-api/src/com/intellij/openapi/components/StateStorage.java index e02c0e52cc10..36112e5dc028 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/components/StateStorage.java +++ b/platform/projectModel-api/src/com/intellij/openapi/components/StateStorage.java @@ -38,8 +38,8 @@ public interface StateStorage { @NotNull ExternalizationSession startExternalization(); @NotNull - SaveSession startSave(ExternalizationSession externalizationSession); - void finishSave(SaveSession saveSession); + SaveSession startSave(@NotNull ExternalizationSession externalizationSession); + void finishSave(@NotNull SaveSession saveSession); void reload(@NotNull Set changedComponents) throws StateStorageException; diff --git a/platform/projectModel-api/src/com/intellij/openapi/components/StorageAnnotationsDefaultValues.java b/platform/projectModel-api/src/com/intellij/openapi/components/StorageAnnotationsDefaultValues.java index 08c831f7bfc1..d9d3c92253e5 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/components/StorageAnnotationsDefaultValues.java +++ b/platform/projectModel-api/src/com/intellij/openapi/components/StorageAnnotationsDefaultValues.java @@ -54,11 +54,11 @@ public interface StorageAnnotationsDefaultValues { } @NotNull - public SaveSession startSave(ExternalizationSession externalizationSession) { + public SaveSession startSave(@NotNull ExternalizationSession externalizationSession) { throw new UnsupportedOperationException("Method startSave not implemented in " + getClass()); } - public void finishSave(SaveSession saveSession) { + public void finishSave(@NotNull SaveSession saveSession) { throw new UnsupportedOperationException("Method finishSave not implemented in " + getClass()); }