wip #7571 @0.5

diff --git a/resources/tools/fwstk/.idea/workspace.xml b/resources/tools/fwstk/.idea/workspace.xml
index 8136733ba9dde050b2a5ad9d028151bfaefdfefa..06680535f45e2f8f645f33b36fbc7a7534e32497 100644 (file)
--- a/resources/tools/fwstk/.idea/workspace.xml
+++ b/resources/tools/fwstk/.idea/workspace.xml
@@ -95,36 +95,36 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Application.extract links.executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "WebServerToolWindowFactoryState": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
-    "WebServerToolWindowPanel.toolwindow.show.date": "false",
-    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
-    "WebServerToolWindowPanel.toolwindow.show.size": "false",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "junie.onboarding.icon.badge.shown": "true",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/Works/cubist_pdf/resources/tools/fwstk",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Libraries",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.2",
-    "ruby.rails.projectView.checked": "true",
-    "settings.editor.selected.configurable": "preferences.lookFeel",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Application.extract links.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/cubist_pdf/resources/tools/fwstk&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Libraries&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="H:\Works\cubeExtranet\fluidbook\tools\fwstk\lib" />
@@ -516,7 +516,8 @@
       <workItem from="1732556939818" duration="344000" />
       <workItem from="1732557350064" duration="14000" />
       <workItem from="1748349213267" duration="1488000" />
-      <workItem from="1748351552423" duration="759000" />
+      <workItem from="1748351552423" duration="1932000" />
+      <workItem from="1748355409566" duration="636000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>

diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class
index 5dd8bec5a6ed0e2a3e434cd39602bd6c13580826..bdf1aa8a51478cc37a837e1ed8ca40568db85d2a 100644 (file)
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class differ

diff --git a/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index 5f4f03ac03a8483686abf9a4d640522e9cc9401e..a03348b5366cd30a83f15219d1f12b48b8f100df 100644 (file)
Binary files a/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar and b/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ

diff --git a/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java b/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java
index 5ffaa05db035741694a85031ea098840019ad9e6..427e49a51525dd69de04720ff3fb9109c656a1bc 100644 (file)
--- a/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java
+++ b/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java
@@ -7,6 +7,9 @@ import java.io.BufferedWriter;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.*;
 
 import org.apache.commons.text.StringEscapeUtils;
@@ -625,11 +628,11 @@ public class Main {
     }
 
     public static void saveLinks(String file, ArrayList<Link> listLinks) throws IOException {
-        FileIO out = new FileIO(file);
-        out.open("w");
-        out.output.writeBytes(Link.header());
+        BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
+                Files.newOutputStream(Paths.get(file)), StandardCharsets.UTF_8));
+        out.write(Link.header());
         for (Link l : listLinks) {
-            out.output.writeBytes(l.toFile());
+            out.write(l.toFile());
         }
         out.close();
     }
@@ -741,6 +744,8 @@ public class Main {
                             if (l.getDictionary().containsKey("TU") && l.getDictionary().getString("TU") != null) {
                                 String t = l.getDictionary().getString("TU");
                                 if (!Objects.equals(t, "")) {
+                                    t = t.replace("\0", "");
+                                    t = t.replace("\b", " ");
                                     t = t.replace("\r\n", "\n");
                                     t = t.replace("\r", "\n");
                                     t = t.replace("\n", "§!§");