wip #5399

diff --git a/resources/tools/fwstk/.idea/workspace.xml b/resources/tools/fwstk/.idea/workspace.xml
index 45338f4911e4510ed4f4247013fe0a906c69431f..48beb948198f4d9d3b27bc46188ee49b7ce7559e 100644 (file)
--- a/resources/tools/fwstk/.idea/workspace.xml
+++ b/resources/tools/fwstk/.idea/workspace.xml
@@ -6,33 +6,10 @@
     </artifacts-to-build>
   </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/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" />
+    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #5410">
       <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/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" />
@@ -118,23 +95,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "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",
-    "last_opened_file_path": "D:/Works/cubist_pdf/resources/tools/fwstk",
-    "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 name="PropertiesComponent">{
+  &quot;keyToString&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;last_opened_file_path&quot;: &quot;D:/Works/cubist_pdf/resources/tools/fwstk&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;SDKs&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" />
@@ -490,7 +467,8 @@
       <workItem from="1631721143268" duration="984000" />
       <workItem from="1648579261372" duration="2928000" />
       <workItem from="1661197921347" duration="504000" />
-      <workItem from="1661198842786" duration="396000" />
+      <workItem from="1661198842786" duration="416000" />
+      <workItem from="1661239352893" duration="103000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -569,7 +547,14 @@
       <option name="project" value="LOCAL" />
       <updated>1606325210833</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="wip #5410">
+      <created>1661199261729</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1661199261729</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TodoView">
@@ -606,7 +591,8 @@
     <MESSAGE value="fix #2353 @6" />
     <MESSAGE value="wip #3135" />
     <MESSAGE value="wip #4097 @0.25" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #4097 @0.25" />
+    <MESSAGE value="wip #5410" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #5410" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class
index 802a0bbd77f3b622447d9dd4ebdcbfa008855925..14d5162de98c9ffaf0de161426102ec40fd29029 100644 (file)
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/out/artifacts/fwstk_jar/fwstk.jar b/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index 26e3682f32f667f95d7b53716b58c24322f3c299..30690f6bef64f5e66483db398a6691948919ddc7 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/TextsThread.java b/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java
index 20749e7fd875cdf6128544c15a46eb23542f042b..6543836c645acf2131fc0159a8c9bd95853c0f1e 100644 (file)
--- a/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java
+++ b/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java
@@ -140,10 +140,6 @@ public class TextsThread extends Thread {
                                        html = htmlStripper.getHTML(doc);
                                        html = cleanhtml(html);
 
-                                       if (!html.equals("") && html.equals(memoHTML)) {
-                                               memoHTML = "";
-                                               continue;
-                                       }
                                        text = htmlStripper.getText(doc);
                                        text = html2text(text);
                                        index = text2index(text);