1 files changed, 7 insertions, 21 deletions

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java
index 01d6fcc6e7e8..6214a9e44d7f 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/CustomizeContextViewAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * 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.
@@ -17,14 +17,12 @@ package com.intellij.debugger.actions;
 
 import com.intellij.debugger.DebuggerBundle;
 import com.intellij.debugger.engine.JavaDebugProcess;
-import com.intellij.debugger.settings.DebuggerDataViewsConfigurable;
+import com.intellij.debugger.settings.JavaDebuggerSettings;
 import com.intellij.debugger.settings.NodeRendererSettings;
-import com.intellij.debugger.settings.UserRenderersConfigurable;
 import com.intellij.idea.ActionsBundle;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.options.CompositeConfigurable;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.TabbedConfigurable;
@@ -40,16 +38,9 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
-import java.util.ArrayList;
 import java.util.List;
 
-/**
- * User: lex
- * Date: Sep 26, 2003
- * Time: 4:39:53 PM
- */
 public class CustomizeContextViewAction extends XDebuggerTreeActionBase {
-
   @Override
   public void actionPerformed(AnActionEvent e) {
     perform(null, "", e);
@@ -58,15 +49,11 @@ public class CustomizeContextViewAction extends XDebuggerTreeActionBase {
   @Override
   protected void perform(XValueNodeImpl node, @NotNull String nodeName, AnActionEvent e) {
     final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext());
-
     Disposable disposable = Disposer.newDisposable();
-    final CompositeConfigurable configurable = new TabbedConfigurable(disposable) {
+    SingleConfigurableEditor editor = new SingleConfigurableEditor(project, new TabbedConfigurable(disposable) {
       @Override
       protected List<Configurable> createConfigurables() {
-        ArrayList<Configurable> array = new ArrayList<Configurable>();
-        array.add(new DebuggerDataViewsConfigurable(project));
-        array.add(new UserRenderersConfigurable(project));
-        return array;
+        return JavaDebuggerSettings.createDataViewsConfigurable();
       }
 
       @Override
@@ -89,13 +76,12 @@ public class CustomizeContextViewAction extends XDebuggerTreeActionBase {
       protected void createConfigurableTabs() {
         for (Configurable configurable : getConfigurables()) {
           JComponent component = configurable.createComponent();
-          component.setBorder(new EmptyBorder(8,8,8,8));
+          assert component != null;
+          component.setBorder(new EmptyBorder(8, 8, 8, 8));
           myTabbedPane.addTab(configurable.getDisplayName(), component);
         }
       }
-    };
-
-    SingleConfigurableEditor editor = new SingleConfigurableEditor(project, configurable);
+    });
     Disposer.register(editor.getDisposable(), disposable);
     editor.show();
   }