Merge remote-tracking branch 'origin/master'

java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsLineMarkerProvider.java

@@ -47,6 +47,7 @@ import com.intellij.xml.util.XmlStringUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
 import java.awt.event.MouseEvent;
 import java.util.Collection;
 import java.util.List;
@@ -160,6 +161,12 @@ public class ExternalAnnotationsLineMarkerProvider extends LineMarkerProviderDes
     return "External annotations";
   }
 
+  @Nullable
+  @Override
+  public Icon getIcon() {
+    return AllIcons.Gutter.ExtAnnotation;
+  }
+
   private static class MyIconGutterHandler implements GutterIconNavigationHandler<PsiElement> {
     static final MyIconGutterHandler INSTANCE = new MyIconGutterHandler();
 

platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -131,6 +131,8 @@ public class ToggleReadOnlyAttributePanel extends FileEditorManagerAdapter imple
 
   @Override
   public void selectionChanged(@NotNull FileEditorManagerEvent event) {
-    myStatusBar.updateWidget(ID());
+    if (myStatusBar != null) {
+      myStatusBar.updateWidget(ID());
+    }
   }
 }