--- /home/cpdev/src/classpath/gnu/xml/xpath/VariableReference.java	2005-07-10 05:32:36.000000000 +0000
+++ gnu/xml/xpath/VariableReference.java	2005-06-30 05:34:23.000000000 +0000
@@ -47,9 +47,9 @@
 {
 
   final XPathVariableResolver resolver;
-  final QName name;
+  final String name;
 
-  public VariableReference(XPathVariableResolver resolver, QName name)
+  public VariableReference(XPathVariableResolver resolver, String name)
   {
     this.resolver = resolver;
     this.name = name;
@@ -64,7 +64,8 @@
             // Needs context to operate properly
             return ((Bindings) resolver).get(name, context, pos, len);
           }
-        return resolver.resolveVariable(name);
+        QName qname = QName.valueOf(name);
+        return resolver.resolveVariable(qname);
       }
     throw new IllegalStateException("no variable resolver");
   }
@@ -79,22 +80,9 @@
     return new VariableReference(r, name);
   }
 
-  public boolean references(QName var)
-  {
-    return name.equals(var);
-  }
-
   public String toString()
   {
-    StringBuffer buf = new StringBuffer("$");
-    String prefix = name.getPrefix();
-    if (prefix != null && !"".equals(prefix))
-      {
-        buf.append(prefix);
-        buf.append(':');
-      }
-    buf.append(name.getLocalPart());
-    return buf.toString();
+    return "$" + name;
   }
   
 }