MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup - AbstractTreeNode<?>

Browse Source 
GitOrigin-RevId: fa3b77b69a092eed8530aa29ffa98a981a35903f
This commit is contained in:
Vladimir Krivosheev
2020-01-13 14:58:24 +01:00
committed by intellij-monorepo-bot
parent aff737f7ef
commit fc1978e0df
138 changed files with 759 additions and 1656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/PropertiesGrouper.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2014 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-2020 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.ide.structureView.impl.java;
import com.intellij.ide.IdeBundle;
@@ -34,7 +20,7 @@ public class PropertiesGrouper implements Grouper{
@Override
@NotNull
public Collection<Group> group(@NotNull final AbstractTreeNode parent, @NotNull Collection<TreeElement> children) {
public Collection<Group> group(@NotNull AbstractTreeNode<?> parent, @NotNull Collection<TreeElement> children) {
if (parent.getValue() instanceof PropertyGroup) return Collections.emptyList();
Map<Group,Group> result = new THashMap<>();
for (TreeElement o : children) {

20
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java
View File

@@ -1,18 +1,4 @@
/*
* Copyright 2000-2014 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-2020 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.ide.structureView.impl.java;
import com.intellij.icons.AllIcons;
@@ -39,7 +25,7 @@ public class SuperTypesGrouper implements Grouper{
@Override
@NotNull
public Collection<Group> group(@NotNull final AbstractTreeNode parent, @NotNull Collection<TreeElement> children) {
public Collection<Group> group(@NotNull AbstractTreeNode<?> parent, @NotNull Collection<TreeElement> children) {
if (isParentGrouped(parent)) return Collections.emptyList();
Map<Group, SuperTypeGroup> groups = new THashMap<>();
@@ -66,7 +52,7 @@ public class SuperTypesGrouper implements Grouper{
break;
}
}
PsiMethod superMethod = superMethods[0];
method.putUserData(SUPER_METHOD_KEY, new WeakReference<>(superMethod));
PsiClass groupClass = superMethod.getContainingClass();