From a4a14e9bc9b421dfff764b8a9793867c1635824a Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Wed, 11 Jul 2012 14:38:19 +0400
Subject: [PATCH] ConstraintPosition class improved

---
 .../calls/inference/ConstraintPosition.java   | 29 +++++++++----------
 .../HtmlTabledDescriptorRenderer.java         |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java
index 860abed1438..a72fa330784 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java
@@ -23,30 +23,29 @@ import java.util.Map;
 /**
  * @author svtk
  */
-public abstract class ConstraintPosition {
-    public static final ConstraintPosition RECEIVER_POSITION = new ConstraintPosition() {};
-    public static final ConstraintPosition EXPECTED_TYPE_POSITION = new ConstraintPosition() {};
+public class ConstraintPosition {
+    public static final ConstraintPosition RECEIVER_POSITION = new ConstraintPosition("RECEIVER_POSITION");
+    public static final ConstraintPosition EXPECTED_TYPE_POSITION = new ConstraintPosition("EXPECTED_TYPE_POSITION");
 
-    private static final Map<Integer, ValueParameterPosition> valueParameterPositions = Maps.newHashMap();
+    private static final Map<Integer, ConstraintPosition> valueParameterPositions = Maps.newHashMap();
 
-    public static ConstraintPosition valueParameterPosition(int index) {
-        ValueParameterPosition position = valueParameterPositions.get(index);
+    public static ConstraintPosition getValueParameterPosition(int index) {
+        ConstraintPosition position = valueParameterPositions.get(index);
         if (position == null) {
-            position = new ValueParameterPosition(index);
+            position = new ConstraintPosition("VALUE_PARAMETER_POSITION(" + index + ")");
             valueParameterPositions.put(index, position);
         }
         return position;
     }
 
-    private static class ValueParameterPosition extends ConstraintPosition {
-        private final int index;
+    private final String debugName;
 
-        private ValueParameterPosition(int index) {
-            this.index = index;
-        }
+    private ConstraintPosition(String name) {
+        debugName = name;
+    }
 
-        public int getIndex() {
-            return index;
-        }
+    @Override
+    public String toString() {
+        return debugName;
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java b/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java
index 1d6daf54414..de3b23203c6 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java
@@ -124,7 +124,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
         for (Iterator<JetType> iterator = argumentTypes.iterator(); iterator.hasNext(); ) {
             JetType argumentType = iterator.next();
             boolean error = false;
-            if (errorPositions.contains(ConstraintPosition.valueParameterPosition(i))) {
+            if (errorPositions.contains(ConstraintPosition.getValueParameterPosition(i))) {
                 error = true;
             }
             String renderedArgument = IdeRenderers.HTML_RENDER_TYPE.render(argumentType);