Souborové dialogy si pamatují naposledy použitý adresář.
authorFrantišek Kučera <franta-hg@frantovo.cz>
Mon, 27 Sep 2010 19:04:50 +0200
changeset 5bea5d9e11d37
parent 4 dfb345ef9452
child 6 ca5b667fd910
Souborové dialogy si pamatují naposledy použitý adresář.
java/Postak/nbproject/build-impl.xml
java/Postak/nbproject/genfiles.properties
java/Postak/nbproject/project.properties
java/Postak/src/cz/frantovo/postak/Nastaveni.java
java/Postak/src/cz/frantovo/postak/Postak.java
java/SuperPostak/nbproject/build-impl.xml
java/SuperPostak/nbproject/genfiles.properties
java/SuperPostak/nbproject/project.properties
java/SuperPostak/src/cz/frantovo/superPostak/PanelPrijemcu.form
java/SuperPostak/src/cz/frantovo/superPostak/PanelPrijemcu.java
java/SuperPostak/src/cz/frantovo/superPostak/SuperPostak.form
java/SuperPostak/src/cz/frantovo/superPostak/SuperPostak.java
java/SuperPostak/src/cz/frantovo/superPostak/ZobrazovacAdres.form
java/SuperPostak/src/cz/frantovo/superPostak/ZobrazovacAdres.java
     1.1 --- a/java/Postak/nbproject/build-impl.xml	Sat Feb 28 18:06:12 2009 +0100
     1.2 +++ b/java/Postak/nbproject/build-impl.xml	Mon Sep 27 19:04:50 2010 +0200
     1.3 @@ -20,6 +20,13 @@
     1.4  
     1.5          -->
     1.6  <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="Postak-impl">
     1.7 +    <fail message="Please build using Ant 1.7.1 or higher.">
     1.8 +        <condition>
     1.9 +            <not>
    1.10 +                <antversion atleast="1.7.1"/>
    1.11 +            </not>
    1.12 +        </condition>
    1.13 +    </fail>
    1.14      <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
    1.15      <!-- 
    1.16                  ======================
    1.17 @@ -48,19 +55,68 @@
    1.18      </target>
    1.19      <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    1.20          <available file="${manifest.file}" property="manifest.available"/>
    1.21 -        <condition property="manifest.available+main.class">
    1.22 +        <available file="${application.splash}" property="splashscreen.available"/>
    1.23 +        <condition property="main.class.available">
    1.24              <and>
    1.25 -                <isset property="manifest.available"/>
    1.26                  <isset property="main.class"/>
    1.27                  <not>
    1.28                      <equals arg1="${main.class}" arg2="" trim="true"/>
    1.29                  </not>
    1.30              </and>
    1.31          </condition>
    1.32 +        <condition property="manifest.available+main.class">
    1.33 +            <and>
    1.34 +                <isset property="manifest.available"/>
    1.35 +                <isset property="main.class.available"/>
    1.36 +            </and>
    1.37 +        </condition>
    1.38 +        <condition property="do.mkdist">
    1.39 +            <and>
    1.40 +                <isset property="libs.CopyLibs.classpath"/>
    1.41 +                <not>
    1.42 +                    <istrue value="${mkdist.disabled}"/>
    1.43 +                </not>
    1.44 +            </and>
    1.45 +        </condition>
    1.46          <condition property="manifest.available+main.class+mkdist.available">
    1.47              <and>
    1.48                  <istrue value="${manifest.available+main.class}"/>
    1.49 -                <isset property="libs.CopyLibs.classpath"/>
    1.50 +                <isset property="do.mkdist"/>
    1.51 +            </and>
    1.52 +        </condition>
    1.53 +        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
    1.54 +            <and>
    1.55 +                <istrue value="${manifest.available+main.class+mkdist.available}"/>
    1.56 +                <istrue value="${splashscreen.available}"/>
    1.57 +            </and>
    1.58 +        </condition>
    1.59 +        <condition property="do.archive">
    1.60 +            <not>
    1.61 +                <istrue value="${jar.archive.disabled}"/>
    1.62 +            </not>
    1.63 +        </condition>
    1.64 +        <condition property="do.archive+manifest.available">
    1.65 +            <and>
    1.66 +                <isset property="manifest.available"/>
    1.67 +                <istrue value="${do.archive}"/>
    1.68 +            </and>
    1.69 +        </condition>
    1.70 +        <condition property="do.archive+manifest.available+main.class">
    1.71 +            <and>
    1.72 +                <istrue value="${manifest.available+main.class}"/>
    1.73 +                <istrue value="${do.archive}"/>
    1.74 +            </and>
    1.75 +        </condition>
    1.76 +        <condition property="do.archive+manifest.available+main.class+mkdist.available">
    1.77 +            <and>
    1.78 +                <istrue value="${manifest.available+main.class+mkdist.available}"/>
    1.79 +                <istrue value="${do.archive}"/>
    1.80 +            </and>
    1.81 +        </condition>
    1.82 +        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
    1.83 +            <and>
    1.84 +                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
    1.85 +                <istrue value="${do.archive}"/>
    1.86              </and>
    1.87          </condition>
    1.88          <condition property="have.tests">
    1.89 @@ -97,6 +153,7 @@
    1.90          <property name="javadoc.preview" value="true"/>
    1.91          <property name="application.args" value=""/>
    1.92          <property name="source.encoding" value="${file.encoding}"/>
    1.93 +        <property name="runtime.encoding" value="${source.encoding}"/>
    1.94          <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
    1.95              <and>
    1.96                  <isset property="javadoc.encoding"/>
    1.97 @@ -112,12 +169,13 @@
    1.98          <condition property="do.depend.true">
    1.99              <istrue value="${do.depend}"/>
   1.100          </condition>
   1.101 -        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
   1.102 -            <and>
   1.103 -                <isset property="jaxws.endorsed.dir"/>
   1.104 -                <available file="nbproject/jaxws-build.xml"/>
   1.105 -            </and>
   1.106 +        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
   1.107 +        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
   1.108 +            <length length="0" string="${endorsed.classpath}" when="greater"/>
   1.109          </condition>
   1.110 +        <property name="javac.fork" value="false"/>
   1.111 +        <property name="jar.index" value="false"/>
   1.112 +        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
   1.113      </target>
   1.114      <target name="-post-init">
   1.115          <!-- Empty placeholder for easier customization. -->
   1.116 @@ -144,26 +202,79 @@
   1.117              </sequential>
   1.118          </macrodef>
   1.119      </target>
   1.120 -    <target name="-init-macrodef-javac">
   1.121 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
   1.122          <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.123              <attribute default="${src.dir}" name="srcdir"/>
   1.124              <attribute default="${build.classes.dir}" name="destdir"/>
   1.125              <attribute default="${javac.classpath}" name="classpath"/>
   1.126 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   1.127 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   1.128              <attribute default="${includes}" name="includes"/>
   1.129              <attribute default="${excludes}" name="excludes"/>
   1.130              <attribute default="${javac.debug}" name="debug"/>
   1.131 -            <attribute default="/does/not/exist" name="sourcepath"/>
   1.132 +            <attribute default="${empty.dir}" name="sourcepath"/>
   1.133 +            <attribute default="${empty.dir}" name="gensrcdir"/>
   1.134              <element name="customize" optional="true"/>
   1.135              <sequential>
   1.136 -                <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.137 +                <property location="${build.dir}/empty" name="empty.dir"/>
   1.138 +                <mkdir dir="${empty.dir}"/>
   1.139 +                <mkdir dir="@{apgeneratedsrcdir}"/>
   1.140 +                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
   1.141 +                    <src>
   1.142 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   1.143 +                            <include name="*"/>
   1.144 +                        </dirset>
   1.145 +                    </src>
   1.146                      <classpath>
   1.147                          <path path="@{classpath}"/>
   1.148                      </classpath>
   1.149 -                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
   1.150 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.151 +                    <compilerarg line="${javac.compilerargs}"/>
   1.152 +                    <compilerarg value="-processorpath"/>
   1.153 +                    <compilerarg path="@{processorpath}:${empty.dir}"/>
   1.154 +                    <compilerarg line="${ap.processors.internal}"/>
   1.155 +                    <compilerarg line="${annotation.processing.processor.options}"/>
   1.156 +                    <compilerarg value="-s"/>
   1.157 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
   1.158 +                    <compilerarg line="${ap.proc.none.internal}"/>
   1.159                      <customize/>
   1.160                  </javac>
   1.161              </sequential>
   1.162          </macrodef>
   1.163 +    </target>
   1.164 +    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
   1.165 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.166 +            <attribute default="${src.dir}" name="srcdir"/>
   1.167 +            <attribute default="${build.classes.dir}" name="destdir"/>
   1.168 +            <attribute default="${javac.classpath}" name="classpath"/>
   1.169 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   1.170 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   1.171 +            <attribute default="${includes}" name="includes"/>
   1.172 +            <attribute default="${excludes}" name="excludes"/>
   1.173 +            <attribute default="${javac.debug}" name="debug"/>
   1.174 +            <attribute default="${empty.dir}" name="sourcepath"/>
   1.175 +            <attribute default="${empty.dir}" name="gensrcdir"/>
   1.176 +            <element name="customize" optional="true"/>
   1.177 +            <sequential>
   1.178 +                <property location="${build.dir}/empty" name="empty.dir"/>
   1.179 +                <mkdir dir="${empty.dir}"/>
   1.180 +                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
   1.181 +                    <src>
   1.182 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   1.183 +                            <include name="*"/>
   1.184 +                        </dirset>
   1.185 +                    </src>
   1.186 +                    <classpath>
   1.187 +                        <path path="@{classpath}"/>
   1.188 +                    </classpath>
   1.189 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.190 +                    <compilerarg line="${javac.compilerargs}"/>
   1.191 +                    <customize/>
   1.192 +                </javac>
   1.193 +            </sequential>
   1.194 +        </macrodef>
   1.195 +    </target>
   1.196 +    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
   1.197          <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.198              <attribute default="${src.dir}" name="srcdir"/>
   1.199              <attribute default="${build.classes.dir}" name="destdir"/>
   1.200 @@ -198,7 +309,7 @@
   1.201              <attribute default="${excludes}" name="excludes"/>
   1.202              <attribute default="**" name="testincludes"/>
   1.203              <sequential>
   1.204 -                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
   1.205 +                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
   1.206                      <batchtest todir="${build.test.results.dir}">
   1.207                          <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   1.208                              <filename name="@{testincludes}"/>
   1.209 @@ -213,6 +324,7 @@
   1.210                      </syspropertyset>
   1.211                      <formatter type="brief" usefile="false"/>
   1.212                      <formatter type="xml"/>
   1.213 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.214                      <jvmarg line="${run.jvmargs}"/>
   1.215                  </junit>
   1.216              </sequential>
   1.217 @@ -269,8 +381,11 @@
   1.218              <element name="customize" optional="true"/>
   1.219              <sequential>
   1.220                  <java classname="@{classname}" dir="${work.dir}" fork="true">
   1.221 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.222                      <jvmarg line="${debug-args-line}"/>
   1.223                      <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   1.224 +                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
   1.225 +                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
   1.226                      <jvmarg line="${run.jvmargs}"/>
   1.227                      <classpath>
   1.228                          <path path="@{classpath}"/>
   1.229 @@ -287,12 +402,16 @@
   1.230      <target name="-init-macrodef-java">
   1.231          <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
   1.232              <attribute default="${main.class}" name="classname"/>
   1.233 +            <attribute default="${run.classpath}" name="classpath"/>
   1.234              <element name="customize" optional="true"/>
   1.235              <sequential>
   1.236                  <java classname="@{classname}" dir="${work.dir}" fork="true">
   1.237 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.238 +                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
   1.239 +                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
   1.240                      <jvmarg line="${run.jvmargs}"/>
   1.241                      <classpath>
   1.242 -                        <path path="${run.classpath}"/>
   1.243 +                        <path path="@{classpath}"/>
   1.244                      </classpath>
   1.245                      <syspropertyset>
   1.246                          <propertyref prefix="run-sys-prop."/>
   1.247 @@ -303,20 +422,86 @@
   1.248              </sequential>
   1.249          </macrodef>
   1.250      </target>
   1.251 +    <target name="-init-macrodef-copylibs">
   1.252 +        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
   1.253 +            <element name="customize" optional="true"/>
   1.254 +            <sequential>
   1.255 +                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.256 +                <pathconvert property="run.classpath.without.build.classes.dir">
   1.257 +                    <path path="${run.classpath}"/>
   1.258 +                    <map from="${build.classes.dir.resolved}" to=""/>
   1.259 +                </pathconvert>
   1.260 +                <pathconvert pathsep=" " property="jar.classpath">
   1.261 +                    <path path="${run.classpath.without.build.classes.dir}"/>
   1.262 +                    <chainedmapper>
   1.263 +                        <flattenmapper/>
   1.264 +                        <globmapper from="*" to="lib/*"/>
   1.265 +                    </chainedmapper>
   1.266 +                </pathconvert>
   1.267 +                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   1.268 +                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.269 +                    <fileset dir="${build.classes.dir}"/>
   1.270 +                    <manifest>
   1.271 +                        <attribute name="Class-Path" value="${jar.classpath}"/>
   1.272 +                        <customize/>
   1.273 +                    </manifest>
   1.274 +                </copylibs>
   1.275 +            </sequential>
   1.276 +        </macrodef>
   1.277 +    </target>
   1.278      <target name="-init-presetdef-jar">
   1.279          <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
   1.280 -            <jar compress="${jar.compress}" jarfile="${dist.jar}">
   1.281 +            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
   1.282                  <j2seproject1:fileset dir="${build.classes.dir}"/>
   1.283              </jar>
   1.284          </presetdef>
   1.285      </target>
   1.286 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
   1.287 +    <target name="-init-ap-cmdline-properties">
   1.288 +        <property name="annotation.processing.enabled" value="true"/>
   1.289 +        <property name="annotation.processing.processors.list" value=""/>
   1.290 +        <property name="annotation.processing.processor.options" value=""/>
   1.291 +        <property name="annotation.processing.run.all.processors" value="true"/>
   1.292 +        <property name="javac.processorpath" value="${javac.classpath}"/>
   1.293 +        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
   1.294 +        <condition property="ap.supported.internal" value="true">
   1.295 +            <not>
   1.296 +                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
   1.297 +            </not>
   1.298 +        </condition>
   1.299 +    </target>
   1.300 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
   1.301 +        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
   1.302 +            <isfalse value="${annotation.processing.run.all.processors}"/>
   1.303 +        </condition>
   1.304 +        <condition else="" property="ap.proc.none.internal" value="-proc:none">
   1.305 +            <isfalse value="${annotation.processing.enabled}"/>
   1.306 +        </condition>
   1.307 +    </target>
   1.308 +    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
   1.309 +        <property name="ap.cmd.line.internal" value=""/>
   1.310 +    </target>
   1.311 +    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
   1.312      <!--
   1.313                  ===================
   1.314                  COMPILATION SECTION
   1.315                  ===================
   1.316              -->
   1.317 -    <target depends="init" name="deps-jar" unless="no.deps"/>
   1.318 +    <target name="-deps-jar-init" unless="built-jar.properties">
   1.319 +        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
   1.320 +        <delete file="${built-jar.properties}" quiet="true"/>
   1.321 +    </target>
   1.322 +    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
   1.323 +        <echo level="warn" message="Cycle detected: Postak was already built"/>
   1.324 +    </target>
   1.325 +    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
   1.326 +        <mkdir dir="${build.dir}"/>
   1.327 +        <touch file="${built-jar.properties}" verbose="false"/>
   1.328 +        <property file="${built-jar.properties}" prefix="already.built.jar."/>
   1.329 +        <antcall target="-warn-already-built-jar"/>
   1.330 +        <propertyfile file="${built-jar.properties}">
   1.331 +            <entry key="${basedir}" value=""/>
   1.332 +        </propertyfile>
   1.333 +    </target>
   1.334      <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
   1.335      <target depends="init" name="-check-automatic-build">
   1.336          <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
   1.337 @@ -332,14 +517,25 @@
   1.338          <!-- You can override this target in the ../build.xml file. -->
   1.339      </target>
   1.340      <target if="do.depend.true" name="-compile-depend">
   1.341 -        <j2seproject3:depend/>
   1.342 +        <pathconvert property="build.generated.subdirs">
   1.343 +            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   1.344 +                <include name="*"/>
   1.345 +            </dirset>
   1.346 +        </pathconvert>
   1.347 +        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
   1.348      </target>
   1.349 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
   1.350 -        <j2seproject3:javac/>
   1.351 +    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
   1.352 +        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
   1.353          <copy todir="${build.classes.dir}">
   1.354              <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.355          </copy>
   1.356      </target>
   1.357 +    <target if="has.persistence.xml" name="-copy-persistence-xml">
   1.358 +        <mkdir dir="${build.classes.dir}/META-INF"/>
   1.359 +        <copy todir="${build.classes.dir}/META-INF">
   1.360 +            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
   1.361 +        </copy>
   1.362 +    </target>
   1.363      <target name="-post-compile">
   1.364          <!-- Empty placeholder for easier customization. -->
   1.365          <!-- You can override this target in the ../build.xml file. -->
   1.366 @@ -352,7 +548,7 @@
   1.367      <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
   1.368          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   1.369          <j2seproject3:force-recompile/>
   1.370 -        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
   1.371 +        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
   1.372      </target>
   1.373      <target name="-post-compile-single">
   1.374          <!-- Empty placeholder for easier customization. -->
   1.375 @@ -372,13 +568,13 @@
   1.376          <!-- Empty placeholder for easier customization. -->
   1.377          <!-- You can override this target in the ../build.xml file. -->
   1.378      </target>
   1.379 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
   1.380 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
   1.381          <j2seproject1:jar/>
   1.382      </target>
   1.383 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
   1.384 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
   1.385          <j2seproject1:jar manifest="${manifest.file}"/>
   1.386      </target>
   1.387 -    <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.388 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
   1.389          <j2seproject1:jar manifest="${manifest.file}">
   1.390              <j2seproject1:manifest>
   1.391                  <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
   1.392 @@ -393,27 +589,26 @@
   1.393          </pathconvert>
   1.394          <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
   1.395      </target>
   1.396 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
   1.397 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   1.398 -        <pathconvert property="run.classpath.without.build.classes.dir">
   1.399 -            <path path="${run.classpath}"/>
   1.400 -            <map from="${build.classes.dir.resolved}" to=""/>
   1.401 -        </pathconvert>
   1.402 -        <pathconvert pathsep=" " property="jar.classpath">
   1.403 -            <path path="${run.classpath.without.build.classes.dir}"/>
   1.404 -            <chainedmapper>
   1.405 -                <flattenmapper/>
   1.406 -                <globmapper from="*" to="lib/*"/>
   1.407 -            </chainedmapper>
   1.408 -        </pathconvert>
   1.409 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   1.410 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   1.411 -            <fileset dir="${build.classes.dir}"/>
   1.412 -            <manifest>
   1.413 +    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen">
   1.414 +        <basename file="${application.splash}" property="splashscreen.basename"/>
   1.415 +        <mkdir dir="${build.classes.dir}/META-INF"/>
   1.416 +        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
   1.417 +        <j2seproject3:copylibs>
   1.418 +            <customize>
   1.419                  <attribute name="Main-Class" value="${main.class}"/>
   1.420 -                <attribute name="Class-Path" value="${jar.classpath}"/>
   1.421 -            </manifest>
   1.422 -        </copylibs>
   1.423 +                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
   1.424 +            </customize>
   1.425 +        </j2seproject3:copylibs>
   1.426 +        <echo>To run this application from the command line without Ant, try:</echo>
   1.427 +        <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.428 +        <echo>java -jar "${dist.jar.resolved}"</echo>
   1.429 +    </target>
   1.430 +    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available">
   1.431 +        <j2seproject3:copylibs>
   1.432 +            <customize>
   1.433 +                <attribute name="Main-Class" value="${main.class}"/>
   1.434 +            </customize>
   1.435 +        </j2seproject3:copylibs>
   1.436          <echo>To run this application from the command line without Ant, try:</echo>
   1.437          <property location="${dist.jar}" name="dist.jar.resolved"/>
   1.438          <echo>java -jar "${dist.jar.resolved}"</echo>
   1.439 @@ -422,7 +617,7 @@
   1.440          <!-- Empty placeholder for easier customization. -->
   1.441          <!-- You can override this target in the ../build.xml file. -->
   1.442      </target>
   1.443 -    <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.444 +    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
   1.445      <!--
   1.446                  =================
   1.447                  EXECUTION SECTION
   1.448 @@ -438,10 +633,14 @@
   1.449      <target name="-do-not-recompile">
   1.450          <property name="javac.includes.binary" value=""/>
   1.451      </target>
   1.452 -    <target depends="init,-do-not-recompile,compile-single" name="run-single">
   1.453 +    <target depends="init,compile-single" name="run-single">
   1.454          <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   1.455          <j2seproject1:java classname="${run.class}"/>
   1.456      </target>
   1.457 +    <target depends="init,compile-test-single" name="run-test-with-main">
   1.458 +        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   1.459 +        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
   1.460 +    </target>
   1.461      <!--
   1.462                  =================
   1.463                  DEBUGGING SECTION
   1.464 @@ -450,6 +649,9 @@
   1.465      <target depends="init" if="netbeans.home" name="-debug-start-debugger">
   1.466          <j2seproject1:nbjpdastart name="${debug.class}"/>
   1.467      </target>
   1.468 +    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
   1.469 +        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
   1.470 +    </target>
   1.471      <target depends="init,compile" name="-debug-start-debuggee">
   1.472          <j2seproject3:debug>
   1.473              <customize>
   1.474 @@ -466,7 +668,12 @@
   1.475          <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
   1.476          <j2seproject3:debug classname="${debug.class}"/>
   1.477      </target>
   1.478 -    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
   1.479 +    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
   1.480 +    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
   1.481 +        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
   1.482 +        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
   1.483 +    </target>
   1.484 +    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
   1.485      <target depends="init" name="-pre-debug-fix">
   1.486          <fail unless="fix.includes">Must set fix.includes</fail>
   1.487          <property name="javac.includes" value="${fix.includes}.java"/>
   1.488 @@ -480,7 +687,7 @@
   1.489                  JAVADOC SECTION
   1.490                  ===============
   1.491              -->
   1.492 -    <target depends="init" name="-javadoc-build">
   1.493 +    <target depends="init" if="have.sources" name="-javadoc-build">
   1.494          <mkdir dir="${dist.javadoc.dir}"/>
   1.495          <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.496              <classpath>
   1.497 @@ -489,7 +696,18 @@
   1.498              <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   1.499                  <filename name="**/*.java"/>
   1.500              </fileset>
   1.501 +            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   1.502 +                <include name="**/*.java"/>
   1.503 +            </fileset>
   1.504          </javadoc>
   1.505 +        <copy todir="${dist.javadoc.dir}">
   1.506 +            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   1.507 +                <filename name="**/doc-files/**"/>
   1.508 +            </fileset>
   1.509 +            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   1.510 +                <include name="**/doc-files/**"/>
   1.511 +            </fileset>
   1.512 +        </copy>
   1.513      </target>
   1.514      <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
   1.515          <nbbrowse file="${dist.javadoc.dir}/index.html"/>
   1.516 @@ -511,7 +729,7 @@
   1.517          <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   1.518      </target>
   1.519      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
   1.520 -        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   1.521 +        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
   1.522          <copy todir="${build.test.classes.dir}">
   1.523              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.524          </copy>
   1.525 @@ -528,7 +746,7 @@
   1.526      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   1.527          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   1.528          <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
   1.529 -        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
   1.530 +        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
   1.531          <copy todir="${build.test.classes.dir}">
   1.532              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.533          </copy>
   1.534 @@ -550,7 +768,7 @@
   1.535          <j2seproject3:junit testincludes="**/*Test.java"/>
   1.536      </target>
   1.537      <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
   1.538 -        <fail if="tests.failed">Some tests failed; see details above.</fail>
   1.539 +        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   1.540      </target>
   1.541      <target depends="init" if="have.tests" name="test-report"/>
   1.542      <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
   1.543 @@ -563,9 +781,9 @@
   1.544          <j2seproject3:junit excludes="" includes="${test.includes}"/>
   1.545      </target>
   1.546      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
   1.547 -        <fail if="tests.failed">Some tests failed; see details above.</fail>
   1.548 +        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   1.549      </target>
   1.550 -    <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.551 +    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
   1.552      <!--
   1.553                  =======================
   1.554                  JUNIT DEBUGGING SECTION
   1.555 @@ -592,7 +810,7 @@
   1.556      <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
   1.557          <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
   1.558      </target>
   1.559 -    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
   1.560 +    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
   1.561      <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
   1.562          <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
   1.563      </target>
   1.564 @@ -629,14 +847,45 @@
   1.565                  CLEANUP SECTION
   1.566                  ===============
   1.567              -->
   1.568 -    <target depends="init" name="deps-clean" unless="no.deps"/>
   1.569 +    <target name="-deps-clean-init" unless="built-clean.properties">
   1.570 +        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
   1.571 +        <delete file="${built-clean.properties}" quiet="true"/>
   1.572 +    </target>
   1.573 +    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
   1.574 +        <echo level="warn" message="Cycle detected: Postak was already built"/>
   1.575 +    </target>
   1.576 +    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
   1.577 +        <mkdir dir="${build.dir}"/>
   1.578 +        <touch file="${built-clean.properties}" verbose="false"/>
   1.579 +        <property file="${built-clean.properties}" prefix="already.built.clean."/>
   1.580 +        <antcall target="-warn-already-built-clean"/>
   1.581 +        <propertyfile file="${built-clean.properties}">
   1.582 +            <entry key="${basedir}" value=""/>
   1.583 +        </propertyfile>
   1.584 +    </target>
   1.585      <target depends="init" name="-do-clean">
   1.586          <delete dir="${build.dir}"/>
   1.587 -        <delete dir="${dist.dir}"/>
   1.588 +        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
   1.589      </target>
   1.590      <target name="-post-clean">
   1.591          <!-- Empty placeholder for easier customization. -->
   1.592          <!-- You can override this target in the ../build.xml file. -->
   1.593      </target>
   1.594      <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
   1.595 +    <target name="-check-call-dep">
   1.596 +        <property file="${call.built.properties}" prefix="already.built."/>
   1.597 +        <condition property="should.call.dep">
   1.598 +            <not>
   1.599 +                <isset property="already.built.${call.subproject}"/>
   1.600 +            </not>
   1.601 +        </condition>
   1.602 +    </target>
   1.603 +    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
   1.604 +        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
   1.605 +            <propertyset>
   1.606 +                <propertyref prefix="transfer."/>
   1.607 +                <mapper from="transfer.*" to="*" type="glob"/>
   1.608 +            </propertyset>
   1.609 +        </ant>
   1.610 +    </target>
   1.611  </project>
     2.1 --- a/java/Postak/nbproject/genfiles.properties	Sat Feb 28 18:06:12 2009 +0100
     2.2 +++ b/java/Postak/nbproject/genfiles.properties	Mon Sep 27 19:04:50 2010 +0200
     2.3 @@ -1,8 +1,8 @@
     2.4  build.xml.data.CRC32=ecce8ba0
     2.5  build.xml.script.CRC32=e861f380
     2.6 -build.xml.stylesheet.CRC32=958a1d3e
     2.7 +build.xml.stylesheet.CRC32=28e38971@1.38.2.45
     2.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     2.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    2.10  nbproject/build-impl.xml.data.CRC32=ecce8ba0
    2.11 -nbproject/build-impl.xml.script.CRC32=a6ef0080
    2.12 -nbproject/build-impl.xml.stylesheet.CRC32=65b8de21
    2.13 +nbproject/build-impl.xml.script.CRC32=c76a5265
    2.14 +nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45
     3.1 --- a/java/Postak/nbproject/project.properties	Sat Feb 28 18:06:12 2009 +0100
     3.2 +++ b/java/Postak/nbproject/project.properties	Mon Sep 27 19:04:50 2010 +0200
     3.3 @@ -5,6 +5,7 @@
     3.4  # This directory is removed when the project is cleaned:
     3.5  build.dir=build
     3.6  build.generated.dir=${build.dir}/generated
     3.7 +build.generated.sources.dir=${build.dir}/generated-sources
     3.8  # Only compile against the classpath explicitly listed here:
     3.9  build.sysclasspath=ignore
    3.10  build.test.classes.dir=${build.dir}/test/classes
     4.1 --- a/java/Postak/src/cz/frantovo/postak/Nastaveni.java	Sat Feb 28 18:06:12 2009 +0100
     4.2 +++ b/java/Postak/src/cz/frantovo/postak/Nastaveni.java	Mon Sep 27 19:04:50 2010 +0200
     4.3 @@ -8,104 +8,116 @@
     4.4   * @author fiki
     4.5   */
     4.6  public class Nastaveni implements Serializable {
     4.7 -    private static final long serialVersionUID = -3155540704924123097L;
     4.8 -    
     4.9 -    private String postovniServer = "localhost";
    4.10 -    private int postovniPort = 25;
    4.11 -    private String postovniJmeno;
    4.12 -    private char[] postovniHeslo;
    4.13 -    private int limitZprav = 1000;
    4.14 -    
    4.15 -    /** Připojovací řetězec */
    4.16 -    private String databaze;
    4.17 -    private String dbJmeno;
    4.18 -    private char[] dbHeslo;
    4.19 -    
    4.20 -    /** Výchozí příjemci */
    4.21 -    private ArrayList<InternetAddressKomu> vychoziPrijemci;
    4.22 -    
    4.23 -    /** Přejatá konstanta od SuperPošťáka */
    4.24 -    private String cestaKCertifikatum;
    4.25  
    4.26 -    public String getCestaKCertifikatum() {
    4.27 -        return cestaKCertifikatum;
    4.28 -    }
    4.29 +	private static final long serialVersionUID = -3155540704924123097L;
    4.30 +	private String postovniServer = "localhost";
    4.31 +	private int postovniPort = 25;
    4.32 +	private String postovniJmeno;
    4.33 +	private char[] postovniHeslo;
    4.34 +	private int limitZprav = 1000;
    4.35 +	/** Připojovací řetězec */
    4.36 +	private String databaze;
    4.37 +	private String dbJmeno;
    4.38 +	private char[] dbHeslo;
    4.39 +	/** Výchozí příjemci */
    4.40 +	private ArrayList<InternetAddressKomu> vychoziPrijemci;
    4.41 +	/** Přejatá konstanta od SuperPošťáka */
    4.42 +	private String cestaKCertifikatum;
    4.43 +	/** 
    4.44 +	 * Výchozí adresář pro ukládání a načítání souborů
    4.45 +	 * např. pro souborové dialogy
    4.46 +	 */
    4.47 +	private String pracovniAdresar;
    4.48  
    4.49 -    public void setCestaKCertifikatum(String cestaKCertifikatum) {
    4.50 -        this.cestaKCertifikatum = cestaKCertifikatum;
    4.51 -    }
    4.52 +	public String getPracovniAdresar() {
    4.53 +		if (pracovniAdresar == null) {
    4.54 +			return System.getProperty("user.home");
    4.55 +		} else {
    4.56 +			return pracovniAdresar;
    4.57 +		}
    4.58 +	}
    4.59  
    4.60 -    public String getPostovniServer() {
    4.61 -        return postovniServer;
    4.62 -    }
    4.63 +	public void setPracovniAdresar(String pracovniAdresar) {
    4.64 +		this.pracovniAdresar = pracovniAdresar;
    4.65 +	}
    4.66  
    4.67 -    public void setPostovniServer(String postovniServer) {
    4.68 -        this.postovniServer = postovniServer;
    4.69 -    }
    4.70 +	public String getCestaKCertifikatum() {
    4.71 +		return cestaKCertifikatum;
    4.72 +	}
    4.73  
    4.74 -    public int getPostovniPort() {
    4.75 -        return postovniPort;
    4.76 -    }
    4.77 +	public void setCestaKCertifikatum(String cestaKCertifikatum) {
    4.78 +		this.cestaKCertifikatum = cestaKCertifikatum;
    4.79 +	}
    4.80  
    4.81 -    public void setPostovniPort(int postovniPort) {
    4.82 -        this.postovniPort = postovniPort;
    4.83 -    }
    4.84 +	public String getPostovniServer() {
    4.85 +		return postovniServer;
    4.86 +	}
    4.87  
    4.88 -    public String getPostovniJmeno() {
    4.89 -        return postovniJmeno;
    4.90 -    }
    4.91 +	public void setPostovniServer(String postovniServer) {
    4.92 +		this.postovniServer = postovniServer;
    4.93 +	}
    4.94  
    4.95 -    public void setPostovniJmeno(String postovniJmeno) {
    4.96 -        this.postovniJmeno = postovniJmeno;
    4.97 -    }
    4.98 +	public int getPostovniPort() {
    4.99 +		return postovniPort;
   4.100 +	}
   4.101  
   4.102 -    public char[] getPostovniHeslo() {
   4.103 -        return postovniHeslo;
   4.104 -    }
   4.105 +	public void setPostovniPort(int postovniPort) {
   4.106 +		this.postovniPort = postovniPort;
   4.107 +	}
   4.108  
   4.109 -    public void setPostovniHeslo(char[] postovniHeslo) {
   4.110 -        this.postovniHeslo = postovniHeslo;
   4.111 -    }
   4.112 +	public String getPostovniJmeno() {
   4.113 +		return postovniJmeno;
   4.114 +	}
   4.115  
   4.116 -    public int getLimitZprav() {
   4.117 -        return limitZprav;
   4.118 -    }
   4.119 +	public void setPostovniJmeno(String postovniJmeno) {
   4.120 +		this.postovniJmeno = postovniJmeno;
   4.121 +	}
   4.122  
   4.123 -    public void setLimitZprav(int limitZprav) {
   4.124 -        this.limitZprav = limitZprav;
   4.125 -    }
   4.126 +	public char[] getPostovniHeslo() {
   4.127 +		return postovniHeslo;
   4.128 +	}
   4.129  
   4.130 -    public String getDatabaze() {
   4.131 -        return databaze;
   4.132 -    }
   4.133 +	public void setPostovniHeslo(char[] postovniHeslo) {
   4.134 +		this.postovniHeslo = postovniHeslo;
   4.135 +	}
   4.136  
   4.137 -    public String getDbJmeno() {
   4.138 -        return dbJmeno;
   4.139 -    }
   4.140 +	public int getLimitZprav() {
   4.141 +		return limitZprav;
   4.142 +	}
   4.143  
   4.144 -    public char[] getDbHeslo() {
   4.145 -        return dbHeslo;
   4.146 -    }
   4.147 +	public void setLimitZprav(int limitZprav) {
   4.148 +		this.limitZprav = limitZprav;
   4.149 +	}
   4.150  
   4.151 -    public ArrayList<InternetAddressKomu> getVychoziPrijemci() {
   4.152 -        return vychoziPrijemci;
   4.153 -    }
   4.154 +	public String getDatabaze() {
   4.155 +		return databaze;
   4.156 +	}
   4.157  
   4.158 -    public void setDatabaze(String databaze) {
   4.159 -        this.databaze = databaze;
   4.160 -    }
   4.161 +	public String getDbJmeno() {
   4.162 +		return dbJmeno;
   4.163 +	}
   4.164  
   4.165 -    public void setDbJmeno(String dbJmeno) {
   4.166 -        this.dbJmeno = dbJmeno;
   4.167 -    }
   4.168 +	public char[] getDbHeslo() {
   4.169 +		return dbHeslo;
   4.170 +	}
   4.171  
   4.172 -    public void setDbHeslo(char[] dbHeslo) {
   4.173 -        this.dbHeslo = dbHeslo;
   4.174 -    }
   4.175 +	public ArrayList<InternetAddressKomu> getVychoziPrijemci() {
   4.176 +		return vychoziPrijemci;
   4.177 +	}
   4.178  
   4.179 -    public void setVychoziPrijemci(ArrayList<InternetAddressKomu> vychoziPrijemci) {
   4.180 -        this.vychoziPrijemci = vychoziPrijemci;
   4.181 -    }
   4.182 -    
   4.183 +	public void setDatabaze(String databaze) {
   4.184 +		this.databaze = databaze;
   4.185 +	}
   4.186  
   4.187 +	public void setDbJmeno(String dbJmeno) {
   4.188 +		this.dbJmeno = dbJmeno;
   4.189 +	}
   4.190 +
   4.191 +	public void setDbHeslo(char[] dbHeslo) {
   4.192 +		this.dbHeslo = dbHeslo;
   4.193 +	}
   4.194 +
   4.195 +	public void setVychoziPrijemci(ArrayList<InternetAddressKomu> vychoziPrijemci) {
   4.196 +		this.vychoziPrijemci = vychoziPrijemci;
   4.197 +	}
   4.198  }
     5.1 --- a/java/Postak/src/cz/frantovo/postak/Postak.java	Sat Feb 28 18:06:12 2009 +0100
     5.2 +++ b/java/Postak/src/cz/frantovo/postak/Postak.java	Mon Sep 27 19:04:50 2010 +0200
     5.3 @@ -90,7 +90,7 @@
     5.4              }
     5.5              naplnPrijemce(mimeZprava, zprava);
     5.6              mimeZprava.setSubject(zprava.getPredmet());
     5.7 -            mimeZprava.setHeader("User-Agent", "http://frantovo.cz/projekty/SuperPostak/");
     5.8 +            mimeZprava.setHeader("User-Agent", "http://frantovo.cz/projekty/SuperPostak/ | https://posta.veverka.ch/posta/");
     5.9              if (zprava.isFormatHTML()) {
    5.10                  mimeZprava.setText(zprava.getText(), "UTF-8", "html");
    5.11              } else {
     6.1 --- a/java/SuperPostak/nbproject/build-impl.xml	Sat Feb 28 18:06:12 2009 +0100
     6.2 +++ b/java/SuperPostak/nbproject/build-impl.xml	Mon Sep 27 19:04:50 2010 +0200
     6.3 @@ -21,6 +21,13 @@
     6.4          -->
     6.5  <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SuperPostak-impl">
     6.6      <import file="jnlp-impl.xml"/>
     6.7 +    <fail message="Please build using Ant 1.7.1 or higher.">
     6.8 +        <condition>
     6.9 +            <not>
    6.10 +                <antversion atleast="1.7.1"/>
    6.11 +            </not>
    6.12 +        </condition>
    6.13 +    </fail>
    6.14      <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
    6.15      <!-- 
    6.16                  ======================
    6.17 @@ -49,19 +56,68 @@
    6.18      </target>
    6.19      <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    6.20          <available file="${manifest.file}" property="manifest.available"/>
    6.21 -        <condition property="manifest.available+main.class">
    6.22 +        <available file="${application.splash}" property="splashscreen.available"/>
    6.23 +        <condition property="main.class.available">
    6.24              <and>
    6.25 -                <isset property="manifest.available"/>
    6.26                  <isset property="main.class"/>
    6.27                  <not>
    6.28                      <equals arg1="${main.class}" arg2="" trim="true"/>
    6.29                  </not>
    6.30              </and>
    6.31          </condition>
    6.32 +        <condition property="manifest.available+main.class">
    6.33 +            <and>
    6.34 +                <isset property="manifest.available"/>
    6.35 +                <isset property="main.class.available"/>
    6.36 +            </and>
    6.37 +        </condition>
    6.38 +        <condition property="do.mkdist">
    6.39 +            <and>
    6.40 +                <isset property="libs.CopyLibs.classpath"/>
    6.41 +                <not>
    6.42 +                    <istrue value="${mkdist.disabled}"/>
    6.43 +                </not>
    6.44 +            </and>
    6.45 +        </condition>
    6.46          <condition property="manifest.available+main.class+mkdist.available">
    6.47              <and>
    6.48                  <istrue value="${manifest.available+main.class}"/>
    6.49 -                <isset property="libs.CopyLibs.classpath"/>
    6.50 +                <isset property="do.mkdist"/>
    6.51 +            </and>
    6.52 +        </condition>
    6.53 +        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
    6.54 +            <and>
    6.55 +                <istrue value="${manifest.available+main.class+mkdist.available}"/>
    6.56 +                <istrue value="${splashscreen.available}"/>
    6.57 +            </and>
    6.58 +        </condition>
    6.59 +        <condition property="do.archive">
    6.60 +            <not>
    6.61 +                <istrue value="${jar.archive.disabled}"/>
    6.62 +            </not>
    6.63 +        </condition>
    6.64 +        <condition property="do.archive+manifest.available">
    6.65 +            <and>
    6.66 +                <isset property="manifest.available"/>
    6.67 +                <istrue value="${do.archive}"/>
    6.68 +            </and>
    6.69 +        </condition>
    6.70 +        <condition property="do.archive+manifest.available+main.class">
    6.71 +            <and>
    6.72 +                <istrue value="${manifest.available+main.class}"/>
    6.73 +                <istrue value="${do.archive}"/>
    6.74 +            </and>
    6.75 +        </condition>
    6.76 +        <condition property="do.archive+manifest.available+main.class+mkdist.available">
    6.77 +            <and>
    6.78 +                <istrue value="${manifest.available+main.class+mkdist.available}"/>
    6.79 +                <istrue value="${do.archive}"/>
    6.80 +            </and>
    6.81 +        </condition>
    6.82 +        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
    6.83 +            <and>
    6.84 +                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
    6.85 +                <istrue value="${do.archive}"/>
    6.86              </and>
    6.87          </condition>
    6.88          <condition property="have.tests">
    6.89 @@ -98,6 +154,7 @@
    6.90          <property name="javadoc.preview" value="true"/>
    6.91          <property name="application.args" value=""/>
    6.92          <property name="source.encoding" value="${file.encoding}"/>
    6.93 +        <property name="runtime.encoding" value="${source.encoding}"/>
    6.94          <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
    6.95              <and>
    6.96                  <isset property="javadoc.encoding"/>
    6.97 @@ -113,12 +170,13 @@
    6.98          <condition property="do.depend.true">
    6.99              <istrue value="${do.depend}"/>
   6.100          </condition>
   6.101 -        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
   6.102 -            <and>
   6.103 -                <isset property="jaxws.endorsed.dir"/>
   6.104 -                <available file="nbproject/jaxws-build.xml"/>
   6.105 -            </and>
   6.106 +        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
   6.107 +        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
   6.108 +            <length length="0" string="${endorsed.classpath}" when="greater"/>
   6.109          </condition>
   6.110 +        <property name="javac.fork" value="false"/>
   6.111 +        <property name="jar.index" value="false"/>
   6.112 +        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
   6.113      </target>
   6.114      <target name="-post-init">
   6.115          <!-- Empty placeholder for easier customization. -->
   6.116 @@ -145,26 +203,79 @@
   6.117              </sequential>
   6.118          </macrodef>
   6.119      </target>
   6.120 -    <target name="-init-macrodef-javac">
   6.121 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
   6.122          <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
   6.123              <attribute default="${src.dir}" name="srcdir"/>
   6.124              <attribute default="${build.classes.dir}" name="destdir"/>
   6.125              <attribute default="${javac.classpath}" name="classpath"/>
   6.126 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   6.127 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   6.128              <attribute default="${includes}" name="includes"/>
   6.129              <attribute default="${excludes}" name="excludes"/>
   6.130              <attribute default="${javac.debug}" name="debug"/>
   6.131 -            <attribute default="/does/not/exist" name="sourcepath"/>
   6.132 +            <attribute default="${empty.dir}" name="sourcepath"/>
   6.133 +            <attribute default="${empty.dir}" name="gensrcdir"/>
   6.134              <element name="customize" optional="true"/>
   6.135              <sequential>
   6.136 -                <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}">
   6.137 +                <property location="${build.dir}/empty" name="empty.dir"/>
   6.138 +                <mkdir dir="${empty.dir}"/>
   6.139 +                <mkdir dir="@{apgeneratedsrcdir}"/>
   6.140 +                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
   6.141 +                    <src>
   6.142 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   6.143 +                            <include name="*"/>
   6.144 +                        </dirset>
   6.145 +                    </src>
   6.146                      <classpath>
   6.147                          <path path="@{classpath}"/>
   6.148                      </classpath>
   6.149 -                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
   6.150 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   6.151 +                    <compilerarg line="${javac.compilerargs}"/>
   6.152 +                    <compilerarg value="-processorpath"/>
   6.153 +                    <compilerarg path="@{processorpath}:${empty.dir}"/>
   6.154 +                    <compilerarg line="${ap.processors.internal}"/>
   6.155 +                    <compilerarg line="${annotation.processing.processor.options}"/>
   6.156 +                    <compilerarg value="-s"/>
   6.157 +                    <compilerarg path="@{apgeneratedsrcdir}"/>
   6.158 +                    <compilerarg line="${ap.proc.none.internal}"/>
   6.159                      <customize/>
   6.160                  </javac>
   6.161              </sequential>
   6.162          </macrodef>
   6.163 +    </target>
   6.164 +    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
   6.165 +        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
   6.166 +            <attribute default="${src.dir}" name="srcdir"/>
   6.167 +            <attribute default="${build.classes.dir}" name="destdir"/>
   6.168 +            <attribute default="${javac.classpath}" name="classpath"/>
   6.169 +            <attribute default="${javac.processorpath}" name="processorpath"/>
   6.170 +            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
   6.171 +            <attribute default="${includes}" name="includes"/>
   6.172 +            <attribute default="${excludes}" name="excludes"/>
   6.173 +            <attribute default="${javac.debug}" name="debug"/>
   6.174 +            <attribute default="${empty.dir}" name="sourcepath"/>
   6.175 +            <attribute default="${empty.dir}" name="gensrcdir"/>
   6.176 +            <element name="customize" optional="true"/>
   6.177 +            <sequential>
   6.178 +                <property location="${build.dir}/empty" name="empty.dir"/>
   6.179 +                <mkdir dir="${empty.dir}"/>
   6.180 +                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
   6.181 +                    <src>
   6.182 +                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   6.183 +                            <include name="*"/>
   6.184 +                        </dirset>
   6.185 +                    </src>
   6.186 +                    <classpath>
   6.187 +                        <path path="@{classpath}"/>
   6.188 +                    </classpath>
   6.189 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   6.190 +                    <compilerarg line="${javac.compilerargs}"/>
   6.191 +                    <customize/>
   6.192 +                </javac>
   6.193 +            </sequential>
   6.194 +        </macrodef>
   6.195 +    </target>
   6.196 +    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
   6.197          <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
   6.198              <attribute default="${src.dir}" name="srcdir"/>
   6.199              <attribute default="${build.classes.dir}" name="destdir"/>
   6.200 @@ -199,7 +310,7 @@
   6.201              <attribute default="${excludes}" name="excludes"/>
   6.202              <attribute default="**" name="testincludes"/>
   6.203              <sequential>
   6.204 -                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
   6.205 +                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
   6.206                      <batchtest todir="${build.test.results.dir}">
   6.207                          <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   6.208                              <filename name="@{testincludes}"/>
   6.209 @@ -214,6 +325,7 @@
   6.210                      </syspropertyset>
   6.211                      <formatter type="brief" usefile="false"/>
   6.212                      <formatter type="xml"/>
   6.213 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   6.214                      <jvmarg line="${run.jvmargs}"/>
   6.215                  </junit>
   6.216              </sequential>
   6.217 @@ -270,8 +382,11 @@
   6.218              <element name="customize" optional="true"/>
   6.219              <sequential>
   6.220                  <java classname="@{classname}" dir="${work.dir}" fork="true">
   6.221 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   6.222                      <jvmarg line="${debug-args-line}"/>
   6.223                      <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   6.224 +                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
   6.225 +                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
   6.226                      <jvmarg line="${run.jvmargs}"/>
   6.227                      <classpath>
   6.228                          <path path="@{classpath}"/>
   6.229 @@ -288,12 +403,16 @@
   6.230      <target name="-init-macrodef-java">
   6.231          <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
   6.232              <attribute default="${main.class}" name="classname"/>
   6.233 +            <attribute default="${run.classpath}" name="classpath"/>
   6.234              <element name="customize" optional="true"/>
   6.235              <sequential>
   6.236                  <java classname="@{classname}" dir="${work.dir}" fork="true">
   6.237 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   6.238 +                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
   6.239 +                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
   6.240                      <jvmarg line="${run.jvmargs}"/>
   6.241                      <classpath>
   6.242 -                        <path path="${run.classpath}"/>
   6.243 +                        <path path="@{classpath}"/>
   6.244                      </classpath>
   6.245                      <syspropertyset>
   6.246                          <propertyref prefix="run-sys-prop."/>
   6.247 @@ -304,22 +423,99 @@
   6.248              </sequential>
   6.249          </macrodef>
   6.250      </target>
   6.251 +    <target name="-init-macrodef-copylibs">
   6.252 +        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
   6.253 +            <element name="customize" optional="true"/>
   6.254 +            <sequential>
   6.255 +                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   6.256 +                <pathconvert property="run.classpath.without.build.classes.dir">
   6.257 +                    <path path="${run.classpath}"/>
   6.258 +                    <map from="${build.classes.dir.resolved}" to=""/>
   6.259 +                </pathconvert>
   6.260 +                <pathconvert pathsep=" " property="jar.classpath">
   6.261 +                    <path path="${run.classpath.without.build.classes.dir}"/>
   6.262 +                    <chainedmapper>
   6.263 +                        <flattenmapper/>
   6.264 +                        <globmapper from="*" to="lib/*"/>
   6.265 +                    </chainedmapper>
   6.266 +                </pathconvert>
   6.267 +                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   6.268 +                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   6.269 +                    <fileset dir="${build.classes.dir}"/>
   6.270 +                    <manifest>
   6.271 +                        <attribute name="Class-Path" value="${jar.classpath}"/>
   6.272 +                        <customize/>
   6.273 +                    </manifest>
   6.274 +                </copylibs>
   6.275 +            </sequential>
   6.276 +        </macrodef>
   6.277 +    </target>
   6.278      <target name="-init-presetdef-jar">
   6.279          <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
   6.280 -            <jar compress="${jar.compress}" jarfile="${dist.jar}">
   6.281 +            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
   6.282                  <j2seproject1:fileset dir="${build.classes.dir}"/>
   6.283              </jar>
   6.284          </presetdef>
   6.285      </target>
   6.286 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
   6.287 +    <target name="-init-ap-cmdline-properties">
   6.288 +        <property name="annotation.processing.enabled" value="true"/>
   6.289 +        <property name="annotation.processing.processors.list" value=""/>
   6.290 +        <property name="annotation.processing.processor.options" value=""/>
   6.291 +        <property name="annotation.processing.run.all.processors" value="true"/>
   6.292 +        <property name="javac.processorpath" value="${javac.classpath}"/>
   6.293 +        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
   6.294 +        <condition property="ap.supported.internal" value="true">
   6.295 +            <not>
   6.296 +                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
   6.297 +            </not>
   6.298 +        </condition>
   6.299 +    </target>
   6.300 +    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
   6.301 +        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
   6.302 +            <isfalse value="${annotation.processing.run.all.processors}"/>
   6.303 +        </condition>
   6.304 +        <condition else="" property="ap.proc.none.internal" value="-proc:none">
   6.305 +            <isfalse value="${annotation.processing.enabled}"/>
   6.306 +        </condition>
   6.307 +    </target>
   6.308 +    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
   6.309 +        <property name="ap.cmd.line.internal" value=""/>
   6.310 +    </target>
   6.311 +    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
   6.312      <!--
   6.313                  ===================
   6.314                  COMPILATION SECTION
   6.315                  ===================
   6.316              -->
   6.317 -    <target depends="init" name="deps-jar" unless="no.deps">
   6.318 -        <ant antfile="${project.JFTable}/build.xml" inheritall="false" target="jar"/>
   6.319 -        <ant antfile="${project.Postak}/build.xml" inheritall="false" target="jar"/>
   6.320 +    <target name="-deps-jar-init" unless="built-jar.properties">
   6.321 +        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
   6.322 +        <delete file="${built-jar.properties}" quiet="true"/>
   6.323 +    </target>
   6.324 +    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
   6.325 +        <echo level="warn" message="Cycle detected: SuperPostak was already built"/>
   6.326 +    </target>
   6.327 +    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
   6.328 +        <mkdir dir="${build.dir}"/>
   6.329 +        <touch file="${built-jar.properties}" verbose="false"/>
   6.330 +        <property file="${built-jar.properties}" prefix="already.built.jar."/>
   6.331 +        <antcall target="-warn-already-built-jar"/>
   6.332 +        <propertyfile file="${built-jar.properties}">
   6.333 +            <entry key="${basedir}" value=""/>
   6.334 +        </propertyfile>
   6.335 +        <antcall target="-maybe-call-dep">
   6.336 +            <param name="call.built.properties" value="${built-jar.properties}"/>
   6.337 +            <param location="${project.JFTable}" name="call.subproject"/>
   6.338 +            <param location="${project.JFTable}/build.xml" name="call.script"/>
   6.339 +            <param name="call.target" value="jar"/>
   6.340 +            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
   6.341 +        </antcall>
   6.342 +        <antcall target="-maybe-call-dep">
   6.343 +            <param name="call.built.properties" value="${built-jar.properties}"/>
   6.344 +            <param location="${project.Postak}" name="call.subproject"/>
   6.345 +            <param location="${project.Postak}/build.xml" name="call.script"/>
   6.346 +            <param name="call.target" value="jar"/>
   6.347 +            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
   6.348 +        </antcall>
   6.349      </target>
   6.350      <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
   6.351      <target depends="init" name="-check-automatic-build">
   6.352 @@ -336,14 +532,25 @@
   6.353          <!-- You can override this target in the ../build.xml file. -->
   6.354      </target>
   6.355      <target if="do.depend.true" name="-compile-depend">
   6.356 -        <j2seproject3:depend/>
   6.357 +        <pathconvert property="build.generated.subdirs">
   6.358 +            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   6.359 +                <include name="*"/>
   6.360 +            </dirset>
   6.361 +        </pathconvert>
   6.362 +        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
   6.363      </target>
   6.364 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
   6.365 -        <j2seproject3:javac/>
   6.366 +    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
   6.367 +        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
   6.368          <copy todir="${build.classes.dir}">
   6.369              <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   6.370          </copy>
   6.371      </target>
   6.372 +    <target if="has.persistence.xml" name="-copy-persistence-xml">
   6.373 +        <mkdir dir="${build.classes.dir}/META-INF"/>
   6.374 +        <copy todir="${build.classes.dir}/META-INF">
   6.375 +            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
   6.376 +        </copy>
   6.377 +    </target>
   6.378      <target name="-post-compile">
   6.379          <!-- Empty placeholder for easier customization. -->
   6.380          <!-- You can override this target in the ../build.xml file. -->
   6.381 @@ -356,7 +563,7 @@
   6.382      <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
   6.383          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   6.384          <j2seproject3:force-recompile/>
   6.385 -        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
   6.386 +        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
   6.387      </target>
   6.388      <target name="-post-compile-single">
   6.389          <!-- Empty placeholder for easier customization. -->
   6.390 @@ -376,13 +583,13 @@
   6.391          <!-- Empty placeholder for easier customization. -->
   6.392          <!-- You can override this target in the ../build.xml file. -->
   6.393      </target>
   6.394 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
   6.395 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
   6.396          <j2seproject1:jar/>
   6.397      </target>
   6.398 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
   6.399 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
   6.400          <j2seproject1:jar manifest="${manifest.file}"/>
   6.401      </target>
   6.402 -    <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">
   6.403 +    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
   6.404          <j2seproject1:jar manifest="${manifest.file}">
   6.405              <j2seproject1:manifest>
   6.406                  <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
   6.407 @@ -397,27 +604,26 @@
   6.408          </pathconvert>
   6.409          <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
   6.410      </target>
   6.411 -    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
   6.412 -        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
   6.413 -        <pathconvert property="run.classpath.without.build.classes.dir">
   6.414 -            <path path="${run.classpath}"/>
   6.415 -            <map from="${build.classes.dir.resolved}" to=""/>
   6.416 -        </pathconvert>
   6.417 -        <pathconvert pathsep=" " property="jar.classpath">
   6.418 -            <path path="${run.classpath.without.build.classes.dir}"/>
   6.419 -            <chainedmapper>
   6.420 -                <flattenmapper/>
   6.421 -                <globmapper from="*" to="lib/*"/>
   6.422 -            </chainedmapper>
   6.423 -        </pathconvert>
   6.424 -        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
   6.425 -        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
   6.426 -            <fileset dir="${build.classes.dir}"/>
   6.427 -            <manifest>
   6.428 +    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen">
   6.429 +        <basename file="${application.splash}" property="splashscreen.basename"/>
   6.430 +        <mkdir dir="${build.classes.dir}/META-INF"/>
   6.431 +        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
   6.432 +        <j2seproject3:copylibs>
   6.433 +            <customize>
   6.434                  <attribute name="Main-Class" value="${main.class}"/>
   6.435 -                <attribute name="Class-Path" value="${jar.classpath}"/>
   6.436 -            </manifest>
   6.437 -        </copylibs>
   6.438 +                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
   6.439 +            </customize>
   6.440 +        </j2seproject3:copylibs>
   6.441 +        <echo>To run this application from the command line without Ant, try:</echo>
   6.442 +        <property location="${dist.jar}" name="dist.jar.resolved"/>
   6.443 +        <echo>java -jar "${dist.jar.resolved}"</echo>
   6.444 +    </target>
   6.445 +    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available">
   6.446 +        <j2seproject3:copylibs>
   6.447 +            <customize>
   6.448 +                <attribute name="Main-Class" value="${main.class}"/>
   6.449 +            </customize>
   6.450 +        </j2seproject3:copylibs>
   6.451          <echo>To run this application from the command line without Ant, try:</echo>
   6.452          <property location="${dist.jar}" name="dist.jar.resolved"/>
   6.453          <echo>java -jar "${dist.jar.resolved}"</echo>
   6.454 @@ -426,7 +632,7 @@
   6.455          <!-- Empty placeholder for easier customization. -->
   6.456          <!-- You can override this target in the ../build.xml file. -->
   6.457      </target>
   6.458 -    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar,jnlp" description="Build JAR." name="jar"/>
   6.459 +    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar,jnlp" description="Build JAR." name="jar"/>
   6.460      <!--
   6.461                  =================
   6.462                  EXECUTION SECTION
   6.463 @@ -442,10 +648,14 @@
   6.464      <target name="-do-not-recompile">
   6.465          <property name="javac.includes.binary" value=""/>
   6.466      </target>
   6.467 -    <target depends="init,-do-not-recompile,compile-single" name="run-single">
   6.468 +    <target depends="init,compile-single" name="run-single">
   6.469          <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   6.470          <j2seproject1:java classname="${run.class}"/>
   6.471      </target>
   6.472 +    <target depends="init,compile-test-single" name="run-test-with-main">
   6.473 +        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   6.474 +        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
   6.475 +    </target>
   6.476      <!--
   6.477                  =================
   6.478                  DEBUGGING SECTION
   6.479 @@ -454,6 +664,9 @@
   6.480      <target depends="init" if="netbeans.home" name="-debug-start-debugger">
   6.481          <j2seproject1:nbjpdastart name="${debug.class}"/>
   6.482      </target>
   6.483 +    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
   6.484 +        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
   6.485 +    </target>
   6.486      <target depends="init,compile" name="-debug-start-debuggee">
   6.487          <j2seproject3:debug>
   6.488              <customize>
   6.489 @@ -470,7 +683,12 @@
   6.490          <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
   6.491          <j2seproject3:debug classname="${debug.class}"/>
   6.492      </target>
   6.493 -    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
   6.494 +    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
   6.495 +    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
   6.496 +        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
   6.497 +        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
   6.498 +    </target>
   6.499 +    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
   6.500      <target depends="init" name="-pre-debug-fix">
   6.501          <fail unless="fix.includes">Must set fix.includes</fail>
   6.502          <property name="javac.includes" value="${fix.includes}.java"/>
   6.503 @@ -484,7 +702,7 @@
   6.504                  JAVADOC SECTION
   6.505                  ===============
   6.506              -->
   6.507 -    <target depends="init" name="-javadoc-build">
   6.508 +    <target depends="init" if="have.sources" name="-javadoc-build">
   6.509          <mkdir dir="${dist.javadoc.dir}"/>
   6.510          <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}">
   6.511              <classpath>
   6.512 @@ -493,7 +711,18 @@
   6.513              <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   6.514                  <filename name="**/*.java"/>
   6.515              </fileset>
   6.516 +            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   6.517 +                <include name="**/*.java"/>
   6.518 +            </fileset>
   6.519          </javadoc>
   6.520 +        <copy todir="${dist.javadoc.dir}">
   6.521 +            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   6.522 +                <filename name="**/doc-files/**"/>
   6.523 +            </fileset>
   6.524 +            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   6.525 +                <include name="**/doc-files/**"/>
   6.526 +            </fileset>
   6.527 +        </copy>
   6.528      </target>
   6.529      <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
   6.530          <nbbrowse file="${dist.javadoc.dir}/index.html"/>
   6.531 @@ -515,7 +744,7 @@
   6.532          <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   6.533      </target>
   6.534      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
   6.535 -        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   6.536 +        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
   6.537          <copy todir="${build.test.classes.dir}">
   6.538              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   6.539          </copy>
   6.540 @@ -532,7 +761,7 @@
   6.541      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   6.542          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   6.543          <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
   6.544 -        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
   6.545 +        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
   6.546          <copy todir="${build.test.classes.dir}">
   6.547              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   6.548          </copy>
   6.549 @@ -554,7 +783,7 @@
   6.550          <j2seproject3:junit testincludes="**/*Test.java"/>
   6.551      </target>
   6.552      <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
   6.553 -        <fail if="tests.failed">Some tests failed; see details above.</fail>
   6.554 +        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   6.555      </target>
   6.556      <target depends="init" if="have.tests" name="test-report"/>
   6.557      <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
   6.558 @@ -567,9 +796,9 @@
   6.559          <j2seproject3:junit excludes="" includes="${test.includes}"/>
   6.560      </target>
   6.561      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
   6.562 -        <fail if="tests.failed">Some tests failed; see details above.</fail>
   6.563 +        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   6.564      </target>
   6.565 -    <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"/>
   6.566 +    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
   6.567      <!--
   6.568                  =======================
   6.569                  JUNIT DEBUGGING SECTION
   6.570 @@ -596,7 +825,7 @@
   6.571      <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
   6.572          <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
   6.573      </target>
   6.574 -    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
   6.575 +    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
   6.576      <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
   6.577          <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
   6.578      </target>
   6.579 @@ -633,17 +862,59 @@
   6.580                  CLEANUP SECTION
   6.581                  ===============
   6.582              -->
   6.583 -    <target depends="init" name="deps-clean" unless="no.deps">
   6.584 -        <ant antfile="${project.JFTable}/build.xml" inheritall="false" target="clean"/>
   6.585 -        <ant antfile="${project.Postak}/build.xml" inheritall="false" target="clean"/>
   6.586 +    <target name="-deps-clean-init" unless="built-clean.properties">
   6.587 +        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
   6.588 +        <delete file="${built-clean.properties}" quiet="true"/>
   6.589 +    </target>
   6.590 +    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
   6.591 +        <echo level="warn" message="Cycle detected: SuperPostak was already built"/>
   6.592 +    </target>
   6.593 +    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
   6.594 +        <mkdir dir="${build.dir}"/>
   6.595 +        <touch file="${built-clean.properties}" verbose="false"/>
   6.596 +        <property file="${built-clean.properties}" prefix="already.built.clean."/>
   6.597 +        <antcall target="-warn-already-built-clean"/>
   6.598 +        <propertyfile file="${built-clean.properties}">
   6.599 +            <entry key="${basedir}" value=""/>
   6.600 +        </propertyfile>
   6.601 +        <antcall target="-maybe-call-dep">
   6.602 +            <param name="call.built.properties" value="${built-clean.properties}"/>
   6.603 +            <param location="${project.JFTable}" name="call.subproject"/>
   6.604 +            <param location="${project.JFTable}/build.xml" name="call.script"/>
   6.605 +            <param name="call.target" value="clean"/>
   6.606 +            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
   6.607 +        </antcall>
   6.608 +        <antcall target="-maybe-call-dep">
   6.609 +            <param name="call.built.properties" value="${built-clean.properties}"/>
   6.610 +            <param location="${project.Postak}" name="call.subproject"/>
   6.611 +            <param location="${project.Postak}/build.xml" name="call.script"/>
   6.612 +            <param name="call.target" value="clean"/>
   6.613 +            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
   6.614 +        </antcall>
   6.615      </target>
   6.616      <target depends="init" name="-do-clean">
   6.617          <delete dir="${build.dir}"/>
   6.618 -        <delete dir="${dist.dir}"/>
   6.619 +        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
   6.620      </target>
   6.621      <target name="-post-clean">
   6.622          <!-- Empty placeholder for easier customization. -->
   6.623          <!-- You can override this target in the ../build.xml file. -->
   6.624      </target>
   6.625      <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
   6.626 +    <target name="-check-call-dep">
   6.627 +        <property file="${call.built.properties}" prefix="already.built."/>
   6.628 +        <condition property="should.call.dep">
   6.629 +            <not>
   6.630 +                <isset property="already.built.${call.subproject}"/>
   6.631 +            </not>
   6.632 +        </condition>
   6.633 +    </target>
   6.634 +    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
   6.635 +        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
   6.636 +            <propertyset>
   6.637 +                <propertyref prefix="transfer."/>
   6.638 +                <mapper from="transfer.*" to="*" type="glob"/>
   6.639 +            </propertyset>
   6.640 +        </ant>
   6.641 +    </target>
   6.642  </project>
     7.1 --- a/java/SuperPostak/nbproject/genfiles.properties	Sat Feb 28 18:06:12 2009 +0100
     7.2 +++ b/java/SuperPostak/nbproject/genfiles.properties	Mon Sep 27 19:04:50 2010 +0200
     7.3 @@ -1,8 +1,8 @@
     7.4  build.xml.data.CRC32=d917048a
     7.5  build.xml.script.CRC32=7b671108
     7.6 -build.xml.stylesheet.CRC32=958a1d3e
     7.7 +build.xml.stylesheet.CRC32=28e38971@1.38.2.45
     7.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     7.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    7.10  nbproject/build-impl.xml.data.CRC32=d917048a
    7.11 -nbproject/build-impl.xml.script.CRC32=957eb65c
    7.12 -nbproject/build-impl.xml.stylesheet.CRC32=65b8de21
    7.13 +nbproject/build-impl.xml.script.CRC32=f09a3efb
    7.14 +nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45
     8.1 --- a/java/SuperPostak/nbproject/project.properties	Sat Feb 28 18:06:12 2009 +0100
     8.2 +++ b/java/SuperPostak/nbproject/project.properties	Mon Sep 27 19:04:50 2010 +0200
     8.3 @@ -5,6 +5,7 @@
     8.4  # This directory is removed when the project is cleaned:
     8.5  build.dir=build
     8.6  build.generated.dir=${build.dir}/generated
     8.7 +build.generated.sources.dir=${build.dir}/generated-sources
     8.8  # Only compile against the classpath explicitly listed here:
     8.9  build.sysclasspath=ignore
    8.10  build.test.classes.dir=${build.dir}/test/classes
    8.11 @@ -30,7 +31,8 @@
    8.12      ${libs.MySQLDriver.classpath}:\
    8.13      ${libs.jTDS-Sybase-MSSQL.classpath}:\
    8.14      ${libs.Sybase.com.classpath}:\
    8.15 -    ${reference.Postak.jar}
    8.16 +    ${reference.Postak.jar}:\
    8.17 +    ${libs.OracleJDBC.classpath}
    8.18  # Space-separated list of extra javac options
    8.19  javac.compilerargs=
    8.20  javac.deprecation=false
     9.1 --- a/java/SuperPostak/src/cz/frantovo/superPostak/PanelPrijemcu.form	Sat Feb 28 18:06:12 2009 +0100
     9.2 +++ b/java/SuperPostak/src/cz/frantovo/superPostak/PanelPrijemcu.form	Mon Sep 27 19:04:50 2010 +0200
     9.3 @@ -1,4 +1,4 @@
     9.4 -<?xml version="1.0" encoding="UTF-8" ?>
     9.5 +<?xml version="1.1" encoding="UTF-8" ?>
     9.6  
     9.7  <Form version="1.3" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
     9.8    <AuxValues>
     9.9 @@ -17,7 +17,7 @@
    9.10      <DimensionLayout dim="0">
    9.11        <Group type="103" groupAlignment="0" attributes="0">
    9.12            <Group type="102" alignment="1" attributes="0">
    9.13 -              <EmptySpace pref="97" max="32767" attributes="0"/>
    9.14 +              <EmptySpace pref="125" max="32767" attributes="0"/>
    9.15                <Component id="otevrit" min="-2" max="-2" attributes="0"/>
    9.16                <EmptySpace max="-2" attributes="0"/>
    9.17                <Component id="ulozit" min="-2" max="-2" attributes="0"/>
    10.1 --- a/java/SuperPostak/src/cz/frantovo/superPostak/PanelPrijemcu.java	Sat Feb 28 18:06:12 2009 +0100
    10.2 +++ b/java/SuperPostak/src/cz/frantovo/superPostak/PanelPrijemcu.java	Mon Sep 27 19:04:50 2010 +0200
    10.3 @@ -2,6 +2,7 @@
    10.4  
    10.5  import cz.frantovo.gui.tabulky.TableSorterModel;
    10.6  import cz.frantovo.postak.InternetAddressKomu;
    10.7 +import cz.frantovo.postak.Nastaveni;
    10.8  import cz.frantovo.postak.Postak;
    10.9  import java.awt.Cursor;
   10.10  import java.io.BufferedReader;
   10.11 @@ -26,9 +27,10 @@
   10.12   */
   10.13  public class PanelPrijemcu extends javax.swing.JPanel {
   10.14  
   10.15 -    private static Logger log = Logger.getLogger(PanelPrijemcu.class.getName());
   10.16 +    private static final Logger log = Logger.getLogger(PanelPrijemcu.class.getName());
   10.17      private static final long serialVersionUID = -8981943048392428523L;
   10.18      private ModelTabulky data = new ModelTabulky();
   10.19 +	private Nastaveni nastaveni = new Nastaveni();
   10.20  
   10.21      /** Creates new form PanelPrijemcu */
   10.22      public PanelPrijemcu() {
   10.23 @@ -42,6 +44,10 @@
   10.24          return data.data;
   10.25      }
   10.26  
   10.27 +	public void setNastaveni(Nastaveni nastaveni) {
   10.28 +		this.nastaveni = nastaveni;
   10.29 +	}
   10.30 +
   10.31      /** 
   10.32       * @param prijemci pokud je null, nastaví prázdná kolekce.
   10.33       */
   10.34 @@ -179,9 +185,11 @@
   10.35          JFileChooser dialog = new JFileChooser();
   10.36          dialog.setMultiSelectionEnabled(false);
   10.37          dialog.setDialogTitle("Uložit seznam do souboru");
   10.38 +		dialog.setCurrentDirectory(new File(nastaveni.getPracovniAdresar()));
   10.39          int vysledek = dialog.showSaveDialog(this);
   10.40          if (vysledek == JFileChooser.APPROVE_OPTION) {
   10.41              File soubor = dialog.getSelectedFile();
   10.42 +			nastaveni.setPracovniAdresar(soubor.getParent());
   10.43              try {
   10.44                  setCursor(new Cursor(Cursor.WAIT_CURSOR));
   10.45                  OutputStreamWriter zapisovac = new FileWriter(soubor);
   10.46 @@ -217,9 +225,11 @@
   10.47          JFileChooser dialog = new JFileChooser();
   10.48          dialog.setMultiSelectionEnabled(false);
   10.49          dialog.setDialogTitle("Načíst adresy ze souboru");
   10.50 +		dialog.setCurrentDirectory(new File(nastaveni.getPracovniAdresar()));
   10.51          int vysledek = dialog.showOpenDialog(this);
   10.52          if (vysledek == JFileChooser.APPROVE_OPTION) {
   10.53              File soubor = dialog.getSelectedFile();
   10.54 +			nastaveni.setPracovniAdresar(soubor.getParent());
   10.55              try {
   10.56                  setCursor(new Cursor(Cursor.WAIT_CURSOR));
   10.57                  BufferedReader ctenar = new BufferedReader(new FileReader(soubor));
    11.1 --- a/java/SuperPostak/src/cz/frantovo/superPostak/SuperPostak.form	Sat Feb 28 18:06:12 2009 +0100
    11.2 +++ b/java/SuperPostak/src/cz/frantovo/superPostak/SuperPostak.form	Mon Sep 27 19:04:50 2010 +0200
    11.3 @@ -1,4 +1,4 @@
    11.4 -<?xml version="1.0" encoding="UTF-8" ?>
    11.5 +<?xml version="1.1" encoding="UTF-8" ?>
    11.6  
    11.7  <Form version="1.3" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
    11.8    <NonVisualComponents>
    12.1 --- a/java/SuperPostak/src/cz/frantovo/superPostak/SuperPostak.java	Sat Feb 28 18:06:12 2009 +0100
    12.2 +++ b/java/SuperPostak/src/cz/frantovo/superPostak/SuperPostak.java	Mon Sep 27 19:04:50 2010 +0200
    12.3 @@ -72,6 +72,11 @@
    12.4          inicializujCardLayout();
    12.5          setLocationRelativeTo(null);
    12.6  
    12.7 +		/** Kvůli souborovým dialogům – aby se otvírali ve stejné složce jako minule. */
    12.8 +		prijemciDodatecni.setNastaveni(nastaveni);
    12.9 +		prijemciVychozi.setNastaveni(nastaveni);
   12.10 +		prijemciZkusebni.setNastaveni(nastaveni);
   12.11 +
   12.12          /** Vyřešíme problém TAB vs. Focus */
   12.13          vyresitTabFocusProblem(vstupSQL);
   12.14          vyresitTabFocusProblem(vstupZprava);
   12.15 @@ -135,6 +140,7 @@
   12.16          nactiOvladacJDBC("com.mysql.jdbc.Driver", "MySQL");
   12.17          nactiOvladacJDBC("net.sourceforge.jtds.jdbc.Driver", "jTDS Sybase a MS SQL");
   12.18          nactiOvladacJDBC("com.sybase.jdbc2.jdbc.SybDriver", "Sybase.com");
   12.19 +        nactiOvladacJDBC("oracle.jdbc.OracleDriver", "Oracle");
   12.20      }
   12.21  
   12.22      /**
   12.23 @@ -1047,6 +1053,7 @@
   12.24              Collection<InternetAddressKomu> adresy = getPrijemciSQL();
   12.25  
   12.26              ZobrazovacAdres zobrazovac = new ZobrazovacAdres(this, false);
   12.27 +			zobrazovac.setNastaveni(nastaveni);
   12.28              zobrazovac.setAdresy(adresy);
   12.29              zobrazovac.setLocationRelativeTo(this);
   12.30              zobrazovac.setVisible(true);
    13.1 --- a/java/SuperPostak/src/cz/frantovo/superPostak/ZobrazovacAdres.form	Sat Feb 28 18:06:12 2009 +0100
    13.2 +++ b/java/SuperPostak/src/cz/frantovo/superPostak/ZobrazovacAdres.form	Mon Sep 27 19:04:50 2010 +0200
    13.3 @@ -1,4 +1,4 @@
    13.4 -<?xml version="1.0" encoding="UTF-8" ?>
    13.5 +<?xml version="1.1" encoding="UTF-8" ?>
    13.6  
    13.7  <Form version="1.3" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
    13.8    <Properties>
    14.1 --- a/java/SuperPostak/src/cz/frantovo/superPostak/ZobrazovacAdres.java	Sat Feb 28 18:06:12 2009 +0100
    14.2 +++ b/java/SuperPostak/src/cz/frantovo/superPostak/ZobrazovacAdres.java	Mon Sep 27 19:04:50 2010 +0200
    14.3 @@ -1,6 +1,7 @@
    14.4  package cz.frantovo.superPostak;
    14.5  
    14.6  import cz.frantovo.postak.InternetAddressKomu;
    14.7 +import cz.frantovo.postak.Nastaveni;
    14.8  import java.util.Collection;
    14.9  
   14.10  /**
   14.11 @@ -22,6 +23,10 @@
   14.12          panelAdres.setAdresy(adresy);
   14.13      }
   14.14  
   14.15 +	public void setNastaveni(Nastaveni n) {
   14.16 +		panelAdres.setNastaveni(n);
   14.17 +	}
   14.18 +
   14.19      /** This method is called from within the constructor to
   14.20       * initialize the form.
   14.21       * WARNING: Do NOT modify this code. The content of this method is