diff --git a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/AnActionEvent.java b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/AnActionEvent.java
index cd901ac36c3d..0c42a6e28775 100644
--- a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/AnActionEvent.java
+++ b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/AnActionEvent.java
@@ -35,8 +35,7 @@ public class AnActionEvent implements PlaceProvider {
 
   /**
    * @throws IllegalArgumentException if {@code dataContext} is {@code null} or
-   * {@code place} is {@code null} or {@code presentation} is {@code null}
-   *
+   *                                  {@code place} is {@code null} or {@code presentation} is {@code null}
    * @see ActionManager#getInstance()
    */
   public AnActionEvent(@Nullable InputEvent inputEvent,
@@ -50,8 +49,7 @@ public class AnActionEvent implements PlaceProvider {
 
   /**
    * @throws IllegalArgumentException if {@code dataContext} is {@code null} or
-   * {@code place} is {@code null} or {@code presentation} is {@code null}
-   *
+   *                                  {@code place} is {@code null} or {@code presentation} is {@code null}
    * @see ActionManager#getInstance()
    */
   public AnActionEvent(@Nullable InputEvent inputEvent,
@@ -72,8 +70,7 @@ public class AnActionEvent implements PlaceProvider {
     myIsActionToolbar = isActionToolbar;
   }
 
-  @NotNull
-  public AnActionEvent withDataContext(@NotNull DataContext dataContext) {
+  public @NotNull AnActionEvent withDataContext(@NotNull DataContext dataContext) {
     if (myDataContext == dataContext) return this;
     AnActionEvent event = new AnActionEvent(myInputEvent, dataContext, myPlace, myPresentation,
                                             myActionManager, myModifiers, myIsContextMenuAction, myIsActionToolbar);
@@ -86,17 +83,16 @@ public class AnActionEvent implements PlaceProvider {
    * @deprecated use {@link #createFromInputEvent(InputEvent, String, Presentation, DataContext, boolean, boolean)}
    */
   @Deprecated(forRemoval = true)
-  @NotNull
-  public static AnActionEvent createFromInputEvent(@NotNull AnAction action, @Nullable InputEvent event, @NotNull String place) {
-    DataContext context = event == null ? DataManager.getInstance().getDataContext() : DataManager.getInstance().getDataContext(event.getComponent());
+  public static @NotNull AnActionEvent createFromInputEvent(@NotNull AnAction action, @Nullable InputEvent event, @NotNull String place) {
+    DataContext context =
+      event == null ? DataManager.getInstance().getDataContext() : DataManager.getInstance().getDataContext(event.getComponent());
     return createFromAnAction(action, event, place, context);
   }
 
-  @NotNull
-  public static AnActionEvent createFromAnAction(@NotNull AnAction action,
-                                                 @Nullable InputEvent event,
-                                                 @NotNull String place,
-                                                 @NotNull DataContext dataContext) {
+  public static @NotNull AnActionEvent createFromAnAction(@NotNull AnAction action,
+                                                          @Nullable InputEvent event,
+                                                          @NotNull String place,
+                                                          @NotNull DataContext dataContext) {
     int modifiers = event == null ? 0 : event.getModifiers();
     Presentation presentation = action.getTemplatePresentation().clone();
     AnActionEvent anActionEvent = new AnActionEvent(event, dataContext, place, presentation, ActionManager.getInstance(), modifiers);
@@ -104,30 +100,29 @@ public class AnActionEvent implements PlaceProvider {
     return anActionEvent;
   }
 
-  @NotNull
-  public static AnActionEvent createFromDataContext(@NotNull String place,
-                                                    @Nullable Presentation presentation,
-                                                    @NotNull DataContext dataContext) {
-    return new AnActionEvent(null, dataContext, place, presentation == null ? new Presentation() : presentation, ActionManager.getInstance(), 0);
+  public static @NotNull AnActionEvent createFromDataContext(@NotNull String place,
+                                                             @Nullable Presentation presentation,
+                                                             @NotNull DataContext dataContext) {
+    return new AnActionEvent(null, dataContext, place, presentation == null ? new Presentation() : presentation,
+                             ActionManager.getInstance(), 0);
   }
 
 
-  @NotNull
-  public static AnActionEvent createFromInputEvent(@Nullable InputEvent event,
-                                                   @NotNull String place,
-                                                   @Nullable Presentation presentation,
-                                                   @NotNull DataContext dataContext) {
+  public static @NotNull AnActionEvent createFromInputEvent(@Nullable InputEvent event,
+                                                            @NotNull String place,
+                                                            @Nullable Presentation presentation,
+                                                            @NotNull DataContext dataContext) {
     return createFromInputEvent(event, place, presentation, dataContext, false, false);
   }
 
-  @NotNull
-  public static AnActionEvent createFromInputEvent(@Nullable InputEvent event,
-                                                   @NotNull String place,
-                                                   @Nullable Presentation presentation,
-                                                   @NotNull DataContext dataContext,
-                                                   boolean isContextMenuAction,
-                                                   boolean isToolbarAction) {
-    return new AnActionEvent(event, dataContext, place, presentation == null ? new Presentation() : presentation, ActionManager.getInstance(),
+  public static @NotNull AnActionEvent createFromInputEvent(@Nullable InputEvent event,
+                                                            @NotNull String place,
+                                                            @Nullable Presentation presentation,
+                                                            @NotNull DataContext dataContext,
+                                                            boolean isContextMenuAction,
+                                                            boolean isToolbarAction) {
+    return new AnActionEvent(event, dataContext, place, presentation == null ? new Presentation() : presentation,
+                             ActionManager.getInstance(),
                              event == null ? 0 : event.getModifiers(), isContextMenuAction, isToolbarAction);
   }
 
@@ -144,13 +139,11 @@ public class AnActionEvent implements PlaceProvider {
   /**
    * @return Project from the context of this event.
    */
-  @Nullable
-  public Project getProject() {
+  public @Nullable Project getProject() {
     return getData(CommonDataKeys.PROJECT);
   }
 
-  @NotNull
-  public static DataContext getInjectedDataContext(@NotNull DataContext dataContext) {
+  public static @NotNull DataContext getInjectedDataContext(@NotNull DataContext dataContext) {
     if (dataContext instanceof InjectedDataContextSupplier) {
       return ((InjectedDataContextSupplier)dataContext).getInjectedDataContext();
     }
@@ -163,19 +156,17 @@ public class AnActionEvent implements PlaceProvider {
    *
    * @return the data context instance.
    */
-  @NotNull
-  public DataContext getDataContext() {
+  public @NotNull DataContext getDataContext() {
     return myWorksInInjected ? getInjectedDataContext(myDataContext) : myDataContext;
   }
 
-  @Nullable
-  public <T> T getData(@NotNull DataKey<T> key) {
+  public @Nullable <T> T getData(@NotNull DataKey<T> key) {
     return getDataContext().getData(key);
   }
 
   /**
    * Returns not null data by a data key. This method assumes that data has been checked for {@code null} in {@code AnAction#update} method.
-   *<br/><br/>
+   * <br/><br/>
    * Example of proper usage:
    *
    * <pre>
@@ -196,8 +187,7 @@ public class AnActionEvent implements PlaceProvider {
    *
    * </pre>
    */
-  @NotNull
-  public <T> T getRequiredData(@NotNull DataKey<T> key) {
+  public @NotNull <T> T getRequiredData(@NotNull DataKey<T> key) {
     T data = getData(key);
     assert data != null;
     return data;
@@ -211,8 +201,7 @@ public class AnActionEvent implements PlaceProvider {
    * @see com.intellij.openapi.actionSystem.ActionPlaces
    */
   @Override
-  @NotNull
-  public String getPlace() {
+  public @NotNull String getPlace() {
     return myPlace;
   }
 
@@ -235,13 +224,13 @@ public class AnActionEvent implements PlaceProvider {
    *
    * @return the presentation instance.
    */
-  @NotNull
-  public Presentation getPresentation() {
+  public @NotNull Presentation getPresentation() {
     return myPresentation;
   }
 
   /**
    * Returns the modifier keys held down during this action event.
+   *
    * @return the modifier keys.
    */
   @JdkConstants.InputEventMask
@@ -249,8 +238,7 @@ public class AnActionEvent implements PlaceProvider {
     return myModifiers;
   }
 
-  @NotNull
-  public ActionManager getActionManager() {
+  public @NotNull ActionManager getActionManager() {
     return myActionManager;
   }
 
@@ -266,8 +254,7 @@ public class AnActionEvent implements PlaceProvider {
     visitor.visitEvent(this);
   }
 
-  @Nullable
-  public UpdateSession getUpdateSession() {
+  public @Nullable UpdateSession getUpdateSession() {
     return myUpdateSession;
   }