From 0ea7d756f6dc2f81e4dcd12ac325a6b1ab18ca27 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Wed, 27 May 2015 15:16:25 +0300
Subject: [PATCH] EA-68400 - NPE: LanguageLevelConfigurable.isModified

---
 .../openapi/roots/ui/configuration/ContentEntriesEditor.java    | 2 ++
 .../roots/ui/configuration/LanguageLevelConfigurable.java       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ContentEntriesEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ContentEntriesEditor.java
index 0726dd55f03f..9bb8ef5c9c5c 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ContentEntriesEditor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ContentEntriesEditor.java
@@ -17,6 +17,7 @@ package com.intellij.openapi.roots.ui.configuration;
 
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.roots.LanguageLevelModuleExtensionImpl;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -47,6 +48,7 @@ public class ContentEntriesEditor extends JavaContentEntriesEditor {
   @Override
   protected void addAdditionalSettingsToPanel(final JPanel mainPanel) {
     myLanguageLevelConfigurable = new LanguageLevelConfigurable(myProject) {
+      @NotNull
       @Override
       public LanguageLevelModuleExtensionImpl getLanguageLevelExtension() {
         return getModel().getModuleExtension(LanguageLevelModuleExtensionImpl.class);
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java
index ad7ca4a1f8d7..43fb9cd7d21c 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java
@@ -89,5 +89,6 @@ public abstract class LanguageLevelConfigurable implements UnnamedConfigurable {
     myLanguageLevelCombo = null;
   }
 
+  @NotNull
   public abstract LanguageLevelModuleExtensionImpl getLanguageLevelExtension();
 }