- Removed alias scala.String

- Renamed in Definitions: OBJECT_CLASS into SCALAOBJECT_CLASS
- Renamed in Definitions: JAVA_<X> into <X> Renamed in Definitions:
- ANYREF_SYNCHRONIZED into OBJECT_SYNCHRONIZED

2 files changed, 5 insertions, 5 deletions

diff --git a/sources/scalac/typechecker/ConstantFolder.java b/sources/scalac/typechecker/ConstantFolder.java
index 20b37323eb..04d788d7f5 100644
--- a/sources/scalac/typechecker/ConstantFolder.java
+++ b/sources/scalac/typechecker/ConstantFolder.java
@@ -285,7 +285,7 @@ public class ConstantFolder {
                 return AConstant.DOUBLE(value.doubleValue());
             return null;
         case STR:
-            if (type.isSameAs(definitions.JAVA_STRING_TYPE()))
+            if (type.isSameAs(definitions.STRING_TYPE()))
                 return value;
             return null;
         default:
diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java
index 4beeabe7e5..961776b7cd 100644
--- a/sources/scalac/typechecker/RefCheck.java
+++ b/sources/scalac/typechecker/RefCheck.java
@@ -574,7 +574,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	Symbol sym = clazz.info().lookupNonPrivate(name);
 	return sym.kind == VAL &&
 	    (sym.owner() == clazz ||
-	     !defs.JAVA_OBJECT_CLASS.isSubClass(sym.owner()) &&
+	     !defs.OBJECT_CLASS.isSubClass(sym.owner()) &&
 	     (sym.flags & DEFERRED) == 0);
     }
 
@@ -644,10 +644,10 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	    for (int i = 0; i < fields.length; i++) {
 		String str = (i == fields.length - 1) ? ")" : ",";
 		body = gen.Apply(
-		    gen.Select(body, defs.JAVA_STRING_PLUS),
+		    gen.Select(body, defs.STRING_PLUS),
 		    new Tree[]{fields[i]});
 		body = gen.Apply(
-		    gen.Select(body, defs.JAVA_STRING_PLUS),
+		    gen.Select(body, defs.STRING_PLUS),
 		    new Tree[]{gen.mkStringLit(clazz.pos, str)});
 	    }
 	}
@@ -723,7 +723,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds {
 	private Tree tagMethod(ClassSymbol clazz) {
 	    Symbol tagSym = new TermSymbol(
 		clazz.pos, Names.tag, clazz,
-		clazz.isSubClass(defs.OBJECT_CLASS) ? OVERRIDE : 0)
+		clazz.isSubClass(defs.SCALAOBJECT_CLASS) ? OVERRIDE : 0)
 		.setInfo(Type.MethodType(Symbol.EMPTY_ARRAY, defs.INT_TYPE()));
 	    clazz.info().members().enter(tagSym);
 	    return gen.DefDef(