From 09e307a506bd82b91e74841fd5e87234728ceaaa Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 19 May 2015 21:04:37 +0200 Subject: [PATCH] Cleanup (formatting) --- .../dependencies/DependenciesPanelTest.java | 99 ++++++++----------- .../DependencyValidationManager.java | 18 ++-- .../DependenciesBuilder.java | 33 +++---- 3 files changed, 63 insertions(+), 87 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/dependencies/DependenciesPanelTest.java b/java/java-tests/testSrc/com/intellij/dependencies/DependenciesPanelTest.java index eedfb006e038..86edb7c8caf3 100644 --- a/java/java-tests/testSrc/com/intellij/dependencies/DependenciesPanelTest.java +++ b/java/java-tests/testSrc/com/intellij/dependencies/DependenciesPanelTest.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2015 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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. */ package com.intellij.dependencies; @@ -40,48 +24,46 @@ import com.intellij.packageDependencies.ForwardDependenciesBuilder; import com.intellij.packageDependencies.ui.DependenciesPanel; import com.intellij.packageDependencies.ui.PackagePatternProvider; import com.intellij.psi.*; -import com.intellij.testFramework.IdeaTestUtil; +import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.TestSourceBasedTestCase; -import junit.framework.Assert; import javax.swing.*; -public class DependenciesPanelTest extends TestSourceBasedTestCase{ - public void testDependencies(){ - DependenciesPanel dependenciesPanel = null; +public class DependenciesPanelTest extends TestSourceBasedTestCase { + public void testDependencies() { + PsiDirectory psiDirectory = getPackageDirectory("com/package1"); + assertNotNull(psiDirectory); + PsiPackage psiPackage = JavaDirectoryService.getInstance().getPackage(psiDirectory); + assertNotNull(psiPackage); + PsiClass[] classes = psiPackage.getClasses(); + sortClassesByName(classes); + PsiFile file = classes[0].getContainingFile(); + + AnalysisScope scope = new AnalysisScope(file); + DependenciesBuilder builder = new ForwardDependenciesBuilder(myProject, scope); + builder.analyze(); + + DependencyUISettings.getInstance().SCOPE_TYPE = PackagePatternProvider.PACKAGES; + DependenciesPanel dependenciesPanel = new DependenciesPanel(myProject, builder); try { - final PsiDirectory psiDirectory = getPackageDirectory("com/package1"); - Assert.assertNotNull(psiDirectory); - final PsiPackage psiPackage = JavaDirectoryService.getInstance().getPackage(psiDirectory); - Assert.assertNotNull(psiPackage); - final PsiClass[] classes = psiPackage.getClasses(); - sortClassesByName(classes); - final PsiFile file = classes[0].getContainingFile(); - final AnalysisScope scope = new AnalysisScope(file); - final DependenciesBuilder builder = new ForwardDependenciesBuilder(myProject, scope); - builder.analyze(); - DependencyUISettings.getInstance().SCOPE_TYPE = PackagePatternProvider.PACKAGES; - dependenciesPanel = new DependenciesPanel(myProject, builder); JTree leftTree = dependenciesPanel.getLeftTree(); - IdeaTestUtil.assertTreeEqual(leftTree, "-Root\n" + - " Library Classes\n" + - " -Production Classes\n" + - " -com.package1\n" + - " [Class1.java]\n" + - " Test Classes\n", true); + PlatformTestUtil.assertTreeEqual(leftTree, "-Root\n" + + " Library Classes\n" + + " -Production Classes\n" + + " -com.package1\n" + + " [Class1.java]\n" + + " Test Classes\n", true); JTree rightTree = dependenciesPanel.getRightTree(); - IdeaTestUtil.assertTreeEqual(rightTree, "-Root\n" + - " Library Classes\n" + - " -Production Classes\n" + - " -com.package1\n" + - " Class2.java\n" + - " Test Classes\n", true); + PlatformTestUtil.assertTreeEqual(rightTree, "-Root\n" + + " Library Classes\n" + + " -Production Classes\n" + + " -com.package1\n" + + " Class2.java\n" + + " Test Classes\n", true); } finally { - if (dependenciesPanel != null) { - Disposer.dispose(dependenciesPanel); - } + Disposer.dispose(dependenciesPanel); } } @@ -94,5 +76,4 @@ public class DependenciesPanelTest extends TestSourceBasedTestCase{ protected String getTestDataPath() { return JavaTestUtil.getJavaTestDataPath(); } - } diff --git a/platform/analysis-api/src/com/intellij/packageDependencies/DependencyValidationManager.java b/platform/analysis-api/src/com/intellij/packageDependencies/DependencyValidationManager.java index 723aef818091..2035dd413cde 100644 --- a/platform/analysis-api/src/com/intellij/packageDependencies/DependencyValidationManager.java +++ b/platform/analysis-api/src/com/intellij/packageDependencies/DependencyValidationManager.java @@ -1,5 +1,5 @@ - /* - * Copyright 2000-2009 JetBrains s.r.o. +/* + * Copyright 2000-2015 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. @@ -26,16 +26,16 @@ import org.jetbrains.annotations.Nullable; import java.util.Map; /** - * User: anna - * Date: Mar 2, 2005 + * @author anna + * @since Mar 2, 2005 */ public abstract class DependencyValidationManager extends NamedScopesHolder { - public DependencyValidationManager(final Project project) { - super(project); + public static DependencyValidationManager getInstance(@NotNull Project project) { + return ServiceManager.getService(project, DependencyValidationManager.class); } - public static DependencyValidationManager getInstance(Project project) { - return ServiceManager.getService(project, DependencyValidationManager.class); + public DependencyValidationManager(@NotNull Project project) { + super(project); } public abstract boolean hasRules(); @@ -61,7 +61,7 @@ public abstract class DependencyValidationManager extends NamedScopesHolder { public abstract void setSkipImportStatements(boolean skip); @NotNull - public abstract Map getUnnamedScopes(); + public abstract Map getUnnamedScopes(); public abstract void reloadRules(); } diff --git a/platform/analysis-impl/src/com/intellij/packageDependencies/DependenciesBuilder.java b/platform/analysis-impl/src/com/intellij/packageDependencies/DependenciesBuilder.java index 4f9e890d4703..6fc05b8bcfde 100644 --- a/platform/analysis-impl/src/com/intellij/packageDependencies/DependenciesBuilder.java +++ b/platform/analysis-impl/src/com/intellij/packageDependencies/DependenciesBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2015 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.packageDependencies; import com.intellij.analysis.AnalysisScope; @@ -29,8 +28,8 @@ import org.jetbrains.annotations.Nullable; import java.util.*; /** - * User: anna - * Date: Jan 19, 2005 + * @author anna + * @since Jan 19, 2005 */ public abstract class DependenciesBuilder { private final Project myProject; @@ -128,12 +127,10 @@ public abstract class DependenciesBuilder { final Set reachable = getDirectDependencies().get(from); if (reachable != null) { if (reachable.contains(to)) { - final ArrayList path = new ArrayList(); - result.add(path); + result.add(new ArrayList()); return result; } - if (!processed.contains(from)) { - processed.add(from); + if (processed.add(from)) { for (PsiFile file : reachable) { if (!getScope().contains(file)) { //exclude paths through scope final List> paths = findPaths(file, to, processed); @@ -148,14 +145,6 @@ public abstract class DependenciesBuilder { return result; } - - - public static void analyzeFileDependencies(PsiFile file, DependencyProcessor processor) { - file.putUserData(PsiFileEx.BATCH_REFERENCE_PROCESSING, Boolean.TRUE); - file.accept(DependenciesVisitorFactory.getInstance().createVisitor(processor)); - file.putUserData(PsiFileEx.BATCH_REFERENCE_PROCESSING, null); - } - public boolean isTransitive() { return myTransitive > 0; } @@ -164,11 +153,17 @@ public abstract class DependenciesBuilder { return myTransitive; } - public interface DependencyProcessor { - void process(PsiElement place, PsiElement dependency); - } public String getRelativeToProjectPath(@NotNull VirtualFile virtualFile) { return ProjectUtilCore.displayUrlRelativeToProject(virtualFile, virtualFile.getPresentableUrl(), getProject(), true, false); } + public static void analyzeFileDependencies(PsiFile file, DependencyProcessor processor) { + file.putUserData(PsiFileEx.BATCH_REFERENCE_PROCESSING, Boolean.TRUE); + file.accept(DependenciesVisitorFactory.getInstance().createVisitor(processor)); + file.putUserData(PsiFileEx.BATCH_REFERENCE_PROCESSING, null); + } + + public interface DependencyProcessor { + void process(PsiElement place, PsiElement dependency); + } }