Changeset 7372 for lang/scala/sandbox

Timestamp:

03/02/08 15:06:12 (9 months ago)

Author:

keisuken

Message:

Scala Ant task build rule changed.

Location:

lang/scala/sandbox

Files:

• build.xml (modified) (2 diffs)
• lib/scala-sandbox.jar (modified) (previous)
• src/jp/ne/cappuccino/keisuken/scl/io/FileUtils.scala (modified) (3 diffs)
• src/jp/ne/cappuccino/keisuken/scl/lang/ProcessBuilder.scala (modified) (2 diffs)
• webpages/lib/scala-sandbox.jar (modified) (previous)

lang/scala/sandbox/build.xml

@@ -30 +30 @@
   =================================================================-->
 
+   <taskdef resource="scala/tools/ant/antlib.xml"
+     classpath="${scala-task-classpath}"/>
+<!--
   <taskdef name="scalac"
     classname="scala.tools.ant.Scalac" classpath="${scala-task-classpath}"/>
@@ -36 +39 @@
   <taskdef name="scaladoc"
     classname="scala.tools.ant.Scaladoc" classpath="${scala-task-classpath}"/>
+-->
 
   <!--================================================================

lang/scala/sandbox/src/jp/ne/cappuccino/keisuken/scl/io/FileUtils.scala

@@ -7 +7 @@
   @throws(classOf[IOException])
   def copy(src: File, dst: File) {
-    if(src.isFile()) {
+    if(src.isFile) {
       copyFile(src, dst)
-    } else if(src.isDirectory()) {
+    } else if(src.isDirectory) {
       for(file <- src.listFiles()) {
-        copy(file, new File(dst, src.getName()))
+        copy(file, new File(dst, src.getName))
       }
     }
@@ -22 +22 @@
 
   @throws(classOf[IOException])
+  def delete(path: File) {
+    if(path.exists) {
+      if(path.isFile) {
+        path.delete
+      } else if(path.isDirectory) {
+        for(file <- path.listFiles) {
+          delete(file)
+        }
+        path.delete
+      }
+    }
+  }
+
+  @throws(classOf[IOException])
+  def delete(path: String) {
+    delete(new File(path))
+  }
+
+  @throws(classOf[IOException])
   private def copyFile(srcFile: File, dstDir: File) {
     var exp: IOException = null
-    if(dstDir.exists() == false) {
+    if(!dstDir.exists) {
       dstDir.mkdirs
     }
@@ -61 +80 @@
 */
     copy("src", "..")
+    delete("../src/jp/ne")
   }
 }

lang/scala/sandbox/src/jp/ne/cappuccino/keisuken/scl/lang/ProcessBuilder.scala

@@ -8 +8 @@
  */
 object ProcessBuilder {
+
+  final val STDIN = new NoCloseInputStream(System.in)
+  final val STDOUT = new NoCloseOutputStream(System.out)
+  final val STDERR = new NoCloseOutputStream(System.err)
+
+  class NoCloseInputStream(in: InputStream)
+    extends FilterInputStream(in) {
+    @throws(classOf[IOException])
+    override def close() {}
+  }
+  class NoCloseOutputStream(out: OutputStream)
+    extends FilterOutputStream(out) {
+    @throws(classOf[IOException])
+    override def close() {out.flush}
+  }
 
   class ProcessStream(in: InputStream, out: OutputStream) {
@@ -121 +136 @@
   @throws(classOf[IOException])
   def exec(command: Array[String]): Process =
-    createProcess(command, null, null, System.in, System.out, System.err)
+    createProcess(command, null, null, STDIN, STDOUT, STDERR)
 
   @throws(classOf[IOException])
   def exec(command: Array[String], env: Array[String]): Process =
-    createProcess(command, env, null, System.in, System.out, System.err)
+    createProcess(command, env, null, STDIN, STDOUT, STDERR)
 
   @throws(classOf[IOException])
   def exec(command: Array[String], dir: File): Process =
-    createProcess(command, null, dir, System.in, System.out, System.err)
+    createProcess(command, null, dir, STDIN, STDOUT, STDERR)
 
   @throws(classOf[IOException])