wip #5195 @0.5

diff --git a/resources/tools/fwstk/.idea/misc.xml b/resources/tools/fwstk/.idea/misc.xml
index 4aff69c566f9433f07202f50a593d58900b57ab2..bec7cd5ba95a4fdf7270c41af870326a33a25941 100644 (file)
--- a/resources/tools/fwstk/.idea/misc.xml
+++ b/resources/tools/fwstk/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AhkProjectSettings">
+    <option name="defaultAhkSdk" value="AutoHotkey" />
+  </component>
   <component name="EncodingComponent">
     <option name="projectEncoding" />
   </component>
@@ -181,28 +184,6 @@
   <component name="SvnBranchConfigurationManager">
     <option name="myConfigurationMap">
       <map>
-        <entry key="$PROJECT_DIR$/../../../../Java">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="trunkUrl" value="svn+ssh://svn.cubedesigners.com/java" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../../../../Java/resources/org/apache/pdfbox/resources">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchUrls">
-                <list>
-                  <option value="http://svn.apache.org/repos/asf/pdfbox/branches" />
-                  <option value="http://svn.apache.org/repos/asf/pdfbox/cmssite" />
-                  <option value="http://svn.apache.org/repos/asf/pdfbox/jempbox-2" />
-                  <option value="http://svn.apache.org/repos/asf/pdfbox/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="http://svn.apache.org/repos/asf/pdfbox/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
         <entry key="$PROJECT_DIR$">
           <value>
             <SvnBranchConfiguration>

diff --git a/resources/tools/fwstk/.idea/workspace.xml b/resources/tools/fwstk/.idea/workspace.xml
index 6ddc0a56911e1838dd847bb2f24410bb27e28f13..98b622527909c3fd1b9102bb464f97941628094d 100644 (file)
--- a/resources/tools/fwstk/.idea/workspace.xml
+++ b/resources/tools/fwstk/.idea/workspace.xml
@@ -6,7 +6,12 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #4097 @0.25" />
+    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #4097 @0.25">
+      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -61,6 +66,21 @@
       <dir>H:\Works\cubeExtranet\fluidbook\tools\fwstk\src</dir>
     </dirStrings>
   </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Link.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/MANIFEST.MF" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/fwstk.iml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" root0="FORCE_HIGHLIGHTING" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="PhpServers">
     <servers />
   </component>
@@ -85,9 +105,9 @@
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542740619620" />
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
     <property name="js.eslint.eslintPackage" value="" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/commons-text-1.8.jar!/" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
-    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15193799" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="configurable.group.language" />
@@ -110,6 +130,34 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="ArquillianJUnit" factoryName="">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="ArquillianTestNG" factoryName="">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <properties />
+      <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
       <option name="BCName" value="" />
       <option name="IOSSimulatorSdkPath" value="" />
@@ -179,59 +227,14 @@
       <option name="USE_PATTERN" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="tests" factoryName="Nosetests">
-      <module name="fwstk" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_regexPattern" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;.&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="tests" factoryName="Unittests">
-      <module name="fwstk" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;.&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
-    <configuration default="true" type="tests" factoryName="py.test">
-      <module name="fwstk" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;.&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
       <option name="DEPLOY" value="true" />
       <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
       <option name="DEPLOY_AS_INSTANT" value="false" />
       <option name="ARTIFACT_NAME" value="" />
       <option name="PM_INSTALL_OPTIONS" value="" />
+      <option name="ALL_USERS" value="false" />
+      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
       <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
       <option name="ACTIVITY_EXTRA_FLAGS" value="" />
       <option name="MODE" value="default_activity" />
@@ -244,14 +247,17 @@
       <Java />
       <Profilers>
         <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_PROFILING_ENABLED" value="false" />
         <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
         <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+        <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+        <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
       </Profilers>
       <option name="DEEP_LINK" value="" />
       <option name="ACTIVITY_CLASS" value="" />
-      <method v="2">
-        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-      </method>
+      <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+      <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+      <method v="2" />
     </configuration>
     <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
       <option name="TESTING_TYPE" value="0" />
@@ -270,12 +276,14 @@
       <Java />
       <Profilers>
         <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_PROFILING_ENABLED" value="false" />
         <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
         <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+        <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+        <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
       </Profilers>
       <method v="2">
         <option name="Make" enabled="true" />
-        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
       </method>
     </configuration>
     <configuration name="extract layout" type="Application" factoryName="Application">
@@ -313,34 +321,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <properties />
-      <listeners />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
       <setting name="vmparams" value="" />
       <setting name="cmdLine" value="run-app" />
@@ -382,6 +362,54 @@
       <envs />
       <method v="2" />
     </configuration>
+    <configuration default="true" type="tests" factoryName="Nosetests">
+      <module name="fwstk" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_regexPattern" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;.&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Unittests">
+      <module name="fwstk" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;.&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="py.test">
+      <module name="fwstk" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_parameters" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;.&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
     <list>
       <item itemvalue="Application.extract links" />
       <item itemvalue="Application.extract texts" />
@@ -390,7 +418,7 @@
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration" cleanupOnStartRun="true">
-    <configuration>C:\Users\Vincent\AppData\Roaming\Subversion</configuration>
+    <configuration>C:\Users\vince\AppData\Roaming\Subversion</configuration>
     <supportedVersion>125</supportedVersion>
     <option name="runUnderTerminal" value="true" />
   </component>
@@ -398,24 +426,24 @@
     <option name="myMappingRoots">
       <list>
         <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
-          <option name="myCopyRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myVcsRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
         </SvnCopyRootSimple>
         <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
-          <option name="myCopyRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
+          <option name="myVcsRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
         </SvnCopyRootSimple>
       </list>
     </option>
     <option name="myMoreRealMappingRoots">
       <list>
         <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
-          <option name="myCopyRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myVcsRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
         </SvnCopyRootSimple>
         <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
-          <option name="myCopyRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
+          <option name="myVcsRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
         </SvnCopyRootSimple>
       </list>
     </option>
@@ -462,6 +490,8 @@
       <workItem from="1589879021642" duration="2421000" />
       <workItem from="1595346736329" duration="5317000" />
       <workItem from="1606322492928" duration="1489000" />
+      <workItem from="1631721143268" duration="984000" />
+      <workItem from="1648579261372" duration="1816000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -579,12 +609,6 @@
     <MESSAGE value="wip #4097 @0.25" />
     <option name="LAST_COMMIT_MESSAGE" value="wip #4097 @0.25" />
   </component>
-  <component name="WindowStateProjectService">
-    <state x="862" y="107" key="CommitChangelistDialog2" timestamp="1606325194911">
-      <screen x="0" y="0" width="2560" height="1040" />
-    </state>
-    <state x="862" y="107" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1606325194911" />
-  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>

diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/CustomStripper.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/CustomStripper.class
index 5448b332f72d1125e87c4088230323f4efed0da0..2046775b29539a133aff12b4a3d4becf572bb94b 100644 (file)
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 b29d1b3b62855d1b14177109546739836e75fe50..774dc6de41c5565c2dc1b80b2f75f253d0f6d61e 100644 (file)
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 9d3d4f0e6db7f08771eec6d5322a11e0d5677fc0..53201112b2cace63a354a2ddfb0b93281d45df75 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/bin/com/fluidbook/fwstk/TextsThread.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class
index d207548dbba79e615f23830c17f97ef37ec2bfa0..eda65a128836f80c1ddfef8c7df85533f3dd4f94 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/bin/com/fluidbook/fwstk/Word.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Word.class
index 7bcca85cddc3ca3946e2ebd9b1936a6c37cc2bf4..28597e7339f1b8a3ecd7b2a3b7b4b96b2e30ad6d 100644 (file)
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 736ddf8c1e378856581e09ee5424e9426d8eaa51..36caf87da30ff82ec173a10f734387b477a4a4b3 100644 (file)
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 cb1138cda0c5abd6d2f93488e84ae48835f81695..d6f95c5516c0b353ce775401687307c6896e77cb 100644 (file)
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 8d28e76a3c1233f12d62625b687223e783802184..a83392abb085045f9b62fabee197ec38f9e62925 100644 (file)
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 3437b08d0c167a16275bd8f3ec54b49cb9e1eb7a..a44092de7c7ae8cd920c19392ac3cdae68cd0c06 100644 (file)
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 1fbfee2a1d9d0fc3ec98b0e5487bf2fc05da2844..aa32469da9fe5b3aab33977be2667494e38cfdb6 100644 (file)
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 02bb84ba689f2cde6754fef9c35b24a61e9e3084..98e65a3182256a03fa685e372650588a282432a3 100644 (file)
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 75841fa4bdfe3c139f0eea3924b614bf6315ac85..6258134278d80bfaa54b98936be3609f750f4ea4 100644 (file)
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 b2b8dfbfb95da59777c92c1e12e837cdb48d0920..4415f5cc934a9870778b866bf8c92982f3f38da4 100644 (file)
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 8e89fe65e3ae19cbf3600f71e4e1bf259789f71c..054c1c377381e2d9a4c0ebc48ba623919d9a4e77 100644 (file)
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 48e3a22062184a47438bdf79e3a7f81f1fc88073..18ace2b3bf6fa6e8df711419a20cefaf96d20db1 100644 (file)
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 c05fd7c4abb3fb3aa4cdc8dfc2d16b85f1844aa9..e5a0d845e2e38d966f416993df35003ba7aff93e 100644 (file)
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 06983f25640064d162826d795151f0381343bdeb..4539d3bf7ae3f3e3628c5cea31283958b054c498 100644 (file)
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 c2a4aaacd5e87c3e45a965e78f4f4c5574b52b71..85452f9699fb13cf56e0ec045a7caa5689cdc65d 100644 (file)
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 0c55de6d0503f6840c51c4210ac567fe67afd09c..1d67ea60ab887dc3a173c9373ca29ae2ce212973 100644 (file)
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 c28b8b3e3f3b67678004c2ba6c7f0869614230aa..21c8b7ada299da537c7e0a08822314d86aeeba39 100644 (file)
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 6f4f3df53bdf00ca60e0b1a5eca412db6fe8f8f2..16a9c9eb10844e05c5f85a623acd81f805ff86f7 100644 (file)
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/src/com/fluidbook/fwstk/Main.java b/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java
index 3909385fdd27098bd1380248017bd789475fed10..6ebf8a4ab23945848d7d594c6a8bf84c3fc0f2fb 100644 (file)
--- a/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java
+++ b/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java
@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.pdfbox.exceptions.COSVisitorException;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -46,16 +45,16 @@ import org.apache.pdfbox.util.PDFImageWriter;
 
 public class Main {
 
-    private static String version = "0.94";
-    private static String date = "20210915";
+    private static String version = "0.93";
+    private static String date = "20110904";
     static int threads = 1;
     static String input = "";
     static Float linkOffsetX = 0.0f;
     static Float linkOffsetY = 0.0f;
 
     public static void main(String[] args) throws IOException,
-        COSVisitorException, ClassNotFoundException, NullPointerException,
-        InterruptedException {
+            COSVisitorException, ClassNotFoundException, NullPointerException,
+            InterruptedException {
 
         if (args.length < 0) {
             printUsage();
@@ -93,7 +92,7 @@ public class Main {
                     printVersion();
                     return;
                 } else if (args[i].trim().compareTo("-h") == 0
-                    || args[i].trim().compareTo("--help") == 0) {
+                        || args[i].trim().compareTo("--help") == 0) {
                     printUsage();
                     return;
                 } else if (args[i].trim().compareTo("--trim") == 0) {
@@ -244,10 +243,10 @@ public class Main {
             stripper.process(nextPage, i);
             Page layout = stripper.getLayout();
             BufferedWriter out
-                = new BufferedWriter(
-                new OutputStreamWriter(
-                    new FileOutputStream(layoutOutput.replace("%d", ""
-                        + i)), "UTF-8"));
+                    = new BufferedWriter(
+                    new OutputStreamWriter(
+                            new FileOutputStream(layoutOutput.replace("%d", ""
+                                    + i)), "UTF-8"));
             out.write(layout.asJSON());
             out.close();
         }
@@ -255,11 +254,10 @@ public class Main {
 
     private static Boolean getInfos(PDDocument doc) throws IOException, COSVisitorException {
         ArrayList<String> res = new ArrayList<>();
-        res.add("Parsed by FWSTK: \t\t\t" + Main.version + " (" + Main.date + ")");
         // General informations
         String[] fields = {"Author", "Title", "CreationDate", "Creator",
-            "Keywords", "ModificationDate", "Producer", "Subject",
-            "Trapped", "Version"};
+                "Keywords", "ModificationDate", "Producer", "Subject",
+                "Trapped", "Version"};
         PDDocumentInformation infos = doc.getDocumentInformation();
         for (String k : fields) {
             String v = infos.getCustomMetadataValue(k);
@@ -271,7 +269,6 @@ public class Main {
         List<PDPage> list = doc.getDocumentCatalog().getAllPages();
         int pages = list.size();
 
-
         res.add("Pages:\t\t\t" + pages);
         Boolean changes = false;
         for (int i = 0; i < pages; i++) {
@@ -303,47 +300,47 @@ public class Main {
 
             // Size
             if (page.getRotation() != null
-                && (page.getRotation() == 90 || page.getRotation() == 270)) {
+                    && (page.getRotation() == 90 || page.getRotation() == 270)) {
                 res.add("Page " + numero + " size:\t\t"
-                    + Math.abs(cropBox.getHeight()) + " pts x "
-                    + Math.abs(cropBox.getWidth()) + " pts");
+                        + Math.abs(cropBox.getHeight()) + " pts x "
+                        + Math.abs(cropBox.getWidth()) + " pts");
                 // Boxes
                 res.add("Page " + numero + " CropBox:\t"
-                    + cropBox.getLowerLeftY() + "\t"
-                    + cropBox.getUpperRightX() + "\t"
-                    + cropBox.getUpperRightY() + "\t"
-                    + cropBox.getLowerLeftX() + "\t");
+                        + cropBox.getLowerLeftY() + "\t"
+                        + cropBox.getUpperRightX() + "\t"
+                        + cropBox.getUpperRightY() + "\t"
+                        + cropBox.getLowerLeftX() + "\t");
                 res.add("Page " + numero + " MediaBox:\t"
-                    + mediaBox.getLowerLeftY() + "\t"
-                    + mediaBox.getUpperRightX() + "\t"
-                    + mediaBox.getUpperRightY() + "\t"
-                    + mediaBox.getLowerLeftX() + "\t");
+                        + mediaBox.getLowerLeftY() + "\t"
+                        + mediaBox.getUpperRightX() + "\t"
+                        + mediaBox.getUpperRightY() + "\t"
+                        + mediaBox.getLowerLeftX() + "\t");
                 res.add("Page " + numero + " TrimBox:\t"
-                    + trimBox.getLowerLeftY() + "\t"
-                    + trimBox.getUpperRightX() + "\t"
-                    + trimBox.getUpperRightY() + "\t"
-                    + trimBox.getLowerLeftX() + "\t");
+                        + trimBox.getLowerLeftY() + "\t"
+                        + trimBox.getUpperRightX() + "\t"
+                        + trimBox.getUpperRightY() + "\t"
+                        + trimBox.getLowerLeftX() + "\t");
             } else {
 
                 res.add("Page " + numero + " size:\t\t"
-                    + Math.abs(cropBox.getWidth()) + " pts x "
-                    + Math.abs(cropBox.getHeight()) + " pts");
+                        + Math.abs(cropBox.getWidth()) + " pts x "
+                        + Math.abs(cropBox.getHeight()) + " pts");
                 // Boxes
                 res.add("Page " + numero + " CropBox:\t"
-                    + cropBox.getLowerLeftX() + "\t"
-                    + cropBox.getUpperRightY() + "\t"
-                    + cropBox.getUpperRightX() + "\t"
-                    + cropBox.getLowerLeftY() + "\t");
+                        + cropBox.getLowerLeftX() + "\t"
+                        + cropBox.getUpperRightY() + "\t"
+                        + cropBox.getUpperRightX() + "\t"
+                        + cropBox.getLowerLeftY() + "\t");
                 res.add("Page " + numero + " MediaBox:\t"
-                    + mediaBox.getLowerLeftX() + "\t"
-                    + mediaBox.getUpperRightY() + "\t"
-                    + mediaBox.getUpperRightX() + "\t"
-                    + mediaBox.getLowerLeftY() + "\t");
+                        + mediaBox.getLowerLeftX() + "\t"
+                        + mediaBox.getUpperRightY() + "\t"
+                        + mediaBox.getUpperRightX() + "\t"
+                        + mediaBox.getLowerLeftY() + "\t");
                 res.add("Page " + numero + " TrimBox:\t"
-                    + trimBox.getLowerLeftX() + "\t"
-                    + trimBox.getUpperRightY() + "\t"
-                    + trimBox.getUpperRightX() + "\t"
-                    + trimBox.getLowerLeftY() + "\t");
+                        + trimBox.getLowerLeftX() + "\t"
+                        + trimBox.getUpperRightY() + "\t"
+                        + trimBox.getUpperRightX() + "\t"
+                        + trimBox.getLowerLeftY() + "\t");
             }
         }
 
@@ -360,7 +357,7 @@ public class Main {
         }
 
         for (String s : res) {
-            System.out.println(StringUtils.trim(s));
+            System.out.println(s);
         }
 
         return changes;
@@ -396,7 +393,7 @@ public class Main {
             }
         }
         res.add("NumberSectionsDelimiters:\t\t"
-            + delimiters.substring(0, delimiters.length() - 1));
+                + delimiters.substring(0, delimiters.length() - 1));
     }
 
     private static void addBookmark(PDDocument doc, ArrayList<String> res,
@@ -413,16 +410,15 @@ public class Main {
 
             }
             current = current.getNextSibling();
-
         }
     }
 
     private static void cutDocument(PDDocument doc, String input,
                                     String output, String cutmode) throws COSVisitorException,
-        IOException {
+            IOException {
 
         System.out.println("Cut document of " + doc.getNumberOfPages()
-            + " with mode " + cutmode);
+                + " with mode " + cutmode);
 
         ArrayList<PDDocument> copies = duplicatePages(doc, input, cutmode);
         cutPages(doc, cutmode);
@@ -473,8 +469,8 @@ public class Main {
             newbox.move(decalage, 0f);
 
             System.out.println("Set cropbox of page " + page + " from "
-                + pdfPage.getCropBox() + " to " + newbox + " (offset : "
-                + decalage + ")");
+                    + pdfPage.getCropBox() + " to " + newbox + " (offset : "
+                    + decalage + ")");
 
             pdfPage.setCropBox(newbox);
             pdfPage.setMediaBox(newbox);
@@ -528,7 +524,7 @@ public class Main {
                 continue;
             }
             System.out.println("Duplicate page " + page + " :: cursor is at "
-                + cursor);
+                    + cursor);
             // Duplicate page
             for (int j = 0; j < duplicateTime; j++) {
                 List<PDPage> l = copies.get(j).getDocumentCatalog().getAllPages();
@@ -550,7 +546,7 @@ public class Main {
 
     private void extractTexts(PDDocument doc, String textsOutput, String method,
                               Integer[] pages, String ignoredSeparators, String input) throws IOException, ClassNotFoundException,
-        NullPointerException, InterruptedException {
+            NullPointerException, InterruptedException {
 
         long s = Calendar.getInstance().getTimeInMillis();
 
@@ -560,7 +556,7 @@ public class Main {
         PDDocument d;
 
         int totalThreads = Math.max(1,
-            Math.min(Math.round(pages.length / 50.0f), Main.threads));
+                Math.min(Math.round(pages.length / 50.0f), Main.threads));
 
         System.out.println("Total threads " + totalThreads);
 
@@ -586,13 +582,13 @@ public class Main {
         }
 
         System.out.println("Extraction des textes with " + method + " : "
-            + ((Calendar.getInstance().getTimeInMillis() - s) / 1000)
-            + "s");
+                + ((Calendar.getInstance().getTimeInMillis() - s) / 1000)
+                + "s");
     }
 
     public static void updateCropBox(PDDocument doc, String output,
                                      String refbox, Integer[] pages, String defined) throws IOException,
-        COSVisitorException {
+            COSVisitorException {
         System.out.println("updateCropBox");
         if (!"".equals(defined)) {
             updateCropBoxDefined(doc, defined);
@@ -605,7 +601,7 @@ public class Main {
     }
 
     private static void updateCropBoxDefined(PDDocument doc, String defined)
-        throws IOException, COSVisitorException {
+            throws IOException, COSVisitorException {
         String[] e = defined.split("*");
         for (int i = 0; i < e.length; i++) {
             String[] e1 = e[i].split(",");
@@ -683,7 +679,7 @@ public class Main {
     }
 
     public static void saveLinks(String file, ArrayList<Link> listLinks)
-        throws IOException {
+            throws IOException {
         FileIO out = new FileIO(file);
         out.open("w");
         out.output.writeBytes(Link.header());
@@ -693,15 +689,6 @@ public class Main {
         out.close();
     }
 
-    public static String getPageFromRemoteGoToAction(PDDocument doc, PDAction a) throws IOException{
-        PDActionGoTo aa = (PDActionGoTo) a;
-        if (null == a) {
-            return "-1";
-        }
-        PDDestination d = aa.getDestination();
-        return getPageFromDestination(doc, d);
-    }
-
     public static String getPageFromAction(PDDocument doc, PDAction a) throws IOException {
         PDActionGoTo aa = (PDActionGoTo) a;
         if (null == a) {
@@ -763,7 +750,7 @@ public class Main {
     }
 
     public static ArrayList<Link> extractLinksOfPage(PDDocument doc, int pageNumber, PDPage p)
-        throws IOException {
+            throws IOException {
         System.out.println(pageNumber);
         ArrayList<Link> listLinks = new ArrayList<>();
         Link myLink;
@@ -822,7 +809,7 @@ public class Main {
                 System.out.println(link.getRectangle().getHeight());
                 myLink.rect = link.getRectangle();
                 if (myLink.rect.getWidth() == 0.0
-                    || myLink.rect.getHeight() == 0.0) {
+                        || myLink.rect.getHeight() == 0.0) {
                     System.out.println("Skip link :: surface == 0");
                     continue;
                 }
@@ -861,9 +848,6 @@ public class Main {
                     } else if (e[0].compareTo("tel") == 0) {
                         myLink.type = 24;
                         myLink.to = e[1];
-                    } else if (e[0].compareTo("tooltip") == 0) {
-                        myLink.type = 18;
-                        myLink.to = e[1];
                     } else {
                         myLink.type = 2;
                     }