diff --git a/java/java-impl/src/com/intellij/util/xml/ui/PsiTypeControl.java b/java/java-impl/src/com/intellij/util/xml/ui/PsiTypeControl.java
index be405408d87e..aac163f74d36 100644
--- a/java/java-impl/src/com/intellij/util/xml/ui/PsiTypeControl.java
+++ b/java/java-impl/src/com/intellij/util/xml/ui/PsiTypeControl.java
@@ -18,11 +18,10 @@ package com.intellij.util.xml.ui;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.JavaPsiFacade;
-import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiType;
 import com.intellij.ui.EditorTextField;
-import com.intellij.ui.ReferenceEditorWithBrowseButton;
 import com.intellij.ui.JavaReferenceEditorUtil;
+import com.intellij.ui.ReferenceEditorWithBrowseButton;
 import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.xml.AbstractConvertContext;
@@ -49,25 +48,17 @@ public class PsiTypeControl extends EditorTextFieldControl<PsiTypePanel> {
         return s;
       }
     }
-    catch (IncorrectOperationException e) {
+    catch (IncorrectOperationException ignored) {
     }
     return rawValue;
   }
 
-  private PsiManager getPsiManager() {
-    return PsiManager.getInstance(getProject());
-  }
-
   protected void setValue(String value) {
     final PsiType type = JvmPsiTypeConverterImpl.convertFromString(value, new AbstractConvertContext() {
       @NotNull
       public DomElement getInvocationElement() {
         return getDomElement();
       }
-
-      public PsiManager getPsiManager() {
-        return PsiTypeControl.this.getPsiManager();
-      }
     });
     if (type != null) {
       value = type.getCanonicalText();
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertContextImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertContextImpl.java
index 8c21795e6e7f..3d163bb5209e 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertContextImpl.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/ConvertContextImpl.java
@@ -15,10 +15,9 @@
  */
 package com.intellij.util.xml.impl;
 
-import com.intellij.psi.PsiManager;
+import com.intellij.openapi.module.Module;
 import com.intellij.util.xml.AbstractConvertContext;
 import com.intellij.util.xml.DomElement;
-import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -31,21 +30,12 @@ public class ConvertContextImpl extends AbstractConvertContext {
     myHandler = handler;
   }
 
-  public ConvertContextImpl(DomElement element) {
-    this(DomManagerImpl.getDomInvocationHandler(element));
-  }
-
   @Override
   @NotNull
   public DomElement getInvocationElement() {
     return myHandler.getProxy();
   }
 
-  @Override
-  public PsiManager getPsiManager() {
-    return myHandler.getFile().getManager();
-  }
-
   @Override
   public Module getModule() {
     final DomElement domElement = getInvocationElement();
diff --git a/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java b/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java
index c2799d7a4b68..205da1c0ea69 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/AbstractConvertContext.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiManager;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.xml.XmlElement;
 import com.intellij.psi.xml.XmlFile;
@@ -61,11 +60,6 @@ public abstract class AbstractConvertContext extends ConvertContext {
     return fileElement.isValid() ? fileElement.getRootElement().getModule() : null;
   }
 
-  @Override
-  public PsiManager getPsiManager() {
-    return getFile().getManager();
-  }
-
   @Override
   @Nullable
   public GlobalSearchScope getSearchScope() {
diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ConvertContext.java b/xml/dom-openapi/src/com/intellij/util/xml/ConvertContext.java
index 00550b0713f4..f90b20463ebd 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/ConvertContext.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/ConvertContext.java
@@ -61,9 +61,11 @@ public abstract class ConvertContext {
   @Nullable
   public abstract GlobalSearchScope getSearchScope();
   
-  public abstract PsiManager getPsiManager();
+  public PsiManager getPsiManager() {
+    return PsiManager.getInstance(getProject());
+  }
 
   public Project getProject() {
-    return getPsiManager().getProject();
+    return getInvocationElement().getManager().getProject();
   }
 }