adjusted for Scala 2.8 default tip
authormatthias@matthias-desktop
Mon Oct 25 11:17:22 2010 +0200 (19 months ago)
changeset 256eba952aa7f0
parent 24 68d6bc35af2e
adjusted for Scala 2.8
nbproject/build-impl.xml
nbproject/genfiles.properties
nbproject/project.properties
src/de/matthiasmann/twlscala/ComboBox.scala
src/de/matthiasmann/twlscala/DialogLayout.scala
src/de/matthiasmann/twlscala/ListBox.scala
src/de/matthiasmann/twlscala/PropertySheet.scala
src/de/matthiasmann/twlscala/twlinternal/EnumCallbackSupport.scala
src/de/matthiasmann/twlscala/twlinternal/SimpleCallbackSupport.scala
src/de/matthiasmann/twlscala/twlinternal/SubscriberList.scala
src/de/matthiasmann/twlscala/twlinternal/ThemeSupport.scala
     1.1 --- a/nbproject/build-impl.xml	Sun Aug 09 09:13:56 2009 +0200
     1.2 +++ b/nbproject/build-impl.xml	Mon Oct 25 11:17:22 2010 +0200
     1.3 @@ -1,716 +1,714 @@
     1.4 -<?xml version="1.0" encoding="UTF-8"?>
     1.5 -<!--
     1.6 -*** GENERATED FROM project.xml - DO NOT EDIT  ***
     1.7 -***         EDIT ../build.xml INSTEAD         ***
     1.8 -
     1.9 -For the purpose of easier reading the script
    1.10 -is divided into following sections:
    1.11 -
    1.12 -  - initialization
    1.13 -  - compilation
    1.14 -  - jar
    1.15 -  - execution
    1.16 -  - debugging
    1.17 -  - javadoc
    1.18 -  - junit compilation
    1.19 -  - junit execution
    1.20 -  - junit debugging
    1.21 -  - applet
    1.22 -  - cleanup
    1.23 -
    1.24 -        
    1.25 -        -->
    1.26 -<project xmlns:jaxrpc="http://www.netbeans.org/ns/scala-project/jax-rpc" xmlns:scalaProject1="http://www.netbeans.org/ns/scala-project/1" basedir=".." default="default" name="TWLScala-impl">
    1.27 -    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
    1.28 -    <!--
    1.29 -                ======================
    1.30 -                INITIALIZATION SECTION 
    1.31 -                ======================
    1.32 -            -->
    1.33 -    <target name="-pre-init">
    1.34 -        <!-- Empty placeholder for easier customization. -->
    1.35 -        <!-- You can override this target in the ../build.xml file. -->
    1.36 -    </target>
    1.37 -    <target depends="-pre-init" name="-init-private">
    1.38 -        <property file="nbproject/private/config.properties"/>
    1.39 -        <property file="nbproject/private/configs/${config}.properties"/>
    1.40 -        <property file="nbproject/private/private.properties"/>
    1.41 -        <property environment="env"/>
    1.42 -        <condition property="scala.home" value="${env.SCALA_HOME}">
    1.43 -            <isset property="env.SCALA_HOME"/>
    1.44 -        </condition>
    1.45 -        <fail unless="scala.home">
    1.46 -You must set SCALA_HOME or environment property and append "-J-Dscala.home=scalahomepath"
    1.47 -property to the end of "netbeans_default_options" in NetBeansInstallationPath/etc/netbeans.conf to point to
    1.48 -Scala installation directory.
    1.49 -                </fail>
    1.50 -        <property name="scala.compiler" value="${scala.home}/lib/scala-compiler.jar"/>
    1.51 -        <property name="scala.library" value="${scala.home}/lib/scala-library.jar"/>
    1.52 -        <property name="scala.lib" value="${scala.home}/lib"/>
    1.53 -        <taskdef resource="scala/tools/ant/antlib.xml">
    1.54 -            <classpath>
    1.55 -                <pathelement location="${scala.compiler}"/>
    1.56 -                <pathelement location="${scala.library}"/>
    1.57 -            </classpath>
    1.58 -        </taskdef>
    1.59 -        <chmod dir="${scala.home}/bin" includes="**/*" perm="u+rx"/>
    1.60 -    </target>
    1.61 -    <target depends="-pre-init,-init-private" name="-init-user">
    1.62 -        <property file="${user.properties.file}"/>
    1.63 -        <!-- The two properties below are usually overridden -->
    1.64 -        <!-- by the active platform. Just a fallback. -->
    1.65 -        <property name="default.javac.source" value="1.4"/>
    1.66 -        <property name="default.javac.target" value="1.4"/>
    1.67 -    </target>
    1.68 -    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
    1.69 -        <property file="nbproject/configs/${config}.properties"/>
    1.70 -        <property file="nbproject/project.properties"/>
    1.71 -    </target>
    1.72 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    1.73 -        <available file="${manifest.file}" property="manifest.available"/>
    1.74 -        <condition property="manifest.available+main.class">
    1.75 -            <and>
    1.76 -                <isset property="manifest.available"/>
    1.77 -                <isset property="main.class"/>
    1.78 -                <not>
    1.79 -                    <equals arg1="${main.class}" arg2="" trim="true"/>
    1.80 -                </not>
    1.81 -            </and>
    1.82 -        </condition>
    1.83 -        <condition property="manifest.available+main.class+mkdist.available">
    1.84 -            <and>
    1.85 -                <istrue value="${manifest.available+main.class}"/>
    1.86 -                <isset property="libs.CopyLibs.classpath"/>
    1.87 -            </and>
    1.88 -        </condition>
    1.89 -        <condition property="have.tests">
    1.90 -            <or>
    1.91 -                <available file="${test.src.dir}"/>
    1.92 -            </or>
    1.93 -        </condition>
    1.94 -        <condition property="have.sources">
    1.95 -            <or>
    1.96 -                <available file="${src.dir}"/>
    1.97 -            </or>
    1.98 -        </condition>
    1.99 -        <condition property="netbeans.home+have.tests">
   1.100 -            <and>
   1.101 -                <isset property="netbeans.home"/>
   1.102 -                <isset property="have.tests"/>
   1.103 -            </and>
   1.104 -        </condition>
   1.105 -        <condition property="no.javadoc.preview">
   1.106 -            <and>
   1.107 -                <isset property="javadoc.preview"/>
   1.108 -                <isfalse value="${javadoc.preview}"/>
   1.109 -            </and>
   1.110 -        </condition>
   1.111 -        <property name="run.jvmargs" value=""/>
   1.112 -        <property name="javac.compilerargs" value=""/>
   1.113 -        <property name="work.dir" value="${basedir}"/>
   1.114 -        <condition property="no.deps">
   1.115 -            <and>
   1.116 -                <istrue value="${no.dependencies}"/>
   1.117 -            </and>
   1.118 -        </condition>
   1.119 -        <property name="javac.debug" value="true"/>
   1.120 -        <property name="javadoc.preview" value="true"/>
   1.121 -        <property name="application.args" value=""/>
   1.122 -        <property name="source.encoding" value="${file.encoding}"/>
   1.123 -        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
   1.124 -            <and>
   1.125 -                <isset property="javadoc.encoding"/>
   1.126 -                <not>
   1.127 -                    <equals arg1="${javadoc.encoding}" arg2=""/>
   1.128 -                </not>
   1.129 -            </and>
   1.130 -        </condition>
   1.131 -        <property name="javadoc.encoding.used" value="${source.encoding}"/>
   1.132 -        <property name="includes" value="**"/>
   1.133 -        <property name="excludes" value=""/>
   1.134 -        <property name="do.depend" value="false"/>
   1.135 -        <condition property="do.depend.true">
   1.136 -            <istrue value="${do.depend}"/>
   1.137 -        </condition>
   1.138 -        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
   1.139 -            <and>
   1.140 -                <isset property="jaxws.endorsed.dir"/>
   1.141 -                <available file="nbproject/jaxws-build.xml"/>
   1.142 -            </and>
   1.143 -        </condition>
   1.144 -    </target>
   1.145 -    <target name="-post-init">
   1.146 -        <!-- Empty placeholder for easier customization. -->
   1.147 -        <!-- You can override this target in the ../build.xml file. -->
   1.148 -    </target>
   1.149 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
   1.150 -        <fail unless="src.dir">Must set src.dir</fail>
   1.151 -        <fail unless="test.src.dir">Must set test.src.dir</fail>
   1.152 -        <fail unless="build.dir">Must set build.dir</fail>
   1.153 -        <fail unless="dist.dir">Must set dist.dir</fail>
   1.154 -        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
   1.155 -        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
   1.156 -        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
   1.157 -        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
   1.158 -        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
   1.159 -        <fail unless="dist.jar">Must set dist.jar</fail>
   1.160 -    </target>
   1.161 -    <target name="-init-macrodef-property">
   1.162 -        <macrodef name="property" uri="http://www.netbeans.org/ns/scala-project/1">
   1.163 -            <attribute name="name"/>
   1.164 -            <attribute name="value"/>
   1.165 -            <sequential>
   1.166 -                <property name="@{name}" value="${@{value}}"/>
   1.167 -            </sequential>
   1.168 -        </macrodef>
   1.169 -    </target>
   1.170 -    <target name="-init-macrodef-javac">
   1.171 -        <macrodef name="javac" uri="http://www.netbeans.org/ns/scala-project/1">
   1.172 -            <attribute default="${src.dir}" name="srcdir"/>
   1.173 -            <attribute default="${build.classes.dir}" name="destdir"/>
   1.174 -            <attribute default="${javac.classpath}" name="classpath"/>
   1.175 -            <attribute default="${includes}" name="includes"/>
   1.176 -            <attribute default="${excludes}" name="excludes"/>
   1.177 -            <attribute default="${javac.debug}" name="debug"/>
   1.178 -            <attribute default="" name="sourcepath"/>
   1.179 -            <element name="customize" optional="true"/>
   1.180 -            <sequential>
   1.181 -                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
   1.182 -                    <classpath>
   1.183 -                        <path path="@{classpath}"/>
   1.184 -                        <fileset dir="${scala.lib}">
   1.185 -                            <include name="**/*.jar"/>
   1.186 -                        </fileset>
   1.187 -                    </classpath>
   1.188 -                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
   1.189 -                    <customize/>
   1.190 -                </javac>
   1.191 -            </sequential>
   1.192 -        </macrodef>
   1.193 -        <macrodef name="depend" uri="http://www.netbeans.org/ns/scala-project/1">
   1.194 -            <attribute default="${src.dir}" name="srcdir"/>
   1.195 -            <attribute default="${build.classes.dir}" name="destdir"/>
   1.196 -            <attribute default="${javac.classpath}" name="classpath"/>
   1.197 -            <sequential>
   1.198 -                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
   1.199 -                    <classpath>
   1.200 -                        <path path="@{classpath}"/>
   1.201 -                    </classpath>
   1.202 -                </depend>
   1.203 -            </sequential>
   1.204 -        </macrodef>
   1.205 -        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/scala-project/1">
   1.206 -            <attribute default="${build.classes.dir}" name="destdir"/>
   1.207 -            <sequential>
   1.208 -                <fail unless="javac.includes">Must set javac.includes</fail>
   1.209 -                <pathconvert pathsep="," property="javac.includes.binary">
   1.210 -                    <path>
   1.211 -                        <filelist dir="@{destdir}" files="${javac.includes}"/>
   1.212 -                    </path>
   1.213 -                    <globmapper from="*.java" to="*.class"/>
   1.214 -                </pathconvert>
   1.215 -                <delete>
   1.216 -                    <files includes="${javac.includes.binary}"/>
   1.217 -                </delete>
   1.218 -            </sequential>
   1.219 -        </macrodef>
   1.220 -    </target>
   1.221 -    <target name="-init-macrodef-scalac">
   1.222 -        <macrodef name="scalac" uri="http://www.netbeans.org/ns/scala-project/1">
   1.223 -            <attribute default="${src.dir}" name="srcdir"/>
   1.224 -            <attribute default="${build.classes.dir}" name="destdir"/>
   1.225 -            <attribute default="${javac.classpath}" name="classpath"/>
   1.226 -            <attribute default="${includes}" name="includes"/>
   1.227 -            <attribute default="${excludes}" name="excludes"/>
   1.228 -            <attribute default="${javac.compilerargs}" name="addparams"/>
   1.229 -            <attribute default="" name="sourcepath"/>
   1.230 -            <element name="customize" optional="true"/>
   1.231 -            <sequential>
   1.232 -                <fsc addparams="@{addparams}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="jvm-${javac.target}">
   1.233 -                    <classpath>
   1.234 -                        <path path="@{classpath}"/>
   1.235 -                        <fileset dir="${scala.lib}">
   1.236 -                            <include name="**/*.jar"/>
   1.237 -                        </fileset>
   1.238 -                    </classpath>
   1.239 -                    <customize/>
   1.240 -                </fsc>
   1.241 -            </sequential>
   1.242 -        </macrodef>
   1.243 -        <macrodef name="depend" uri="http://www.netbeans.org/ns/scala-project/1">
   1.244 -            <attribute default="${src.dir}" name="srcdir"/>
   1.245 -            <attribute default="${build.classes.dir}" name="destdir"/>
   1.246 -            <attribute default="${javac.classpath}" name="classpath"/>
   1.247 -            <sequential>
   1.248 -                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
   1.249 -                    <classpath>
   1.250 -                        <path path="@{classpath}"/>
   1.251 -                    </classpath>
   1.252 -                </depend>
   1.253 -            </sequential>
   1.254 -        </macrodef>
   1.255 -        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/scala-project/1">
   1.256 -            <attribute default="${build.classes.dir}" name="destdir"/>
   1.257 -            <sequential>
   1.258 -                <fail unless="javac.includes">Must set javac.includes</fail>
   1.259 -                <pathconvert pathsep="," property="javac.includes.binary">
   1.260 -                    <path>
   1.261 -                        <filelist dir="@{destdir}" files="${javac.includes}"/>
   1.262 -                    </path>
   1.263 -                    <globmapper from="*.scala" to="*.class"/>
   1.264 -                </pathconvert>
   1.265 -                <delete>
   1.266 -                    <files includes="${javac.includes.binary}"/>
   1.267 -                </delete>
   1.268 -            </sequential>
   1.269 -        </macrodef>
   1.270 -    </target>
   1.271 -    <target name="-init-macrodef-junit">
   1.272 -        <macrodef name="junit" uri="http://www.netbeans.org/ns/scala-project/1">
   1.273 -            <attribute default="${includes}" name="includes"/>
   1.274 -            <attribute default="${excludes}" name="excludes"/>
   1.275 -            <attribute default="**" name="testincludes"/>
   1.276 -            <sequential>
   1.277 -                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
   1.278 -                    <batchtest todir="${build.test.results.dir}">
   1.279 -                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   1.280 -                            <filename name="@{testincludes}"/>
   1.281 -                        </fileset>
   1.282 -                    </batchtest>
   1.283 -                    <classpath>
   1.284 -                        <path path="${run.test.classpath}"/>
   1.285 -                        <fileset dir="${scala.lib}">
   1.286 -                            <include name="**/*.jar"/>
   1.287 -                        </fileset>
   1.288 -                    </classpath>
   1.289 -                    <syspropertyset>
   1.290 -                        <propertyref prefix="test-sys-prop."/>
   1.291 -                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.292 -                    </syspropertyset>
   1.293 -                    <formatter type="brief" usefile="false"/>
   1.294 -                    <formatter type="xml"/>
   1.295 -                    <jvmarg line="${run.jvmargs}"/>
   1.296 -                </junit>
   1.297 -            </sequential>
   1.298 -        </macrodef>
   1.299 -    </target>
   1.300 -    <target name="-init-macrodef-nbjpda">
   1.301 -        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/scala-project/1">
   1.302 -            <attribute default="${main.class}" name="name"/>
   1.303 -            <attribute default="${debug.classpath}" name="classpath"/>
   1.304 -            <attribute default="" name="stopclassname"/>
   1.305 -            <sequential>
   1.306 -                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
   1.307 -                    <classpath>
   1.308 -                        <path path="@{classpath}"/>
   1.309 -                    </classpath>
   1.310 -                </nbjpdastart>
   1.311 -            </sequential>
   1.312 -        </macrodef>
   1.313 -        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/scala-project/1">
   1.314 -            <attribute default="${build.classes.dir}" name="dir"/>
   1.315 -            <sequential>
   1.316 -                <nbjpdareload>
   1.317 -                    <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
   1.318 -                </nbjpdareload>
   1.319 -            </sequential>
   1.320 -        </macrodef>
   1.321 -    </target>
   1.322 -    <target name="-init-debug-args">
   1.323 -        <property name="version-output" value="java version &quot;${ant.java.version}"/>
   1.324 -        <condition property="have-jdk-older-than-1.4">
   1.325 -            <or>
   1.326 -                <contains string="${version-output}" substring="java version &quot;1.0"/>
   1.327 -                <contains string="${version-output}" substring="java version &quot;1.1"/>
   1.328 -                <contains string="${version-output}" substring="java version &quot;1.2"/>
   1.329 -                <contains string="${version-output}" substring="java version &quot;1.3"/>
   1.330 -            </or>
   1.331 -        </condition>
   1.332 -        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
   1.333 -            <istrue value="${have-jdk-older-than-1.4}"/>
   1.334 -        </condition>
   1.335 -    </target>
   1.336 -    <target depends="-init-debug-args" name="-init-macrodef-debug">
   1.337 -        <macrodef name="debug" uri="http://www.netbeans.org/ns/scala-project/1">
   1.338 -            <attribute default="${main.class}" name="classname"/>
   1.339 -            <attribute default="${debug.classpath}" name="classpath"/>
   1.340 -            <element name="customize" optional="true"/>
   1.341 -            <sequential>
   1.342 -                <java classname="@{classname}" dir="${work.dir}" fork="true">
   1.343 -                    <jvmarg line="${debug-args-line}"/>
   1.344 -                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
   1.345 -                    <jvmarg line="${run.jvmargs}"/>
   1.346 -                    <classpath>
   1.347 -                        <path path="@{classpath}"/>
   1.348 -                        <fileset dir="${scala.lib}">
   1.349 -                            <include name="**/*.jar"/>
   1.350 -                        </fileset>
   1.351 -                    </classpath>
   1.352 -                    <syspropertyset>
   1.353 -                        <propertyref prefix="run-sys-prop."/>
   1.354 -                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
   1.355 -                    </syspropertyset>
   1.356 -                    <customize/>
   1.357 -                </java>
   1.358 -            </sequential>
   1.359 -        </macrodef>
   1.360 -    </target>
   1.361 -    <target name="-init-macrodef-java">
   1.362 -        <macrodef name="java" uri="http://www.netbeans.org/ns/scala-project/1">
   1.363 -            <attribute default="${main.class}" name="classname"/>
   1.364 -            <element name="customize" optional="true"/>
   1.365 -            <sequential>
   1.366 -                <java classname="@{classname}" dir="${work.dir}" fork="true">
   1.367 -                    <jvmarg line="${run.jvmargs}"/>
   1.368 -                    <classpath>
   1.369 -                        <path path="${run.classpath}"/>
   1.370 -                        <fileset dir="${scala.lib}">
   1.371 -                            <include name="**/*.jar"/>
   1.372 -                        </fileset>
   1.373 -                    </classpath>
   1.374 -                    <syspropertyset>
   1.375 -                        <propertyref prefix="run-sys-prop."/>
   1.376 -                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
   1.377 -                    </syspropertyset>
   1.378 -                    <customize/>
   1.379 -                </java>
   1.380 -            </sequential>
   1.381 -        </macrodef>
   1.382 -    </target>
   1.383 -    <target name="-init-presetdef-jar">
   1.384 -        <presetdef name="jar" uri="http://www.netbeans.org/ns/scala-project/1">
   1.385 -            <jar compress="${jar.compress}" jarfile="${dist.jar}">
   1.386 -                <scalaProject1:fileset dir="${build.classes.dir}"/>
   1.387 -            </jar>
   1.388 -        </presetdef>
   1.389 -    </target>
   1.390 -    <target depends="-pre-init,-init-private ,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-scalac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
   1.391 -    <!--
   1.392 -                ===================
   1.393 -                COMPILATION SECTION
   1.394 -                ===================
   1.395 -            -->
   1.396 -    <target depends="init" name="deps-jar" unless="no.deps">
   1.397 -        <ant antfile="${project.TWL}/build.xml" inheritall="false" target="jar"/>
   1.398 -    </target>
   1.399 -    <target depends="init,deps-jar" name="-pre-pre-compile">
   1.400 -        <mkdir dir="${build.classes.dir}"/>
   1.401 -    </target>
   1.402 -    <target name="-pre-compile">
   1.403 -        <!-- Empty placeholder for easier customization. -->
   1.404 -        <!-- You can override this target in the ../build.xml file. -->
   1.405 -    </target>
   1.406 -    <target if="do.depend.true" name="-compile-depend">
   1.407 -        <scalaProject1:depend/>
   1.408 -    </target>
   1.409 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
   1.410 -        <scalaProject1:scalac/>
   1.411 -        <scalaProject1:javac/>
   1.412 -        <copy todir="${build.classes.dir}">
   1.413 -            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}&#10;                        " includes="${includes}"/>
   1.414 -        </copy>
   1.415 -    </target>
   1.416 -    <target name="-post-compile">
   1.417 -        <!-- Empty placeholder for easier customization. -->
   1.418 -        <!-- You can override this target in the ../build.xml file. -->
   1.419 -    </target>
   1.420 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
   1.421 -    <target name="-pre-compile-single">
   1.422 -        <!-- Empty placeholder for easier customization. -->
   1.423 -        <!-- You can override this target in the ../build.xml file. -->
   1.424 -    </target>
   1.425 -    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
   1.426 -        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   1.427 -        <scalaProject1:force-recompile/>
   1.428 -        <scalaProject1:scalac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
   1.429 -    </target>
   1.430 -    <target name="-post-compile-single">
   1.431 -        <!-- Empty placeholder for easier customization. -->
   1.432 -        <!-- You can override this target in the ../build.xml file. -->
   1.433 -    </target>
   1.434 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
   1.435 -    <!--
   1.436 -                ====================
   1.437 -                JAR BUILDING SECTION
   1.438 -                ====================
   1.439 -            -->
   1.440 -    <target depends="init" name="-pre-pre-jar">
   1.441 -        <dirname file="${dist.jar}" property="dist.jar.dir"/>
   1.442 -        <mkdir dir="${dist.jar.dir}"/>
   1.443 -    </target>
   1.444 -    <target name="-pre-jar">
   1.445 -        <!-- Empty placeholder for easier customization. -->
   1.446 -        <!-- You can override this target in the ../build.xml file. -->
   1.447 -    </target>
   1.448 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
   1.449 -        <scalaProject1:jar/>
   1.450 -    </target>
   1.451 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
   1.452 -        <scalaProject1:jar manifest="${manifest.file}"/>
   1.453 -    </target>
   1.454 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
   1.455 -        <scalaProject1:jar manifest="${manifest.file}">
   1.456 -            <scalaProject1:manifest>
   1.457 -                <scalaProject1:attribute name="Main-Class" value="${main.class}"/>
   1.458 -            </scalaProject1:manifest>
   1.459 -        </scalaProject1:jar>
   1.460 -        <echo>To run this application from the command line without Ant, try:</echo>
   1.461 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.462 -        <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.463 -        <pathconvert property="run.classpath.with.dist.jar">
   1.464 -            <path path="${run.classpath}"/>
   1.465 -            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
   1.466 -        </pathconvert>
   1.467 -        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}
   1.468 -                </echo>
   1.469 -    </target>
   1.470 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
   1.471 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.472 -        <pathconvert property="run.classpath.without.build.classes.dir">
   1.473 -            <path path="${run.classpath}"/>
   1.474 -            <map from="${build.classes.dir.resolved}" to=""/>
   1.475 -        </pathconvert>
   1.476 -        <pathconvert pathsep=" " property="jar.classpath">
   1.477 -            <path path="${run.classpath.without.build.classes.dir}"/>
   1.478 -            <chainedmapper>
   1.479 -                <flattenmapper/>
   1.480 -                <globmapper from="*" to="lib/*"/>
   1.481 -            </chainedmapper>
   1.482 -        </pathconvert>
   1.483 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   1.484 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.485 -            <fileset dir="${build.classes.dir}"/>
   1.486 -            <manifest>
   1.487 -                <attribute name="Main-Class" value="${main.class}"/>
   1.488 -                <attribute name="Class-Path" value="${jar.classpath}"/>
   1.489 -            </manifest>
   1.490 -        </copylibs>
   1.491 -        <echo>To run this application from the command line without Ant, try:</echo>
   1.492 -        <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.493 -        <echo>java -jar "${dist.jar.resolved}"
   1.494 -                </echo>
   1.495 -    </target>
   1.496 -    <target name="-post-jar">
   1.497 -        <!-- Empty placeholder for easier customization. -->
   1.498 -        <!-- You can override this target in the ../build.xml file. -->
   1.499 -    </target>
   1.500 -    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
   1.501 -    <!--
   1.502 -                =================
   1.503 -                EXECUTION SECTION
   1.504 -                =================
   1.505 -            -->
   1.506 -    <target depends="init,compile" description="Run a main class." name="run">
   1.507 -        <scalaProject1:java>
   1.508 -            <customize>
   1.509 -                <arg line="${application.args}"/>
   1.510 -            </customize>
   1.511 -        </scalaProject1:java>
   1.512 -    </target>
   1.513 -    <target name="-do-not-recompile">
   1.514 -        <property name="javac.includes.binary" value=""/>
   1.515 -    </target>
   1.516 -    <target depends="init,-do-not-recompile,compile-single" name="run-single">
   1.517 -        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   1.518 -        <scalaProject1:java classname="${run.class}"/>
   1.519 -    </target>
   1.520 -    <!--
   1.521 -                =================
   1.522 -                DEBUGGING SECTION
   1.523 -                =================
   1.524 -            -->
   1.525 -    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
   1.526 -        <scalaProject1:nbjpdastart name="${debug.class}"/>
   1.527 -    </target>
   1.528 -    <target depends="init,compile" name="-debug-start-debuggee">
   1.529 -        <scalaProject1:debug>
   1.530 -            <customize>
   1.531 -                <arg line="${application.args}"/>
   1.532 -            </customize>
   1.533 -        </scalaProject1:debug>
   1.534 -    </target>
   1.535 -    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
   1.536 -    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
   1.537 -        <scalaProject1:nbjpdastart stopclassname="${main.class}"/>
   1.538 -    </target>
   1.539 -    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
   1.540 -    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
   1.541 -        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
   1.542 -        <scalaProject1:debug classname="${debug.class}"/>
   1.543 -    </target>
   1.544 -    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
   1.545 -    <target depends="init" name="-pre-debug-fix">
   1.546 -        <fail unless="fix.includes">Must set fix.includes</fail>
   1.547 -        <property name="javac.includes" value="${fix.includes}.java"/>
   1.548 -    </target>
   1.549 -    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
   1.550 -        <scalaProject1:nbjpdareload/>
   1.551 -    </target>
   1.552 -    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
   1.553 -    <!--
   1.554 -                ===============
   1.555 -                JAVADOC SECTION
   1.556 -                ===============
   1.557 -            -->
   1.558 -    <target depends="init" name="-javadoc-build">
   1.559 -        <mkdir dir="${dist.javadoc.dir}"/>
   1.560 -        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
   1.561 -            <classpath>
   1.562 -                <path path="${javac.classpath}"/>
   1.563 -            </classpath>
   1.564 -            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   1.565 -                <filename name="**/*.java"/>
   1.566 -            </fileset>
   1.567 -        </javadoc>
   1.568 -    </target>
   1.569 -    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
   1.570 -        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
   1.571 -    </target>
   1.572 -    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
   1.573 -    <!--
   1.574 -                =========================
   1.575 -                JUNIT COMPILATION SECTION
   1.576 -                =========================
   1.577 -            -->
   1.578 -    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
   1.579 -        <mkdir dir="${build.test.classes.dir}"/>
   1.580 -    </target>
   1.581 -    <target name="-pre-compile-test">
   1.582 -        <!-- Empty placeholder for easier customization. -->
   1.583 -        <!-- You can override this target in the ../build.xml file. -->
   1.584 -    </target>
   1.585 -    <target if="do.depend.true" name="-compile-test-depend">
   1.586 -        <scalaProject1:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   1.587 -    </target>
   1.588 -    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
   1.589 -        <scalaProject1:scalac classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   1.590 -        <copy todir="${build.test.classes.dir}">
   1.591 -            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}&#10;                        " includes="${includes}"/>
   1.592 -        </copy>
   1.593 -    </target>
   1.594 -    <target name="-post-compile-test">
   1.595 -        <!-- Empty placeholder for easier customization. -->
   1.596 -        <!-- You can override this target in the ../build.xml file. -->
   1.597 -    </target>
   1.598 -    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
   1.599 -    <target name="-pre-compile-test-single">
   1.600 -        <!-- Empty placeholder for easier customization. -->
   1.601 -        <!-- You can override this target in the ../build.xml file. -->
   1.602 -    </target>
   1.603 -    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   1.604 -        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   1.605 -        <scalaProject1:force-recompile destdir="${build.test.classes.dir}"/>
   1.606 -        <scalaProject1:scalac classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
   1.607 -        <copy todir="${build.test.classes.dir}">
   1.608 -            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}&#10;                        " includes="${includes}"/>
   1.609 -        </copy>
   1.610 -    </target>
   1.611 -    <target name="-post-compile-test-single">
   1.612 -        <!-- Empty placeholder for easier customization. -->
   1.613 -        <!-- You can override this target in the ../build.xml file. -->
   1.614 -    </target>
   1.615 -    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
   1.616 -    <!--
   1.617 -                =======================
   1.618 -                JUNIT EXECUTION SECTION
   1.619 -                =======================
   1.620 -            -->
   1.621 -    <target depends="init" if="have.tests" name="-pre-test-run">
   1.622 -        <mkdir dir="${build.test.results.dir}"/>
   1.623 -    </target>
   1.624 -    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
   1.625 -        <scalaProject1:junit testincludes="**/*Test.class"/>
   1.626 -    </target>
   1.627 -    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
   1.628 -        <fail if="tests.failed">Some tests failed; see details above.</fail>
   1.629 -    </target>
   1.630 -    <target depends="init" if="have.tests" name="test-report"/>
   1.631 -    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
   1.632 -    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
   1.633 -    <target depends="init" if="have.tests" name="-pre-test-run-single">
   1.634 -        <mkdir dir="${build.test.results.dir}"/>
   1.635 -    </target>
   1.636 -    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
   1.637 -        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
   1.638 -        <scalaProject1:junit excludes="" includes="${test.includes}"/>
   1.639 -    </target>
   1.640 -    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
   1.641 -        <fail if="tests.failed">Some tests failed; see details above.</fail>
   1.642 -    </target>
   1.643 -    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
   1.644 -    <!--
   1.645 -                =======================
   1.646 -                JUNIT DEBUGGING SECTION
   1.647 -                =======================
   1.648 -            -->
   1.649 -    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
   1.650 -        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
   1.651 -        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
   1.652 -        <delete file="${test.report.file}"/>
   1.653 -        <mkdir dir="${build.test.results.dir}"/>
   1.654 -        <scalaProject1:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
   1.655 -            <customize>
   1.656 -                <syspropertyset>
   1.657 -                    <propertyref prefix="test-sys-prop."/>
   1.658 -                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
   1.659 -                </syspropertyset>
   1.660 -                <arg value="${test.class}"/>
   1.661 -                <arg value="showoutput=true"/>
   1.662 -                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
   1.663 -                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
   1.664 -            </customize>
   1.665 -        </scalaProject1:debug>
   1.666 -    </target>
   1.667 -    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
   1.668 -        <scalaProject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
   1.669 -    </target>
   1.670 -    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
   1.671 -    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
   1.672 -        <scalaProject1:nbjpdareload dir="${build.test.classes.dir}"/>
   1.673 -    </target>
   1.674 -    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
   1.675 -    <!--
   1.676 -                =========================
   1.677 -                APPLET EXECUTION SECTION
   1.678 -                =========================
   1.679 -            -->
   1.680 -    <target depends="init,compile-single" name="run-applet">
   1.681 -        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
   1.682 -        <scalaProject1:java classname="sun.applet.AppletViewer">
   1.683 -            <customize>
   1.684 -                <arg value="${applet.url}"/>
   1.685 -            </customize>
   1.686 -        </scalaProject1:java>
   1.687 -    </target>
   1.688 -    <!--
   1.689 -                =========================
   1.690 -                APPLET DEBUGGING  SECTION
   1.691 -                =========================
   1.692 -            -->
   1.693 -    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
   1.694 -        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
   1.695 -        <scalaProject1:debug classname="sun.applet.AppletViewer">
   1.696 -            <customize>
   1.697 -                <arg value="${applet.url}"/>
   1.698 -            </customize>
   1.699 -        </scalaProject1:debug>
   1.700 -    </target>
   1.701 -    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
   1.702 -    <!--
   1.703 -                ===============
   1.704 -                CLEANUP SECTION
   1.705 -                ===============
   1.706 -            -->
   1.707 -    <target depends="init" name="deps-clean" unless="no.deps">
   1.708 -        <ant antfile="${project.TWL}/build.xml" inheritall="false" target="clean"/>
   1.709 -    </target>
   1.710 -    <target depends="init" name="-do-clean">
   1.711 -        <delete dir="${build.dir}"/>
   1.712 -        <delete dir="${dist.dir}"/>
   1.713 -    </target>
   1.714 -    <target name="-post-clean">
   1.715 -        <!-- Empty placeholder for easier customization. -->
   1.716 -        <!-- You can override this target in the ../build.xml file. -->
   1.717 -    </target>
   1.718 -    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
   1.719 -</project>
   1.720 +<?xml version="1.0" encoding="UTF-8"?>
   1.721 +<!--
   1.722 +*** GENERATED FROM project.xml - DO NOT EDIT  ***
   1.723 +***         EDIT ../build.xml INSTEAD         ***
   1.724 +
   1.725 +For the purpose of easier reading the script
   1.726 +is divided into following sections:
   1.727 +
   1.728 +  - initialization
   1.729 +  - compilation
   1.730 +  - jar
   1.731 +  - execution
   1.732 +  - debugging
   1.733 +  - javadoc
   1.734 +  - junit compilation
   1.735 +  - junit execution
   1.736 +  - junit debugging
   1.737 +  - applet
   1.738 +  - cleanup
   1.739 +
   1.740 +        
   1.741 +        -->
   1.742 +<project xmlns:jaxrpc="http://www.netbeans.org/ns/scala-project/jax-rpc" xmlns:scalaProject1="http://www.netbeans.org/ns/scala-project/1" basedir=".." default="default" name="TWLScala-impl">
   1.743 +    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
   1.744 +    <!--
   1.745 +                ======================
   1.746 +                INITIALIZATION SECTION
   1.747 +                ======================
   1.748 +            -->
   1.749 +    <target name="-pre-init">
   1.750 +        <!-- Empty placeholder for easier customization. -->
   1.751 +        <!-- You can override this target in the ../build.xml file. -->
   1.752 +    </target>
   1.753 +    <target depends="-pre-init" name="-init-private">
   1.754 +        <property file="nbproject/private/config.properties"/>
   1.755 +        <property file="nbproject/private/configs/${config}.properties"/>
   1.756 +        <property file="nbproject/private/private.properties"/>
   1.757 +        <property environment="env"/>
   1.758 +        <condition property="scala.home" value="${env.SCALA_HOME}">
   1.759 +            <isset property="env.SCALA_HOME"/>
   1.760 +        </condition>
   1.761 +        <fail unless="scala.home">
   1.762 +                    You must set SCALA_HOME or environment property and append "-J-Dscala.home=scalahomepath"
   1.763 +                    property to the end of "netbeans_default_options" in NetBeansInstallationPath/etc/netbeans.conf to point to
   1.764 +                    Scala installation directory.
   1.765 +                </fail>
   1.766 +        <property name="scala.compiler" value="${scala.home}/lib/scala-compiler.jar"/>
   1.767 +        <property name="scala.library" value="${scala.home}/lib/scala-library.jar"/>
   1.768 +        <property name="scala.lib" value="${scala.home}/lib"/>
   1.769 +        <taskdef resource="scala/tools/ant/antlib.xml">
   1.770 +            <classpath>
   1.771 +                <pathelement location="${scala.compiler}"/>
   1.772 +                <pathelement location="${scala.library}"/>
   1.773 +            </classpath>
   1.774 +        </taskdef>
   1.775 +    </target>
   1.776 +    <target depends="-pre-init,-init-private" name="-init-user">
   1.777 +        <property file="${user.properties.file}"/>
   1.778 +        <!-- The two properties below are usually overridden -->
   1.779 +        <!-- by the active platform. Just a fallback. -->
   1.780 +        <property name="default.javac.source" value="1.5"/>
   1.781 +        <property name="default.javac.target" value="1.5"/>
   1.782 +    </target>
   1.783 +    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
   1.784 +        <property file="nbproject/configs/${config}.properties"/>
   1.785 +        <property file="nbproject/project.properties"/>
   1.786 +    </target>
   1.787 +    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
   1.788 +        <available file="${manifest.file}" property="manifest.available"/>
   1.789 +        <condition property="manifest.available+main.class">
   1.790 +            <and>
   1.791 +                <isset property="manifest.available"/>
   1.792 +                <isset property="main.class"/>
   1.793 +                <not>
   1.794 +                    <equals arg1="${main.class}" arg2="" trim="true"/>
   1.795 +                </not>
   1.796 +            </and>
   1.797 +        </condition>
   1.798 +        <condition property="manifest.available+main.class+mkdist.available">
   1.799 +            <and>
   1.800 +                <istrue value="${manifest.available+main.class}"/>
   1.801 +                <isset property="libs.CopyLibs.classpath"/>
   1.802 +            </and>
   1.803 +        </condition>
   1.804 +        <condition property="have.tests">
   1.805 +            <or>
   1.806 +                <available file="${test.src.dir}"/>
   1.807 +            </or>
   1.808 +        </condition>
   1.809 +        <condition property="have.sources">
   1.810 +            <or>
   1.811 +                <available file="${src.dir}"/>
   1.812 +            </or>
   1.813 +        </condition>
   1.814 +        <condition property="netbeans.home+have.tests">
   1.815 +            <and>
   1.816 +                <isset property="netbeans.home"/>
   1.817 +                <isset property="have.tests"/>
   1.818 +            </and>
   1.819 +        </condition>
   1.820 +        <condition property="no.javadoc.preview">
   1.821 +            <and>
   1.822 +                <isset property="javadoc.preview"/>
   1.823 +                <isfalse value="${javadoc.preview}"/>
   1.824 +            </and>
   1.825 +        </condition>
   1.826 +        <property name="run.jvmargs" value=""/>
   1.827 +        <property name="javac.compilerargs" value=""/>
   1.828 +        <property name="work.dir" value="${basedir}"/>
   1.829 +        <condition property="no.deps">
   1.830 +            <and>
   1.831 +                <istrue value="${no.dependencies}"/>
   1.832 +            </and>
   1.833 +        </condition>
   1.834 +        <property name="javac.debug" value="true"/>
   1.835 +        <property name="javadoc.preview" value="true"/>
   1.836 +        <property name="application.args" value=""/>
   1.837 +        <property name="source.encoding" value="${file.encoding}"/>
   1.838 +        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
   1.839 +            <and>
   1.840 +                <isset property="javadoc.encoding"/>
   1.841 +                <not>
   1.842 +                    <equals arg1="${javadoc.encoding}" arg2=""/>
   1.843 +                </not>
   1.844 +            </and>
   1.845 +        </condition>
   1.846 +        <property name="javadoc.encoding.used" value="${source.encoding}"/>
   1.847 +        <property name="includes" value="**"/>
   1.848 +        <property name="excludes" value=""/>
   1.849 +        <property name="extdirs" value=" "/>
   1.850 +        <property name="do.depend" value="false"/>
   1.851 +        <condition property="do.depend.true">
   1.852 +            <istrue value="${do.depend}"/>
   1.853 +        </condition>
   1.854 +        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
   1.855 +            <and>
   1.856 +                <isset property="jaxws.endorsed.dir"/>
   1.857 +                <available file="nbproject/jaxws-build.xml"/>
   1.858 +            </and>
   1.859 +        </condition>
   1.860 +    </target>
   1.861 +    <target name="-post-init">
   1.862 +        <!-- Empty placeholder for easier customization. -->
   1.863 +        <!-- You can override this target in the ../build.xml file. -->
   1.864 +    </target>
   1.865 +    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
   1.866 +        <fail unless="src.dir">Must set src.dir</fail>
   1.867 +        <fail unless="test.src.dir">Must set test.src.dir</fail>
   1.868 +        <fail unless="build.dir">Must set build.dir</fail>
   1.869 +        <fail unless="dist.dir">Must set dist.dir</fail>
   1.870 +        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
   1.871 +        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
   1.872 +        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
   1.873 +        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
   1.874 +        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
   1.875 +        <fail unless="dist.jar">Must set dist.jar</fail>
   1.876 +    </target>
   1.877 +    <target name="-init-macrodef-property">
   1.878 +        <macrodef name="property" uri="http://www.netbeans.org/ns/scala-project/1">
   1.879 +            <attribute name="name"/>
   1.880 +            <attribute name="value"/>
   1.881 +            <sequential>
   1.882 +                <property name="@{name}" value="${@{value}}"/>
   1.883 +            </sequential>
   1.884 +        </macrodef>
   1.885 +    </target>
   1.886 +    <target name="-init-macrodef-javac">
   1.887 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/scala-project/1">
   1.888 +            <attribute default="${src.dir}" name="srcdir"/>
   1.889 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.890 +            <attribute default="${javac.classpath}" name="classpath"/>
   1.891 +            <attribute default="${includes}" name="includes"/>
   1.892 +            <attribute default="${excludes}" name="excludes"/>
   1.893 +            <attribute default="${javac.debug}" name="debug"/>
   1.894 +            <attribute default="" name="sourcepath"/>
   1.895 +            <element name="customize" optional="true"/>
   1.896 +            <sequential>
   1.897 +                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
   1.898 +                    <classpath>
   1.899 +                        <path path="@{classpath}"/>
   1.900 +                        <fileset dir="${scala.lib}">
   1.901 +                            <include name="**/*.jar"/>
   1.902 +                        </fileset>
   1.903 +                    </classpath>
   1.904 +                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
   1.905 +                    <customize/>
   1.906 +                </javac>
   1.907 +            </sequential>
   1.908 +        </macrodef>
   1.909 +        <macrodef name="depend" uri="http://www.netbeans.org/ns/scala-project/1">
   1.910 +            <attribute default="${src.dir}" name="srcdir"/>
   1.911 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.912 +            <attribute default="${javac.classpath}" name="classpath"/>
   1.913 +            <sequential>
   1.914 +                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
   1.915 +                    <classpath>
   1.916 +                        <path>
   1.917 +                            <pathelement path="@{classpath}"/>
   1.918 +                            <fileset dir="${scala.lib}">
   1.919 +                                <include name="**/*.jar"/>
   1.920 +                            </fileset>
   1.921 +                            <pathelement location="${build.classes.dir}"/>
   1.922 +                        </path>
   1.923 +                    </classpath>
   1.924 +                </depend>
   1.925 +            </sequential>
   1.926 +        </macrodef>
   1.927 +        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/scala-project/1">
   1.928 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.929 +            <sequential>
   1.930 +                <fail unless="javac.includes">Must set javac.includes</fail>
   1.931 +                <pathconvert pathsep="," property="javac.includes.binary">
   1.932 +                    <path>
   1.933 +                        <filelist dir="@{destdir}" files="${javac.includes}"/>
   1.934 +                    </path>
   1.935 +                    <globmapper from="*.java" to="*.class"/>
   1.936 +                </pathconvert>
   1.937 +                <delete>
   1.938 +                    <files includes="${javac.includes.binary}"/>
   1.939 +                </delete>
   1.940 +            </sequential>
   1.941 +        </macrodef>
   1.942 +    </target>
   1.943 +    <target name="-init-macrodef-scalac">
   1.944 +        <macrodef name="scalac" uri="http://www.netbeans.org/ns/scala-project/1">
   1.945 +            <attribute default="${src.dir}" name="srcdir"/>
   1.946 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.947 +            <attribute default="${javac.classpath}" name="classpath"/>
   1.948 +            <attribute default="${extdirs}" name="extdirs"/>
   1.949 +            <attribute default="${includes}" name="includes"/>
   1.950 +            <attribute default="${excludes}" name="excludes"/>
   1.951 +            <attribute default="${scalac.compilerargs}" name="addparams"/>
   1.952 +            <attribute default="" name="sourcepath"/>
   1.953 +            <element name="customize" optional="true"/>
   1.954 +            <sequential>
   1.955 +                <scalac addparams="-make:transitive -dependencyfile &quot;${basedir}/${build.dir}/.scala_dependencies&quot; @{addparams}" deprecation="${scalac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" extdirs="@{extdirs}" force="yes" fork="true" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="jvm-${javac.target}" unchecked="${scalac.unchecked}">
   1.956 +                    <classpath>
   1.957 +                        <path>
   1.958 +                            <pathelement path="@{classpath}"/>
   1.959 +                            <fileset dir="${scala.lib}">
   1.960 +                                <include name="**/*.jar"/>
   1.961 +                            </fileset>
   1.962 +                            <pathelement location="${build.classes.dir}"/>
   1.963 +                        </path>
   1.964 +                    </classpath>
   1.965 +                    <customize/>
   1.966 +                </scalac>
   1.967 +            </sequential>
   1.968 +        </macrodef>
   1.969 +        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/scala-project/1">
   1.970 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.971 +            <sequential>
   1.972 +                <fail unless="javac.includes">Must set javac.includes</fail>
   1.973 +                <pathconvert pathsep="," property="javac.includes.binary">
   1.974 +                    <path>
   1.975 +                        <filelist dir="@{destdir}" files="${javac.includes}"/>
   1.976 +                    </path>
   1.977 +                    <globmapper from="*.scala" to="*.class"/>
   1.978 +                </pathconvert>
   1.979 +                <delete>
   1.980 +                    <files includes="${javac.includes.binary}"/>
   1.981 +                </delete>
   1.982 +            </sequential>
   1.983 +        </macrodef>
   1.984 +    </target>
   1.985 +    <target name="-init-macrodef-junit">
   1.986 +        <macrodef name="junit" uri="http://www.netbeans.org/ns/scala-project/1">
   1.987 +            <attribute default="${includes}" name="includes"/>
   1.988 +            <attribute default="${excludes}" name="excludes"/>
   1.989 +            <attribute default="**" name="testincludes"/>
   1.990 +            <sequential>
   1.991 +                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
   1.992 +                    <batchtest todir="${build.test.results.dir}">
   1.993 +                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   1.994 +                            <filename name="@{testincludes}"/>
   1.995 +                        </fileset>
   1.996 +                    </batchtest>
   1.997 +                    <classpath>
   1.998 +                        <path path="${run.test.classpath}"/>
   1.999 +                        <fileset dir="${scala.lib}">
  1.1000 +                            <include name="**/*.jar"/>
  1.1001 +                        </fileset>
  1.1002 +                    </classpath>
  1.1003 +                    <syspropertyset>
  1.1004 +                        <propertyref prefix="test-sys-prop."/>
  1.1005 +                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
  1.1006 +                    </syspropertyset>
  1.1007 +                    <formatter type="brief" usefile="false"/>
  1.1008 +                    <formatter type="xml"/>
  1.1009 +                    <jvmarg line="${run.jvmargs}"/>
  1.1010 +                </junit>
  1.1011 +            </sequential>
  1.1012 +        </macrodef>
  1.1013 +    </target>
  1.1014 +    <target name="-init-macrodef-nbjpda">
  1.1015 +        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/scala-project/1">
  1.1016 +            <attribute default="${main.class}" name="name"/>
  1.1017 +            <attribute default="${debug.classpath}" name="classpath"/>
  1.1018 +            <attribute default="" name="stopclassname"/>
  1.1019 +            <sequential>
  1.1020 +                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
  1.1021 +                    <classpath>
  1.1022 +                        <path path="@{classpath}"/>
  1.1023 +                    </classpath>
  1.1024 +                </nbjpdastart>
  1.1025 +            </sequential>
  1.1026 +        </macrodef>
  1.1027 +        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/scala-project/1">
  1.1028 +            <attribute default="${build.classes.dir}" name="dir"/>
  1.1029 +            <sequential>
  1.1030 +                <nbjpdareload>
  1.1031 +                    <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
  1.1032 +                </nbjpdareload>
  1.1033 +            </sequential>
  1.1034 +        </macrodef>
  1.1035 +    </target>
  1.1036 +    <target name="-init-debug-args">
  1.1037 +        <property name="version-output" value="java version &quot;${ant.java.version}"/>
  1.1038 +        <condition property="have-jdk-older-than-1.4">
  1.1039 +            <or>
  1.1040 +                <contains string="${version-output}" substring="java version &quot;1.0"/>
  1.1041 +                <contains string="${version-output}" substring="java version &quot;1.1"/>
  1.1042 +                <contains string="${version-output}" substring="java version &quot;1.2"/>
  1.1043 +                <contains string="${version-output}" substring="java version &quot;1.3"/>
  1.1044 +            </or>
  1.1045 +        </condition>
  1.1046 +        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
  1.1047 +            <istrue value="${have-jdk-older-than-1.4}"/>
  1.1048 +        </condition>
  1.1049 +    </target>
  1.1050 +    <target depends="-init-debug-args" name="-init-macrodef-debug">
  1.1051 +        <macrodef name="debug" uri="http://www.netbeans.org/ns/scala-project/1">
  1.1052 +            <attribute default="${main.class}" name="classname"/>
  1.1053 +            <attribute default="${debug.classpath}" name="classpath"/>
  1.1054 +            <element name="customize" optional="true"/>
  1.1055 +            <sequential>
  1.1056 +                <java classname="@{classname}" dir="${work.dir}" fork="true">
  1.1057 +                    <jvmarg line="${debug-args-line}"/>
  1.1058 +                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
  1.1059 +                    <jvmarg line="${run.jvmargs}"/>
  1.1060 +                    <classpath>
  1.1061 +                        <path path="@{classpath}"/>
  1.1062 +                        <fileset dir="${scala.lib}">
  1.1063 +                            <include name="**/*.jar"/>
  1.1064 +                        </fileset>
  1.1065 +                    </classpath>
  1.1066 +                    <syspropertyset>
  1.1067 +                        <propertyref prefix="run-sys-prop."/>
  1.1068 +                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
  1.1069 +                    </syspropertyset>
  1.1070 +                    <customize/>
  1.1071 +                </java>
  1.1072 +            </sequential>
  1.1073 +        </macrodef>
  1.1074 +    </target>
  1.1075 +    <target name="-init-macrodef-java">
  1.1076 +        <macrodef name="java" uri="http://www.netbeans.org/ns/scala-project/1">
  1.1077 +            <attribute default="${main.class}" name="classname"/>
  1.1078 +            <element name="customize" optional="true"/>
  1.1079 +            <sequential>
  1.1080 +                <java classname="@{classname}" dir="${work.dir}" fork="true">
  1.1081 +                    <jvmarg line="${run.jvmargs}"/>
  1.1082 +                    <classpath>
  1.1083 +                        <path path="${run.classpath}"/>
  1.1084 +                        <fileset dir="${scala.lib}">
  1.1085 +                            <include name="**/*.jar"/>
  1.1086 +                        </fileset>
  1.1087 +                    </classpath>
  1.1088 +                    <syspropertyset>
  1.1089 +                        <propertyref prefix="run-sys-prop."/>
  1.1090 +                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
  1.1091 +                    </syspropertyset>
  1.1092 +                    <customize/>
  1.1093 +                </java>
  1.1094 +            </sequential>
  1.1095 +        </macrodef>
  1.1096 +    </target>
  1.1097 +    <target name="-init-presetdef-jar">
  1.1098 +        <presetdef name="jar" uri="http://www.netbeans.org/ns/scala-project/1">
  1.1099 +            <jar compress="${jar.compress}" jarfile="${dist.jar}">
  1.1100 +                <scalaProject1:fileset dir="${build.classes.dir}"/>
  1.1101 +            </jar>
  1.1102 +        </presetdef>
  1.1103 +    </target>
  1.1104 +    <target depends="-pre-init,-init-private ,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-scalac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
  1.1105 +    <!--
  1.1106 +                ===================
  1.1107 +                COMPILATION SECTION
  1.1108 +                ===================
  1.1109 +            -->
  1.1110 +    <target depends="init" name="deps-jar" unless="no.deps">
  1.1111 +        <ant antfile="${project.TWL}/build.xml" inheritall="false" target="jar"/>
  1.1112 +    </target>
  1.1113 +    <target depends="init,deps-jar" name="-pre-pre-compile">
  1.1114 +        <mkdir dir="${build.classes.dir}"/>
  1.1115 +    </target>
  1.1116 +    <target name="-pre-compile">
  1.1117 +        <!-- Empty placeholder for easier customization. -->
  1.1118 +        <!-- You can override this target in the ../build.xml file. -->
  1.1119 +    </target>
  1.1120 +    <target if="do.depend.true" name="-compile-depend">
  1.1121 +        <scalaProject1:depend/>
  1.1122 +    </target>
  1.1123 +    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
  1.1124 +        <scalaProject1:scalac/>
  1.1125 +        <scalaProject1:javac/>
  1.1126 +        <copy todir="${build.classes.dir}">
  1.1127 +            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}&#10;                        " includes="${includes}"/>
  1.1128 +        </copy>
  1.1129 +    </target>
  1.1130 +    <target name="-post-compile">
  1.1131 +        <!-- Empty placeholder for easier customization. -->
  1.1132 +        <!-- You can override this target in the ../build.xml file. -->
  1.1133 +    </target>
  1.1134 +    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
  1.1135 +    <target name="-pre-compile-single">
  1.1136 +        <!-- Empty placeholder for easier customization. -->
  1.1137 +        <!-- You can override this target in the ../build.xml file. -->
  1.1138 +    </target>
  1.1139 +    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
  1.1140 +        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
  1.1141 +        <scalaProject1:force-recompile/>
  1.1142 +        <scalaProject1:scalac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
  1.1143 +    </target>
  1.1144 +    <target name="-post-compile-single">
  1.1145 +        <!-- Empty placeholder for easier customization. -->
  1.1146 +        <!-- You can override this target in the ../build.xml file. -->
  1.1147 +    </target>
  1.1148 +    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
  1.1149 +    <!--
  1.1150 +                ====================
  1.1151 +                JAR BUILDING SECTION
  1.1152 +                ====================
  1.1153 +            -->
  1.1154 +    <target depends="init" name="-pre-pre-jar">
  1.1155 +        <dirname file="${dist.jar}" property="dist.jar.dir"/>
  1.1156 +        <mkdir dir="${dist.jar.dir}"/>
  1.1157 +    </target>
  1.1158 +    <target name="-pre-jar">
  1.1159 +        <!-- Empty placeholder for easier customization. -->
  1.1160 +        <!-- You can override this target in the ../build.xml file. -->
  1.1161 +    </target>
  1.1162 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
  1.1163 +        <scalaProject1:jar/>
  1.1164 +    </target>
  1.1165 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
  1.1166 +        <scalaProject1:jar manifest="${manifest.file}"/>
  1.1167 +    </target>
  1.1168 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
  1.1169 +        <scalaProject1:jar manifest="${manifest.file}">
  1.1170 +            <scalaProject1:manifest>
  1.1171 +                <scalaProject1:attribute name="Main-Class" value="${main.class}"/>
  1.1172 +            </scalaProject1:manifest>
  1.1173 +        </scalaProject1:jar>
  1.1174 +        <echo>To run this application from the command line without Ant, try:</echo>
  1.1175 +        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
  1.1176 +        <property location="${dist.jar}" name="dist.jar.resolved"/>
  1.1177 +        <pathconvert property="run.classpath.with.dist.jar">
  1.1178 +            <path path="${run.classpath}"/>
  1.1179 +            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
  1.1180 +        </pathconvert>
  1.1181 +        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}
  1.1182 +                </echo>
  1.1183 +    </target>
  1.1184 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
  1.1185 +        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
  1.1186 +        <pathconvert property="run.classpath.without.build.classes.dir">
  1.1187 +            <path path="${run.classpath}"/>
  1.1188 +            <map from="${build.classes.dir.resolved}" to=""/>
  1.1189 +        </pathconvert>
  1.1190 +        <pathconvert pathsep=" " property="jar.classpath">
  1.1191 +            <path path="${run.classpath.without.build.classes.dir}"/>
  1.1192 +            <chainedmapper>
  1.1193 +                <flattenmapper/>
  1.1194 +                <globmapper from="*" to="lib/*"/>
  1.1195 +            </chainedmapper>
  1.1196 +        </pathconvert>
  1.1197 +        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
  1.1198 +        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
  1.1199 +            <fileset dir="${build.classes.dir}"/>
  1.1200 +            <manifest>
  1.1201 +                <attribute name="Main-Class" value="${main.class}"/>
  1.1202 +                <attribute name="Class-Path" value="${jar.classpath}"/>
  1.1203 +            </manifest>
  1.1204 +        </copylibs>
  1.1205 +        <echo>To run this application from the command line without Ant, try:</echo>
  1.1206 +        <property location="${dist.jar}" name="dist.jar.resolved"/>
  1.1207 +        <echo>java -jar "${dist.jar.resolved}"
  1.1208 +                </echo>
  1.1209 +    </target>
  1.1210 +    <target name="-post-jar">
  1.1211 +        <!-- Empty placeholder for easier customization. -->
  1.1212 +        <!-- You can override this target in the ../build.xml file. -->
  1.1213 +    </target>
  1.1214 +    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
  1.1215 +    <!--
  1.1216 +                =================
  1.1217 +                EXECUTION SECTION
  1.1218 +                =================
  1.1219 +            -->
  1.1220 +    <target depends="init,compile" description="Run a main class." name="run">
  1.1221 +        <scalaProject1:java>
  1.1222 +            <customize>
  1.1223 +                <arg line="${application.args}"/>
  1.1224 +            </customize>
  1.1225 +        </scalaProject1:java>
  1.1226 +    </target>
  1.1227 +    <target name="-do-not-recompile">
  1.1228 +        <property name="javac.includes.binary" value=""/>
  1.1229 +    </target>
  1.1230 +    <target depends="init,-do-not-recompile,compile-single" name="run-single">
  1.1231 +        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
  1.1232 +        <scalaProject1:java classname="${run.class}"/>
  1.1233 +    </target>
  1.1234 +    <!--
  1.1235 +                =================
  1.1236 +                DEBUGGING SECTION
  1.1237 +                =================
  1.1238 +            -->
  1.1239 +    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
  1.1240 +        <scalaProject1:nbjpdastart name="${debug.class}"/>
  1.1241 +    </target>
  1.1242 +    <target depends="init,compile" name="-debug-start-debuggee">
  1.1243 +        <scalaProject1:debug>
  1.1244 +            <customize>
  1.1245 +                <arg line="${application.args}"/>
  1.1246 +            </customize>
  1.1247 +        </scalaProject1:debug>
  1.1248 +    </target>
  1.1249 +    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
  1.1250 +    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
  1.1251 +        <scalaProject1:nbjpdastart stopclassname="${main.class}"/>
  1.1252 +    </target>
  1.1253 +    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
  1.1254 +    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
  1.1255 +        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
  1.1256 +        <scalaProject1:debug classname="${debug.class}"/>
  1.1257 +    </target>
  1.1258 +    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
  1.1259 +    <target depends="init" name="-pre-debug-fix">
  1.1260 +        <fail unless="fix.includes">Must set fix.includes</fail>
  1.1261 +        <property name="javac.includes" value="${fix.includes}.java"/>
  1.1262 +    </target>
  1.1263 +    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
  1.1264 +        <scalaProject1:nbjpdareload/>
  1.1265 +    </target>
  1.1266 +    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
  1.1267 +    <!--
  1.1268 +                ===============
  1.1269 +                JAVADOC SECTION
  1.1270 +                ===============
  1.1271 +            -->
  1.1272 +    <target depends="init" name="-javadoc-build">
  1.1273 +        <mkdir dir="${dist.javadoc.dir}"/>
  1.1274 +        <scaladoc addparams="${javadoc.additionalparam}" deprecation="yes" destdir="${dist.javadoc.dir}" doctitle="${javadoc.windowtitle}" encoding="${javadoc.encoding.used}" srcdir="${src.dir}" unchecked="yes">
  1.1275 +            <classpath>
  1.1276 +                <path path="${javac.classpath}"/>
  1.1277 +                <fileset dir="${scala.lib}">
  1.1278 +                    <include name="**/*.jar"/>
  1.1279 +                </fileset>
  1.1280 +            </classpath>
  1.1281 +        </scaladoc>
  1.1282 +    </target>
  1.1283 +    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
  1.1284 +        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
  1.1285 +    </target>
  1.1286 +    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
  1.1287 +    <!--
  1.1288 +                =========================
  1.1289 +                JUNIT COMPILATION SECTION
  1.1290 +                =========================
  1.1291 +            -->
  1.1292 +    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
  1.1293 +        <mkdir dir="${build.test.classes.dir}"/>
  1.1294 +    </target>
  1.1295 +    <target name="-pre-compile-test">
  1.1296 +        <!-- Empty placeholder for easier customization. -->
  1.1297 +        <!-- You can override this target in the ../build.xml file. -->
  1.1298 +    </target>
  1.1299 +    <target if="do.depend.true" name="-compile-test-depend">
  1.1300 +        <scalaProject1:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
  1.1301 +    </target>
  1.1302 +    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
  1.1303 +        <scalaProject1:scalac classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
  1.1304 +        <copy todir="${build.test.classes.dir}">
  1.1305 +            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}&#10;                        " includes="${includes}"/>
  1.1306 +        </copy>
  1.1307 +    </target>
  1.1308 +    <target name="-post-compile-test">
  1.1309 +        <!-- Empty placeholder for easier customization. -->
  1.1310 +        <!-- You can override this target in the ../build.xml file. -->
  1.1311 +    </target>
  1.1312 +    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
  1.1313 +    <target name="-pre-compile-test-single">
  1.1314 +        <!-- Empty placeholder for easier customization. -->
  1.1315 +        <!-- You can override this target in the ../build.xml file. -->
  1.1316 +    </target>
  1.1317 +    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
  1.1318 +        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
  1.1319 +        <scalaProject1:force-recompile destdir="${build.test.classes.dir}"/>
  1.1320 +        <scalaProject1:scalac classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
  1.1321 +        <copy todir="${build.test.classes.dir}">
  1.1322 +            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}&#10;                        " includes="${includes}"/>
  1.1323 +        </copy>
  1.1324 +    </target>
  1.1325 +    <target name="-post-compile-test-single">
  1.1326 +        <!-- Empty placeholder for easier customization. -->
  1.1327 +        <!-- You can override this target in the ../build.xml file. -->
  1.1328 +    </target>
  1.1329 +    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
  1.1330 +    <!--
  1.1331 +                =======================
  1.1332 +                JUNIT EXECUTION SECTION
  1.1333 +                =======================
  1.1334 +            -->
  1.1335 +    <target depends="init" if="have.tests" name="-pre-test-run">
  1.1336 +        <mkdir dir="${build.test.results.dir}"/>
  1.1337 +    </target>
  1.1338 +    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
  1.1339 +        <scalaProject1:junit testincludes="**/*Test.class"/>
  1.1340 +    </target>
  1.1341 +    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
  1.1342 +        <fail if="tests.failed">Some tests failed; see details above.</fail>
  1.1343 +    </target>
  1.1344 +    <target depends="init" if="have.tests" name="test-report"/>
  1.1345 +    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
  1.1346 +    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
  1.1347 +    <target depends="init" if="have.tests" name="-pre-test-run-single">
  1.1348 +        <mkdir dir="${build.test.results.dir}"/>
  1.1349 +    </target>
  1.1350 +    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
  1.1351 +        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
  1.1352 +        <scalaProject1:junit excludes="" includes="${test.includes}"/>
  1.1353 +    </target>
  1.1354 +    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
  1.1355 +        <fail if="tests.failed">Some tests failed; see details above.</fail>
  1.1356 +    </target>
  1.1357 +    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
  1.1358 +    <!--
  1.1359 +                =======================
  1.1360 +                JUNIT DEBUGGING SECTION
  1.1361 +                =======================
  1.1362 +            -->
  1.1363 +    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
  1.1364 +        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
  1.1365 +        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
  1.1366 +        <delete file="${test.report.file}"/>
  1.1367 +        <mkdir dir="${build.test.results.dir}"/>
  1.1368 +        <scalaProject1:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
  1.1369 +            <customize>
  1.1370 +                <syspropertyset>
  1.1371 +                    <propertyref prefix="test-sys-prop."/>
  1.1372 +                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
  1.1373 +                </syspropertyset>
  1.1374 +                <arg value="${test.class}"/>
  1.1375 +                <arg value="showoutput=true"/>
  1.1376 +                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
  1.1377 +                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
  1.1378 +            </customize>
  1.1379 +        </scalaProject1:debug>
  1.1380 +    </target>
  1.1381 +    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
  1.1382 +        <scalaProject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
  1.1383 +    </target>
  1.1384 +    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
  1.1385 +    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
  1.1386 +        <scalaProject1:nbjpdareload dir="${build.test.classes.dir}"/>
  1.1387 +    </target>
  1.1388 +    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
  1.1389 +    <!--
  1.1390 +                =========================
  1.1391 +                APPLET EXECUTION SECTION
  1.1392 +                =========================
  1.1393 +            -->
  1.1394 +    <target depends="init,compile-single" name="run-applet">
  1.1395 +        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
  1.1396 +        <scalaProject1:java classname="sun.applet.AppletViewer">
  1.1397 +            <customize>
  1.1398 +                <arg value="${applet.url}"/>
  1.1399 +            </customize>
  1.1400 +        </scalaProject1:java>
  1.1401 +    </target>
  1.1402 +    <!--
  1.1403 +                =========================
  1.1404 +                APPLET DEBUGGING  SECTION
  1.1405 +                =========================
  1.1406 +            -->
  1.1407 +    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
  1.1408 +        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
  1.1409 +        <scalaProject1:debug classname="sun.applet.AppletViewer">
  1.1410 +            <customize>
  1.1411 +                <arg value="${applet.url}"/>
  1.1412 +            </customize>
  1.1413 +        </scalaProject1:debug>
  1.1414 +    </target>
  1.1415 +    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
  1.1416 +    <!--
  1.1417 +                ===============
  1.1418 +                CLEANUP SECTION
  1.1419 +                ===============
  1.1420 +            -->
  1.1421 +    <target depends="init" name="deps-clean" unless="no.deps">
  1.1422 +        <ant antfile="${project.TWL}/build.xml" inheritall="false" target="clean"/>
  1.1423 +    </target>
  1.1424 +    <target depends="init" name="-do-clean">
  1.1425 +        <delete dir="${build.dir}"/>
  1.1426 +        <delete dir="${dist.dir}"/>
  1.1427 +    </target>
  1.1428 +    <target name="-post-clean">
  1.1429 +        <!-- Empty placeholder for easier customization. -->
  1.1430 +        <!-- You can override this target in the ../build.xml file. -->
  1.1431 +    </target>
  1.1432 +    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
  1.1433 +</project>
     2.1 --- a/nbproject/genfiles.properties	Sun Aug 09 09:13:56 2009 +0200
     2.2 +++ b/nbproject/genfiles.properties	Mon Oct 25 11:17:22 2010 +0200
     2.3 @@ -1,8 +1,8 @@
     2.4 -build.xml.data.CRC32=e1dea330
     2.5 -build.xml.script.CRC32=4c5c7c51
     2.6 -build.xml.stylesheet.CRC32=ca9d572e@1.3.0
     2.7 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     2.8 -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     2.9 -nbproject/build-impl.xml.data.CRC32=e1dea330
    2.10 -nbproject/build-impl.xml.script.CRC32=42c57808
    2.11 -nbproject/build-impl.xml.stylesheet.CRC32=bd42a74d@1.3.0
    2.12 +build.xml.data.CRC32=e1dea330
    2.13 +build.xml.script.CRC32=4c5c7c51
    2.14 +build.xml.stylesheet.CRC32=ca9d572e@1.3.0
    2.15 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    2.16 +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    2.17 +nbproject/build-impl.xml.data.CRC32=e1dea330
    2.18 +nbproject/build-impl.xml.script.CRC32=4c96e89b
    2.19 +nbproject/build-impl.xml.stylesheet.CRC32=5220179f@1.5
     3.1 --- a/nbproject/project.properties	Sun Aug 09 09:13:56 2009 +0200
     3.2 +++ b/nbproject/project.properties	Mon Oct 25 11:17:22 2010 +0200
     3.3 @@ -62,3 +62,6 @@
     3.4  source.encoding=UTF-8
     3.5  src.dir=src
     3.6  test.src.dir=test
     3.7 +scalac.compilerargs=
     3.8 +scalac.deprecation=yes
     3.9 +scalac.unchecked=yes
     4.1 --- a/src/de/matthiasmann/twlscala/ComboBox.scala	Sun Aug 09 09:13:56 2009 +0200
     4.2 +++ b/src/de/matthiasmann/twlscala/ComboBox.scala	Mon Oct 25 11:17:22 2010 +0200
     4.3 @@ -32,17 +32,17 @@
     4.4  import twlinternal._
     4.5  import de.matthiasmann.twl.model.{ListModel => TWLListModel}
     4.6  
     4.7 -case class ComboBoxSelectionChanged(combobox:ComboBox)
     4.8 +case class ComboBoxSelectionChanged[T](combobox:ComboBox[T])
     4.9  
    4.10 -class ComboBox extends de.matthiasmann.twl.ComboBox with SimpleCallbackSupport with ThemeSupport {
    4.11 +class ComboBox[T] extends de.matthiasmann.twl.ComboBox[T] with SimpleCallbackSupport with ThemeSupport {
    4.12      theme = "combobox"
    4.13 -    def this(m:TWLListModel[_]) { this(); setModel(m) }
    4.14 +    def this(m:TWLListModel[T]) { this(); setModel(m) }
    4.15      def model = getModel
    4.16 -    def model_= (m:TWLListModel[_]) { setModel(m) }
    4.17 +    def model_= (m:TWLListModel[T]) { setModel(m) }
    4.18      def selected = getSelected
    4.19      def selected_= (i:Int) { setSelected(i) }
    4.20 -    def computeWidthFromModel = isComputeWidthFromModel
    4.21 -    def computeWidthFromModel_= (b:Boolean) { setComputeWidthFromModel(b) }
    4.22 +//    def computeWidthFromModel = isComputeWidthFromModel
    4.23 +//    def computeWidthFromModel_= (b:Boolean) { setComputeWidthFromModel(b) }
    4.24  
    4.25      protected def simplePublisherMsg = ComboBoxSelectionChanged(this)
    4.26  }
     5.1 --- a/src/de/matthiasmann/twlscala/DialogLayout.scala	Sun Aug 09 09:13:56 2009 +0200
     5.2 +++ b/src/de/matthiasmann/twlscala/DialogLayout.scala	Mon Oct 25 11:17:22 2010 +0200
     5.3 @@ -62,10 +62,18 @@
     5.4          override def toString = "NamedGap("+name+")"
     5.5      }
     5.6      case object Filler extends Gap
     5.7 -    case object SmallGap extends FixedGap(TWLDialogLayout.SMALL_GAP)
     5.8 -    case object MediumGap extends FixedGap(TWLDialogLayout.MEDIUM_GAP)
     5.9 -    case object LargeGap extends FixedGap(TWLDialogLayout.LARGE_GAP)
    5.10 -    case object DefaultGap extends FixedGap(TWLDialogLayout.DEFAULT_GAP)
    5.11 +    object SmallGap {
    5.12 +        def apply() = new FixedGap(TWLDialogLayout.SMALL_GAP)
    5.13 +    }
    5.14 +    object MediumGap {
    5.15 +        def apply() = new FixedGap(TWLDialogLayout.MEDIUM_GAP)
    5.16 +    }
    5.17 +    object LargeGap {
    5.18 +        def apply() = new FixedGap(TWLDialogLayout.LARGE_GAP)
    5.19 +    }
    5.20 +    object DefaultGap {
    5.21 +        def apply() = new FixedGap(TWLDialogLayout.DEFAULT_GAP)
    5.22 +    }
    5.23      object Gap {
    5.24          def apply(size:Int) = { require(size >= 0); new FixedGap(if(size<MAX) size else MAX) }
    5.25          def apply(name:String) = new NamedGap(name)
     6.1 --- a/src/de/matthiasmann/twlscala/ListBox.scala	Sun Aug 09 09:13:56 2009 +0200
     6.2 +++ b/src/de/matthiasmann/twlscala/ListBox.scala	Mon Oct 25 11:17:22 2010 +0200
     6.3 @@ -33,11 +33,11 @@
     6.4  import de.matthiasmann.twl.{ListBox => TWLListBox}
     6.5  import de.matthiasmann.twl.model.{ListModel => TWLListModel}
     6.6  
     6.7 -class ListBox extends TWLListBox with EnumCallbackSupport[TWLListBox.CallbackReason] with ThemeSupport {
     6.8 +class ListBox[T] extends TWLListBox[T] with EnumCallbackSupport[TWLListBox.CallbackReason] with ThemeSupport {
     6.9      theme = "combobox"
    6.10 -    def this(m:TWLListModel[_]) { this(); setModel(m) }
    6.11 +    def this(m:TWLListModel[T]) { this(); setModel(m) }
    6.12      def model = getModel
    6.13 -    def model_= (m:TWLListModel[_]) { setModel(m) }
    6.14 +    def model_= (m:TWLListModel[T]) { setModel(m) }
    6.15      def selected = getSelected
    6.16      def selected_= (i:Int) { setSelected(i) }
    6.17  }
     7.1 --- a/src/de/matthiasmann/twlscala/PropertySheet.scala	Sun Aug 09 09:13:56 2009 +0200
     7.2 +++ b/src/de/matthiasmann/twlscala/PropertySheet.scala	Mon Oct 25 11:17:22 2010 +0200
     7.3 @@ -46,7 +46,7 @@
     7.4          def +=[T] (f:TWLPropertySheet.PropertyEditorFactory[T])(implicit m:Manifest[T]) {
     7.5              registerPropertyEditorFactory(m.erasure.asInstanceOf[Class[T]], f)
     7.6          }
     7.7 -        def +=[T] (f:(TWLProperty[T])=>TWLPropertySheet.PropertyEditor[T])(implicit m:Manifest[T]) {
     7.8 +        def +=[T] (f:(TWLProperty[T])=>TWLPropertySheet.PropertyEditor)(implicit m:Manifest[T]) {
     7.9              +=(new TWLPropertySheet.PropertyEditorFactory[T] {
    7.10                      def createEditor(p:TWLProperty[T]) = f(p)
    7.11              })
    7.12 @@ -56,8 +56,8 @@
    7.13  
    7.14  class Property[T](clazz:Class[T], propertyName:String, initialValue:T) extends TWLSimpleProperty(clazz, propertyName, initialValue) {
    7.15      def name = getName
    7.16 -    def value = getValue
    7.17 -    def value_= (v:T) { setValueFromCode(v) }
    7.18 +    def value = getPropertyValue
    7.19 +    def value_= (v:T) { setPropertyValue(v) }
    7.20      def readonly = isReadOnly
    7.21      def readonly_= (b:Boolean) { setReadOnly(b) }
    7.22      override def toString = "Proptery[name="+name+",value="+value+"]"
    7.23 @@ -73,7 +73,7 @@
    7.24      }
    7.25  }
    7.26  
    7.27 -class PropertyList(val underlying:TWLSimplePropertyList) extends RandomAccessSeq[TWLProperty[_]] {
    7.28 +class PropertyList(val underlying:TWLSimplePropertyList) extends IndexedSeq[TWLProperty[_]] {
    7.29      def this(name:String) { this(new TWLSimplePropertyList(name)) }
    7.30      def apply(idx:Int) = underlying.getProperty(idx)
    7.31      def length = underlying.getNumProperties
     8.1 --- a/src/de/matthiasmann/twlscala/twlinternal/EnumCallbackSupport.scala	Sun Aug 09 09:13:56 2009 +0200
     8.2 +++ b/src/de/matthiasmann/twlscala/twlinternal/EnumCallbackSupport.scala	Mon Oct 25 11:17:22 2010 +0200
     8.3 @@ -30,6 +30,7 @@
     8.4  package de.matthiasmann.twlscala.twlinternal
     8.5  
     8.6  import de.matthiasmann.twl.CallbackWithReason
     8.7 +import de.matthiasmann.twlscala.Publisher
     8.8  
     8.9  trait EnumCallbackSupport[T <: Enum[T]] extends Publisher { self =>
    8.10      def addCallback(h: CallbackWithReason[T])
     9.1 --- a/src/de/matthiasmann/twlscala/twlinternal/SimpleCallbackSupport.scala	Sun Aug 09 09:13:56 2009 +0200
     9.2 +++ b/src/de/matthiasmann/twlscala/twlinternal/SimpleCallbackSupport.scala	Mon Oct 25 11:17:22 2010 +0200
     9.3 @@ -29,6 +29,8 @@
     9.4   */
     9.5  package de.matthiasmann.twlscala.twlinternal
     9.6  
     9.7 +import de.matthiasmann.twlscala.Publisher
     9.8 +
     9.9  trait SimpleCallbackSupport extends Publisher {
    9.10      def addCallback(r:Runnable)
    9.11      protected def simplePublisherMsg:Any
    10.1 --- a/src/de/matthiasmann/twlscala/twlinternal/SubscriberList.scala	Sun Aug 09 09:13:56 2009 +0200
    10.2 +++ b/src/de/matthiasmann/twlscala/twlinternal/SubscriberList.scala	Mon Oct 25 11:17:22 2010 +0200
    10.3 @@ -29,6 +29,8 @@
    10.4   */
    10.5  package de.matthiasmann.twlscala.twlinternal
    10.6  
    10.7 +import de.matthiasmann.twlscala.Reactor
    10.8 +
    10.9  final private[twlscala] class SubscriberList {
   10.10      import scala.ref.WeakReference
   10.11      type ListType = List[WeakReference[Reactor]]
    11.1 --- a/src/de/matthiasmann/twlscala/twlinternal/ThemeSupport.scala	Sun Aug 09 09:13:56 2009 +0200
    11.2 +++ b/src/de/matthiasmann/twlscala/twlinternal/ThemeSupport.scala	Mon Oct 25 11:17:22 2010 +0200
    11.3 @@ -70,6 +70,8 @@
    11.4      }
    11.5  }
    11.6  
    11.7 +/* Version for Scala 2.7.x
    11.8 +
    11.9  import scala.collection.mutable.Buffer
   11.10  class WidgetContent private[twlscala] (peer:TWLWidget) extends Buffer[TWLWidget] with RandomAccessSeq.Mutable[TWLWidget] {
   11.11      override def stringPrefix = "WidgetContent"
   11.12 @@ -89,13 +91,13 @@
   11.13      def += (w:TWLWidget) = { peer.add(w); this }
   11.14      def ++= (xs:TWLWidget*) = { insertAll(length, xs) }
   11.15  }
   11.16 +*/
   11.17  
   11.18  /* Version for Scala 2.8
   11.19 +*/
   11.20 +import scala.collection._
   11.21  
   11.22 -import scala.collection._
   11.23 -import mutable.Buffer
   11.24 -
   11.25 -class WidgetContent private[twlscala] (peer:TWLWidget) extends RandomAccessSeq[TWLWidget] {
   11.26 +class WidgetContent private[twlscala] (peer:TWLWidget) extends IndexedSeq[TWLWidget] {
   11.27      override def stringPrefix = "WidgetContent"
   11.28      def length = peer.getNumChildren
   11.29      def apply(n:Int) = peer.getChild(n)
   11.30 @@ -111,4 +113,3 @@
   11.31      def +: (w:TWLWidget) = { peer.insertChild(w, 0); this }
   11.32      def += (w:TWLWidget) = { peer.add(w); this }
   11.33  }
   11.34 -*/