From 4f4ba9986a29e9cc753aedda73dd9d6fb0797e8e Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 16 Nov 2015 19:09:38 +0300 Subject: [PATCH] cleanup --- .../execution/lineMarker/ExecutorAction.java | 6 ++--- .../diff/impl/util/GutterActionRenderer.java | 25 +++++++++++++++---- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/lineMarker/ExecutorAction.java b/platform/lang-impl/src/com/intellij/execution/lineMarker/ExecutorAction.java index 4026879a23de..aab0f554792d 100644 --- a/platform/lang-impl/src/com/intellij/execution/lineMarker/ExecutorAction.java +++ b/platform/lang-impl/src/com/intellij/execution/lineMarker/ExecutorAction.java @@ -37,7 +37,7 @@ import java.util.List; * @author Dmitry Avdeev */ public class ExecutorAction extends AnAction { - + @NotNull public static AnAction[] getActions(final int order) { return ContainerUtil.map2Array(ExecutorRegistry.getInstance().getRegisteredExecutors(), AnAction.class, new Function() { @Override @@ -51,8 +51,8 @@ public class ExecutorAction extends AnAction { private final Executor myExecutor; private final int myOrder; - private ExecutorAction(AnAction origin, - Executor executor, + private ExecutorAction(@NotNull AnAction origin, + @NotNull Executor executor, int order) { myOrigin = origin; myExecutor = executor; diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java index 6786ef898399..6fe8155109dc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.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. @@ -29,11 +29,26 @@ public class GutterActionRenderer extends GutterIconRenderer implements DumbAwar myAction = action; } + @Override @NotNull - public Icon getIcon() { return myAction.getTemplatePresentation().getIcon(); } - public AnAction getClickAction() { return myAction; } - public String getTooltipText() { return myAction.getTemplatePresentation().getText(); } - public boolean isNavigateAction() { return true; } + public Icon getIcon() { + return myAction.getTemplatePresentation().getIcon(); + } + + @Override + public AnAction getClickAction() { + return myAction; + } + + @Override + public String getTooltipText() { + return myAction.getTemplatePresentation().getText(); + } + + @Override + public boolean isNavigateAction() { + return true; + } @Override public boolean equals(Object o) {