From 4090d5dc5b9075ecebc2cb1019b356a81bf72a0b Mon Sep 17 00:00:00 2001
From: Gregory Shrago <Gregory.Shrago@jetbrains.com>
Date: Wed, 11 Nov 2009 14:50:30 +0300
Subject: [PATCH] WI-583 Exception when add/remove/edit/import language
 injections

---
 .../plugins/intelliLang/InjectionsSettingsUI.java         | 4 ++--
 .../inject/config/ui/MethodParameterPanel.java            | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
index 1c30e04e0d49..2a384c8dec68 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
@@ -16,6 +16,7 @@
 
 package org.intellij.plugins.intelliLang;
 
+import com.intellij.ide.ui.SplitterProportionsDataImpl;
 import com.intellij.lang.Language;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
@@ -34,7 +35,6 @@ import com.intellij.openapi.util.Factory;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.peer.PeerFactory;
 import com.intellij.ui.*;
 import com.intellij.ui.table.TableView;
 import com.intellij.util.Consumer;
@@ -574,7 +574,7 @@ public class InjectionsSettingsUI implements Configurable {
 
     final FileChooserDialog chooser = FileChooserFactory.getInstance().createFileChooser(descriptor, myProject);
 
-    final SplitterProportionsData splitterData = PeerFactory.getInstance().getUIHelper().createSplitterProportionsData();
+    final SplitterProportionsData splitterData = new SplitterProportionsDataImpl();
     splitterData.externalizeFromDimensionService("IntelliLang.ImportSettingsKey.SplitterProportions");
 
     final VirtualFile[] files = chooser.choose(null, myProject);
diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java
index 673e36ab0ee1..f2e78dc7eea8 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java
@@ -25,14 +25,10 @@ import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Condition;
-import com.intellij.peer.PeerFactory;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiFormatUtil;
-import com.intellij.ui.BooleanTableCellRenderer;
-import com.intellij.ui.ColoredTreeCellRenderer;
-import com.intellij.ui.ReferenceEditorWithBrowseButton;
-import com.intellij.ui.SimpleTextAttributes;
+import com.intellij.ui.*;
 import com.intellij.ui.dualView.TreeTableView;
 import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns;
 import com.intellij.ui.treeStructure.treetable.TreeColumnInfo;
@@ -121,7 +117,7 @@ public class MethodParameterPanel extends AbstractInjectionPanel<MethodParameter
 
     });
     init(injection.copy());
-    PeerFactory.getInstance().getUIHelper().installTreeTableSpeedSearch(myParamsTable, new Convertor<TreePath, String>() {
+    new TreeTableSpeedSearch(myParamsTable, new Convertor<TreePath, String>() {
       @Nullable
       public String convert(final TreePath o) {
         final Object userObject = ((DefaultMutableTreeNode)o.getLastPathComponent()).getUserObject();