From a4486fa84f91950862ceb77da0441320c939e3eb Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 6 Jul 2015 15:15:14 +0300 Subject: [PATCH] remove redundant fields in *TestConsoleProperties --- .../junit2/ui/properties/JUnitConsoleProperties.java | 6 ++---- .../testng/model/TestNGConsoleProperties.java | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java b/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java index 0bbde43947cb..dc8f89d9eb64 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java @@ -34,23 +34,21 @@ import javax.swing.*; public class JUnitConsoleProperties extends JavaAwareTestConsoleProperties { - private final JUnitConfiguration myConfiguration; public JUnitConsoleProperties(@NotNull JUnitConfiguration configuration, Executor executor) { super("JUnit", configuration, executor); - myConfiguration = configuration; } @NotNull @Override protected GlobalSearchScope initScope() { - final JUnitConfiguration.Data persistentData = myConfiguration.getPersistentData(); + final JUnitConfiguration.Data persistentData = getConfiguration().getPersistentData(); final String testObject = persistentData.TEST_OBJECT; //ignore invisible setting if (JUnitConfiguration.TEST_CATEGORY.equals(testObject) || JUnitConfiguration.TEST_PATTERN.equals(testObject) || JUnitConfiguration.TEST_PACKAGE.equals(testObject)) { - final SourceScope sourceScope = persistentData.getScope().getSourceScope(myConfiguration); + final SourceScope sourceScope = persistentData.getScope().getSourceScope(getConfiguration()); return sourceScope != null ? sourceScope.getGlobalSearchScope() : GlobalSearchScope.allScope(getProject()); } else { diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java index ee272704f0bc..dd100921cec7 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java +++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java @@ -34,23 +34,22 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; public class TestNGConsoleProperties extends JavaAwareTestConsoleProperties { - private final TestNGConfiguration myConfiguration; public TestNGConsoleProperties(TestNGConfiguration config, Executor executor) { super("TestNG", config, executor); - myConfiguration = config; } @NotNull @Override protected GlobalSearchScope initScope() { - final String testObject = myConfiguration.getPersistantData().TEST_OBJECT; + final TestNGConfiguration configuration = getConfiguration(); + final String testObject = configuration.getPersistantData().TEST_OBJECT; if (TestType.CLASS.getType().equals(testObject) || TestType.METHOD.getType().equals(testObject)) { return super.initScope(); } else { - final SourceScope sourceScope = myConfiguration.getPersistantData().getScope().getSourceScope(myConfiguration); + final SourceScope sourceScope = configuration.getPersistantData().getScope().getSourceScope(configuration); return sourceScope != null ? sourceScope.getGlobalSearchScope() : GlobalSearchScope.allScope(getProject()); } }