summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-09-11 15:15:53 +0000
committermichelou <michelou@epfl.ch>2006-09-11 15:15:53 +0000
commit9a8e9075dc345207d1979e703907ce923fff8691 (patch)
treec9aacdca1e466999c97f5fd824707ac6e0d9adfa /src
parent3818926f90461ca6652c27d2f9ba0202863c3f94 (diff)
downloadscala-9a8e9075dc345207d1979e703907ce923fff8691.tar.gz
scala-9a8e9075dc345207d1979e703907ce923fff8691.tar.bz2
scala-9a8e9075dc345207d1979e703907ce923fff8691.zip
replaced 'Predef.Array' by 'Array' (and Java 1....
replaced 'Predef.Array' by 'Array' (and Java 1.5.0_08 by 1.5.0_07)
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/Interpreter.scala4
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala2
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala2
-rw-r--r--src/compiler/scala/tools/nsc/matching/PatternMatchers.scala2
-rw-r--r--src/compiler/scala/tools/nsc/symtab/Types.scala2
-rw-r--r--src/manual/scala/tools/docutil/EmitHtml.scala4
-rw-r--r--src/manual/scala/tools/docutil/EmitManPage.scala4
7 files changed, 10 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index ce19735ffd..c6ea239f1d 100644
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@@ -100,9 +100,9 @@ class Interpreter(val settings: Settings, reporter: Reporter, out: PrintWriter)
*/
private val classLoader =
if (parentClassLoader == null)
- new URLClassLoader(Predef.Array(classfilePath.toURL))
+ new URLClassLoader(Array(classfilePath.toURL))
else
- new URLClassLoader(Predef.Array(classfilePath.toURL), parentClassLoader)
+ new URLClassLoader(Array(classfilePath.toURL), parentClassLoader)
protected def parentClassLoader: ClassLoader =
new URLClassLoader(
diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
index 6ba999eb11..4ce4b1758a 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
@@ -206,7 +206,7 @@ class MarkupParser(unit: CompilationUnit, s: Scanner, p: Parser, presWS: boolean
}
nextch
}
- new String(Predef.Array(i.asInstanceOf[char]))
+ new String(Array(i.asInstanceOf[char]))
}
/** Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 725ddff27d..f4ad9a4add 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -1080,7 +1080,7 @@ abstract class GenJVM extends SubComponent {
jcode.emitINVOKEVIRTUAL(JAVA_LANG_STRINGBUFFER,
"append",
new JMethodType(stringBufferType,
- Predef.Array(jtype)))
+ Array(jtype)))
case EndConcat =>
jcode.emitINVOKEVIRTUAL(JAVA_LANG_STRINGBUFFER,
"toString",
diff --git a/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala b/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala
index 6269e1a86f..c24433af7d 100644
--- a/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala
+++ b/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala
@@ -212,7 +212,7 @@ trait PatternMatchers requires (transform.ExplicitOuter with PatternNodes) {
*/
def pBody(pos: PositionType, bound: Array[ValDef], guard: Tree, body: Tree) = {
val node =
- new Body(Predef.Array(bound), Predef.Array(guard), Predef.Array(body))
+ new Body(Array(bound), Array(guard), Array(body))
node.pos = pos
node
}
diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index fb302d2bd3..36d9b6b08c 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -302,7 +302,7 @@ trait Types requires SymbolTable {
*
* Sorting is with respect to Symbol.isLess() on type symbols.
*/
- def closure: Array[Type] = Predef.Array(this)
+ def closure: Array[Type] = Array(this)
def baseClasses: List[Symbol] = List()
diff --git a/src/manual/scala/tools/docutil/EmitHtml.scala b/src/manual/scala/tools/docutil/EmitHtml.scala
index 12b692a8e8..74e3724bb4 100644
--- a/src/manual/scala/tools/docutil/EmitHtml.scala
+++ b/src/manual/scala/tools/docutil/EmitHtml.scala
@@ -342,8 +342,8 @@ object EmitHtml {
try {
val cl = this.getClass.getClassLoader()
val clasz = cl.loadClass(args(0))
- val meth = clasz.getDeclaredMethod("manpage", Predef.Array[Class]())
- val doc = meth.invoke(null, Predef.Array[Object]()).asInstanceOf[Document]
+ val meth = clasz.getDeclaredMethod("manpage", Array[Class]())
+ val doc = meth.invoke(null, Array[Object]()).asInstanceOf[Document]
emitDocument(doc)
} catch {
case ex: Exception =>
diff --git a/src/manual/scala/tools/docutil/EmitManPage.scala b/src/manual/scala/tools/docutil/EmitManPage.scala
index fd9e0d9c05..ad3b99d107 100644
--- a/src/manual/scala/tools/docutil/EmitManPage.scala
+++ b/src/manual/scala/tools/docutil/EmitManPage.scala
@@ -163,8 +163,8 @@ object EmitManPage {
try {
val cl = this.getClass.getClassLoader()
val clasz = cl.loadClass(args(0))
- val meth = clasz.getDeclaredMethod("manpage", Predef.Array[Class]())
- val doc = meth.invoke(null, Predef.Array[Object]()).asInstanceOf[Document]
+ val meth = clasz.getDeclaredMethod("manpage", Array[Class]())
+ val doc = meth.invoke(null, Array[Object]()).asInstanceOf[Document]
emitDocument(doc)
} catch {
case ex: Exception =>