From 0a9d31381978ef1b2698fd3fae7fb3f1012ccc44 Mon Sep 17 00:00:00 2001 From: Oleg Sukhodolsky Date: Thu, 31 Jan 2013 17:56:24 +0400 Subject: [PATCH] RUBY-12947: we have to explicitly specify ruby default external encoding for cucumber run #RUBY-12947 fixed --- .../sm/runner/ui/SMTestRunnerResultsForm.java | 37 ++----------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java index 9d99c2b90916..69b41e932110 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java @@ -35,6 +35,7 @@ import com.intellij.openapi.progress.util.ColorProgressBar; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.wm.IdeFocusManager; +import com.intellij.ui.JBColor; import com.intellij.util.text.DateFormatUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -58,7 +59,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel implements TestFrameworkRunningModel, TestResultsViewer, SMTRunnerEventsListener { @NonNls private static final String DEFAULT_SM_RUNNER_SPLITTER_PROPERTY = "SMTestRunner.Splitter.Proportion"; - public static final Color DARK_YELLOW = Color.YELLOW.darker(); + public static final Color DARK_YELLOW = JBColor.YELLOW.darker(); private SMTRunnerTestTreeView myTreeView; @@ -491,7 +492,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel if (testingFinished) { if (myTestsTotal == 0) { myStatusLine.setStatusColor(myTestsRootNode.wasLaunched() || !myTestsRootNode.isTestsReporterAttached() - ? Color.LIGHT_GRAY + ? JBColor.LIGHT_GRAY : ColorProgressBar.RED); } // else color will be according failed/passed tests @@ -606,36 +607,4 @@ public class SMTestRunnerResultsForm extends TestResultsPanel // check that we are in consistent mode return isCustomMessage != (myCurrentCustomProgressCategory == null); } - - - private static class MyFocusTraversalPolicy extends FocusTraversalPolicy { - final List myComponents; - - private MyFocusTraversalPolicy(final List components) { - myComponents = components; - } - - public Component getComponentAfter(final Container container, final Component component) { - return myComponents.get((myComponents.indexOf(component) + 1) % myComponents.size()); - } - - public Component getComponentBefore(final Container container, final Component component) { - final int prevIndex = myComponents.indexOf(component) - 1; - final int normalizedIndex = prevIndex < 0 ? myComponents.size() - 1 : prevIndex; - - return myComponents.get(normalizedIndex); - } - - public Component getFirstComponent(final Container container) { - return myComponents.get(0); - } - - public Component getLastComponent(final Container container) { - return myComponents.get(myComponents.size() - 1); - } - - public Component getDefaultComponent(final Container container) { - return getFirstComponent(container); - } - } }