MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (typos; pointless annotation)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-10-27 14:20:12 +02:00
parent 74a05dfab5
commit c202b1565e
2 changed files with 89 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/ComposeFunctionChainAction.java
+2 -16
View File
@@ -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-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.
package com.intellij.codeInsight.intention.impl;
import com.intellij.codeInsight.CodeInsightBundle;
@@ -45,7 +31,7 @@ public class ComposeFunctionChainAction extends PsiElementBaseIntentionAction {
PsiClass aClass = method.getContainingClass();
if(aClass == null) return false;
if(!CommonClassNames.JAVA_UTIL_FUNCTION_FUNCTION.equals(aClass.getQualifiedName()) &&
!CommonClassNames.JAVA_UTIL_FUNCTION_BIFUNCTION.equals(aClass.getQualifiedName())) {
!CommonClassNames.JAVA_UTIL_FUNCTION_BI_FUNCTION.equals(aClass.getQualifiedName())) {
return false;
}
PsiElement parent = PsiUtil.skipParenthesizedExprUp(call.getParent());
platform/core-api/src/com/intellij/psi/CommonClassNames.java
+87 -97
View File
@@ -1,123 +1,113 @@
/*
* Copyright 2000-2017 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-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.
package com.intellij.psi;
import org.jetbrains.annotations.NonNls;
/**
* @author peter
*/
public interface CommonClassNames {
@NonNls String DEFAULT_PACKAGE = "java.lang";
String DEFAULT_PACKAGE = "java.lang";
@NonNls String JAVA_LANG_OBJECT = "java.lang.Object";
@NonNls String JAVA_LANG_OBJECT_SHORT = "Object";
@NonNls String JAVA_LANG_CLASS = "java.lang.Class";
@NonNls String JAVA_LANG_OVERRIDE = "java.lang.Override";
@NonNls String JAVA_LANG_ENUM = "java.lang.Enum";
@NonNls String JAVA_LANG_VOID = "java.lang.Void";
String JAVA_LANG_OBJECT = "java.lang.Object";
String JAVA_LANG_OBJECT_SHORT = "Object";
String JAVA_LANG_CLASS = "java.lang.Class";
String JAVA_LANG_OVERRIDE = "java.lang.Override";
String JAVA_LANG_ENUM = "java.lang.Enum";
String JAVA_LANG_VOID = "java.lang.Void";
@NonNls String JAVA_UTIL_OBJECTS = "java.util.Objects";
String JAVA_UTIL_OBJECTS = "java.util.Objects";
@NonNls String JAVA_LANG_THROWABLE = "java.lang.Throwable";
@NonNls String JAVA_LANG_EXCEPTION = "java.lang.Exception";
@NonNls String JAVA_LANG_ERROR = "java.lang.Error";
@NonNls String JAVA_LANG_ASSERTION_ERROR = "java.lang.AssertionError";
@NonNls String JAVA_LANG_RUNTIME_EXCEPTION = "java.lang.RuntimeException";
@NonNls String JAVA_LANG_AUTO_CLOSEABLE = "java.lang.AutoCloseable";
String JAVA_LANG_THROWABLE = "java.lang.Throwable";
String JAVA_LANG_EXCEPTION = "java.lang.Exception";
String JAVA_LANG_ERROR = "java.lang.Error";
String JAVA_LANG_ASSERTION_ERROR = "java.lang.AssertionError";
String JAVA_LANG_RUNTIME_EXCEPTION = "java.lang.RuntimeException";
String JAVA_LANG_AUTO_CLOSEABLE = "java.lang.AutoCloseable";
@NonNls String JAVA_LANG_ITERABLE = "java.lang.Iterable";
@NonNls String JAVA_UTIL_ITERATOR = "java.util.Iterator";
String JAVA_LANG_ITERABLE = "java.lang.Iterable";
String JAVA_UTIL_ITERATOR = "java.util.Iterator";
@NonNls String JAVA_LANG_RUNNABLE = "java.lang.Runnable";
String JAVA_LANG_RUNNABLE = "java.lang.Runnable";
@NonNls String JAVA_LANG_DEPRECATED = "java.lang.Deprecated";
String JAVA_LANG_DEPRECATED = "java.lang.Deprecated";
@NonNls String JAVA_LANG_ANNOTATION_TARGET = "java.lang.annotation.Target";
@NonNls String JAVA_LANG_ANNOTATION_INHERITED = "java.lang.annotation.Inherited";
@NonNls String JAVA_LANG_ANNOTATION_ANNOTATION = "java.lang.annotation.Annotation";
@NonNls String JAVA_LANG_ANNOTATION_RETENTION = "java.lang.annotation.Retention";
@NonNls String JAVA_LANG_ANNOTATION_REPEATABLE = "java.lang.annotation.Repeatable";
String JAVA_LANG_ANNOTATION_TARGET = "java.lang.annotation.Target";
String JAVA_LANG_ANNOTATION_INHERITED = "java.lang.annotation.Inherited";
String JAVA_LANG_ANNOTATION_ANNOTATION = "java.lang.annotation.Annotation";
String JAVA_LANG_ANNOTATION_RETENTION = "java.lang.annotation.Retention";
String JAVA_LANG_ANNOTATION_REPEATABLE = "java.lang.annotation.Repeatable";
@NonNls String JAVA_LANG_REFLECT_ARRAY = "java.lang.reflect.Array";
String JAVA_LANG_REFLECT_ARRAY = "java.lang.reflect.Array";
@NonNls String JAVA_UTIL_ARRAYS = "java.util.Arrays";
@NonNls String JAVA_UTIL_COLLECTIONS = "java.util.Collections";
@NonNls String JAVA_UTIL_COLLECTION = "java.util.Collection";
@NonNls String JAVA_UTIL_MAP = "java.util.Map";
@NonNls String JAVA_UTIL_MAP_ENTRY = "java.util.Map.Entry";
@NonNls String JAVA_UTIL_HASH_MAP = "java.util.HashMap";
@NonNls String JAVA_UTIL_CONCURRENT_HASH_MAP = "java.util.concurrent.ConcurrentHashMap";
@NonNls String JAVA_UTIL_LIST = "java.util.List";
@NonNls String JAVA_UTIL_ARRAY_LIST = "java.util.ArrayList";
@NonNls String JAVA_UTIL_SET = "java.util.Set";
@NonNls String JAVA_UTIL_HASH_SET = "java.util.HashSet";
@NonNls String JAVA_UTIL_PROPERTIES = "java.util.Properties";
@NonNls String JAVA_UTIL_PROPERTY_RESOURCE_BUNDLE = "java.util.PropertyResourceBundle";
@NonNls String JAVA_UTIL_DATE = "java.util.Date";
@NonNls String JAVA_UTIL_CALENDAR = "java.util.Calendar";
@NonNls String JAVA_UTIL_DICTIONARY = "java.util.Dictionary";
@NonNls String JAVA_UTIL_COMPARATOR = "java.util.Comparator";
String JAVA_UTIL_ARRAYS = "java.util.Arrays";
String JAVA_UTIL_COLLECTIONS = "java.util.Collections";
String JAVA_UTIL_COLLECTION = "java.util.Collection";
String JAVA_UTIL_MAP = "java.util.Map";
String JAVA_UTIL_MAP_ENTRY = "java.util.Map.Entry";
String JAVA_UTIL_HASH_MAP = "java.util.HashMap";
String JAVA_UTIL_CONCURRENT_HASH_MAP = "java.util.concurrent.ConcurrentHashMap";
String JAVA_UTIL_LIST = "java.util.List";
String JAVA_UTIL_ARRAY_LIST = "java.util.ArrayList";
String JAVA_UTIL_SET = "java.util.Set";
String JAVA_UTIL_HASH_SET = "java.util.HashSet";
String JAVA_UTIL_PROPERTIES = "java.util.Properties";
String JAVA_UTIL_PROPERTY_RESOURCE_BUNDLE = "java.util.PropertyResourceBundle";
String JAVA_UTIL_DATE = "java.util.Date";
String JAVA_UTIL_CALENDAR = "java.util.Calendar";
String JAVA_UTIL_DICTIONARY = "java.util.Dictionary";
String JAVA_UTIL_COMPARATOR = "java.util.Comparator";
@NonNls String JAVA_UTIL_OPTIONAL = "java.util.Optional";
String JAVA_UTIL_OPTIONAL = "java.util.Optional";
@NonNls String JAVA_IO_SERIALIZABLE = "java.io.Serializable";
@NonNls String JAVA_IO_EXTERNALIZABLE = "java.io.Externalizable";
@NonNls String JAVA_IO_FILE = "java.io.File";
String JAVA_IO_SERIALIZABLE = "java.io.Serializable";
String JAVA_IO_EXTERNALIZABLE = "java.io.Externalizable";
String JAVA_IO_FILE = "java.io.File";
@NonNls String JAVA_LANG_STRING = "java.lang.String";
@NonNls String JAVA_LANG_STRING_SHORT = "String";
@NonNls String JAVA_LANG_NUMBER = "java.lang.Number";
@NonNls String JAVA_LANG_BOOLEAN = "java.lang.Boolean";
@NonNls String JAVA_LANG_BYTE = "java.lang.Byte";
@NonNls String JAVA_LANG_SHORT = "java.lang.Short";
@NonNls String JAVA_LANG_INTEGER = "java.lang.Integer";
@NonNls String JAVA_LANG_LONG = "java.lang.Long";
@NonNls String JAVA_LANG_FLOAT = "java.lang.Float";
@NonNls String JAVA_LANG_DOUBLE = "java.lang.Double";
@NonNls String JAVA_LANG_CHARACTER = "java.lang.Character";
String JAVA_LANG_STRING = "java.lang.String";
String JAVA_LANG_STRING_SHORT = "String";
String JAVA_LANG_NUMBER = "java.lang.Number";
String JAVA_LANG_BOOLEAN = "java.lang.Boolean";
String JAVA_LANG_BYTE = "java.lang.Byte";
String JAVA_LANG_SHORT = "java.lang.Short";
String JAVA_LANG_INTEGER = "java.lang.Integer";
String JAVA_LANG_LONG = "java.lang.Long";
String JAVA_LANG_FLOAT = "java.lang.Float";
String JAVA_LANG_DOUBLE = "java.lang.Double";
String JAVA_LANG_CHARACTER = "java.lang.Character";
@NonNls String JAVA_LANG_STRING_BUFFER = "java.lang.StringBuffer";
@NonNls String JAVA_LANG_STRING_BUILDER = "java.lang.StringBuilder";
@NonNls String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder";
String JAVA_LANG_STRING_BUFFER = "java.lang.StringBuffer";
String JAVA_LANG_STRING_BUILDER = "java.lang.StringBuilder";
String JAVA_LANG_ABSTRACT_STRING_BUILDER = "java.lang.AbstractStringBuilder";
@NonNls String JAVA_LANG_MATH = "java.lang.Math";
@NonNls String JAVA_LANG_STRICT_MATH = "java.lang.StrictMath";
String JAVA_LANG_MATH = "java.lang.Math";
String JAVA_LANG_STRICT_MATH = "java.lang.StrictMath";
@NonNls String JAVA_LANG_CLONEABLE = "java.lang.Cloneable";
@NonNls String JAVA_LANG_COMPARABLE = "java.lang.Comparable";
String JAVA_LANG_CLONEABLE = "java.lang.Cloneable";
String JAVA_LANG_COMPARABLE = "java.lang.Comparable";
@NonNls String JAVA_LANG_NULL_POINTER_EXCEPTION = "java.lang.NullPointerException";
String JAVA_LANG_NULL_POINTER_EXCEPTION = "java.lang.NullPointerException";
@NonNls String JAVA_UTIL_CONCURRENT_FUTURE = "java.util.concurrent.Future";
@NonNls String JAVA_UTIL_CONCURRENT_CALLABLE = "java.util.concurrent.Callable";
String JAVA_UTIL_CONCURRENT_FUTURE = "java.util.concurrent.Future";
String JAVA_UTIL_CONCURRENT_CALLABLE = "java.util.concurrent.Callable";
@NonNls String JAVA_UTIL_STREAM_BASE_STREAM = "java.util.stream.BaseStream";
@NonNls String JAVA_UTIL_STREAM_STREAM = "java.util.stream.Stream";
@NonNls String JAVA_UTIL_STREAM_INT_STREAM = "java.util.stream.IntStream";
@NonNls String JAVA_UTIL_STREAM_LONG_STREAM = "java.util.stream.LongStream";
@NonNls String JAVA_UTIL_STREAM_DOUBLE_STREAM = "java.util.stream.DoubleStream";
@NonNls String JAVA_UTIL_STREAM_COLLECTORS = "java.util.stream.Collectors";
@NonNls String JAVA_UTIL_FUNCTION_PREDICATE = "java.util.function.Predicate";
@NonNls String JAVA_UTIL_FUNCTION_CONSUMER = "java.util.function.Consumer";
@NonNls String JAVA_UTIL_FUNCTION_FUNCTION = "java.util.function.Function";
@NonNls String JAVA_UTIL_FUNCTION_BIFUNCTION = "java.util.function.BiFunction";
String JAVA_UTIL_STREAM_BASE_STREAM = "java.util.stream.BaseStream";
String JAVA_UTIL_STREAM_STREAM = "java.util.stream.Stream";
String JAVA_UTIL_STREAM_INT_STREAM = "java.util.stream.IntStream";
String JAVA_UTIL_STREAM_LONG_STREAM = "java.util.stream.LongStream";
String JAVA_UTIL_STREAM_DOUBLE_STREAM = "java.util.stream.DoubleStream";
String JAVA_UTIL_STREAM_COLLECTORS = "java.util.stream.Collectors";
String JAVA_UTIL_FUNCTION_PREDICATE = "java.util.function.Predicate";
String JAVA_UTIL_FUNCTION_CONSUMER = "java.util.function.Consumer";
String JAVA_UTIL_FUNCTION_FUNCTION = "java.util.function.Function";
String JAVA_UTIL_FUNCTION_BI_FUNCTION = "java.util.function.BiFunction";
@NonNls String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature";
String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature";
@NonNls String CLASS_FILE_EXTENSION = ".class";
@NonNls String JAVA_LANG_FUNCTIONAL_INTERFACE = "java.lang.FunctionalInterface";
}
String CLASS_FILE_EXTENSION = ".class";
String JAVA_LANG_FUNCTIONAL_INTERFACE = "java.lang.FunctionalInterface";
//<editor-fold desc="Deprecated stuff.">
/** @deprecated use {@link #JAVA_UTIL_FUNCTION_BI_FUNCTION} (to be removed in IDEA 2019) */
@SuppressWarnings("SpellCheckingInspection")
String JAVA_UTIL_FUNCTION_BIFUNCTION = JAVA_UTIL_FUNCTION_BI_FUNCTION;
//</editor-fold>
}