From 628862ec4fc9c5c1682560665db5f3af246d5291 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 6 Nov 2014 17:16:14 +0100 Subject: [PATCH] notnull --- .../editor-ui-api/src/com/intellij/ide/ui/UISettings.java | 2 +- .../impl/source/codeStyle/PersistableCodeStyleSchemes.java | 2 +- .../src/com/intellij/util/xmlb/SerializationFilter.java | 7 ++++--- .../com/intellij/util/xmlb/SerializationFilterBase.java | 2 +- .../util/src/com/intellij/util/xmlb/XmlSerializer.java | 2 +- .../testSrc/com/intellij/util/xmlb/XmlSerializerTest.java | 4 ++-- .../tasks/context/XDebuggerBreakpointsContextProvider.java | 2 +- .../intellij/tasks/context/XDebuggerWatchesProvider.java | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java index 4a390bc1383b..a366c5bff330 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java +++ b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java @@ -186,7 +186,7 @@ public class UISettings extends SimpleModificationTracker implements PersistentS public static class FontFilter implements SerializationFilter { @Override - public boolean accepts(Accessor accessor, Object bean) { + public boolean accepts(@NotNull Accessor accessor, Object bean) { UISettings settings = (UISettings)bean; return !hasDefaultFontSetting(settings); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/PersistableCodeStyleSchemes.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/PersistableCodeStyleSchemes.java index e3f4fb760fbf..d04cc68967bc 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/PersistableCodeStyleSchemes.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/PersistableCodeStyleSchemes.java @@ -52,7 +52,7 @@ public class PersistableCodeStyleSchemes extends CodeStyleSchemesImpl implements public Element getState() { return XmlSerializer.serialize(this, new SerializationFilter() { @Override - public boolean accepts(Accessor accessor, Object bean) { + public boolean accepts(@NotNull Accessor accessor, Object bean) { return accessor.getValueClass().equals(String.class); } }); diff --git a/platform/util/src/com/intellij/util/xmlb/SerializationFilter.java b/platform/util/src/com/intellij/util/xmlb/SerializationFilter.java index 4c0d2a81ff62..01f6f68f4fd1 100644 --- a/platform/util/src/com/intellij/util/xmlb/SerializationFilter.java +++ b/platform/util/src/com/intellij/util/xmlb/SerializationFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.intellij.util.xmlb; +import org.jetbrains.annotations.NotNull; + public interface SerializationFilter { - boolean accepts(Accessor accessor, Object bean); + boolean accepts(@NotNull Accessor accessor, Object bean); } diff --git a/platform/util/src/com/intellij/util/xmlb/SerializationFilterBase.java b/platform/util/src/com/intellij/util/xmlb/SerializationFilterBase.java index 3fab01c85af6..7c1cb2b51795 100644 --- a/platform/util/src/com/intellij/util/xmlb/SerializationFilterBase.java +++ b/platform/util/src/com/intellij/util/xmlb/SerializationFilterBase.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable; public abstract class SerializationFilterBase implements SerializationFilter { @Override - public final boolean accepts(Accessor accessor, Object bean) { + public final boolean accepts(@NotNull Accessor accessor, Object bean) { if (bean == null) { return true; } diff --git a/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java b/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java index 76fa9d08c0e1..97e4a35276a5 100644 --- a/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java +++ b/platform/util/src/com/intellij/util/xmlb/XmlSerializer.java @@ -31,7 +31,7 @@ import java.util.Set; public class XmlSerializer { private static final SerializationFilter TRUE_FILTER = new SerializationFilter() { @Override - public boolean accepts(Accessor accessor, Object bean) { + public boolean accepts(@NotNull Accessor accessor, Object bean) { return true; } }; diff --git a/platform/util/testSrc/com/intellij/util/xmlb/XmlSerializerTest.java b/platform/util/testSrc/com/intellij/util/xmlb/XmlSerializerTest.java index a5b8edc491aa..69cc37512462 100644 --- a/platform/util/testSrc/com/intellij/util/xmlb/XmlSerializerTest.java +++ b/platform/util/testSrc/com/intellij/util/xmlb/XmlSerializerTest.java @@ -537,7 +537,7 @@ public class XmlSerializerTest extends TestCase { "", new SerializationFilter() { @Override - public boolean accepts(Accessor accessor, Object bean) { + public boolean accepts(@NotNull Accessor accessor, Object bean) { return accessor.getName().startsWith("I"); } }); @@ -850,7 +850,7 @@ public class XmlSerializerTest extends TestCase { } public static class PropertyFilterTest implements SerializationFilter { @Override - public boolean accepts(Accessor accessor, Object bean) { + public boolean accepts(@NotNull Accessor accessor, Object bean) { return !accessor.read(bean).equals("skip"); } } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/context/XDebuggerBreakpointsContextProvider.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/context/XDebuggerBreakpointsContextProvider.java index 2e8d5df8c823..ec4d81f86d2c 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/context/XDebuggerBreakpointsContextProvider.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/context/XDebuggerBreakpointsContextProvider.java @@ -56,7 +56,7 @@ public class XDebuggerBreakpointsContextProvider extends WorkingContextProvider XBreakpointManagerImpl.BreakpointManagerState state = myBreakpointManager.getState(); Element serialize = XmlSerializer.serialize(state, new SerializationFilter() { @Override - public boolean accepts(Accessor accessor, Object bean) { + public boolean accepts(@NotNull Accessor accessor, Object bean) { return accessor.read(bean) != null; } }); diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/context/XDebuggerWatchesProvider.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/context/XDebuggerWatchesProvider.java index 62b26995daf2..2b39f86d30b8 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/context/XDebuggerWatchesProvider.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/context/XDebuggerWatchesProvider.java @@ -54,7 +54,7 @@ public class XDebuggerWatchesProvider extends WorkingContextProvider { XDebuggerWatchesManager.WatchesManagerState state = myWatchesManager.getState(); Element serialize = XmlSerializer.serialize(state, new SerializationFilter() { @Override - public boolean accepts(Accessor accessor, Object bean) { + public boolean accepts(@NotNull Accessor accessor, Object bean) { return accessor.read(bean) != null; } });