fix #2353 @6

diff --git a/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml b/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml
index 3eb314946071da5438b74ea550b8ee5675b4a664..408ea811e1ce77cdc65e6568971d61718eeb5aa7 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml
+++ b/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml
@@ -9,10 +9,12 @@
         </element>\r
       </element>\r
       <element id="library" level="project" name="avalon-framework-4.1.4" />\r
-      <element id="library" level="project" name="jempbox-1.8.13" />\r
-      <element id="library" level="project" name="pdfbox-1.8.13" />\r
-      <element id="library" level="project" name="fontbox-1.8.13" />\r
-      <element id="library" level="project" name="commons-lang3-3.7.jar" />\r
+      <element id="library" level="project" name="commons-io-2.6" />\r
+      <element id="library" level="project" name="commons-text-1.6" />\r
+      <element id="library" level="project" name="commons-logging-1.2" />\r
+      <element id="library" level="project" name="jempbox-1.8.16" />\r
+      <element id="library" level="project" name="pdfbox-1.8.16" />\r
+      <element id="library" level="project" name="fontbox-1.8.16" />\r
       <element id="dir-copy" path="$PROJECT_DIR$/project_resources" />\r
     </root>\r
   </artifact>\r

diff --git a/fluidbook/tools/fwstk/.idea/libraries/avalon_framework_4_1_4.xml b/fluidbook/tools/fwstk/.idea/libraries/avalon_framework_4_1_4.xml
index 914c28660d54e5c5497d79fc86bcbbcf566899ae..b29d4f1d57f86bdfe64fdc21002a46c65b849c99 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/libraries/avalon_framework_4_1_4.xml
+++ b/fluidbook/tools/fwstk/.idea/libraries/avalon_framework_4_1_4.xml
@@ -4,8 +4,6 @@
       <root url="jar://$PROJECT_DIR$/lib/avalon-framework-4.1.4.jar!/" />\r
       <root url="jar://$PROJECT_DIR$/lib/bcmail-jdk16-146.jar!/" />\r
       <root url="jar://$PROJECT_DIR$/lib/bcprov-jdk16-146.jar!/" />\r
-      <root url="jar://$PROJECT_DIR$/lib/commons-io-2.4.jar!/" />\r
-      <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.1.1.jar!/" />\r
     </CLASSES>\r
     <JAVADOC />\r
     <SOURCES />\r

diff --git a/fluidbook/tools/fwstk/.idea/libraries/commons_io_2_6.xml b/fluidbook/tools/fwstk/.idea/libraries/commons_io_2_6.xml
new file mode 100644 (file)
index 0000000..edee7f6
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/libraries/commons_io_2_6.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">\r
+  <library name="commons-io-2.6">\r
+    <CLASSES>\r
+      <root url="jar://$PROJECT_DIR$/lib/commons-io-2.6.jar!/" />\r
+    </CLASSES>\r
+    <JAVADOC />\r
+    <SOURCES />\r
+  </library>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/commons_lang3_3_7.xml b/fluidbook/tools/fwstk/.idea/libraries/commons_lang3_3_7.xml
deleted file mode 100644 (file)
index d005cc5..0000000
--- a/fluidbook/tools/fwstk/.idea/libraries/commons_lang3_3_7.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">\r
-  <library name="commons-lang3-3.7">\r
-    <CLASSES>\r
-      <root url="jar://$PROJECT_DIR$/lib/commons-lang3-3.7.jar!/" />\r
-    </CLASSES>\r
-    <JAVADOC />\r
-    <SOURCES />\r
-  </library>\r
-</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/commons_logging_1_2.xml b/fluidbook/tools/fwstk/.idea/libraries/commons_logging_1_2.xml
new file mode 100644 (file)
index 0000000..dce183f
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/libraries/commons_logging_1_2.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">\r
+  <library name="commons-logging-1.2">\r
+    <CLASSES>\r
+      <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.2.jar!/" />\r
+    </CLASSES>\r
+    <JAVADOC />\r
+    <SOURCES />\r
+  </library>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_6.xml b/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_6.xml
new file mode 100644 (file)
index 0000000..3ccf211
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_6.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">\r
+  <library name="commons-text-1.6">\r
+    <CLASSES>\r
+      <root url="jar://$PROJECT_DIR$/lib/commons-text-1.6.jar!/" />\r
+    </CLASSES>\r
+    <JAVADOC />\r
+    <SOURCES />\r
+  </library>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_13.xml b/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_13.xml
deleted file mode 100644 (file)
index 2df1cb8..0000000
--- a/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_13.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">\r
-  <library name="fontbox-1.8.13">\r
-    <CLASSES>\r
-      <root url="jar://$PROJECT_DIR$/lib/fontbox-1.8.13.jar!/" />\r
-    </CLASSES>\r
-    <JAVADOC />\r
-    <SOURCES />\r
-  </library>\r
-</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_16.xml b/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_16.xml
new file mode 100644 (file)
index 0000000..2ab6f94
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_16.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">\r
+  <library name="fontbox-1.8.16">\r
+    <CLASSES>\r
+      <root url="jar://$PROJECT_DIR$/lib/fontbox-1.8.16.jar!/" />\r
+    </CLASSES>\r
+    <JAVADOC />\r
+    <SOURCES />\r
+  </library>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_13.xml b/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_13.xml
deleted file mode 100644 (file)
index a860285..0000000
--- a/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_13.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">\r
-  <library name="jempbox-1.8.13">\r
-    <CLASSES>\r
-      <root url="jar://$PROJECT_DIR$/lib/jempbox-1.8.13.jar!/" />\r
-    </CLASSES>\r
-    <JAVADOC />\r
-    <SOURCES />\r
-  </library>\r
-</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_16.xml b/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_16.xml
new file mode 100644 (file)
index 0000000..6f16241
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_16.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">\r
+  <library name="jempbox-1.8.16">\r
+    <CLASSES>\r
+      <root url="jar://$PROJECT_DIR$/lib/jempbox-1.8.16.jar!/" />\r
+    </CLASSES>\r
+    <JAVADOC />\r
+    <SOURCES />\r
+  </library>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_13.xml b/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_13.xml
deleted file mode 100644 (file)
index c6fba8f..0000000
--- a/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_13.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">\r
-  <library name="pdfbox-1.8.13">\r
-    <CLASSES>\r
-      <root url="jar://$PROJECT_DIR$/lib/pdfbox-1.8.13.jar!/" />\r
-    </CLASSES>\r
-    <JAVADOC />\r
-    <SOURCES>\r
-      <root url="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/" />\r
-    </SOURCES>\r
-  </library>\r
-</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_16.xml b/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_16.xml
new file mode 100644 (file)
index 0000000..b908005
--- /dev/null
+++ b/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_16.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">\r
+  <library name="pdfbox-1.8.16">\r
+    <CLASSES>\r
+      <root url="jar://$PROJECT_DIR$/lib/pdfbox-1.8.16.jar!/" />\r
+    </CLASSES>\r
+    <JAVADOC />\r
+    <SOURCES />\r
+  </library>\r
+</component>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index f6de5ceec475d7c497cc7185b4c5988cdce651bb..c55095f13be54517c95d0a898b4a2df972223c7f 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -7,8 +7,41 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="fix #2243 @0:40">
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/commons_io_2_6.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/commons_logging_1_2.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/commons_text_1_6.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/fontbox_1_8_16.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/jempbox_1_8_16.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/pdfbox_1_8_16.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/commons-io-2.6.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/commons-lang3-3.8.1.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/commons-logging-1.2.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/commons-text-1.6.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/fontbox-1.8.16.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/jempbox-1.8.16.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/pdfbox-1.8.16.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fontbox-1.8.16.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/jempbox-1.8.16.jar" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/pdfbox-1.8.16.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/avalon_framework_4_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/avalon_framework_4_1_4.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/fontbox_1_8_13.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/jempbox_1_8_13.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/pdfbox_1_8_13.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/MANIFEST.MF" beforeDir="false" afterPath="$PROJECT_DIR$/MANIFEST.MF" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/fwstk.iml" beforeDir="false" afterPath="$PROJECT_DIR$/fwstk.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/commons-io-2.4.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/commons-lang3-3.7.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/commons-logging-1.1.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/fontbox-1.8.13.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/jempbox-1.8.13.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/pdfbox-1.8.13.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/commons-lang3-3.7.jar" beforeDir="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/layout/LayoutStripper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" afterDir="false" />
     </list>
     <ignored path="fwstk.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -27,33 +60,43 @@
     <session id="-183392587">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="3" />
+          <entry key="project.closed" value="5" />
           <entry key="project.open.time.1" value="1" />
           <entry key="project.open.time.10" value="1" />
+          <entry key="project.open.time.11" value="1" />
           <entry key="project.open.time.2" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.open.time.9" value="2" />
+          <entry key="project.opened" value="6" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="java" value="12" />
+          <entry key="MF" value="1" />
+          <entry key="java" value="13" />
+          <entry key="xml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="JAVA" value="12" />
+          <entry key="JAVA" value="13" />
+          <entry key="Manifest" value="1" />
+          <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="7" />
+          <entry key="MF" value="17" />
+          <entry key="java" value="48" />
           <entry key="txt" value="15" />
+          <entry key="xml" value="38" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="7" />
+          <entry key="JAVA" value="48" />
+          <entry key="Manifest" value="17" />
           <entry key="PLAIN_TEXT" value="15" />
+          <entry key="XML" value="38" />
         </counts>
       </usages-collector>
     </session>
@@ -63,33 +106,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3536">
-              <caret line="250" column="32" selection-start-line="250" selection-start-column="32" selection-end-line="250" selection-end-column="32" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="935">
-              <caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -120,8 +136,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="714">
-              <caret line="52" column="19" selection-start-line="52" selection-start-column="19" selection-end-line="52" selection-end-column="19" />
+            <state relative-caret-position="935">
+              <caret line="63" column="9" selection-start-line="63" selection-start-column="9" selection-end-line="63" selection-end-column="9" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -129,6 +145,24 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/MANIFEST.MF">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="68">
+              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="221">
+              <caret line="13" column="69" selection-start-line="13" selection-start-column="69" selection-end-line="13" selection-end-column="69" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Word.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -150,20 +184,26 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
+            <state relative-caret-position="867">
               <caret line="59" selection-start-line="59" selection-end-line="59" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFStreamEngine.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="217">
-              <caret line="74" column="30" selection-start-line="74" selection-start-column="30" selection-end-line="74" selection-end-column="30" />
-              <folding>
-                <element signature="e#2703#2711#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="306">
+              <caret line="68" column="7" selection-start-line="68" selection-start-column="7" selection-end-line="68" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="408">
+              <caret line="38" selection-start-line="38" selection-end-line="38" />
             </state>
           </provider>
         </entry>
@@ -205,6 +245,7 @@
       <find>getPageEnd</find>
       <find>writePageStart</find>
       <find>addMoreFormatting</find>
+      <find>lang3</find>
     </findStrings>
     <dirStrings>
       <dir>H:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk\layout</dir>
@@ -225,21 +266,21 @@
       <list>
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/Link.java" />
-        <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" />
-        <option value="$PROJECT_DIR$/MANIFEST.MF" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java" />
-        <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java" />
         <option value="$PROJECT_DIR$/fwstk.iml" />
-        <option value="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java" />
         <option value="$PROJECT_DIR$/src/cube/util/StringUtil.java" />
+        <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" />
+        <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" />
+        <option value="$PROJECT_DIR$/MANIFEST.MF" />
+        <option value="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" />
       </list>
     </option>
   </component>
@@ -260,6 +301,7 @@
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
+    <ConfirmationsSetting value="2" id="Remove" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -301,35 +343,6 @@
               <item name="fwstk" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-              <item name="pdfbox-1.8.13.jar" type="ab9368bb:PsiFileNode" />
-            </path>
-            <path>
-              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-              <item name="pdfbox-1.8.13.jar" type="ab9368bb:PsiFileNode" />
-              <item name="pdfbox" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-              <item name="pdfbox-1.8.13.jar" type="ab9368bb:PsiFileNode" />
-              <item name="pdfbox" type="462c0819:PsiDirectoryNode" />
-              <item name="pdmodel" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-              <item name="pdfbox-1.8.13.jar" type="ab9368bb:PsiFileNode" />
-              <item name="pdfbox" type="462c0819:PsiDirectoryNode" />
-              <item name="util" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
               <item name="fwstk" type="462c0819:PsiDirectoryNode" />
@@ -392,8 +405,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -405,11 +418,12 @@
     <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
     <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542712260318" />
     <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-lang3-3.7.jar!/" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/commons-logging-1.2.jar!/" />
     <property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
-    <property name="project.structure.last.edited" value="SDKs" />
+    <property name="project.structure.last.edited" value="Libraries" />
     <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" />
@@ -773,6 +787,9 @@
       <workItem from="1536915422503" duration="1202000" />
       <workItem from="1536936327997" duration="1627000" />
       <workItem from="1541603515738" duration="1532000" />
+      <workItem from="1542650839553" duration="56000" />
+      <workItem from="1542710796466" duration="980000" />
+      <workItem from="1542711819188" duration="1040000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -834,7 +851,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="81264000" />
+    <option name="totallyTimeSpent" value="83340000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -849,7 +866,7 @@
     <frame x="-1928" y="-8" width="1936" height="1176" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1673774" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17217484" />
       <window_info id="Palette&#9;" order="1" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Capture Tool" order="3" />
@@ -862,12 +879,12 @@
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32934782" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32853025" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.52132195" side_tool="true" weight="0.32934782" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="9" weight="0.32934782" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32934782" />
-      <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.48720682" weight="0.32660902" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.32853025" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32853025" />
+      <window_info active="true" anchor="bottom" id="Messages" order="11" sideWeight="0.48720682" visible="true" weight="0.32660902" />
       <window_info anchor="bottom" id="File Transfer" order="12" visible="true" weight="0.32756963" />
       <window_info anchor="right" id="SciView" order="0" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
@@ -959,23 +976,9 @@
       </provider>
     </entry>
     <entry file="jar://$PROJECT_DIR$/lib/pdfbox-1.8.6.jar!/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.class" />
-    <entry file="jar://$PROJECT_DIR$/lib/pdfbox-1.8.13.jar!/org/apache/pdfbox/util/PDFStreamEngine.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="153" column="9" lean-forward="true" selection-start-line="153" selection-start-column="9" selection-end-line="153" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/libraries/pdfbox_1_8_13.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/libraries/fontbox_1_8_13.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="jar://$PROJECT_DIR$/lib/pdfbox-1.8.13.jar!/org/apache/pdfbox/util/PDFStreamEngine.class" />
+    <entry file="file://$PROJECT_DIR$/.idea/libraries/pdfbox_1_8_13.xml" />
+    <entry file="file://$PROJECT_DIR$/.idea/libraries/fontbox_1_8_13.xml" />
     <entry file="file://$PROJECT_DIR$/project_resources/com/adobe/icc/cmyk/USWebCoatedSWOP.icc">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -991,13 +994,6 @@
     </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/util/LinkedList.java" />
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/util/ArrayList.java" />
-    <entry file="file://$PROJECT_DIR$/MANIFEST.MF">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" selection-start-line="6" selection-end-line="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/lang/Object.java" />
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1013,16 +1009,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="68" selection-start-line="11" selection-start-column="68" selection-end-line="11" selection-end-column="68" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml" />
     <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5151">
@@ -1051,13 +1038,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="850">
-          <caret line="64" column="22" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3536">
@@ -1104,8 +1084,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="714">
-          <caret line="52" column="19" selection-start-line="52" selection-start-column="19" selection-end-line="52" selection-end-column="19" />
+        <state relative-caret-position="935">
+          <caret line="63" column="9" selection-start-line="63" selection-start-column="9" selection-end-line="63" selection-end-column="9" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1128,18 +1108,36 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
+        <state relative-caret-position="867">
           <caret line="59" selection-start-line="59" selection-end-line="59" />
         </state>
       </provider>
     </entry>
     <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFStreamEngine.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="74" column="30" selection-start-line="74" selection-start-column="30" selection-end-line="74" selection-end-column="30" />
-          <folding>
-            <element signature="e#2703#2711#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="306">
+          <caret line="68" column="7" selection-start-line="68" selection-start-column="7" selection-end-line="68" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="38" selection-start-line="38" selection-end-line="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/MANIFEST.MF">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="13" column="69" selection-start-line="13" selection-start-column="69" selection-end-line="13" selection-end-column="69" />
         </state>
       </provider>
     </entry>
@@ -1151,9 +1149,9 @@
           <artifact-editor>
             <show-content>
               <type id="jpa-descriptors" />
+              <type id="javaee-facet-resources" />
               <type id="library" />
               <type id="artifact" />
-              <type id="javaee-facet-resources" />
             </show-content>
           </artifact-editor>
           <last-edited>fwstk:jar</last-edited>
@@ -1230,7 +1228,7 @@
       </state>
       <state key="ProjectLibrariesConfigurable.UI">
         <settings>
-          <last-edited>jempbox-1.8.13</last-edited>
+          <last-edited>avalon-framework-4.1.4</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>

diff --git a/fluidbook/tools/fwstk/MANIFEST.MF b/fluidbook/tools/fwstk/MANIFEST.MF
index 2ecde2d6f753d5875d72dc1a81bdce09e7b62613..d6072f5181a9a7d6422ed0195abfcf5c14c85a95 100644 (file)
--- a/fluidbook/tools/fwstk/MANIFEST.MF
+++ b/fluidbook/tools/fwstk/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0\r
-Class-Path: pdfbox-1.8.13.jar fontbox-1.8.13.jar jempbox-1.8.13.jar av\r
+Class-Path: pdfbox-1.8.16.jar fontbox-1.8.16.jar jempbox-1.8.16.jar av\r
  alon-framework-4.1.4.jar bcmail-jdk16-146.jar bcprov-jdk16-146.jar co\r
- mmons-io-2.4.jar commons-logging-1.1.1.jar commons-lang3-3.7.jar\r
+ mmons-io-2.6.jar commons-logging-1.2.jar commons-lang3-3.8.1.jar comm\r
+ ons-text-1.6.jar\r
 Main-Class: com.fluidbook.fwstk.Main\r
 \r

diff --git a/fluidbook/tools/fwstk/fwstk.iml b/fluidbook/tools/fwstk/fwstk.iml
index 140eefefa8a71306ddbeaa820bf81b652aa1bea0..2792d5048af67898173054eea2a93854a306c099 100644 (file)
--- a/fluidbook/tools/fwstk/fwstk.iml
+++ b/fluidbook/tools/fwstk/fwstk.iml
@@ -20,9 +20,11 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="library" exported="" name="avalon-framework-4.1.4" level="project" />
-    <orderEntry type="library" exported="" name="fontbox-1.8.13" level="project" />
-    <orderEntry type="library" exported="" name="jempbox-1.8.13" level="project" />
-    <orderEntry type="library" exported="" name="pdfbox-1.8.13" level="project" />
-    <orderEntry type="library" exported="" name="commons-lang3-3.7" level="project" />
+    <orderEntry type="library" name="fontbox-1.8.16" level="project" />
+    <orderEntry type="library" name="jempbox-1.8.16" level="project" />
+    <orderEntry type="library" name="pdfbox-1.8.16" level="project" />
+    <orderEntry type="library" name="commons-text-1.6" level="project" />
+    <orderEntry type="library" name="commons-io-2.6" level="project" />
+    <orderEntry type="library" name="commons-logging-1.2" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/lib/commons-io-2.4.jar b/fluidbook/tools/fwstk/lib/commons-io-2.4.jar
deleted file mode 100644 (file)
index 90035a4..0000000
Binary files a/fluidbook/tools/fwstk/lib/commons-io-2.4.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/lib/commons-io-2.6.jar b/fluidbook/tools/fwstk/lib/commons-io-2.6.jar
new file mode 100644 (file)
index 0000000..00556b1
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/commons-io-2.6.jar differ

diff --git a/fluidbook/tools/fwstk/lib/commons-lang3-3.7.jar b/fluidbook/tools/fwstk/lib/commons-lang3-3.7.jar
deleted file mode 100644 (file)
index f37ded6..0000000
Binary files a/fluidbook/tools/fwstk/lib/commons-lang3-3.7.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/lib/commons-lang3-3.8.1.jar b/fluidbook/tools/fwstk/lib/commons-lang3-3.8.1.jar
new file mode 100644 (file)
index 0000000..2c65ce6
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/commons-lang3-3.8.1.jar differ

diff --git a/fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar b/fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar
deleted file mode 100644 (file)
index 8758a96..0000000
Binary files a/fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/lib/commons-logging-1.2.jar b/fluidbook/tools/fwstk/lib/commons-logging-1.2.jar
new file mode 100644 (file)
index 0000000..93a3b9f
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/commons-logging-1.2.jar differ

diff --git a/fluidbook/tools/fwstk/lib/commons-text-1.6.jar b/fluidbook/tools/fwstk/lib/commons-text-1.6.jar
new file mode 100644 (file)
index 0000000..63e4730
Binary files /dev/null and b/fluidbook/tools/fwstk/lib/commons-text-1.6.jar differ

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

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

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

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

diff --git a/fluidbook/tools/fwstk/lib/pdfbox-1.8.13.jar b/fluidbook/tools/fwstk/lib/pdfbox-1.8.13.jar
deleted file mode 100644 (file)
index 8102edb..0000000
Binary files a/fluidbook/tools/fwstk/lib/pdfbox-1.8.13.jar and /dev/null differ

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

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-lang3-3.7.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-lang3-3.7.jar
deleted file mode 100644 (file)
index f37ded6..0000000
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-lang3-3.7.jar and /dev/null differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.16.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.16.jar
new file mode 100644 (file)
index 0000000..0ebc06b
Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.16.jar differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index 6df2683c829eac592bcb28261359602f9026c292..00d440c554267ebcc4b8edd9a734eb3a35071d81 100644 (file)
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.16.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.16.jar
new file mode 100644 (file)
index 0000000..edd06c5
Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.16.jar differ

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.16.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.16.jar
new file mode 100644 (file)
index 0000000..d1e4c85
Binary files /dev/null and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.16.jar differ