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

clean up

Browse Source
This commit is contained in:
sergey.vasiliev
2017-08-07 13:58:24 +02:00
parent 745d65e3ef
commit d55de7fcec
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java
+7 -19
View File
@@ -111,7 +111,7 @@ public class NavigationGutterIconBuilder<T> {
public static <T> NavigationGutterIconBuilder<T> create(@NotNull final Icon icon,
@NotNull NotNullFunction<T, Collection<? extends PsiElement>> converter,
final @Nullable NotNullFunction<T, Collection<? extends GotoRelatedItem>> gotoRelatedItemProvider) {
return new NavigationGutterIconBuilder<T>(icon, converter, gotoRelatedItemProvider);
return new NavigationGutterIconBuilder<>(icon, converter, gotoRelatedItemProvider);
}
public NavigationGutterIconBuilder<T> setTarget(@Nullable T target) {
@@ -166,7 +166,7 @@ public class NavigationGutterIconBuilder<T> {
}
public NavigationGutterIconBuilder<T> setCellRenderer(@NotNull final PsiElementListCellRenderer cellRenderer) {
myCellRenderer = new Computable.PredefinedValueComputable<PsiElementListCellRenderer>(cellRenderer);
myCellRenderer = new Computable.PredefinedValueComputable<>(cellRenderer);
return this;
}
@@ -255,7 +255,7 @@ public class NavigationGutterIconBuilder<T> {
final boolean empty = isEmpty();
if (myTooltipText == null && !myLazy) {
final SortedSet<String> names = new TreeSet<String>();
final SortedSet<String> names = new TreeSet<>();
for (T t : myTargets.getValue()) {
final String text = myNamer.fun(t);
if (text != null) {
@@ -274,7 +274,7 @@ public class NavigationGutterIconBuilder<T> {
}
Computable<PsiElementListCellRenderer> renderer =
myCellRenderer == null ? (Computable<PsiElementListCellRenderer>)() -> new DefaultPsiElementCellRenderer() : myCellRenderer;
myCellRenderer == null ? () -> new DefaultPsiElementCellRenderer() : myCellRenderer;
return new MyNavigationGutterIconRenderer(this, myAlignment, myIcon, myTooltipText, pointers, renderer, empty);
}
@@ -299,8 +299,8 @@ public class NavigationGutterIconBuilder<T> {
private static <T> List<SmartPsiElementPointer> calcPsiTargets(Project project, Collection<? extends T> targets,
NotNullFunction<T, Collection<? extends PsiElement>> converter) {
SmartPointerManager manager = SmartPointerManager.getInstance(project);
Set<PsiElement> elements = new THashSet<PsiElement>();
final List<SmartPsiElementPointer> list = new ArrayList<SmartPsiElementPointer>(targets.size());
Set<PsiElement> elements = new THashSet<>();
final List<SmartPsiElementPointer> list = new ArrayList<>(targets.size());
for (final T target : targets) {
for (final PsiElement psiElement : converter.fun(target)) {
if (elements.add(psiElement) && psiElement.isValid()) {
@@ -316,7 +316,7 @@ public class NavigationGutterIconBuilder<T> {
return false;
}
Set<PsiElement> elements = new THashSet<PsiElement>();
Set<PsiElement> elements = new THashSet<>();
Collection<? extends T> targets = myTargets.getValue();
for (final T target : targets) {
for (final PsiElement psiElement : myConverter.fun(target)) {
@@ -392,16 +392,4 @@ public class NavigationGutterIconBuilder<T> {
return result;
}
}
private static class MyPsiElementRelatedItemLineMarkerInfo extends RelatedItemLineMarkerInfo<PsiElement> {
public MyPsiElementRelatedItemLineMarkerInfo(PsiElement element,
NavigationGutterIconRenderer renderer,
String tooltip,
NotNullLazyValue<Collection<? extends GotoRelatedItem>> gotoTargets) {
super(element, element.getTextRange(), renderer.getIcon(), Pass.LINE_MARKERS, tooltip == null
? null
: new ConstantFunction<>(tooltip),
renderer.isNavigateAction() ? renderer : null, renderer.getAlignment(), gotoTargets);
}
}
}