Multi-catch type API cleanup

java/java-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java

@@ -177,7 +177,7 @@ public class PsiSubstitutorImpl implements PsiSubstitutor {
       final List<PsiType> substituted = ContainerUtil.map(disjunctionType.getDisjunctions(), new Function<PsiType, PsiType>() {
         @Override public PsiType fun(PsiType psiType) { return psiType.accept(SubstitutionVisitorBase.this); }
       });
-      return new PsiDisjunctionType(substituted, disjunctionType.getManager());
+      return disjunctionType.newDisjunctionType(substituted);
     }
   }
 

java/openapi/src/com/intellij/psi/PsiDisjunctionType.java

@@ -30,8 +30,8 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- * Composite type resulting from Project Coin's multi-catch statements, * i.e. <code>FileNotFoundException | EOFException</code>.
- * In most cases should be threatened via its least upper bound * (<code>IOException</code> in the example above).
+ * Composite type resulting from Project Coin's multi-catch statements, i.e. <code>FileNotFoundException | EOFException</code>.
+ * In most cases should be threatened via its least upper bound (<code>IOException</code> in the example above).
  */
 public class PsiDisjunctionType extends PsiType {
   private final PsiManager myManager;
@@ -64,8 +64,8 @@ public class PsiDisjunctionType extends PsiType {
     return myTypes;
   }
 
-  public PsiManager getManager() {
-    return myManager;
+  public PsiDisjunctionType newDisjunctionType(final List<PsiType> types) {
+    return new PsiDisjunctionType(types, myManager);
   }
 
   @Override

java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java

@@ -1170,7 +1170,7 @@ public class TypeConversionUtil {
         final List<PsiType> erased = ContainerUtil.map(disjunctionType.getDisjunctions(), new Function<PsiType, PsiType>() {
           @Override public PsiType fun(PsiType psiType) { return erasure(psiType, beforeSubstitutor); }
         });
-        return new PsiDisjunctionType(erased, disjunctionType.getManager());
+        return disjunctionType.newDisjunctionType(erased);
       }
     });
   }