diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java b/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java index fcdf3951f79f..93a76d440d8a 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * 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. @@ -104,11 +104,6 @@ public class ClassesTreeStructureProvider implements SelectableTreeStructureProv return file != null && (index.isUnderSourceRootOfType(file, JavaModuleSourceRootTypes.SOURCES) || index.isInLibraryClasses(file) || index.isInLibrarySource(file)); } - @Override - public Object getData(Collection selected, String dataName) { - return null; - } - @Override public PsiElement getTopLevelElement(final PsiElement element) { PsiFile baseRootFile = getBaseRootFile(element); diff --git a/java/java-tests/testSrc/com/intellij/projectView/ClassNameConvertor.java b/java/java-tests/testSrc/com/intellij/projectView/ClassNameConvertor.java index e5a8b9be5dbe..99a7554641a9 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/ClassNameConvertor.java +++ b/java/java-tests/testSrc/com/intellij/projectView/ClassNameConvertor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * 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. @@ -83,9 +83,4 @@ class ClassNameConvertor implements TreeStructureProvider { } return result; } - - @Override - public Object getData(Collection selected, String dataName) { - return null; - } } diff --git a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeSortingTest.java b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeSortingTest.java index c57a98f0663e..316fbb574b90 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeSortingTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeSortingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * 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. @@ -349,10 +349,5 @@ public class ProjectTreeSortingTest extends BaseProjectViewTestCase { } return result; } - - @Override - public Object getData(Collection selected, String dataName) { - return null; - } } } diff --git a/java/java-tests/testSrc/com/intellij/projectView/ProjectViewUpdatingTest.java b/java/java-tests/testSrc/com/intellij/projectView/ProjectViewUpdatingTest.java index b6953d670c2f..e722a6e55111 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/ProjectViewUpdatingTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/ProjectViewUpdatingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * 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. @@ -21,7 +21,6 @@ import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.projectView.impl.AbstractProjectViewPSIPane; import com.intellij.ide.projectView.impl.ClassesTreeStructureProvider; import com.intellij.ide.util.treeView.AbstractTreeNode; -import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.command.WriteCommandAction; @@ -35,13 +34,11 @@ import com.intellij.uiDesigner.projectView.FormMergerTreeStructureProvider; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; import java.util.ArrayList; import java.util.Collection; -import java.util.Comparator; import java.util.List; @SuppressWarnings({"HardCodedStringLiteral"}) @@ -410,12 +407,6 @@ public class ProjectViewUpdatingTest extends BaseProjectViewTestCase { result.add(rootWrapper); return result; } - - @Override - @Nullable - public Object getData(Collection selected, String dataName) { - return null; - } }; } diff --git a/java/java-tests/testSrc/com/intellij/projectView/SameNamesJoiner.java b/java/java-tests/testSrc/com/intellij/projectView/SameNamesJoiner.java index 75f4d2887e1d..1e0f1352d6cf 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/SameNamesJoiner.java +++ b/java/java-tests/testSrc/com/intellij/projectView/SameNamesJoiner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * 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. @@ -67,11 +67,6 @@ class SameNamesJoiner implements TreeStructureProvider { return result; } - @Override - public Object getData(Collection selected, String dataName) { - return null; - } - public PsiElement getTopLevelElement(final PsiElement element) { return null; } diff --git a/platform/editor-ui-api/src/com/intellij/ide/projectView/TreeStructureProvider.java b/platform/editor-ui-api/src/com/intellij/ide/projectView/TreeStructureProvider.java index f70742891b5c..2838eb6ebdb8 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/projectView/TreeStructureProvider.java +++ b/platform/editor-ui-api/src/com/intellij/ide/projectView/TreeStructureProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * 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. @@ -53,5 +53,7 @@ public interface TreeStructureProvider { * @see com.intellij.openapi.actionSystem.DataProvider */ @Nullable - Object getData(Collection selected, String dataName); + default Object getData(Collection selected, String dataName) { + return null; + } } diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeStructure.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeStructure.java index ff87d2009100..2f8d9172b28c 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeStructure.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeStructure.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * 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. @@ -38,7 +38,6 @@ import com.intellij.psi.impl.file.PsiDirectoryImpl; import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -184,11 +183,5 @@ public class FavoritesTreeStructure extends ProjectTreeStructure { } return children; } - - @Nullable - @Override - public Object getData(Collection selected, String dataName) { - return null; - } } } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/NestingTreeStructureProvider.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/NestingTreeStructureProvider.java index f2b784810bf7..b8f92afd2be1 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/NestingTreeStructureProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/NestingTreeStructureProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * 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. @@ -108,12 +108,6 @@ public class NestingTreeStructureProvider implements TreeStructureProvider, Dumb return Collections.emptyList(); } - @Nullable - @Override - public Object getData(final Collection selected, final String dataName) { - return null; - } - @NotNull @Override public Collection modify(@NotNull final AbstractTreeNode parent, diff --git a/platform/lang-impl/src/com/intellij/platform/PlatformProjectViewStructureProvider.java b/platform/lang-impl/src/com/intellij/platform/PlatformProjectViewStructureProvider.java index 3e98e55ee8f7..fff4dfc283d0 100644 --- a/platform/lang-impl/src/com/intellij/platform/PlatformProjectViewStructureProvider.java +++ b/platform/lang-impl/src/com/intellij/platform/PlatformProjectViewStructureProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * 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. @@ -64,9 +64,4 @@ public class PlatformProjectViewStructureProvider implements TreeStructureProvid } return children; } - - @Override - public Object getData(final Collection selected, final String dataName) { - return null; - } } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/projectView/GradleTreeStructureProvider.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/projectView/GradleTreeStructureProvider.java index e800a2ce3d19..23c25cf34fdf 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/projectView/GradleTreeStructureProvider.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/projectView/GradleTreeStructureProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * 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. @@ -112,12 +112,6 @@ public class GradleTreeStructureProvider implements TreeStructureProvider { return children; } - @Nullable - @Override - public Object getData(Collection selected, String dataName) { - return null; - } - private static boolean showUnderModuleGroup(Module module) { if (ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, module)) { String projectPath = ExternalSystemApiUtil.getExternalProjectPath(module); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltTreeStructureProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltTreeStructureProvider.java index bc20d81f0ca6..7f9a999f6cdf 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltTreeStructureProvider.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltTreeStructureProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * 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. @@ -29,7 +29,6 @@ import org.intellij.lang.xpath.xslt.XsltConfig; import org.intellij.lang.xpath.xslt.XsltSupport; import org.intellij.lang.xpath.xslt.associations.FileAssociationsManager; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.util.ArrayList; @@ -68,12 +67,6 @@ public class XsltTreeStructureProvider implements TreeStructureProvider { return l; } - @Nullable - @SuppressWarnings({"RawUseOfParameterizedType"}) - public Object getData(Collection selected, String dataName) { - return null; - } - private static class XsltFileNode extends PsiFileNode { private final FileAssociationsManager myInstance; private final XsltConfig myConfig; diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java b/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java index 2cdcdc0afaa1..f0132da6ac8f 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java @@ -8,11 +8,10 @@ import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiDirectory; -import com.jetbrains.edu.learning.courseFormat.Course; import com.jetbrains.edu.learning.StudyTaskManager; import com.jetbrains.edu.learning.StudyUtils; +import com.jetbrains.edu.learning.courseFormat.Course; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -55,10 +54,4 @@ public class StudyTreeStructureProvider implements TreeStructureProvider, DumbAw protected boolean shouldModify(@NotNull final Project project) { return StudyUtils.isStudentProject(project); } - - @Nullable - @Override - public Object getData(Collection selected, String dataName) { - return null; - } } diff --git a/python/src/com/jetbrains/python/projectView/PyTreeStructureProvider.java b/python/src/com/jetbrains/python/projectView/PyTreeStructureProvider.java index 2d90b69d071f..2510a46057cd 100644 --- a/python/src/com/jetbrains/python/projectView/PyTreeStructureProvider.java +++ b/python/src/com/jetbrains/python/projectView/PyTreeStructureProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * 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. @@ -147,11 +147,6 @@ public class PyTreeStructureProvider implements SelectableTreeStructureProvider, return newChildren; } - @Override - public Object getData(Collection selected, String dataName) { - return null; - } - @Override public PsiElement getTopLevelElement(PsiElement element) { PyPsiUtils.assertValid(element);