From da2a1d374e1cdc82b5bb67fd301d68f1e6c10369 Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Wed, 13 Feb 2019 11:30:19 +0300
Subject: [PATCH] Property accessor methods nullability

---
 .../intellij/ide/JavaLanguageCodeStyleSettingsProvider.java    | 1 +
 .../codeStyle/properties/CodeStylePropertyAccessor.java        | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
index a7f251fa3ee6..3270b6371633 100644
--- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
+++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
@@ -365,6 +365,7 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
     }
 
     @Override
+    @Nullable
     public List<String> get() {
       return mySettings.getRepeatAnnotations();
     }
diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/CodeStylePropertyAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/CodeStylePropertyAccessor.java
index 6bcd26616311..b76c0baef795 100644
--- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/CodeStylePropertyAccessor.java
+++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/CodeStylePropertyAccessor.java
@@ -2,10 +2,12 @@
 package com.intellij.application.options.codeStyle.properties;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public abstract class CodeStylePropertyAccessor<V> {
   public abstract boolean set(@NotNull V extVal);
 
+  @Nullable
   public abstract V get();
 
   public final boolean setFromString(@NotNull String valueString) {
@@ -16,6 +18,7 @@ public abstract class CodeStylePropertyAccessor<V> {
     return false;
   }
 
+  @Nullable
   protected abstract V parseString(@NotNull String string);
 
   public boolean isGenericProperty() {