(no commit message)

diff --git a/fluidbook/tools/fwstk/lib/fontbox-1.8.6.jar b/fluidbook/tools/fwstk/lib/fontbox-1.8.6.jar
new file mode 100644 (file)
index 0000000..1b06087
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/fontbox-1.8.6.jar differ

diff --git a/fluidbook/tools/fwstk/lib/jempbox-1.8.6.jar b/fluidbook/tools/fwstk/lib/jempbox-1.8.6.jar
new file mode 100644 (file)
index 0000000..e3109dc
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/jempbox-1.8.6.jar differ

diff --git a/fluidbook/tools/fwstk/lib/pdfbox-1.8.6.jar b/fluidbook/tools/fwstk/lib/pdfbox-1.8.6.jar
new file mode 100644 (file)
index 0000000..495dfdb
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/pdfbox-1.8.6.jar differ

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index 01b77c4756768f8fc5f22a8ef723e1f2a35307be..9b00e008f0465076379c8fcc0c41afeb5339106e 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/private.properties
@@ -5,4 +5,4 @@ do.jar=true
 file.reference.icu4j-50_1.jar=H:\\Works\\Java\\jar\\icu4j-4_6_1.jar\r
 javac.debug=true\r
 javadoc.preview=true\r
-user.properties.file=H:\\Applications\\Roaming\\Netbeans\\8.0RC1\\user\\build.properties\r
+user.properties.file=H:\\Applications\\Roaming\\Netbeans\\8.0\\user\\build.properties\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index 72c2ca212137757d4ed6148a0d5aeb650d806bef..cb40c280a5d0486eb1902683692d19c560dc0701 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -32,12 +32,12 @@ file.reference.bcmail-jdk16-146.jar=lib/bcmail-jdk16-146.jar
 file.reference.bcprov-jdk16-146.jar=lib/bcprov-jdk16-146.jar\r
 file.reference.commons-io-2.4.jar=lib\\commons-io-2.4.jar\r
 file.reference.commons-logging-1.1.1.jar=lib/commons-logging-1.1.1.jar\r
-file.reference.fontbox-1.8.2.jar=lib\\fontbox-1.8.2.jar\r
+file.reference.fontbox-1.8.6.jar=lib\\fontbox-1.8.6.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.8.2.jar=lib\\jempbox-1.8.2.jar\r
-file.reference.pdfbox-1.8.2.jar=lib\\pdfbox-1.8.2.jar\r
+file.reference.jempbox-1.8.6.jar=lib\\jempbox-1.8.6.jar\r
+file.reference.pdfbox-1.8.6.jar=lib\\pdfbox-1.8.6.jar\r
 file.reference.Works-Java=../../../../Java\r
 includes=**\r
 jar.archive.disabled=${jnlp.enabled}\r
@@ -51,9 +51,9 @@ javac.classpath=\
     ${file.reference.FWSTK_Resources.jar}:\\r
     ${file.reference.icu4j-50_1.jar}:\\r
     ${file.reference.commons-io-2.4.jar}:\\r
-    ${file.reference.fontbox-1.8.2.jar}:\\r
-    ${file.reference.jempbox-1.8.2.jar}:\\r
-    ${file.reference.pdfbox-1.8.2.jar}\r
+    ${file.reference.fontbox-1.8.6.jar}:\\r
+    ${file.reference.jempbox-1.8.6.jar}:\\r
+    ${file.reference.pdfbox-1.8.6.jar}\r
 # Space-separated list of extra javac options\r
 javac.compilerargs=\r
 javac.deprecation=false\r
@@ -87,6 +87,10 @@ jnlp.signing=
 jnlp.signing.alias=\r
 jnlp.signing.keystore=\r
 main.class=com.fluidbook.fwstk.Main\r
+# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed\r
+manifest.custom.codebase=\r
+# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)\r
+manifest.custom.permissions=\r
 manifest.file=manifest.mf\r
 meta.inf.dir=${src.dir}/META-INF\r
 mkdist.disabled=false\r
@@ -97,7 +101,7 @@ run.classpath=\
 # Space-separated list of JVM arguments used when running the project\r
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value\r
 # or test-sys-prop.name=value to set system properties for unit tests):\r
-run.jvmargs=\r
+run.jvmargs=-Xmx2048m\r
 run.test.classpath=\\r
     ${javac.test.classpath}:\\r
     ${build.test.classes.dir}\r

diff --git a/fluidbook/tools/fwstk/src/cube/util/StringUtil.java b/fluidbook/tools/fwstk/src/cube/util/StringUtil.java
index cbb00b848222d27db29bdf8e59c370c0270719d1..c8cbfa4bd9863c36fa935cf971974dfd1a9e085a 100644 (file)
--- a/fluidbook/tools/fwstk/src/cube/util/StringUtil.java
+++ b/fluidbook/tools/fwstk/src/cube/util/StringUtil.java
@@ -1,5 +1,6 @@
 package cube.util;
 
+import cube.util.AsciiUtils;
 import java.util.HashMap;
 
 public class StringUtil {