Changeset 7762 for lang/scala

Timestamp:

03/10/08 18:15:36 (9 months ago)

Author:

keisuken

Message:

scalac ant task add encoding options.

Location:

lang/scala/sandbox

Files:

• HTMLParser-LICENSE.txt (added)
• build.xml (modified) (5 diffs)
• docs/api/scala/all-classes.html (modified) (5 diffs)
• docs/api/scala/jp/gr/java_conf/mizu/io/IO$object.html (modified) (3 diffs)
• docs/api/scala/jp/gr/java_conf/mizu/xml/XmlUtil$object.RichElem.html (modified) (2 diffs)
• lib/htmlparser.jar (added)
• lib/scala-sandbox.jar (modified) (previous)
• src/jp/ne/cappuccino/keisuken/scl/swing/SwingBuilder.scala (modified) (6 diffs)
• webpages/lib/scala-sandbox.jar (modified) (previous)

lang/scala/sandbox/build.xml

@@ -32 +32 @@
    <taskdef resource="scala/tools/ant/antlib.xml"
      classpath="${scala-task-classpath}"/>
-<!--
-  <taskdef name="scalac"
-    classname="scala.tools.ant.Scalac" classpath="${scala-task-classpath}"/>
-  <taskdef name="scalascript"
-    classname="scala.tools.ant.ScalaTool" classpath="${scala-task-classpath}"/>
-  <taskdef name="scaladoc"
-    classname="scala.tools.ant.Scaladoc" classpath="${scala-task-classpath}"/>
--->
 
   <!--================================================================
@@ -52 +44 @@
   <property name="specs-scalacheck-jar" value="${lib}/scalacheck-1.1.1.jar"/>
 
+  <property name="htmlparser-jar" value="${lib}/htmlparser.jar"/>
+
   <property name="tablelayout-jar" value="${lib}/tablelayout.jar"/>
 
-  <property name="classpath"  value="${scala-compiler-jar}:${scala-library-jar}:${poi-scratchpad-jar}:${poi-contrib-jar}:${poi-jar}:${specs-jar}:${specs-scalacheck-jar}:${tablelayout-jar}:${classes}" />
+  <property name="classpath"  value="${scala-compiler-jar}:${scala-library-jar}:${poi-scratchpad-jar}:${poi-contrib-jar}:${poi-jar}:${specs-jar}:${specs-scalacheck-jar}:${htmlparser-jar}:${tablelayout-jar}:${classes}" />
 
   <!--================================================================
@@ -151 +145 @@
       classpath="${classpath}"
       srcdir="${src}"
-      destdir="${classes}">
-    </scalac>
+      destdir="${classes}"
+      encoding="utf-8"
+      deprecation="on"
+      unchecked="on"
+    />
   </target>
 
@@ -165 +162 @@
       destdir="${api-scala}"
       classpath="${classpath}"
+      encoding="utf-8"
+      deprecation="on"
+      unchecked="on"
     />
 <!--
@@ -264 +264 @@
   <target name="clean">
     <delete dir="${classes}" quiet="true" />
+<!--
     <delete quiet="true">
       <fileset dir="${api}" excludes="**/.svn"/>
     </delete>
+-->
     <delete dir="${tmp}" quiet="true" />
   </target>

lang/scala/sandbox/docs/api/scala/all-classes.html

@@ -18 +18 @@
 <li id="Classes_G"><a href="jp/gr/java_conf/mizu/gui/GUIBuilder.html" target="contentFrame">GUIBuilder</a></li>
 <li id="Classes_H"><a href="jp/ne/cappuccino/keisuken/scl/test/HelloWorldApplet.html" target="contentFrame">HelloWorldApplet</a></li>
+<li><a href="jp/ryugate/text/HtmlParser$object.MyNode.html" target="contentFrame">HtmlParser.MyNode</a></li>
+<li><a href="jp/ryugate/text/HtmlParser$object.MyNodeFilter.html" target="contentFrame">HtmlParser.MyNodeFilter</a></li>
+<li><a href="jp/ryugate/text/HtmlParser$object.MyNodeList.html" target="contentFrame">HtmlParser.MyNodeList</a></li>
+<li><a href="jp/ryugate/text/HtmlParser$object.MyParser.html" target="contentFrame">HtmlParser.MyParser</a></li>
+<li><a href="jp/ryugate/text/HtmlParser$object.MyTag.html" target="contentFrame">HtmlParser.MyTag</a></li>
 <li><a href="jp/ryugate/net/Http$object.Http.html" target="contentFrame">Http.Http</a></li>
 <li id="Classes_I"><a href="jp/gr/java_conf/mizu/io/IO$object.Resource.html" target="contentFrame">IO.Resource</a></li>
@@ -34 +39 @@
 <li><a href="jp/ryugate/apache/POI$object.Row.html" target="contentFrame">POI.Row</a></li>
 <li><a href="jp/ryugate/apache/POI$object.Sheet.html" target="contentFrame">POI.Sheet</a></li>
+<li><a href="jp/ne/cappuccino/keisuken/scl/lang/ProcessBuilder$object.NoCloseInputStream.html" target="contentFrame">ProcessBuilder.NoCloseInputStream</a></li>
+<li><a href="jp/ne/cappuccino/keisuken/scl/lang/ProcessBuilder$object.NoCloseOutputStream.html" target="contentFrame">ProcessBuilder.NoCloseOutputStream</a></li>
 <li><a href="jp/ne/cappuccino/keisuken/scl/lang/ProcessBuilder$object.Process.html" target="contentFrame">ProcessBuilder.Process</a></li>
 <li><a href="jp/ne/cappuccino/keisuken/scl/lang/ProcessBuilder$object.ProcessStream.html" target="contentFrame">ProcessBuilder.ProcessStream</a></li>
@@ -47 +54 @@
 <li><a href="jp/ne/cappuccino/keisuken/scl/swing/SwingBuilder$object.Frame.html" target="contentFrame">SwingBuilder.Frame</a></li>
 <li><a href="jp/ne/cappuccino/keisuken/scl/swing/SwingBuilder$object.SwingCommand.html" target="contentFrame">SwingBuilder.SwingCommand</a></li>
-<li id="Classes_T"><a href="jp/ryugate/video/Timecode$object.Timecode.html" target="contentFrame">Timecode.Timecode</a></li>
-<li><a href="jp/ryugate/video/Timecode$object.Timecode.Tcode.html" target="contentFrame">Timecode.Timecode.Tcode</a></li>
-<li><a href="jp/ryugate/video/Timecode$object.TimecodeFactory.html" target="contentFrame">Timecode.TimecodeFactory</a></li>
+<li id="Classes_T"><a href="jp/ryugate/video/Timecode.html" target="contentFrame">Timecode</a></li>
 <li id="Classes_X"><a href="jp/gr/java_conf/mizu/xml/XmlUtil$object.RichElem.html" target="contentFrame">XmlUtil.RichElem</a></li>
         </ul>
@@ -61 +66 @@
 <li><a href="Foo$object.html" target="contentFrame">Foo</a></li>
 <li><a href="jp/ryugate/text/Format$object.html" target="contentFrame">Format</a></li>
-<li id="Objects_H"><a href="jp/ryugate/net/Http$object.html" target="contentFrame">Http</a></li>
+<li id="Objects_H"><a href="jp/ryugate/text/HtmlParser$object.html" target="contentFrame">HtmlParser</a></li>
+<li><a href="jp/ryugate/text/HtmlParser$object.CSSFilter$object.html" target="contentFrame">HtmlParser.CSSFilter</a></li>
+<li><a href="jp/ryugate/net/Http$object.html" target="contentFrame">Http</a></li>
 <li id="Objects_I"><a href="jp/gr/java_conf/mizu/io/IO$object.html" target="contentFrame">IO</a></li>
 <li id="Objects_J"><a href="jp/ryugate/image/Java2d$object.html" target="contentFrame">Java2d</a></li>
@@ -80 +87 @@
 <li id="Objects_S"><a href="jp/ne/cappuccino/keisuken/scl/swing/SwingBuilder$object.html" target="contentFrame">SwingBuilder</a></li>
 <li id="Objects_T"><a href="jp/ne/cappuccino/keisuken/scl/lang/Thread$object.html" target="contentFrame">Thread</a></li>
-<li><a href="jp/ryugate/video/Timecode$object.html" target="contentFrame">Timecode</a></li>
+<li><a href="jp/ryugate/video/TimecodeTest$object.html" target="contentFrame">TimecodeTest</a></li>
 <li id="Objects_X"><a href="jp/gr/java_conf/mizu/xml/XmlUtil$object.html" target="contentFrame">XmlUtil</a></li>
         </ul></div></body>

lang/scala/sandbox/docs/api/scala/jp/gr/java_conf/mizu/io/IO$object.html

@@ -77 +77 @@
       </td>
       <td class="signature">
+        <em><a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openIn%28java.io.File%29" target="_self">openIn</a></em>
+        [<em>T</em>](<em>file</em> : <a href="" target="contentFrame" class="java/io/File">java.io.File</a>)(<em>proc</em> : (<a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.RichInputStream.html" target="_self">RichInputStream</a>) =&gt; <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openIn%28java.io.File%29#T" target="_self">T</a>) : <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openIn%28java.io.File%29#T" target="_self">T</a>
+        
+        
+      </td>
+    </tr>
+<tr>
+      <td class="modifiers" valign="top"> 
+        <code> def</code>
+      </td>
+      <td class="signature">
         <em><a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openIn%28java.net.URL%29" target="_self">openIn</a></em>
         [<em>T</em>](<em>url</em> : <a href="" target="contentFrame" class="java/net/URL">java.net.URL</a>)(<em>proc</em> : (<a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.RichInputStream.html" target="_self">RichInputStream</a>) =&gt; <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openIn%28java.net.URL%29#T" target="_self">T</a>) : <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openIn%28java.net.URL%29#T" target="_self">T</a>
@@ -88 +99 @@
       </td>
       <td class="signature">
-        <em><a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openIn%28java.io.File%29" target="_self">openIn</a></em>
-        [<em>T</em>](<em>file</em> : <a href="" target="contentFrame" class="java/io/File">java.io.File</a>)(<em>proc</em> : (<a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.RichInputStream.html" target="_self">RichInputStream</a>) =&gt; <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openIn%28java.io.File%29#T" target="_self">T</a>) : <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openIn%28java.io.File%29#T" target="_self">T</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
         <em><a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openOut%28java.io.File%29" target="_self">openOut</a></em>
         [<em>T</em>](<em>file</em> : <a href="" target="contentFrame" class="java/io/File">java.io.File</a>)(<em>proc</em> : (<a href="" target="contentFrame" class="java/io/PrintStream">java.io.PrintStream</a>) =&gt; <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openOut%28java.io.File%29#T" target="_self">T</a>) : <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openOut%28java.io.File%29#T" target="_self">T</a>
@@ -110 +110 @@
       </td>
       <td class="signature">
+        <em><a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28java.io.File%29" target="_self">openReader</a></em>
+        [<em>T</em>](<em>file</em> : <a href="" target="contentFrame" class="java/io/File">java.io.File</a>)(<em>proc</em> : (<a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.RichReader.html" target="_self">RichReader</a>) =&gt; <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28java.io.File%29#T" target="_self">T</a>) : <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28java.io.File%29#T" target="_self">T</a>
+        
+        
+      </td>
+    </tr>
+<tr>
+      <td class="modifiers" valign="top"> 
+        <code> def</code>
+      </td>
+      <td class="signature">
+        <em><a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28String%29" target="_self">openReader</a></em>
+        [<em>T</em>](<em>file</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>)(<em>proc</em> : (<a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.RichReader.html" target="_self">RichReader</a>) =&gt; <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28String%29#T" target="_self">T</a>) : <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28String%29#T" target="_self">T</a>
+        
+        
+      </td>
+    </tr>
+<tr>
+      <td class="modifiers" valign="top"> 
+        <code> def</code>
+      </td>
+      <td class="signature">
         <em><a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28java.net.URL%29" target="_self">openReader</a></em>
         [<em>T</em>](<em>url</em> : <a href="" target="contentFrame" class="java/net/URL">java.net.URL</a>)(<em>proc</em> : (<a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.RichReader.html" target="_self">RichReader</a>) =&gt; <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28java.net.URL%29#T" target="_self">T</a>) : <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28java.net.URL%29#T" target="_self">T</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28String%29" target="_self">openReader</a></em>
-        [<em>T</em>](<em>file</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>)(<em>proc</em> : (<a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.RichReader.html" target="_self">RichReader</a>) =&gt; <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28String%29#T" target="_self">T</a>) : <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28String%29#T" target="_self">T</a>
-        
-        
-      </td>
-    </tr>
-<tr>
-      <td class="modifiers" valign="top"> 
-        <code> def</code>
-      </td>
-      <td class="signature">
-        <em><a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28java.io.File%29" target="_self">openReader</a></em>
-        [<em>T</em>](<em>file</em> : <a href="" target="contentFrame" class="java/io/File">java.io.File</a>)(<em>proc</em> : (<a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.RichReader.html" target="_self">RichReader</a>) =&gt; <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28java.io.File%29#T" target="_self">T</a>) : <a href="../../../../../jp/gr/java_conf/mizu/io/IO$object.html#openReader%28java.io.File%29#T" target="_self">T</a>
         
         

lang/scala/sandbox/docs/api/scala/jp/gr/java_conf/mizu/xml/XmlUtil$object.RichElem.html

@@ -44 +44 @@
       </td>
       <td class="signature">
-        <em><a href="../../../../../jp/gr/java_conf/mizu/xml/XmlUtil$object.RichElem.html#%25%28String%2CString%29" target="_self">%</a></em>
-        (<em>key</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>, <em>value</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>) : <a href="" target="contentFrame" class="scala/xml/Elem">scala.xml.Elem</a>
+        <em><a href="../../../../../jp/gr/java_conf/mizu/xml/XmlUtil$object.RichElem.html#%25%28String%2CString%2CString%29" target="_self">%</a></em>
+        (<em>prefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>, <em>key</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>, <em>value</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>) : <a href="" target="contentFrame" class="scala/xml/Elem">scala.xml.Elem</a>
         
         
@@ -55 +55 @@
       </td>
       <td class="signature">
-        <em><a href="../../../../../jp/gr/java_conf/mizu/xml/XmlUtil$object.RichElem.html#%25%28String%2CString%2CString%29" target="_self">%</a></em>
-        (<em>prefix</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>, <em>key</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>, <em>value</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>) : <a href="" target="contentFrame" class="scala/xml/Elem">scala.xml.Elem</a>
+        <em><a href="../../../../../jp/gr/java_conf/mizu/xml/XmlUtil$object.RichElem.html#%25%28String%2CString%29" target="_self">%</a></em>
+        (<em>key</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>, <em>value</em> : <a href="" target="contentFrame" class="java/lang/String">java.lang.String</a>) : <a href="" target="contentFrame" class="scala/xml/Elem">scala.xml.Elem</a>
         
         

lang/scala/sandbox/src/jp/ne/cappuccino/keisuken/scl/swing/SwingBuilder.scala

@@ -13 +13 @@
 object SwingBuilder {
 
+  type ActionProc = ActionEvent => Unit
+
   trait SwingCommand {
     def exec(commands: AnyRef*): Unit = exec(commands.toArray)
@@ -18 +20 @@
   }
 
-  class ActionAdapter(proc: ActionEvent => Unit) extends ActionListener {
-    def actionPerformed(e: ActionEvent) = proc(e)
+  class ActionAdapter(proc: ActionProc) extends ActionListener {
+    def actionPerformed(e: ActionEvent): Unit = proc(e)
   }
 
-  def action(proc: ActionEvent => Unit) = ('action, proc)
+  def action(proc: ActionProc) = ('action, new ActionAdapter(proc))
 
   class Frame extends JFrame with SwingCommand {
@@ -55 +57 @@
   }
 
+
   class Button(text: String) extends JButton(text) with SwingCommand {
     def this(text: String, commands: Array[AnyRef]) {
@@ -63 +66 @@
       for(command <- commands) {
         command match {
-          case ('action, proc: (ActionEvent => Unit)) =>
-            addActionListener(new ActionAdapter(proc))
+          case ('action, action: ActionAdapter) =>
+            addActionListener(action)
           case ('text, text: String) =>
             setText(text)
@@ -117 +120 @@
         case ('showSave, parent: java.awt.Component) =>
           chooser.showSaveDialog(parent)
-        case ('action, proc: (ActionEvent => Unit)) =>
-          chooser.addActionListener(new ActionAdapter(proc))
+        case ('action, action: ActionAdapter) =>
+          chooser.addActionListener(action)
         case _ =>
           println("NG: " + command)
@@ -152 +155 @@
             )
           )
-        ),
+        )
       ),
       'pack,