(no commit message)

diff --git a/fluidbook/tools/FWSTK_Resources/nbproject/private/private.xml b/fluidbook/tools/FWSTK_Resources/nbproject/private/private.xml
index b386d60a1a6b6de48f1f5170159854d16c05c349..6c4cdc21b589d32c3ec9c4f477977d14b5e9109a 100644 (file)
--- a/fluidbook/tools/FWSTK_Resources/nbproject/private/private.xml
+++ b/fluidbook/tools/FWSTK_Resources/nbproject/private/private.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">\r
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>\r
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>\r
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">\r
         <file>file:/H:/Works/extranet/fluidbook/tools/FWSTK_Resources/src/org/apache/pdfbox/resources/cmap/Add-RKSJ-V</file>\r
         <file>file:/H:/Works/extranet/fluidbook/tools/FWSTK_Resources/src/org/apache/pdfbox/resources/cmap/Identity-H</file>\r

diff --git a/fluidbook/tools/fwstk/nbproject/build-impl.xml b/fluidbook/tools/fwstk/nbproject/build-impl.xml
index 1dff7cf416dc7d7e948ae4cdccba167deeeb64e6..7ea0240352ca016bf0d9039b7b1959dad8991336 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/build-impl.xml
+++ b/fluidbook/tools/fwstk/nbproject/build-impl.xml
@@ -79,43 +79,6 @@ is divided into following sections:
         <property file="nbproject/project.properties"/>\r
     </target>\r
     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">\r
-        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>\r
-        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>\r
-        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>\r
-        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>\r
-        <condition property="platform.javac" value="${platform.home}/bin/javac">\r
-            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>\r
-        </condition>\r
-        <property name="platform.javac" value="${platform.javac.tmp}"/>\r
-        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>\r
-        <condition property="platform.java" value="${platform.home}/bin/java">\r
-            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>\r
-        </condition>\r
-        <property name="platform.java" value="${platform.java.tmp}"/>\r
-        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>\r
-        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">\r
-            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>\r
-        </condition>\r
-        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>\r
-        <condition property="platform.invalid" value="true">\r
-            <or>\r
-                <contains string="${platform.javac}" substring="$${platforms."/>\r
-                <contains string="${platform.java}" substring="$${platforms."/>\r
-                <contains string="${platform.javadoc}" substring="$${platforms."/>\r
-            </or>\r
-        </condition>\r
-        <fail unless="platform.home">Must set platform.home</fail>\r
-        <fail unless="platform.bootcp">Must set platform.bootcp</fail>\r
-        <fail unless="platform.java">Must set platform.java</fail>\r
-        <fail unless="platform.javac">Must set platform.javac</fail>\r
-        <fail if="platform.invalid">\r
- The J2SE Platform is not correctly set up.\r
- Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. \r
- Either open the project in the IDE and setup the Platform with the same name or add it manually.\r
- For example like this:\r
-     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)\r
-  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) \r
-  </fail>\r
         <available file="${manifest.file}" property="manifest.available"/>\r
         <condition property="splashscreen.available">\r
             <and>\r
@@ -248,6 +211,15 @@ is divided into following sections:
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">\r
             <length length="0" string="${endorsed.classpath}" when="greater"/>\r
         </condition>\r
+        <condition else="false" property="jdkBug6558476">\r
+            <and>\r
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>\r
+                <not>\r
+                    <os family="unix"/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <property name="javac.fork" value="${jdkBug6558476}"/>\r
         <property name="jar.index" value="false"/>\r
         <property name="jar.index.metainf" value="${jar.index}"/>\r
         <property name="copylibs.rebase" value="true"/>\r
@@ -315,7 +287,7 @@ is divided into following sections:
                 <property location="${build.dir}/empty" name="empty.dir"/>\r
                 <mkdir dir="${empty.dir}"/>\r
                 <mkdir dir="@{apgeneratedsrcdir}"/>\r
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
+                <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}">\r
                     <src>\r
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
                             <include name="*"/>\r
@@ -354,7 +326,7 @@ is divided into following sections:
             <sequential>\r
                 <property location="${build.dir}/empty" name="empty.dir"/>\r
                 <mkdir dir="${empty.dir}"/>\r
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
+                <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}">\r
                     <src>\r
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
                             <include name="*"/>\r
@@ -420,6 +392,11 @@ is divided into following sections:
             </and>\r
         </condition>\r
     </target>\r
+    <target name="-init-test-properties">\r
+        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>\r
+        <property name="test.binarytestincludes" value=""/>\r
+        <property name="test.binaryexcludes" value=""/>\r
+    </target>\r
     <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">\r
         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">\r
             <attribute default="${includes}" name="includes"/>\r
@@ -429,7 +406,7 @@ is divided into following sections:
             <element name="customize" optional="true"/>\r
             <sequential>\r
                 <property name="junit.forkmode" value="perTest"/>\r
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
                     <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>\r
                     <syspropertyset>\r
                         <propertyref prefix="test-sys-prop."/>\r
@@ -443,7 +420,7 @@ is divided into following sections:
             </sequential>\r
         </macrodef>\r
     </target>\r
-    <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">\r
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">\r
         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">\r
             <attribute default="${includes}" name="includes"/>\r
             <attribute default="${excludes}" name="excludes"/>\r
@@ -452,8 +429,12 @@ is divided into following sections:
             <element name="customize" optional="true"/>\r
             <sequential>\r
                 <property name="junit.forkmode" value="perTest"/>\r
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">\r
-                    <batchtest todir="${build.test.results.dir}"/>\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
+                    <batchtest todir="${build.test.results.dir}">\r
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">\r
+                            <filename name="${test.binarytestincludes}"/>\r
+                        </fileset>\r
+                    </batchtest>\r
                     <syspropertyset>\r
                         <propertyref prefix="test-sys-prop."/>\r
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
@@ -480,7 +461,7 @@ is divided into following sections:
                 </condition>\r
                 <union id="test.set"/>\r
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>\r
-                <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="fwstk" testname="TestNG tests" workingDir="${work.dir}">\r
+                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="fwstk" testname="TestNG tests" workingDir="${work.dir}">\r
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>\r
                     <propertyset>\r
                         <propertyref prefix="test-sys-prop."/>\r
@@ -560,7 +541,7 @@ is divided into following sections:
             <element name="customize" optional="true"/>\r
             <sequential>\r
                 <property name="junit.forkmode" value="perTest"/>\r
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
                     <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>\r
                     <syspropertyset>\r
                         <propertyref prefix="test-sys-prop."/>\r
@@ -576,7 +557,7 @@ is divided into following sections:
             </sequential>\r
         </macrodef>\r
     </target>\r
-    <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">\r
+    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">\r
         <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">\r
             <attribute default="${includes}" name="includes"/>\r
             <attribute default="${excludes}" name="excludes"/>\r
@@ -585,8 +566,12 @@ is divided into following sections:
             <element name="customize" optional="true"/>\r
             <sequential>\r
                 <property name="junit.forkmode" value="perTest"/>\r
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">\r
-                    <batchtest todir="${build.test.results.dir}"/>\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
+                    <batchtest todir="${build.test.results.dir}">\r
+                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">\r
+                            <filename name="${test.binarytestincludes}"/>\r
+                        </fileset>\r
+                    </batchtest>\r
                     <syspropertyset>\r
                         <propertyref prefix="test-sys-prop."/>\r
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>\r
@@ -758,9 +743,6 @@ is divided into following sections:
                     <classpath>\r
                         <path path="@{classpath}"/>\r
                     </classpath>\r
-                    <bootclasspath>\r
-                        <path path="${platform.bootcp}"/>\r
-                    </bootclasspath>\r
                 </nbjpdastart>\r
             </sequential>\r
         </macrodef>\r
@@ -776,9 +758,7 @@ is divided into following sections:
         </macrodef>\r
     </target>\r
     <target name="-init-debug-args">\r
-        <exec executable="${platform.java}" outputproperty="version-output">\r
-            <arg value="-version"/>\r
-        </exec>\r
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>\r
         <condition property="have-jdk-older-than-1.4">\r
             <or>\r
                 <contains string="${version-output}" substring="java version &quot;1.0"/>\r
@@ -803,7 +783,7 @@ is divided into following sections:
             <attribute default="${debug.classpath}" name="classpath"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
-                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
+                <java classname="@{classname}" dir="${work.dir}" fork="true">\r
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg line="${debug-args-line}"/>\r
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
@@ -830,7 +810,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
-                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
+                <java classname="@{classname}" dir="${work.dir}" fork="true">\r
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
@@ -963,7 +943,7 @@ is divided into following sections:
     <target if="has.persistence.xml" name="-copy-persistence-xml">\r
         <mkdir dir="${build.classes.dir}/META-INF"/>\r
         <copy todir="${build.classes.dir}/META-INF">\r
-            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>\r
+            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>\r
         </copy>\r
     </target>\r
     <target name="-post-compile">\r
@@ -1017,7 +997,7 @@ is divided into following sections:
             <path path="${run.classpath}"/>\r
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>\r
         </pathconvert>\r
-        <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
+        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
     </target>\r
     <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">\r
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>\r
@@ -1044,7 +1024,7 @@ is divided into following sections:
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>\r
         <echo level="info">To run this application from the command line without Ant, try:</echo>\r
         <property location="${dist.jar}" name="dist.jar.resolved"/>\r
-        <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>\r
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>\r
     </target>\r
     <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">\r
         <delete>\r
@@ -1235,7 +1215,7 @@ is divided into following sections:
                 </not>\r
             </and>\r
         </condition>\r
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" 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}">\r
+        <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}">\r
             <classpath>\r
                 <path path="${javac.classpath}"/>\r
             </classpath>\r

diff --git a/fluidbook/tools/fwstk/nbproject/genfiles.properties b/fluidbook/tools/fwstk/nbproject/genfiles.properties
index 2b32d9ec237d3ee1158e0eac542e2abc072c9c45..ff028331a91c0cd9ce9eece4b89cae019edfede1 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/genfiles.properties
+++ b/fluidbook/tools/fwstk/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=1c2c8395\r
+build.xml.data.CRC32=75d32fc3\r
 build.xml.script.CRC32=ef618d2d\r
-build.xml.stylesheet.CRC32=28e38971@1.44.1.45\r
+build.xml.stylesheet.CRC32=28e38971@1.55.1.46\r
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.\r
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.\r
-nbproject/build-impl.xml.data.CRC32=1c2c8395\r
-nbproject/build-impl.xml.script.CRC32=8b7167f5\r
-nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46\r
+nbproject/build-impl.xml.data.CRC32=75d32fc3\r
+nbproject/build-impl.xml.script.CRC32=893f2795\r
+nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.55.1.46\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/config.properties b/fluidbook/tools/fwstk/nbproject/private/config.properties
index 5aa2fea7bf417086c81ccabfe06cb2d78e4134e3..9d6df0f95eac7e0bed4af6b3fca67bc21f4bef06 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/config.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/config.properties
@@ -1 +1 @@
-config=Extract_Links\r
+config=Extract_texts\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index 6a461bf4670a40619184caf2d7e0d7acf2c2a4db..4935a57da515e71b37b91fb2ceb39151a392a8f9 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/private.properties
@@ -4,4 +4,4 @@ do.depend=false
 do.jar=true\r
 javac.debug=true\r
 javadoc.preview=true\r
-user.properties.file=C:\\Users\\Vincent\\AppData\\Roaming\\NetBeans\\7.2\\build.properties\r
+user.properties.file=H:\\Applications\\Roaming\\Netbeans\\user\\build.properties\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index 3a4147f250fcf8d5b417dadf293062af2168ae12..3a048af1e057cbbb598834d8fff6f350697fc0e4 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.xml
+++ b/fluidbook/tools/fwstk/nbproject/private/private.xml
@@ -4,5 +4,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>\r
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">\r
         <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Main.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/cube/util/Array.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/layout/Word.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/layout/LayoutStripper.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/CustomStripper.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Link.java</file>\r
     </open-files>\r
 </project-private>\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index 4fc47a56bb07b78d4c29750b95771c00545e05f6..1d69fd6264e888ec11375e3eda039e25e9b6d13c 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -33,6 +33,7 @@ file.reference.bcprov-jdk16-146.jar=lib/bcprov-jdk16-146.jar
 file.reference.commons-logging-1.1.1.jar=lib/commons-logging-1.1.1.jar\r
 file.reference.fontbox-1.7.1.jar=lib\\fontbox-1.7.1.jar\r
 file.reference.FWSTK_Resources.jar=../FWSTK_Resources/dist/FWSTK_Resources.jar\r
+file.reference.icu4j-50_1.jar=H:\\Works\\Java\\jar\\icu4j-50_1.jar\r
 file.reference.Java-resources=../../../../Java/resources\r
 file.reference.jempbox-1.7.1.jar=lib\\jempbox-1.7.1.jar\r
 file.reference.pdfbox-1.7.1.jar=lib\\pdfbox-1.7.1.jar\r
@@ -49,7 +50,8 @@ javac.classpath=\
     ${file.reference.FWSTK_Resources.jar}:\\r
     ${file.reference.fontbox-1.7.1.jar}:\\r
     ${file.reference.jempbox-1.7.1.jar}:\\r
-    ${file.reference.pdfbox-1.7.1.jar}\r
+    ${file.reference.pdfbox-1.7.1.jar}:\\r
+    ${file.reference.icu4j-50_1.jar}\r
 # Space-separated list of extra javac options\r
 javac.compilerargs=\r
 javac.deprecation=false\r
@@ -86,7 +88,7 @@ main.class=com.fluidbook.fwstk.Main
 manifest.file=manifest.mf\r
 meta.inf.dir=${src.dir}/META-INF\r
 mkdist.disabled=false\r
-platform.active=JDK_1.7\r
+platform.active=default_platform\r
 run.classpath=\\r
     ${build.classes.dir}:\\r
     ${javac.classpath}\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.xml b/fluidbook/tools/fwstk/nbproject/project.xml
index fecc0cd7d07d9657852452dd6430a314a7638dc6..2f3c04693347f9845fd0386890f1977f49e7708e 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.xml
+++ b/fluidbook/tools/fwstk/nbproject/project.xml
@@ -4,7 +4,6 @@
     <configuration>\r
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">\r
             <name>fwstk</name>\r
-            <explicit-platform explicit-source-supported="true"/>\r
             <source-roots>\r
                 <root id="src.src.dir"/>\r
             </source-roots>\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index d9be848965049163cecabfc0da673afd1b6f0a65..da911fd70f2384278835228a14fa0604eff63168 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -53,7 +53,7 @@ class wsDocument extends cubeMetier {
        protected static $resolution2multiply = array(72 => 2, 100 => 2, 150 => 3, 200 => 3, 300 => 3, 450 => 4, 600 => 5);\r
        // Number section styles\r
        protected static\r
-       $numberStyles = array('NoNumber' => 'no', 'DecimalArabicNumerals' => 'decimal',\r
+                       $numberStyles = array('NoNumber' => 'no', 'DecimalArabicNumerals' => 'decimal',\r
                'UppercaseRomanNumerals' => 'roman_up', 'LowercaseRomanNumerals' => 'roman_low',\r
                'UppercaseLetters' => 'letters_up', 'LowercaseLetters' => 'letters_low');\r
 \r

diff --git a/inc/ws/Util/class.ws.tools.php b/inc/ws/Util/class.ws.tools.php
index 08e3486fb5eb2b2a3c62f36d6a070a67e17de01e..1c206c6c7c6f82532dfa5ee43b6191222649bded 100644 (file)
--- a/inc/ws/Util/class.ws.tools.php
+++ b/inc/ws/Util/class.ws.tools.php
@@ -2,7 +2,7 @@
 
 class wsTools {
 
-       public static function encodeWebVideos($file, $dir=null, $async=true, $force=false) {
+       public static function encodeWebVideos($file, $dir = null, $async = true, $force = false) {
                if (is_null($dir)) {
                        $dir = dirname($file);
                }
@@ -64,15 +64,14 @@ class wsTools {
                }
                self::copy($png, $dest . '/' . $icon . '.png');
        }
-       
+
        public static function copy($source, $dest) {
-               if(!file_exists($source)){
+               if (!file_exists($source)) {
                        return;
                }
                copy($source, $dest);
                touch($dest, filemtime($source));
        }
-
 }
 
 ?>