From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 5 Oct 2011 15:28:39 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d5e5a3c327166aed126b917b060230aeaa052fa9;p=cubeextranet.git

---

diff --git a/fluidbook/tools/fwstk/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/fluidbook/tools/fwstk/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
new file mode 100644
index 000000000..1c0f59737
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar differ
diff --git a/fluidbook/tools/fwstk/lib/avalon-framework-4.1.4.jar b/fluidbook/tools/fwstk/lib/avalon-framework-4.1.4.jar
new file mode 100644
index 000000000..0abf0b953
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/avalon-framework-4.1.4.jar differ
diff --git a/fluidbook/tools/fwstk/lib/bcmail-jdk16-146.jar b/fluidbook/tools/fwstk/lib/bcmail-jdk16-146.jar
new file mode 100644
index 000000000..6bd6765c2
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/bcmail-jdk16-146.jar differ
diff --git a/fluidbook/tools/fwstk/lib/bcprov-jdk16-146.jar b/fluidbook/tools/fwstk/lib/bcprov-jdk16-146.jar
new file mode 100644
index 000000000..27d3481e6
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/bcprov-jdk16-146.jar differ
diff --git a/fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar b/fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar
new file mode 100644
index 000000000..8758a96b7
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar differ
diff --git a/fluidbook/tools/fwstk/lib/fontbox-1.6.0.jar b/fluidbook/tools/fwstk/lib/fontbox-1.6.0.jar
new file mode 100644
index 000000000..c3492fc29
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/fontbox-1.6.0.jar differ
diff --git a/fluidbook/tools/fwstk/lib/jempbox-1.6.0.jar b/fluidbook/tools/fwstk/lib/jempbox-1.6.0.jar
new file mode 100644
index 000000000..5ca6d7a58
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/jempbox-1.6.0.jar differ
diff --git a/fluidbook/tools/fwstk/lib/nblibraries.properties b/fluidbook/tools/fwstk/lib/nblibraries.properties
new file mode 100644
index 000000000..790344a2e
--- /dev/null
+++ b/fluidbook/tools/fwstk/lib/nblibraries.properties
@@ -0,0 +1,2 @@
+libs.CopyLibs.classpath=\
+    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
diff --git a/fluidbook/tools/fwstk/lib/pdfbox-1.6.0.jar b/fluidbook/tools/fwstk/lib/pdfbox-1.6.0.jar
new file mode 100644
index 000000000..75efe034f
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/pdfbox-1.6.0.jar differ
diff --git a/fluidbook/tools/fwstk/nbproject/build-impl.xml b/fluidbook/tools/fwstk/nbproject/build-impl.xml
index e0ac685fb..7ca68e01b 100644
--- a/fluidbook/tools/fwstk/nbproject/build-impl.xml
+++ b/fluidbook/tools/fwstk/nbproject/build-impl.xml
@@ -42,18 +42,80 @@ is divided into following sections:
         <property file="nbproject/private/configs/${config}.properties"/>
         <property file="nbproject/private/private.properties"/>
     </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
+    <target name="-pre-init-libraries">
+        <property location=".\lib\nblibraries.properties" name="libraries.path"/>
+        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
+        <pathconvert dirsep="/" property="libraries.dir">
+            <path path="${libraries.dir.nativedirsep}"/>
+        </pathconvert>
+        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
+        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
+    </target>
+    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
         <property name="default.javac.source" value="1.4"/>
         <property name="default.javac.target" value="1.4"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
         <property file="nbproject/project.properties"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+        <condition property="platform.javac" value="${platform.home}/bin/javac">
+            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+        </condition>
+        <property name="platform.javac" value="${platform.javac.tmp}"/>
+        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+        <condition property="platform.java" value="${platform.home}/bin/java">
+            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+        </condition>
+        <property name="platform.java" value="${platform.java.tmp}"/>
+        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+        </condition>
+        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+        <condition property="platform.invalid" value="true">
+            <or>
+                <contains string="${platform.javac}" substring="$${platforms."/>
+                <contains string="${platform.java}" substring="$${platforms."/>
+                <contains string="${platform.javadoc}" substring="$${platforms."/>
+            </or>
+        </condition>
+        <fail unless="platform.home">Must set platform.home</fail>
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+        <fail unless="platform.java">Must set platform.java</fail>
+        <fail unless="platform.javac">Must set platform.javac</fail>
+        <fail if="platform.invalid">
+ The J2SE Platform is not correctly set up.
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. 
+ Either open the project in the IDE and setup the Platform with the same name or add it manually.
+ For example like this:
+     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
+  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) 
+  </fail>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
             <and>
@@ -185,15 +247,6 @@ is divided into following sections:
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
             <length length="0" string="${endorsed.classpath}" when="greater"/>
         </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <property name="javac.fork" value="${jdkBug6558476}"/>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
@@ -202,7 +255,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.src.dir">Must set src.src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
@@ -239,7 +292,7 @@ is divided into following sections:
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
                 <mkdir dir="@{apgeneratedsrcdir}"/>
-                <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}">
+                <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}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -278,7 +331,7 @@ is divided into following sections:
             <sequential>
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
-                <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}">
+                <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}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -335,7 +388,7 @@ is divided into following sections:
             <attribute default="**" name="testincludes"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}"/>
                     <classpath>
                         <path path="${run.test.classpath}"/>
@@ -407,6 +460,9 @@ is divided into following sections:
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
+                    <bootclasspath>
+                        <path path="${platform.bootcp}"/>
+                    </bootclasspath>
                 </nbjpdastart>
             </sequential>
         </macrodef>
@@ -422,7 +478,9 @@ is divided into following sections:
         </macrodef>
     </target>
     <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <exec executable="${platform.java}" outputproperty="version-output">
+            <arg value="-version"/>
+        </exec>
         <condition property="have-jdk-older-than-1.4">
             <or>
                 <contains string="${version-output}" substring="java version &quot;1.0"/>
@@ -447,7 +505,7 @@ is divided into following sections:
             <attribute default="${debug.classpath}" name="classpath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
@@ -472,7 +530,7 @@ is divided into following sections:
             <attribute default="${run.classpath}" name="classpath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -548,7 +606,7 @@ is divided into following sections:
     <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
         <property name="ap.cmd.line.internal" value=""/>
     </target>
-    <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"/>
+    <target depends="-pre-init,-init-private,-init-libraries,-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"/>
     <!--
                 ===================
                 COMPILATION SECTION
@@ -655,7 +713,7 @@ is divided into following sections:
             <path path="${run.classpath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+        <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
     </target>
     <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
@@ -682,7 +740,7 @@ is divided into following sections:
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+        <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
     </target>
     <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
         <delete>
@@ -832,7 +890,7 @@ is divided into following sections:
             -->
     <target depends="init" if="have.sources" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <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}">
+        <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}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
diff --git a/fluidbook/tools/fwstk/nbproject/genfiles.properties b/fluidbook/tools/fwstk/nbproject/genfiles.properties
index 00af3e9f5..4731b76e4 100644
--- a/fluidbook/tools/fwstk/nbproject/genfiles.properties
+++ b/fluidbook/tools/fwstk/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=5afba316
+build.xml.data.CRC32=1c2c8395
 build.xml.script.CRC32=ef618d2d
 build.xml.stylesheet.CRC32=28e38971@1.44.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=5afba316
-nbproject/build-impl.xml.script.CRC32=f0904f14
+nbproject/build-impl.xml.data.CRC32=1c2c8395
+nbproject/build-impl.xml.script.CRC32=244b17d0
 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/fluidbook/tools/fwstk/nbproject/private/config.properties b/fluidbook/tools/fwstk/nbproject/private/config.properties
index a7cc32142..5aa2fea7b 100644
--- a/fluidbook/tools/fwstk/nbproject/private/config.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/config.properties
@@ -1 +1 @@
-config=Extract_Layout
+config=Extract_Links
diff --git a/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Links.properties b/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Links.properties
index fc4404267..509e7b93f 100644
--- a/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Links.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/configs/Extract_Links.properties
@@ -1 +1 @@
-application.args=--input C:\\Users\\Vincent\\Documents\\links\\document.pdf --extractLinks C:\\Users\\Vincent\\Documents\\links\\p%d.csv
+application.args=--input H:\\Documents\\fwstk\\links\\document.pdf --extractLinks H:\\Documents\\fwstk\\links\\p%d.csv
diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index 75eb4042c..c85e5f3f2 100644
--- 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
 javac.debug=true
 javadoc.preview=true
-user.properties.file=C:\\Users\\Cube\\.netbeans\\7.0\\build.properties
+user.properties.file=C:\\Users\\Vincent\\.netbeans\\7.0\\build.properties
diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index e1d9e82f1..6f58e2ccf 100644
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -26,15 +26,15 @@ dist.jar=${dist.dir}/fwstk.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.avalon-framework-4.1.4.jar=H:\\Works\\Java\\jar\\avalon-framework-4.1.4.jar
-file.reference.bcmail-jdk16-146.jar=H:\\Works\\Java\\jar\\bcmail-jdk16-146.jar
-file.reference.bcprov-jdk16-146.jar=H:\\Works\\Java\\jar\\bcprov-jdk16-146.jar
-file.reference.commons-logging-1.1.1.jar=H:\\Works\\Java\\jar\\commons-logging-1.1.1.jar
-file.reference.fontbox-1.6.0.jar=H:\\Works\\Java\\jar\\fontbox-1.6.0.jar
-file.reference.FWSTK_Resources.jar=..\\FWSTK_Resources\\dist\\FWSTK_Resources.jar
+file.reference.avalon-framework-4.1.4.jar=lib/avalon-framework-4.1.4.jar
+file.reference.bcmail-jdk16-146.jar=lib/bcmail-jdk16-146.jar
+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
+file.reference.fontbox-1.6.0.jar=lib/fontbox-1.6.0.jar
+file.reference.FWSTK_Resources.jar=../FWSTK_Resources/dist/FWSTK_Resources.jar
 file.reference.Java-resources=../../../../Java/resources
-file.reference.jempbox-1.6.0.jar=H:\\Works\\Java\\jar\\jempbox-1.6.0.jar
-file.reference.pdfbox-1.6.0.jar=H:\\Works\\Java\\jar\\pdfbox-1.6.0.jar
+file.reference.jempbox-1.6.0.jar=lib/jempbox-1.6.0.jar
+file.reference.pdfbox-1.6.0.jar=lib/pdfbox-1.6.0.jar
 file.reference.Works-Java=../../../../Java
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -85,7 +85,7 @@ main.class=com.fluidbook.fwstk.Main
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
-platform.active=default_platform
+platform.active=JDK_1.7
 run.classpath=\
     ${build.classes.dir}:\
     ${javac.classpath}
diff --git a/fluidbook/tools/fwstk/nbproject/project.xml b/fluidbook/tools/fwstk/nbproject/project.xml
index a70a3bf29..fecc0cd7d 100644
--- a/fluidbook/tools/fwstk/nbproject/project.xml
+++ b/fluidbook/tools/fwstk/nbproject/project.xml
@@ -4,10 +4,14 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>fwstk</name>
+            <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.src.dir"/>
             </source-roots>
             <test-roots/>
         </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>.\lib\nblibraries.properties</definitions>
+        </libraries>
     </configuration>
 </project>
diff --git a/inc/ws/Util/fontextractor/class.ws.pdf.font.php b/inc/ws/Util/fontextractor/class.ws.pdf.font.php
index f33251a41..adf68bb64 100644
--- a/inc/ws/Util/fontextractor/class.ws.pdf.font.php
+++ b/inc/ws/Util/fontextractor/class.ws.pdf.font.php
@@ -102,13 +102,13 @@ class wsPDFFont {
 		$fontforge->setArg(null, $font->italicAngle);
 		$fontforge->setArg(null, $font->ascent);
 		$fontforge->setArg(null, $font->descent);
-		if ($font->firstChar == 0 && $font->firstWidth == 500) {
-			$fontforge->setArg(null, '-');
-			$fontforge->setArg(null, '-');
-		} else {
-			$fontforge->setArg(null, $font->firstChar);
-			$fontforge->setArg(null, $font->firstWidth);
-		}
+		//if ($font->firstChar == 0 && $font->firstWidth == 500) {
+		$fontforge->setArg(null, '-');
+		$fontforge->setArg(null, '-');
+		//} else {
+		//	$fontforge->setArg(null, $font->firstChar);
+		//	$fontforge->setArg(null, $font->firstWidth);
+		//}
 		$fontforge->execute();
 		$this->addToLog($fontforge);
 	}