From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 22 Aug 2022 20:14:21 +0000 (+0200)
Subject: wip #5410
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=251731dcaf736607c1cf41b05fd564526987ee13;p=cubist_pdf.git

wip #5410
---

diff --git a/resources/tools/fwstk/.idea/deployment.xml b/resources/tools/fwstk/.idea/deployment.xml
index 82033ec..d64fd48 100644
--- a/resources/tools/fwstk/.idea/deployment.xml
+++ b/resources/tools/fwstk/.idea/deployment.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" serverName="workshop.fluidbook.com">
+  <component name="PublishConfigData" serverName="workshop.fluidbook.com" confirmBeforeUploading="false">
+    <option name="confirmBeforeUploading" value="false" />
     <serverData>
+      <paths name="ccv-montpellier.fr">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="demo1.cubedesigners.com">
         <serverdata>
           <mappings>
@@ -30,6 +38,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="dev.detouteslescouleurs.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="dev.enko-running-shoes.com">
         <serverdata>
           <mappings>
@@ -37,6 +52,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="dev.extranet.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="dev.fluidbook.com">
         <serverdata>
           <mappings>
@@ -44,6 +66,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="dev.pm-instrumentation.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="dev.rbcmobilier.com">
         <serverdata>
           <mappings>
@@ -109,6 +138,20 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="odl.cube">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="odl.paris.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="parrotmail.dev.cubedesigners.com">
         <serverdata>
           <mappings>
@@ -116,6 +159,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="preview.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="pro.cubjeans.com">
         <serverdata>
           <mappings>
@@ -130,11 +180,16 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="wheel02.hf-customercare.com">
+      <paths name="stats3.fluidbook.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="toolbox.fluidbook.com">
         <serverdata>
           <mappings>
-            <mapping local="$PROJECT_DIR$/../../../../Java" web="/" />
-            <mapping local="$PROJECT_DIR$/../../../../Java/resources" web="/" />
             <mapping local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
@@ -195,6 +250,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="www.detouteslescouleurs.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="www.enko-running-shoes.com">
         <serverdata>
           <mappings>
@@ -216,6 +278,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="www.hf-customercare.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="www.kadreo.com">
         <serverdata>
           <mappings>
@@ -265,6 +334,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="www.pm-instrumentation.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="www.preventicom.com">
         <serverdata>
           <mappings>
diff --git a/resources/tools/fwstk/.idea/misc.xml b/resources/tools/fwstk/.idea/misc.xml
index e5dddc0..bec7cd5 100644
--- a/resources/tools/fwstk/.idea/misc.xml
+++ b/resources/tools/fwstk/.idea/misc.xml
@@ -178,7 +178,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="18" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">
diff --git a/resources/tools/fwstk/.idea/workspace.xml b/resources/tools/fwstk/.idea/workspace.xml
index 3b4574a..45338f4 100644
--- a/resources/tools/fwstk/.idea/workspace.xml
+++ b/resources/tools/fwstk/.idea/workspace.xml
@@ -7,13 +7,32 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #4097 @0.25">
-      <change beforePath="$PROJECT_DIR$/../../../.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../../.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/CustomStripper.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/CustomStripper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/Link.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/Link.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/Main.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/TextsThread.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/TextsThread.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/Word.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/Word.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/geom/CubeMatrix.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/geom/CubeMatrix.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/geom/CubeRectangle.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/geom/CubeRectangle.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/geom/Point.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/geom/Point.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Group.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Group.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/LayoutElement.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/LayoutElement.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/LayoutStripper.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/LayoutStripper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Letter.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Letter.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Line.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Line.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Page.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Page.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Separator.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Separator.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Space.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Space.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Word.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/com/fluidbook/fwstk/layout/Word.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/cube/files/FileIO.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/cube/files/FileIO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/cube/util/Array.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/cube/util/Array.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/cube/util/AsciiUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/cube/util/AsciiUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bin/cube/util/StringUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/bin/cube/util/StringUtil.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../../src/PDFTools.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../../src/PDFTools.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -108,10 +127,11 @@
     "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
     "WebServerToolWindowPanel.toolwindow.show.size": "false",
     "last_opened_file_path": "D:/Works/cubist_pdf/resources/tools/fwstk",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
+    "project.structure.last.edited": "SDKs",
+    "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>
@@ -470,6 +490,7 @@
       <workItem from="1631721143268" duration="984000" />
       <workItem from="1648579261372" duration="2928000" />
       <workItem from="1661197921347" duration="504000" />
+      <workItem from="1661198842786" duration="396000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/CustomStripper.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/CustomStripper.class
index 0036ff0..2046775 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/CustomStripper.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/CustomStripper.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/Link.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Link.class
index 36f8798..774dc6d 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/Link.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Link.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class
index ccb0a95..446c643 100644
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/bin/com/fluidbook/fwstk/TextsThread.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class
index c1e8e34..802a0bb 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/Word.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Word.class
index aed39a2..28597e7 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/Word.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Word.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/CubeMatrix.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/CubeMatrix.class
index bb26772..36caf87 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/CubeMatrix.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/CubeMatrix.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/CubeRectangle.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/CubeRectangle.class
index 3baafb4..d6f95c5 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/CubeRectangle.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/CubeRectangle.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/Point.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/Point.class
index 86e0732..a83392a 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/Point.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/geom/Point.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Group.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Group.class
index 961bd99..d93bc21 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Group.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Group.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutElement.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutElement.class
index da51a8c..aa32469 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutElement.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutElement.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutStripper.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutStripper.class
index db57ff1..98e65a3 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutStripper.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutStripper.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Letter.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Letter.class
index 302ddd8..6258134 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Letter.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Letter.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Line.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Line.class
index 8a664b7..4415f5c 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Line.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Line.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Page.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Page.class
index b0a5052..054c1c3 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Page.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Page.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Separator.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Separator.class
index 49a3974..18ace2b 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Separator.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Separator.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Space.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Space.class
index 04fd3d3..e5a0d84 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Space.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Space.class differ
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Word.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Word.class
index 4699861..4539d3b 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Word.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Word.class differ
diff --git a/resources/tools/fwstk/bin/cube/files/FileIO.class b/resources/tools/fwstk/bin/cube/files/FileIO.class
index 749131b..85452f9 100644
Binary files a/resources/tools/fwstk/bin/cube/files/FileIO.class and b/resources/tools/fwstk/bin/cube/files/FileIO.class differ
diff --git a/resources/tools/fwstk/bin/cube/util/Array.class b/resources/tools/fwstk/bin/cube/util/Array.class
index 4371484..1d67ea6 100644
Binary files a/resources/tools/fwstk/bin/cube/util/Array.class and b/resources/tools/fwstk/bin/cube/util/Array.class differ
diff --git a/resources/tools/fwstk/bin/cube/util/AsciiUtils.class b/resources/tools/fwstk/bin/cube/util/AsciiUtils.class
index a45f9f2..21c8b7a 100644
Binary files a/resources/tools/fwstk/bin/cube/util/AsciiUtils.class and b/resources/tools/fwstk/bin/cube/util/AsciiUtils.class differ
diff --git a/resources/tools/fwstk/bin/cube/util/StringUtil.class b/resources/tools/fwstk/bin/cube/util/StringUtil.class
index a143bff..16a9c9e 100644
Binary files a/resources/tools/fwstk/bin/cube/util/StringUtil.class and b/resources/tools/fwstk/bin/cube/util/StringUtil.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 8aba199..26e3682 100644
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/TextsThread.java b/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java
index c7e31eb..20749e7 100644
--- a/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java
+++ b/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java
@@ -154,7 +154,6 @@ public class TextsThread extends Thread {
 					String hfile = file.replaceFirst("%s", "h");
 
 					try {
-						System.out.println(":)");
 						out = new BufferedWriter(new OutputStreamWriter(
 								new FileOutputStream(pfile), "UTF8"));
 						out.write(text);