1 files changed, 16 insertions, 16 deletions

diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/ReductionSystem.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/ReductionSystem.java
index 271c686b7fa9..a23d6d033c74 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/ReductionSystem.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/ReductionSystem.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.
@@ -31,19 +31,19 @@ import java.util.*;
  * @author db
  */
 public class ReductionSystem {
-  final HashSet<Constraint> myConstraints = new HashSet<Constraint>();
-  final HashSet<PsiElement> myElements;
-  final HashMap<PsiTypeCastExpression, PsiType> myCastToOperandType;
-  final HashMap<PsiElement, PsiType> myTypes;
+  final Set<Constraint> myConstraints = new HashSet<Constraint>();
+  final Set<PsiElement> myElements;
+  final Map<PsiTypeCastExpression, PsiType> myCastToOperandType;
+  final Map<PsiElement, PsiType> myTypes;
   final PsiTypeVariableFactory myTypeVariableFactory;
   final Project myProject;
   final Settings mySettings;
 
-  HashSet<PsiTypeVariable> myBoundVariables;
+  Set<PsiTypeVariable> myBoundVariables;
 
   public ReductionSystem(final Project project,
-                         final HashSet<PsiElement> elements,
-                         final HashMap<PsiElement, PsiType> types,
+                         final Set<PsiElement> elements,
+                         final Map<PsiElement, PsiType> types,
                          final PsiTypeVariableFactory factory,
                          final Settings settings) {
     myProject = project;
@@ -59,7 +59,7 @@ public class ReductionSystem {
     return myProject;
   }
 
-  public HashSet<Constraint> getConstraints() {
+  public Set<Constraint> getConstraints() {
     return myConstraints;
   }
 
@@ -165,7 +165,7 @@ public class ReductionSystem {
     class Node {
       int myComponent = -1;
       Constraint myConstraint;
-      HashSet<Node> myNeighbours = new HashSet<Node>();
+      Set<Node> myNeighbours = new HashSet<Node>();
 
       public Node() {
         myConstraint = null;
@@ -189,7 +189,7 @@ public class ReductionSystem {
 
     final Node[] typeVariableNodes = new Node[myTypeVariableFactory.getNumber()];
     final Node[] constraintNodes = new Node[myConstraints.size()];
-    final HashMap<Constraint, HashSet<PsiTypeVariable>> boundVariables = new HashMap<Constraint, HashSet<PsiTypeVariable>>();
+    final Map<Constraint, Set<PsiTypeVariable>> boundVariables = new HashMap<Constraint, Set<PsiTypeVariable>>();
 
     for (int i = 0; i < typeVariableNodes.length; i++) {
       typeVariableNodes[i] = new Node();
@@ -207,7 +207,7 @@ public class ReductionSystem {
       int l = 0;
 
       for (final Constraint constraint : myConstraints) {
-        final HashSet<PsiTypeVariable> boundVars = new HashSet<PsiTypeVariable>();
+        final Set<PsiTypeVariable> boundVars = new LinkedHashSet<PsiTypeVariable>();
         final Node constraintNode = constraintNodes[l++];
 
         new Object() {
@@ -266,9 +266,9 @@ public class ReductionSystem {
       }
     }
 
-    final LinkedList<HashSet<PsiTypeVariable>> clusters = myTypeVariableFactory.getClusters();
+    List<Set<PsiTypeVariable>> clusters = myTypeVariableFactory.getClusters();
 
-    for (final HashSet<PsiTypeVariable> cluster : clusters) {
+    for (final Set<PsiTypeVariable> cluster : clusters) {
       Node prev = null;
 
       for (final PsiTypeVariable variable : cluster) {
@@ -327,7 +327,7 @@ public class ReductionSystem {
     return systems;
   }
 
-  private void addConstraint(final Constraint constraint, final HashSet<PsiTypeVariable> vars) {
+  private void addConstraint(final Constraint constraint, final Set<PsiTypeVariable> vars) {
     if (myBoundVariables == null) {
       myBoundVariables = vars;
     }
@@ -342,7 +342,7 @@ public class ReductionSystem {
     return myTypeVariableFactory;
   }
 
-  public HashSet<PsiTypeVariable> getBoundVariables() {
+  public Set<PsiTypeVariable> getBoundVariables() {
     return myBoundVariables;
   }