From cfe53d3d54fe1d4ca60873f6d3e353837f6fcb79 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 20 Jan 2014 16:44:34 +0400 Subject: [PATCH] notnull --- .../com/intellij/openapi/actionSystem/ActionManager.java | 4 ++-- .../src/com/intellij/openapi/extensions/PluginId.java | 4 ++-- .../openapi/actionSystem/ex/ActionManagerEx.java | 8 ++++++-- .../openapi/actionSystem/impl/ActionManagerImpl.java | 9 +++++---- .../openapi/actionSystem/impl/ButtonToolbarImpl.java | 7 ++++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionManager.java b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionManager.java index 504f55931a8e..5577664bf9f7 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionManager.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionManager.java @@ -72,7 +72,7 @@ public abstract class ActionManager implements ApplicationComponent { * * @return An instance of ActionToolbar */ - public abstract ActionToolbar createActionToolbar(@NonNls String place, ActionGroup group, boolean horizontal); + public abstract ActionToolbar createActionToolbar(@NonNls String place, @NotNull ActionGroup group, boolean horizontal); /** * Returns action associated with the specified actionId. @@ -151,7 +151,7 @@ public abstract class ActionManager implements ApplicationComponent { * @return the created panel. * @since 5.1 */ - public abstract JComponent createButtonToolbar(final String actionPlace, final ActionGroup messageActionGroup); + public abstract JComponent createButtonToolbar(final String actionPlace, @NotNull ActionGroup messageActionGroup); public abstract AnAction getActionOrStub(@NonNls String id); diff --git a/platform/extensions/src/com/intellij/openapi/extensions/PluginId.java b/platform/extensions/src/com/intellij/openapi/extensions/PluginId.java index 15beeb67fcca..84fba8f3b547 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/PluginId.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/PluginId.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. @@ -36,7 +36,7 @@ public class PluginId implements Comparable { } @Override - public int compareTo(PluginId o) { + public int compareTo(@NotNull PluginId o) { return myIdString.compareTo(o.myIdString); } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionManagerEx.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionManagerEx.java index 757b0677a52c..ab2612311fee 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionManagerEx.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionManagerEx.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 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. @@ -18,6 +18,7 @@ package com.intellij.openapi.actionSystem.ex; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.extensions.PluginId; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -31,7 +32,7 @@ public abstract class ActionManagerEx extends ActionManager { return (ActionManagerEx)getInstance(); } - public abstract ActionToolbar createActionToolbar(String place, ActionGroup group, boolean horizontal, boolean decorateButtons); + public abstract ActionToolbar createActionToolbar(String place, @NotNull ActionGroup group, boolean horizontal, boolean decorateButtons); public abstract void fireBeforeActionPerformed(AnAction action, DataContext dataContext, AnActionEvent event); @@ -88,6 +89,7 @@ public abstract class ActionManagerEx extends ActionManager { } + @NotNull public abstract String[] getPluginActions(PluginId pluginId); public abstract void queueActionPerformedEvent(final AnAction action, DataContext context, AnActionEvent event); @@ -96,10 +98,12 @@ public abstract class ActionManagerEx extends ActionManager { public abstract boolean isTransparentOnlyActionsUpdateNow(); + @NotNull public List getAbbreviations() { return Collections.emptyList(); } + @NotNull public List findActionIdsByAbbreviation(String abbreviation) { return Collections.emptyList(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java index 923f788c1025..535034d4fadc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 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. @@ -203,12 +203,12 @@ public final class ActionManagerImpl extends ActionManagerEx implements Applicat } @Override - public ActionToolbar createActionToolbar(final String place, final ActionGroup group, final boolean horizontal) { + public ActionToolbar createActionToolbar(final String place, @NotNull final ActionGroup group, final boolean horizontal) { return createActionToolbar(place, group, horizontal, false); } @Override - public ActionToolbar createActionToolbar(final String place, final ActionGroup group, final boolean horizontal, final boolean decorateButtons) { + public ActionToolbar createActionToolbar(final String place, @NotNull final ActionGroup group, final boolean horizontal, final boolean decorateButtons) { return new ActionToolbarImpl(place, group, horizontal, decorateButtons, myDataManager, this, (KeymapManagerEx)myKeymapManager); } @@ -338,7 +338,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Applicat } @Override - public JComponent createButtonToolbar(final String actionPlace, final ActionGroup messageActionGroup) { + public JComponent createButtonToolbar(final String actionPlace, @NotNull final ActionGroup messageActionGroup) { return new ButtonToolbarImpl(actionPlace, messageActionGroup, myDataManager, this); } @@ -1030,6 +1030,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Applicat }; } + @NotNull @Override public String[] getPluginActions(PluginId pluginName) { if (myPlugin2Id.containsKey(pluginName)){ diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java index 6b0a55fb207f..e3496b8dd654 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ButtonToolbarImpl.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. @@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ActionManagerEx; import com.intellij.openapi.actionSystem.ex.ActionUtil; import com.intellij.openapi.application.ModalityState; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -40,7 +41,7 @@ public class ButtonToolbarImpl extends JPanel { private final ArrayList myActions = new ArrayList(); public ButtonToolbarImpl(final String place, - final ActionGroup actionGroup, + @NotNull ActionGroup actionGroup, DataManager dataManager, ActionManagerEx actionManager) { super(new GridBagLayout()); @@ -57,7 +58,7 @@ public class ButtonToolbarImpl extends JPanel { } - private void initButtons(final ActionGroup actionGroup) { + private void initButtons(@NotNull ActionGroup actionGroup) { final AnAction[] actions = actionGroup.getChildren(null); if (actions.length > 0) {