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 (typo)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-03-03 17:50:17 +01:00
parent 1f1c09d15e
commit c47da586b7
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* 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.
@@ -223,7 +223,7 @@ public class JavaFindUsagesHandler extends FindUsagesHandler{
}
@Override
protected boolean isSearchForTextOccurencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
protected boolean isSearchForTextOccurrencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
return !isSingleFile &&
new JavaNonCodeSearchElementDescriptionProvider().getElementDescription(psiElement, NonCodeSearchDescriptionLocation.NON_JAVA) != null;
}
platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesHandler.java
+13 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* 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.
@@ -41,7 +41,7 @@ import java.util.Collections;
/**
* @author peter
* @see com.intellij.find.findUsages.FindUsagesHandlerFactory
* @see FindUsagesHandlerFactory
*/
public abstract class FindUsagesHandler {
// return this handler if you want to cancel the search
@@ -57,8 +57,8 @@ public abstract class FindUsagesHandler {
@NotNull
public AbstractFindUsagesDialog getFindUsagesDialog(boolean isSingleFile, boolean toShowInNewTab, boolean mustOpenInNewTab) {
return new CommonFindUsagesDialog(myPsiElement, getProject(), getFindUsagesOptions(DataManager.getInstance().getDataContext()),
toShowInNewTab, mustOpenInNewTab, isSingleFile, this);
@SuppressWarnings("deprecation") DataContext ctx = DataManager.getInstance().getDataContext();
return new CommonFindUsagesDialog(myPsiElement, getProject(), getFindUsagesOptions(ctx), toShowInNewTab, mustOpenInNewTab, isSingleFile, this);
}
@NotNull
@@ -102,7 +102,7 @@ public abstract class FindUsagesHandler {
@NotNull
public FindUsagesOptions getFindUsagesOptions(@Nullable final DataContext dataContext) {
FindUsagesOptions options = createFindUsagesOptions(getProject(), dataContext);
options.isSearchForTextOccurrences &= isSearchForTextOccurencesAvailable(getPsiElement(), false);
options.isSearchForTextOccurrences &= isSearchForTextOccurrencesAvailable(getPsiElement(), false);
return options;
}
@@ -165,6 +165,13 @@ public abstract class FindUsagesHandler {
return Collections.singleton(element.getText());
}
@SuppressWarnings("deprecation")
protected boolean isSearchForTextOccurrencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
return isSearchForTextOccurencesAvailable(psiElement, isSingleFile);
}
/** @deprecated use/override {@link #isSearchForTextOccurrencesAvailable(PsiElement, boolean)} instead (to be removed in IDEA 18) */
@SuppressWarnings({"SpellCheckingInspection", "UnusedParameters"})
protected boolean isSearchForTextOccurencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
return false;
}
@@ -236,7 +243,7 @@ public abstract class FindUsagesHandler {
}
@Override
protected boolean isSearchForTextOccurencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
protected boolean isSearchForTextOccurrencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
throw new IncorrectOperationException();
}
platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesUtil.java
+4 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* 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.
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.find.findUsages;
import com.intellij.psi.PsiElement;
@@ -21,10 +20,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class FindUsagesUtil {
private FindUsagesUtil() {
}
private FindUsagesUtil() { }
public static boolean isSearchForTextOccurrencesAvailable(@NotNull PsiElement element, boolean isSingleFile, @Nullable FindUsagesHandler handler) {
return !isSingleFile && handler != null && handler.isSearchForTextOccurencesAvailable(element, isSingleFile);
return !isSingleFile && handler != null && handler.isSearchForTextOccurrencesAvailable(element, isSingleFile);
}
}
}
python/src/com/jetbrains/python/findUsages/PyClassFindUsagesHandler.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* 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.
@@ -47,7 +47,7 @@ public class PyClassFindUsagesHandler extends FindUsagesHandler {
}
@Override
protected boolean isSearchForTextOccurencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
protected boolean isSearchForTextOccurrencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
return true;
}
python/src/com/jetbrains/python/findUsages/PyFunctionFindUsagesHandler.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* 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.
@@ -38,7 +38,7 @@ public class PyFunctionFindUsagesHandler extends FindUsagesHandler {
}
@Override
protected boolean isSearchForTextOccurencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
protected boolean isSearchForTextOccurrencesAvailable(@NotNull PsiElement psiElement, boolean isSingleFile) {
return true;
}