- renamed getType to getScalaType

7 files changed, 8 insertions, 8 deletions

diff --git a/sources/scala/ScalaObject.java b/sources/scala/ScalaObject.java
index 5895f5bae8..c9ebecd4be 100644
--- a/sources/scala/ScalaObject.java
+++ b/sources/scala/ScalaObject.java
@@ -18,7 +18,7 @@ public interface ScalaObject {
     /**
      * Return the Scala type of the object.
      */
-    public ScalaClassType getType();
+    public ScalaClassType getScalaType();
 
     /** This method is needed for optimizing pattern matching expressions
      *  which match on constructors of case classes.
diff --git a/sources/scala/Type.java b/sources/scala/Type.java
index df07f7e8fd..0119d38dba 100644
--- a/sources/scala/Type.java
+++ b/sources/scala/Type.java
@@ -89,7 +89,7 @@ abstract public class Type implements java.io.Serializable {
             if (isInstance(o))
                 return o;
             else
-                throw new ClassCastException("\n" + ((ScalaObject)o).getType()
+                throw new ClassCastException("\n" + ((ScalaObject)o).getScalaType()
                                              + "\n" + this.toString());
         }
     }
diff --git a/sources/scala/runtime/types/ScalaClassType.java b/sources/scala/runtime/types/ScalaClassType.java
index 51f002e211..794fc4e12a 100644
--- a/sources/scala/runtime/types/ScalaClassType.java
+++ b/sources/scala/runtime/types/ScalaClassType.java
@@ -54,12 +54,12 @@ public class ScalaClassType extends ClassType {
     public boolean isInstance(Object o) {
         return super.isInstance(o)
             && (isTrivial
-                || ((ScalaObject)o).getType().weakIsSubScalaClassType(this));
+                || ((ScalaObject)o).getScalaType().weakIsSubScalaClassType(this));
     }
 
     public boolean weakIsInstance(Object o) {
         assert Statistics.incWeakInstanceOf();
-        return ((ScalaObject)o).getType().weakIsSubScalaClassType(this);
+        return ((ScalaObject)o).getScalaType().weakIsSubScalaClassType(this);
     }
 
     protected boolean isSubClassType(ClassType that) {
diff --git a/sources/scala/tools/scalac/typechecker/RefCheck.scala b/sources/scala/tools/scalac/typechecker/RefCheck.scala
index 48390d2777..42e208fe8e 100755
--- a/sources/scala/tools/scalac/typechecker/RefCheck.scala
+++ b/sources/scala/tools/scalac/typechecker/RefCheck.scala
@@ -818,7 +818,7 @@ class RefCheck(globl: scalac.Global) extends Transformer(globl) {
       SYNTHETIC
       | (if (clazz.isSubClass(defs.SCALAOBJECT_CLASS)) OVERRIDE else 0);
     val getTypeSym = clazz
-      .newMethod(clazz.pos, flags, Names.getType)
+      .newMethod(clazz.pos, flags, Names.getScalaType)
       .setInfo(Type.MethodType(Symbol.EMPTY_ARRAY,
                                defs.SCALACLASSTYPE_TYPE()));
     clazz.info().members().enter(getTypeSym);
diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java
index cb647954ec..cedd8703cd 100644
--- a/sources/scalac/symtab/Definitions.java
+++ b/sources/scalac/symtab/Definitions.java
@@ -379,7 +379,7 @@ public class Definitions {
 
     public Symbol SCALAOBJECT_GETTYPE() {
         if (SCALAOBJECT_GETTYPE == null)
-            SCALAOBJECT_GETTYPE = loadTerm(SCALAOBJECT_CLASS, Names.getType);
+            SCALAOBJECT_GETTYPE = loadTerm(SCALAOBJECT_CLASS, Names.getScalaType);
         return SCALAOBJECT_GETTYPE;
     }
 
diff --git a/sources/scalac/transformer/TypesAsValuesPhase.java b/sources/scalac/transformer/TypesAsValuesPhase.java
index c56e577df1..b18afe9525 100644
--- a/sources/scalac/transformer/TypesAsValuesPhase.java
+++ b/sources/scalac/transformer/TypesAsValuesPhase.java
@@ -374,7 +374,7 @@ public class TypesAsValuesPhase extends Phase {
             case DefDef(_, _, _, _, _, Tree rhs):
                 Symbol symbol = getSymbolFor(tree);
 
-                if (symbol.name == Names.getType && symbol.isSynthetic()) {
+                if (symbol.name == Names.getScalaType && symbol.isSynthetic()) {
                     // Correct the body of the getType method which,
                     // until now, was a placeholder (introduced by
                     // RefCheck).
diff --git a/sources/scalac/util/Names.java b/sources/scalac/util/Names.java
index 16557bbaab..9875857bdd 100644
--- a/sources/scalac/util/Names.java
+++ b/sources/scalac/util/Names.java
@@ -180,7 +180,7 @@ public class Names {
     public static final Name get = Name.fromString("get");
     public static final Name getClass = Name.fromString("getClass");
     public static final Name getInstantiation = Name.fromString("getInstantiation");
-    public static final Name getType = Name.fromString("getType");
+    public static final Name getScalaType = Name.fromString("getScalaType");
     public static final Name isInstance = Name.fromString("isInstance");
     public static final Name hashCode = Name.fromString("hashCode");
     public static final Name hasNext = Name.fromString("hasNext");