From c48469d73edb01a9f01f0991afe6394468220956 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 20 Nov 2018 12:24:59 +0000 Subject: [PATCH] fix #2353 @6 --- .../tools/fwstk/.idea/artifacts/fwstk_jar.xml | 10 +- .../libraries/avalon_framework_4_1_4.xml | 2 - .../fwstk/.idea/libraries/commons_io_2_6.xml | 9 + .../.idea/libraries/commons_lang3_3_7.xml | 9 - .../.idea/libraries/commons_logging_1_2.xml | 9 + .../.idea/libraries/commons_text_1_6.xml | 9 + .../fwstk/.idea/libraries/fontbox_1_8_13.xml | 9 - .../fwstk/.idea/libraries/fontbox_1_8_16.xml | 9 + .../fwstk/.idea/libraries/jempbox_1_8_13.xml | 9 - .../fwstk/.idea/libraries/jempbox_1_8_16.xml | 9 + .../fwstk/.idea/libraries/pdfbox_1_8_13.xml | 11 - .../fwstk/.idea/libraries/pdfbox_1_8_16.xml | 9 + fluidbook/tools/fwstk/.idea/workspace.xml | 268 +++++++++--------- fluidbook/tools/fwstk/MANIFEST.MF | 5 +- fluidbook/tools/fwstk/fwstk.iml | 10 +- fluidbook/tools/fwstk/lib/commons-io-2.4.jar | Bin 185140 -> 0 bytes fluidbook/tools/fwstk/lib/commons-io-2.6.jar | Bin 0 -> 214788 bytes .../tools/fwstk/lib/commons-lang3-3.7.jar | Bin 499634 -> 0 bytes .../tools/fwstk/lib/commons-lang3-3.8.1.jar | Bin 0 -> 501879 bytes .../tools/fwstk/lib/commons-logging-1.1.1.jar | Bin 60841 -> 0 bytes .../tools/fwstk/lib/commons-logging-1.2.jar | Bin 0 -> 61829 bytes .../tools/fwstk/lib/commons-text-1.6.jar | Bin 0 -> 197176 bytes ...{fontbox-1.8.13.jar => fontbox-1.8.16.jar} | Bin 219658 -> 219679 bytes ...{jempbox-1.8.13.jar => jempbox-1.8.16.jar} | Bin 51731 -> 51743 bytes .../{pdfbox-1.8.13.jar => pdfbox-1.8.16.jar} | Bin 4094523 -> 4094597 bytes .../artifacts/fwstk_jar/commons-lang3-3.7.jar | Bin 499634 -> 0 bytes .../artifacts/fwstk_jar/fontbox-1.8.16.jar | Bin 0 -> 219679 bytes .../fwstk/out/artifacts/fwstk_jar/fwstk.jar | Bin 3179076 -> 3179120 bytes .../artifacts/fwstk_jar/jempbox-1.8.16.jar | Bin 0 -> 51743 bytes .../out/artifacts/fwstk_jar/pdfbox-1.8.16.jar | Bin 0 -> 4094597 bytes 30 files changed, 202 insertions(+), 185 deletions(-) create mode 100644 fluidbook/tools/fwstk/.idea/libraries/commons_io_2_6.xml delete mode 100644 fluidbook/tools/fwstk/.idea/libraries/commons_lang3_3_7.xml create mode 100644 fluidbook/tools/fwstk/.idea/libraries/commons_logging_1_2.xml create mode 100644 fluidbook/tools/fwstk/.idea/libraries/commons_text_1_6.xml delete mode 100644 fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_13.xml create mode 100644 fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_16.xml delete mode 100644 fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_13.xml create mode 100644 fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_16.xml delete mode 100644 fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_13.xml create mode 100644 fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_16.xml delete mode 100644 fluidbook/tools/fwstk/lib/commons-io-2.4.jar create mode 100644 fluidbook/tools/fwstk/lib/commons-io-2.6.jar delete mode 100644 fluidbook/tools/fwstk/lib/commons-lang3-3.7.jar create mode 100644 fluidbook/tools/fwstk/lib/commons-lang3-3.8.1.jar delete mode 100644 fluidbook/tools/fwstk/lib/commons-logging-1.1.1.jar create mode 100644 fluidbook/tools/fwstk/lib/commons-logging-1.2.jar create mode 100644 fluidbook/tools/fwstk/lib/commons-text-1.6.jar rename fluidbook/tools/fwstk/lib/{fontbox-1.8.13.jar => fontbox-1.8.16.jar} (85%) rename fluidbook/tools/fwstk/lib/{jempbox-1.8.13.jar => jempbox-1.8.16.jar} (78%) rename fluidbook/tools/fwstk/lib/{pdfbox-1.8.13.jar => pdfbox-1.8.16.jar} (90%) delete mode 100644 fluidbook/tools/fwstk/out/artifacts/fwstk_jar/commons-lang3-3.7.jar create mode 100644 fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fontbox-1.8.16.jar create mode 100644 fluidbook/tools/fwstk/out/artifacts/fwstk_jar/jempbox-1.8.16.jar create mode 100644 fluidbook/tools/fwstk/out/artifacts/fwstk_jar/pdfbox-1.8.16.jar diff --git a/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml b/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml index 3eb314946..408ea811e 100644 --- a/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml +++ b/fluidbook/tools/fwstk/.idea/artifacts/fwstk_jar.xml @@ -9,10 +9,12 @@ - - - - + + + + + + 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 914c28660..b29d4f1d5 100644 --- 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 @@ - - 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 index 000000000..edee7f6c0 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/commons_io_2_6.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ 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 index d005cc5ce..000000000 --- a/fluidbook/tools/fwstk/.idea/libraries/commons_lang3_3_7.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ 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 index 000000000..dce183fb6 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/commons_logging_1_2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ 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 index 000000000..3ccf211cf --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/commons_text_1_6.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ 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 index 2df1cb8e0..000000000 --- a/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_13.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ 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 index 000000000..2ab6f9465 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/fontbox_1_8_16.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ 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 index a860285e3..000000000 --- a/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_13.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ 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 index 000000000..6f1624169 --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/jempbox_1_8_16.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ 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 index c6fba8fa1..000000000 --- a/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_13.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ 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 index 000000000..b9080050c --- /dev/null +++ b/fluidbook/tools/fwstk/.idea/libraries/pdfbox_1_8_16.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml index f6de5ceec..c55095f13 100644 --- a/fluidbook/tools/fwstk/.idea/workspace.xml +++ b/fluidbook/tools/fwstk/.idea/workspace.xml @@ -7,8 +7,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27,33 +60,43 @@ - + + - + + - + + + - + + + - + + + - + + + @@ -63,33 +106,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -120,8 +136,8 @@ - - + + @@ -129,6 +145,24 @@ + + + + + + + + + + + + + + + + + + @@ -150,20 +184,26 @@ - + - + - - - - - + + + + + + + + + + + @@ -205,6 +245,7 @@ getPageEnd writePageStart addMoreFormatting + lang3 H:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk\layout @@ -225,21 +266,21 @@ @@ -260,6 +301,7 @@ + @@ -301,35 +343,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -392,8 +405,8 @@