From b07c3d8701fb23ee5a979666d8d7763e1309d8c4 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 31 Jan 2019 17:30:10 +0100 Subject: [PATCH] cleanup --- .../impl/ExtensionComponentAdapter.java | 3 +-- .../actionSystem/EditorActionHandlerBean.java | 22 ++++--------------- .../devkit-core/src/dom/ExtensionPoint.java | 17 +------------- .../AddAnnotationValueIntention.kt | 3 +-- 4 files changed, 7 insertions(+), 38 deletions(-) diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionComponentAdapter.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionComponentAdapter.java index d4abd40ce425..0bda8c84748f 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionComponentAdapter.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionComponentAdapter.java @@ -58,8 +58,7 @@ public class ExtensionComponentAdapter implements LoadingOrder.Orderable { } if (instance instanceof PluginAware) { - PluginAware pluginAware = (PluginAware)instance; - pluginAware.setPluginDescriptor(myPluginDescriptor); + ((PluginAware)instance).setPluginDescriptor(myPluginDescriptor); } return instance; } diff --git a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorActionHandlerBean.java b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorActionHandlerBean.java index 1dc17d2f1936..6c29702f126c 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorActionHandlerBean.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorActionHandlerBean.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2009 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.editor.actionSystem; import com.intellij.openapi.application.ApplicationManager; @@ -25,9 +11,9 @@ import com.intellij.util.xmlb.annotations.Attribute; /** * @author yole */ -public class EditorActionHandlerBean extends AbstractExtensionPointBean { - private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.actionSystem.EditorActionHandlerBean"); - +public final class EditorActionHandlerBean extends AbstractExtensionPointBean { + private static final Logger LOG = Logger.getInstance(EditorActionHandlerBean.class); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.editorActionHandler"); // these must be public for scrambling compatibility diff --git a/plugins/devkit/devkit-core/src/dom/ExtensionPoint.java b/plugins/devkit/devkit-core/src/dom/ExtensionPoint.java index c7010d53275c..83070ac59b92 100644 --- a/plugins/devkit/devkit-core/src/dom/ExtensionPoint.java +++ b/plugins/devkit/devkit-core/src/dom/ExtensionPoint.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.idea.devkit.dom; import com.intellij.ide.presentation.Presentation; @@ -34,7 +20,6 @@ public interface ExtensionPoint extends DomElement { IDEA_APPLICATION } - @NotNull @Override XmlTag getXmlTag(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/annotations/AddAnnotationValueIntention.kt b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/annotations/AddAnnotationValueIntention.kt index 3d5edf843b15..41d852f30079 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/annotations/AddAnnotationValueIntention.kt +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/annotations/AddAnnotationValueIntention.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.intentions.annotations import com.intellij.openapi.editor.Editor @@ -19,7 +19,6 @@ import org.jetbrains.plugins.groovy.lang.psi.patterns.groovyAnnotationArgumentLi import org.jetbrains.plugins.groovy.lang.psi.patterns.groovyAnnotationArgumentValue class AddAnnotationValueIntention : Intention() { - companion object { private val myPredicate: PsiElementPredicate