diff --git a/graphics-pdfbox-layout/src/main/java/module-info.java b/graphics-pdfbox-layout/src/main/java/module-info.java index c26822a..0ef6752 100644 --- a/graphics-pdfbox-layout/src/main/java/module-info.java +++ b/graphics-pdfbox-layout/src/main/java/module-info.java @@ -1,11 +1,11 @@ module org.xbib.graphics.layout.pdfbox { exports org.xbib.graphics.pdfbox.layout.boxable; exports org.xbib.graphics.pdfbox.layout.color; - exports org.xbib.graphics.pdfbox.layout.elements; - exports org.xbib.graphics.pdfbox.layout.elements.render; + exports org.xbib.graphics.pdfbox.layout.element; + exports org.xbib.graphics.pdfbox.layout.element.render; exports org.xbib.graphics.pdfbox.layout.font; - exports org.xbib.graphics.pdfbox.layout.script; - exports org.xbib.graphics.pdfbox.layout.script.command; + exports org.xbib.graphics.pdfbox.layout.element.scripting; + exports org.xbib.graphics.pdfbox.layout.element.scripting.command; exports org.xbib.graphics.pdfbox.layout.shape; exports org.xbib.graphics.pdfbox.layout.table; exports org.xbib.graphics.pdfbox.layout.table.render; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/BarcodeElement.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/BarcodeElement.java similarity index 98% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/BarcodeElement.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/BarcodeElement.java index e66d3d4..67b61d6 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/BarcodeElement.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/BarcodeElement.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/ChartElement.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/ChartElement.java similarity index 96% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/ChartElement.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/ChartElement.java index 7f0b658..2c21fdd 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/ChartElement.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/ChartElement.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -11,11 +11,8 @@ import org.xbib.graphics.pdfbox.layout.text.DrawListener; import org.xbib.graphics.pdfbox.layout.text.Position; import org.xbib.graphics.pdfbox.layout.text.WidthRespecting; -import java.awt.Color; import java.awt.geom.AffineTransform; import java.io.IOException; -import java.util.Arrays; -import java.util.logging.Logger; public class ChartElement implements Element, Drawable, Dividable, WidthRespecting { diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/ControlElement.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/ControlElement.java similarity index 93% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/ControlElement.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/ControlElement.java index edf0cdc..6405702 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/ControlElement.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/ControlElement.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; /** * ControlElements do not have a drawable representation, but control page flow, diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Cutter.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Cutter.java similarity index 97% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Cutter.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Cutter.java index b4be3f9..b107f5b 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Cutter.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Cutter.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Dimension.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Dimension.java similarity index 96% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Dimension.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Dimension.java index 29a4e9b..d5017bd 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Dimension.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Dimension.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; /** * In order to avoid dependencies to AWT, we use our own Dimension class here. diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Dividable.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Dividable.java similarity index 96% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Dividable.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Dividable.java index 90976dc..bb1a53c 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Dividable.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Dividable.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Document.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Document.java similarity index 93% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Document.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Document.java index c1df0da..eab165e 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Document.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Document.java @@ -1,15 +1,15 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.io.MemoryUsageSetting; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentInformation; -import org.xbib.graphics.pdfbox.layout.elements.render.Layout; -import org.xbib.graphics.pdfbox.layout.elements.render.LayoutHint; -import org.xbib.graphics.pdfbox.layout.elements.render.RenderContext; -import org.xbib.graphics.pdfbox.layout.elements.render.RenderListener; -import org.xbib.graphics.pdfbox.layout.elements.render.Renderer; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayout; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.render.Layout; +import org.xbib.graphics.pdfbox.layout.element.render.LayoutHint; +import org.xbib.graphics.pdfbox.layout.element.render.RenderContext; +import org.xbib.graphics.pdfbox.layout.element.render.RenderListener; +import org.xbib.graphics.pdfbox.layout.element.render.Renderer; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayout; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import java.io.Closeable; import java.io.IOException; import java.io.OutputStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Drawable.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Drawable.java similarity index 94% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Drawable.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Drawable.java index 2336479..eac204b 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Drawable.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Drawable.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; -import org.xbib.graphics.pdfbox.layout.elements.render.Layout; +import org.xbib.graphics.pdfbox.layout.element.render.Layout; import org.xbib.graphics.pdfbox.layout.text.DrawListener; import org.xbib.graphics.pdfbox.layout.text.Position; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Element.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Element.java similarity index 73% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Element.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Element.java index 9386628..56cb21d 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Element.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Element.java @@ -1,6 +1,6 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; -import org.xbib.graphics.pdfbox.layout.elements.render.LayoutHint; +import org.xbib.graphics.pdfbox.layout.element.render.LayoutHint; /** * Base (tagging) interface for elements in a {@link Document}. diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Frame.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Frame.java similarity index 99% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Frame.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Frame.java index a3e3700..0aef7b3 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Frame.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Frame.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/HorizontalRuler.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/HorizontalRuler.java similarity index 98% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/HorizontalRuler.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/HorizontalRuler.java index 52b8ff6..443195b 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/HorizontalRuler.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/HorizontalRuler.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/ImageElement.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/ImageElement.java similarity index 98% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/ImageElement.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/ImageElement.java index 56d020e..b1aaf53 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/ImageElement.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/ImageElement.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Orientation.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Orientation.java similarity index 51% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Orientation.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Orientation.java index a8fac28..650799c 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Orientation.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Orientation.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; public enum Orientation { diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PageFormat.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PageFormat.java similarity index 99% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PageFormat.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PageFormat.java index c4d08e8..7edbf0b 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PageFormat.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PageFormat.java @@ -1,7 +1,7 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.common.PDRectangle; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayout; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayout; import java.util.Locale; import java.util.Objects; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PageFormats.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PageFormats.java similarity index 91% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PageFormats.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PageFormats.java index 8484958..b1ca935 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PageFormats.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PageFormats.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; public interface PageFormats { diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Paragraph.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Paragraph.java similarity index 98% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Paragraph.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Paragraph.java index 9b31ef2..4ee56f7 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Paragraph.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Paragraph.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PathElement.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PathElement.java similarity index 97% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PathElement.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PathElement.java index 8973591..3661087 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PathElement.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PathElement.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PositionControl.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PositionControl.java similarity index 98% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PositionControl.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PositionControl.java index e92a3b9..6783e73 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/PositionControl.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/PositionControl.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; /** * Utility class to create elements that allow the manipulation of the current diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Rectangle.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Rectangle.java similarity index 96% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Rectangle.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Rectangle.java index 760acca..d7b55e8 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/Rectangle.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Rectangle.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; /** * In order to avoid dependencies to AWT, we use our own Rectangle class here. diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/SVGElement.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/SVGElement.java similarity index 95% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/SVGElement.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/SVGElement.java index bf144d7..66d6bae 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/SVGElement.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/SVGElement.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; /* import io.sf.carte.echosvg.anim.dom.SAXSVGDocumentFactory; @@ -9,7 +9,6 @@ import io.sf.carte.echosvg.bridge.UserAgent; import io.sf.carte.echosvg.bridge.UserAgentAdapter; import io.sf.carte.echosvg.gvt.GraphicsNode; */ -import javax.xml.parsers.SAXParserFactory; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject; @@ -21,12 +20,9 @@ import org.xbib.graphics.pdfbox.font.DefaultFontDrawer; import org.xbib.graphics.pdfbox.font.FontDrawer; import org.xbib.graphics.pdfbox.layout.text.DrawListener; import org.xbib.graphics.pdfbox.layout.text.Position; -import org.w3c.dom.Document; -import org.xml.sax.XMLReader; import java.awt.color.ICC_Profile; import java.io.IOException; -import java.io.StringReader; public class SVGElement extends ImageElement { diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/TableElement.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/TableElement.java similarity index 98% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/TableElement.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/TableElement.java index 0691244..92b15a1 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/TableElement.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/TableElement.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/TextElement.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/TextElement.java similarity index 91% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/TextElement.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/TextElement.java index db51386..cd118fa 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/TextElement.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/TextElement.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.xbib.graphics.pdfbox.layout.font.Font; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/VerticalSpacer.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/VerticalSpacer.java similarity index 96% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/VerticalSpacer.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/VerticalSpacer.java index 1931891..43a99f7 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/VerticalSpacer.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/VerticalSpacer.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements; +package org.xbib.graphics.pdfbox.layout.element; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/ColumnLayout.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/ColumnLayout.java similarity index 91% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/ColumnLayout.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/ColumnLayout.java index 1e358b5..30f7ab1 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/ColumnLayout.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/ColumnLayout.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; -import org.xbib.graphics.pdfbox.layout.elements.ControlElement; -import org.xbib.graphics.pdfbox.layout.elements.Drawable; -import org.xbib.graphics.pdfbox.layout.elements.Element; +import org.xbib.graphics.pdfbox.layout.element.ControlElement; +import org.xbib.graphics.pdfbox.layout.element.Drawable; +import org.xbib.graphics.pdfbox.layout.element.Element; import java.io.IOException; /** diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/ColumnLayoutHint.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/ColumnLayoutHint.java similarity index 97% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/ColumnLayoutHint.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/ColumnLayoutHint.java index 871da4a..11ab23d 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/ColumnLayoutHint.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/ColumnLayoutHint.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; import org.xbib.graphics.pdfbox.layout.text.Alignment; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/Layout.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/Layout.java similarity index 59% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/Layout.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/Layout.java index fbe8686..636712f 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/Layout.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/Layout.java @@ -1,6 +1,6 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; -import org.xbib.graphics.pdfbox.layout.elements.Element; +import org.xbib.graphics.pdfbox.layout.element.Element; /** * A layout is used to size and position the elements of a document according to diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/LayoutHint.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/LayoutHint.java similarity index 56% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/LayoutHint.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/LayoutHint.java index f5d2cc1..325d9bc 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/LayoutHint.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/LayoutHint.java @@ -1,7 +1,7 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Element; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Element; /** * Each element in a document {@link Document#add(Element, LayoutHint)} diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/Layouts.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/Layouts.java similarity index 83% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/Layouts.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/Layouts.java index 2686e5a..d6e9d39 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/Layouts.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/Layouts.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; public enum Layouts { VERTICAL, diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/RenderContext.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/RenderContext.java similarity index 94% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/RenderContext.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/RenderContext.java index d35a180..38e86ec 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/RenderContext.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/RenderContext.java @@ -1,19 +1,19 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; import org.apache.pdfbox.util.Matrix; -import org.xbib.graphics.pdfbox.layout.elements.ControlElement; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Element; -import org.xbib.graphics.pdfbox.layout.elements.Orientation; -import org.xbib.graphics.pdfbox.layout.elements.PageFormat; -import org.xbib.graphics.pdfbox.layout.elements.PositionControl; -import org.xbib.graphics.pdfbox.layout.elements.PositionControl.MarkPosition; -import org.xbib.graphics.pdfbox.layout.elements.PositionControl.MovePosition; -import org.xbib.graphics.pdfbox.layout.elements.PositionControl.ResetPosition; -import org.xbib.graphics.pdfbox.layout.elements.PositionControl.SetPosition; +import org.xbib.graphics.pdfbox.layout.element.ControlElement; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Element; +import org.xbib.graphics.pdfbox.layout.element.Orientation; +import org.xbib.graphics.pdfbox.layout.element.PageFormat; +import org.xbib.graphics.pdfbox.layout.element.PositionControl; +import org.xbib.graphics.pdfbox.layout.element.PositionControl.MarkPosition; +import org.xbib.graphics.pdfbox.layout.element.PositionControl.MovePosition; +import org.xbib.graphics.pdfbox.layout.element.PositionControl.ResetPosition; +import org.xbib.graphics.pdfbox.layout.element.PositionControl.SetPosition; import org.xbib.graphics.pdfbox.layout.text.DrawContext; import org.xbib.graphics.pdfbox.layout.text.DrawListener; import org.xbib.graphics.pdfbox.layout.text.Position; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/RenderListener.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/RenderListener.java similarity index 91% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/RenderListener.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/RenderListener.java index 4f97883..26a61c7 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/RenderListener.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/RenderListener.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; /** * A render listener is called before and after a page has been rendered. It may diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/Renderer.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/Renderer.java similarity index 85% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/Renderer.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/Renderer.java index 8d71627..ac54802 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/Renderer.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/Renderer.java @@ -1,6 +1,6 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; -import org.xbib.graphics.pdfbox.layout.elements.Element; +import org.xbib.graphics.pdfbox.layout.element.Element; import java.io.IOException; /** diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/VerticalLayout.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/VerticalLayout.java similarity index 95% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/VerticalLayout.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/VerticalLayout.java index 1742088..a1687dd 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/VerticalLayout.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/VerticalLayout.java @@ -1,13 +1,13 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; import org.apache.pdfbox.pdmodel.PDPageContentStream; -import org.xbib.graphics.pdfbox.layout.elements.ControlElement; -import org.xbib.graphics.pdfbox.layout.elements.Cutter; -import org.xbib.graphics.pdfbox.layout.elements.Dividable; -import org.xbib.graphics.pdfbox.layout.elements.Drawable; -import org.xbib.graphics.pdfbox.layout.elements.Element; -import org.xbib.graphics.pdfbox.layout.elements.PageFormat; -import org.xbib.graphics.pdfbox.layout.elements.VerticalSpacer; +import org.xbib.graphics.pdfbox.layout.element.ControlElement; +import org.xbib.graphics.pdfbox.layout.element.Cutter; +import org.xbib.graphics.pdfbox.layout.element.Dividable; +import org.xbib.graphics.pdfbox.layout.element.Drawable; +import org.xbib.graphics.pdfbox.layout.element.Element; +import org.xbib.graphics.pdfbox.layout.element.PageFormat; +import org.xbib.graphics.pdfbox.layout.element.VerticalSpacer; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.text.Position; import org.xbib.graphics.pdfbox.layout.text.WidthRespecting; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/VerticalLayoutHint.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/VerticalLayoutHint.java similarity index 99% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/VerticalLayoutHint.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/VerticalLayoutHint.java index 5cea469..838cc44 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/elements/render/VerticalLayoutHint.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/render/VerticalLayoutHint.java @@ -1,4 +1,4 @@ -package org.xbib.graphics.pdfbox.layout.elements.render; +package org.xbib.graphics.pdfbox.layout.element.render; import org.xbib.graphics.pdfbox.layout.text.Alignment; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/Engine.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/Engine.java similarity index 85% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/Engine.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/Engine.java index 5f361ad..89c3ca3 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/Engine.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/Engine.java @@ -1,6 +1,6 @@ -package org.xbib.graphics.pdfbox.layout.script; +package org.xbib.graphics.pdfbox.layout.element.scripting; -import org.xbib.graphics.pdfbox.layout.script.command.Command; +import org.xbib.graphics.pdfbox.layout.element.scripting.command.Command; import org.xbib.settings.Settings; import java.io.Closeable; @@ -9,6 +9,8 @@ import java.util.logging.Logger; public class Engine implements Closeable { + private static final Logger logger = Logger.getLogger(Engine.class.getName()); + private final String packageName; private final ClassLoader classLoader; @@ -52,6 +54,7 @@ public class Engine implements Closeable { String className = packageName + ".command." + type.substring(0, 1).toUpperCase() + type.substring(1) + "Command"; Class cl = classLoader.loadClass(className); Command command = (Command) cl.getConstructor().newInstance(); + logger.finer("executing element " + type + " settings = " + settings.getAsMap()); command.execute(this, state, settings); } catch (Exception e) { throw new IOException(e); diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/State.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/State.java similarity index 76% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/State.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/State.java index c718018..c805b41 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/State.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/State.java @@ -1,7 +1,7 @@ -package org.xbib.graphics.pdfbox.layout.script; +package org.xbib.graphics.pdfbox.layout.element.scripting; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Element; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Element; import java.util.List; import java.util.Stack; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/BarcodeCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/BarcodeCommand.java similarity index 88% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/BarcodeCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/BarcodeCommand.java index b65251e..29a181f 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/BarcodeCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/BarcodeCommand.java @@ -1,12 +1,12 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; import org.xbib.graphics.barcode.HumanReadableLocation; import org.xbib.graphics.barcode.Symbol; import org.xbib.graphics.barcode.Symbols; -import org.xbib.graphics.pdfbox.layout.elements.BarcodeElement; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.BarcodeElement; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.text.Position; import org.xbib.settings.Settings; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/CellCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/CellCommand.java similarity index 93% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/CellCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/CellCommand.java index 0469e31..89f1bb6 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/CellCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/CellCommand.java @@ -1,12 +1,12 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; import org.xbib.graphics.pdfbox.layout.color.ColorFactory; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.Font; import org.xbib.graphics.pdfbox.layout.font.Fonts; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.table.BorderStyle; import org.xbib.graphics.pdfbox.layout.table.BorderStyleInterface; import org.xbib.graphics.pdfbox.layout.table.HorizontalAlignment; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ChartCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ChartCommand.java similarity index 87% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ChartCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ChartCommand.java index d026bea..ec02da2 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ChartCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ChartCommand.java @@ -1,9 +1,9 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.ChartElement; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.ChartElement; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.text.Position; import org.xbib.settings.Settings; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ColumnlayoutCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ColumnlayoutCommand.java similarity index 64% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ColumnlayoutCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ColumnlayoutCommand.java index b4138d4..7fce7b7 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ColumnlayoutCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ColumnlayoutCommand.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.render.ColumnLayout; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.render.ColumnLayout; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/Command.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/Command.java new file mode 100644 index 0000000..bd23db0 --- /dev/null +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/Command.java @@ -0,0 +1,11 @@ +package org.xbib.graphics.pdfbox.layout.element.scripting.command; + +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; +import org.xbib.settings.Settings; + +import java.io.IOException; + +public interface Command { + void execute(Engine engine, State state, Settings settings) throws IOException; +} diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/DocumentCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/DocumentCommand.java similarity index 83% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/DocumentCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/DocumentCommand.java index d1c1044..410258b 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/DocumentCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/DocumentCommand.java @@ -1,9 +1,9 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.PageFormat; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.PageFormat; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/FrameCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/FrameCommand.java similarity index 77% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/FrameCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/FrameCommand.java index 0f096eb..6046f2b 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/FrameCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/FrameCommand.java @@ -1,9 +1,9 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; import org.xbib.graphics.pdfbox.layout.color.ColorFactory; -import org.xbib.graphics.pdfbox.layout.elements.Frame; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.Frame; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.awt.Color; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/HorizontalrulerCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/HorizontalrulerCommand.java similarity index 81% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/HorizontalrulerCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/HorizontalrulerCommand.java index 3c69a3b..a1b73dd 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/HorizontalrulerCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/HorizontalrulerCommand.java @@ -1,9 +1,9 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; import org.xbib.graphics.pdfbox.layout.color.ColorFactory; -import org.xbib.graphics.pdfbox.layout.elements.HorizontalRuler; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.HorizontalRuler; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.shape.Stroke; import org.xbib.settings.Settings; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ImageCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ImageCommand.java similarity index 84% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ImageCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ImageCommand.java index 7108daa..26fe4ec 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ImageCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ImageCommand.java @@ -1,10 +1,10 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.ImageElement; -import org.xbib.graphics.pdfbox.layout.elements.SVGElement; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.ImageElement; +import org.xbib.graphics.pdfbox.layout.element.SVGElement; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.text.Position; import org.xbib.settings.Settings; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/LayoutCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/LayoutCommand.java similarity index 63% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/LayoutCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/LayoutCommand.java index a546d73..c523917 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/LayoutCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/LayoutCommand.java @@ -1,7 +1,7 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/MarkpositionCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/MarkpositionCommand.java similarity index 59% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/MarkpositionCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/MarkpositionCommand.java index 22878dd..03a22e1 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/MarkpositionCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/MarkpositionCommand.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.PositionControl; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.PositionControl; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/MovepositionCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/MovepositionCommand.java similarity index 62% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/MovepositionCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/MovepositionCommand.java index c355ac0..0eedcf4 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/MovepositionCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/MovepositionCommand.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.PositionControl; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.PositionControl; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/NewcolumnCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/NewcolumnCommand.java similarity index 57% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/NewcolumnCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/NewcolumnCommand.java index a0723b7..2e3f368 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/NewcolumnCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/NewcolumnCommand.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.ControlElement; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.ControlElement; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/NewpageCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/NewpageCommand.java similarity index 57% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/NewpageCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/NewpageCommand.java index 939624f..2cc7abc 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/NewpageCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/NewpageCommand.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.ControlElement; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.ControlElement; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ParagraphCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ParagraphCommand.java similarity index 84% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ParagraphCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ParagraphCommand.java index 51c0a72..f18411f 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ParagraphCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ParagraphCommand.java @@ -1,9 +1,9 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.text.Position; import org.xbib.settings.Settings; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/PathCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/PathCommand.java similarity index 88% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/PathCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/PathCommand.java index 545dcf3..40682d9 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/PathCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/PathCommand.java @@ -1,9 +1,9 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; import org.xbib.graphics.pdfbox.layout.color.ColorFactory; -import org.xbib.graphics.pdfbox.layout.elements.PathElement; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.PathElement; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.shape.Path; import org.xbib.graphics.pdfbox.layout.shape.Stroke; import org.xbib.graphics.pdfbox.layout.text.Position; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ResetpositionCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ResetpositionCommand.java similarity index 59% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ResetpositionCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ResetpositionCommand.java index db89928..b34a3a4 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/ResetpositionCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/ResetpositionCommand.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.PositionControl; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.PositionControl; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/RowCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/RowCommand.java similarity index 90% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/RowCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/RowCommand.java index 71a935c..9bedc0e 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/RowCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/RowCommand.java @@ -1,10 +1,10 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; import org.xbib.graphics.pdfbox.layout.color.ColorFactory; -import org.xbib.graphics.pdfbox.layout.elements.Document; +import org.xbib.graphics.pdfbox.layout.element.Document; import org.xbib.graphics.pdfbox.layout.font.Fonts; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.table.BorderStyle; import org.xbib.graphics.pdfbox.layout.table.BorderStyleInterface; import org.xbib.graphics.pdfbox.layout.table.HorizontalAlignment; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/SetpositionCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/SetpositionCommand.java similarity index 62% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/SetpositionCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/SetpositionCommand.java index a092a5f..d4d4112 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/SetpositionCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/SetpositionCommand.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.PositionControl; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.PositionControl; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/TableCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/TableCommand.java similarity index 81% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/TableCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/TableCommand.java index faf129d..0f5122e 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/TableCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/TableCommand.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.TableElement; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.TableElement; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.text.Position; import org.xbib.settings.Settings; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/TextCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/TextCommand.java similarity index 82% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/TextCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/TextCommand.java index 2060977..e0f76fc 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/TextCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/TextCommand.java @@ -1,14 +1,14 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Element; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.TextElement; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Element; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.TextElement; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.font.Font; import org.xbib.graphics.pdfbox.layout.font.Fonts; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.text.Position; import org.xbib.settings.Settings; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/VerticalspacerCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/VerticalspacerCommand.java similarity index 59% rename from graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/VerticalspacerCommand.java rename to graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/VerticalspacerCommand.java index fadb790..c6db456 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/VerticalspacerCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/VerticalspacerCommand.java @@ -1,8 +1,8 @@ -package org.xbib.graphics.pdfbox.layout.script.command; +package org.xbib.graphics.pdfbox.layout.element.scripting.command; -import org.xbib.graphics.pdfbox.layout.elements.VerticalSpacer; -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; +import org.xbib.graphics.pdfbox.layout.element.VerticalSpacer; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; +import org.xbib.graphics.pdfbox.layout.element.scripting.State; import org.xbib.settings.Settings; import java.io.IOException; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/font/Fonts.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/font/Fonts.java index 8226ddc..704a452 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/font/Fonts.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/font/Fonts.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.font; -import org.xbib.graphics.pdfbox.layout.elements.Document; +import org.xbib.graphics.pdfbox.layout.element.Document; import java.util.HashMap; import java.util.Map; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/font/NotoSansFont.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/font/NotoSansFont.java index 5315097..4b4e1e7 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/font/NotoSansFont.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/font/NotoSansFont.java @@ -3,7 +3,7 @@ package org.xbib.graphics.pdfbox.layout.font; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.font.PDFont; import org.apache.pdfbox.pdmodel.font.PDType0Font; -import org.xbib.graphics.pdfbox.layout.elements.Document; +import org.xbib.graphics.pdfbox.layout.element.Document; import java.io.IOException; import java.io.UncheckedIOException; import java.util.Objects; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/Command.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/Command.java deleted file mode 100644 index 6a61021..0000000 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/script/command/Command.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.xbib.graphics.pdfbox.layout.script.command; - -import org.xbib.graphics.pdfbox.layout.script.Engine; -import org.xbib.graphics.pdfbox.layout.script.State; -import org.xbib.settings.Settings; - -import java.io.IOException; - -public interface Command { - void execute(Engine engine, State state, Settings settings) throws IOException; -} diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Cell.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Cell.java index 3d2fc64..fa69e90 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Cell.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Cell.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.table; -import org.xbib.graphics.pdfbox.layout.elements.Element; +import org.xbib.graphics.pdfbox.layout.element.Element; import org.xbib.graphics.pdfbox.layout.table.render.Renderer; import java.awt.Color; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/DrawableCell.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/DrawableCell.java index 6854bff..59a027b 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/DrawableCell.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/DrawableCell.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.table; -import org.xbib.graphics.pdfbox.layout.elements.Drawable; +import org.xbib.graphics.pdfbox.layout.element.Drawable; import org.xbib.graphics.pdfbox.layout.table.render.DrawableCellRenderer; import org.xbib.graphics.pdfbox.layout.table.render.Renderer; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Hyperlink.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Hyperlink.java index 17bc626..cc90ae8 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Hyperlink.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Hyperlink.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.table; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.Font; import org.xbib.graphics.pdfbox.layout.font.FontDescriptor; import org.xbib.graphics.pdfbox.layout.text.annotations.AnnotatedStyledText; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Markup.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Markup.java index 207d6e1..241d46f 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Markup.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Markup.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.table; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.Font; public class Markup implements ParagraphProcessor { diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/NewLine.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/NewLine.java index b13d7d6..a356fd1 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/NewLine.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/NewLine.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.table; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.Font; import org.xbib.graphics.pdfbox.layout.font.FontDescriptor; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/ParagraphCell.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/ParagraphCell.java index 9680de0..e296c03 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/ParagraphCell.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/ParagraphCell.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.table; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.table.render.Renderer; import org.xbib.graphics.pdfbox.layout.table.render.ParagraphCellRenderer; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/ParagraphProcessor.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/ParagraphProcessor.java index 96f1985..97d347b 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/ParagraphProcessor.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/ParagraphProcessor.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.table; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import java.io.IOException; public interface ParagraphProcessor { diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Row.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Row.java index 88a47ce..54f9546 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Row.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Row.java @@ -1,8 +1,8 @@ package org.xbib.graphics.pdfbox.layout.table; -import org.xbib.graphics.pdfbox.layout.elements.Drawable; -import org.xbib.graphics.pdfbox.layout.elements.Element; -import org.xbib.graphics.pdfbox.layout.elements.HorizontalRuler; +import org.xbib.graphics.pdfbox.layout.element.Drawable; +import org.xbib.graphics.pdfbox.layout.element.Element; +import org.xbib.graphics.pdfbox.layout.element.HorizontalRuler; import org.xbib.graphics.pdfbox.layout.font.Font; import java.awt.Color; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/StyledText.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/StyledText.java index 7e3603e..f1e7254 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/StyledText.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/StyledText.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.table; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.Font; import org.xbib.graphics.pdfbox.layout.font.FontDescriptor; import org.xbib.graphics.pdfbox.layout.util.PdfUtil; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/render/DrawableCellRenderer.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/render/DrawableCellRenderer.java index 7eaba1d..6375a58 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/render/DrawableCellRenderer.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/render/DrawableCellRenderer.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.table.render; -import org.xbib.graphics.pdfbox.layout.elements.Drawable; +import org.xbib.graphics.pdfbox.layout.element.Drawable; import org.xbib.graphics.pdfbox.layout.table.DrawableCell; import org.xbib.graphics.pdfbox.layout.text.Position; import org.xbib.graphics.pdfbox.layout.text.WidthRespecting; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/render/ParagraphCellRenderer.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/render/ParagraphCellRenderer.java index ba9d050..8dc5461 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/render/ParagraphCellRenderer.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/render/ParagraphCellRenderer.java @@ -3,7 +3,7 @@ package org.xbib.graphics.pdfbox.layout.table.render; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.table.HorizontalAlignment; import org.xbib.graphics.pdfbox.layout.table.ParagraphCell; import org.xbib.graphics.pdfbox.layout.text.Alignment; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/text/annotations/AnnotationDrawListener.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/text/annotations/AnnotationDrawListener.java index d327cf5..b3f3202 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/text/annotations/AnnotationDrawListener.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/text/annotations/AnnotationDrawListener.java @@ -2,8 +2,8 @@ package org.xbib.graphics.pdfbox.layout.text.annotations; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; -import org.xbib.graphics.pdfbox.layout.elements.render.RenderContext; -import org.xbib.graphics.pdfbox.layout.elements.render.RenderListener; +import org.xbib.graphics.pdfbox.layout.element.render.RenderContext; +import org.xbib.graphics.pdfbox.layout.element.render.RenderListener; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.text.DrawContext; import org.xbib.graphics.pdfbox.layout.text.DrawListener; diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/util/TextSequenceUtil.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/util/TextSequenceUtil.java index fb03582..e5f65a0 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/util/TextSequenceUtil.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/util/TextSequenceUtil.java @@ -1,8 +1,8 @@ package org.xbib.graphics.pdfbox.layout.util; import org.apache.pdfbox.pdmodel.PDPageContentStream; -import org.xbib.graphics.pdfbox.layout.elements.Dividable.Divided; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Dividable.Divided; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.FontDescriptor; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.text.DrawListener; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/AlignedTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/AlignedTest.java index aec8e07..e92367f 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/AlignedTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/AlignedTest.java @@ -1,9 +1,9 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import org.xbib.graphics.pdfbox.layout.util.WordBreakerFactory; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ColumnsTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ColumnsTest.java index 072470c..3c99fbb 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ColumnsTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ColumnsTest.java @@ -1,11 +1,11 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.VerticalSpacer; -import org.xbib.graphics.pdfbox.layout.elements.render.ColumnLayout; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.VerticalSpacer; +import org.xbib.graphics.pdfbox.layout.element.render.ColumnLayout; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/CustomAnnotationTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/CustomAnnotationTest.java index 36a1698..40853bd 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/CustomAnnotationTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/CustomAnnotationTest.java @@ -7,9 +7,9 @@ import org.apache.pdfbox.pdmodel.graphics.color.PDColor; import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB; import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.PageFormat; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.PageFormat; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import org.xbib.graphics.pdfbox.layout.font.FontDescriptor; import org.xbib.graphics.pdfbox.layout.text.DrawContext; @@ -26,7 +26,6 @@ import java.awt.Color; import java.awt.geom.AffineTransform; import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.io.UncheckedIOException; import java.util.Collections; import java.util.List; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/CustomRendererTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/CustomRendererTest.java index eb8a56e..0243b27 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/CustomRendererTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/CustomRendererTest.java @@ -1,15 +1,15 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Element; -import org.xbib.graphics.pdfbox.layout.elements.HorizontalRuler; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.LayoutHint; -import org.xbib.graphics.pdfbox.layout.elements.render.RenderContext; -import org.xbib.graphics.pdfbox.layout.elements.render.RenderListener; -import org.xbib.graphics.pdfbox.layout.elements.render.Renderer; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Element; +import org.xbib.graphics.pdfbox.layout.element.HorizontalRuler; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.LayoutHint; +import org.xbib.graphics.pdfbox.layout.element.render.RenderContext; +import org.xbib.graphics.pdfbox.layout.element.render.RenderListener; +import org.xbib.graphics.pdfbox.layout.element.render.Renderer; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.font.FontDescriptor; import org.xbib.graphics.pdfbox.layout.shape.Stroke; import org.xbib.graphics.pdfbox.layout.shape.Stroke.CapStyle; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/FramesTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/FramesTest.java index ed8c9b3..71fb696 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/FramesTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/FramesTest.java @@ -1,11 +1,11 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Frame; -import org.xbib.graphics.pdfbox.layout.elements.PageFormats; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Frame; +import org.xbib.graphics.pdfbox.layout.element.PageFormats; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.shape.Ellipse; import org.xbib.graphics.pdfbox.layout.shape.Rect; import org.xbib.graphics.pdfbox.layout.shape.RoundRect; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloBarcodeTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloBarcodeTest.java index d85369f..764dd03 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloBarcodeTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloBarcodeTest.java @@ -4,11 +4,11 @@ import org.junit.jupiter.api.Test; import org.xbib.graphics.barcode.Code3Of9; import org.xbib.graphics.barcode.HumanReadableLocation; import org.xbib.graphics.barcode.Symbol; -import org.xbib.graphics.pdfbox.layout.elements.BarcodeElement; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.PageFormats; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.BarcodeElement; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.PageFormats; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import org.xbib.graphics.pdfbox.layout.text.Indent; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloCatTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloCatTest.java index 39267d8..fb339e8 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloCatTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloCatTest.java @@ -1,10 +1,10 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.ImageElement; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.ImageElement; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloDocTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloDocTest.java index 80b26f8..8b6e4e9 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloDocTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloDocTest.java @@ -1,8 +1,8 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloNotoFontTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloNotoFontTest.java index eb3703c..5aa9952 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloNotoFontTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/HelloNotoFontTest.java @@ -1,9 +1,9 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.PageFormats; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.PageFormats; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.Font; import org.xbib.graphics.pdfbox.layout.font.NotoSansFont; import org.xbib.graphics.pdfbox.layout.text.Indent; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/IndentationTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/IndentationTest.java index 7457e14..4ef3ea8 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/IndentationTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/IndentationTest.java @@ -1,8 +1,8 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import org.xbib.graphics.pdfbox.layout.text.Indent; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LandscapeTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LandscapeTest.java index 4de97c7..d0f988f 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LandscapeTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LandscapeTest.java @@ -1,14 +1,14 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.ControlElement; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.PageFormat; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.VerticalSpacer; -import org.xbib.graphics.pdfbox.layout.elements.render.ColumnLayout; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayout; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.ControlElement; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.PageFormat; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.VerticalSpacer; +import org.xbib.graphics.pdfbox.layout.element.render.ColumnLayout; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayout; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LetterTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LetterTest.java index e669145..11163c5 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LetterTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LetterTest.java @@ -1,11 +1,11 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.ImageElement; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.VerticalSpacer; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.ImageElement; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.VerticalSpacer; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import org.xbib.graphics.pdfbox.layout.text.Position; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LineSpacingTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LineSpacingTest.java index 995006c..e5dbf33 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LineSpacingTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LineSpacingTest.java @@ -1,10 +1,10 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.ControlElement; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.ColumnLayout; +import org.xbib.graphics.pdfbox.layout.element.ControlElement; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.ColumnLayout; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LinksTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LinksTest.java index c0eb882..4453008 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LinksTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LinksTest.java @@ -1,8 +1,8 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ListenerTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ListenerTest.java index c5eecad..74bc9ba 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ListenerTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ListenerTest.java @@ -1,10 +1,10 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.RenderContext; -import org.xbib.graphics.pdfbox.layout.elements.render.RenderListener; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.RenderContext; +import org.xbib.graphics.pdfbox.layout.element.render.RenderListener; import org.xbib.graphics.pdfbox.layout.font.FontDescriptor; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.font.BaseFont; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LowLevelText.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LowLevelText.java index 5ab458a..567fc57 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LowLevelText.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/LowLevelText.java @@ -4,7 +4,7 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.PageFormat; +import org.xbib.graphics.pdfbox.layout.element.PageFormat; import org.xbib.graphics.pdfbox.layout.font.FontDescriptor; import org.xbib.graphics.pdfbox.layout.shape.RoundRect; import org.xbib.graphics.pdfbox.layout.shape.Shape; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MarginTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MarginTest.java index 371d9ab..ef37e3e 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MarginTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MarginTest.java @@ -1,9 +1,9 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MarkupTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MarkupTest.java index c2b546d..35bd79a 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MarkupTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MarkupTest.java @@ -1,9 +1,9 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.text.Alignment; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MultiplePagesTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MultiplePagesTest.java index 99c48b9..600d885 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MultiplePagesTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/MultiplePagesTest.java @@ -1,8 +1,8 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/RotationTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/RotationTest.java index efeaf8d..cafc23b 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/RotationTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/RotationTest.java @@ -1,14 +1,14 @@ package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.ControlElement; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.elements.PageFormat; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; -import org.xbib.graphics.pdfbox.layout.elements.VerticalSpacer; -import org.xbib.graphics.pdfbox.layout.elements.render.ColumnLayout; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayout; -import org.xbib.graphics.pdfbox.layout.elements.render.VerticalLayoutHint; +import org.xbib.graphics.pdfbox.layout.element.ControlElement; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.PageFormat; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.VerticalSpacer; +import org.xbib.graphics.pdfbox.layout.element.render.ColumnLayout; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayout; +import org.xbib.graphics.pdfbox.layout.element.render.VerticalLayoutHint; import org.xbib.graphics.pdfbox.layout.font.BaseFont; import java.io.FileOutputStream; diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/script/ScriptTest.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ScriptingTest.java similarity index 85% rename from graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/script/ScriptTest.java rename to graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ScriptingTest.java index f5b0125..3857b95 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/script/ScriptTest.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/ScriptingTest.java @@ -1,13 +1,13 @@ -package org.xbib.graphics.pdfbox.layout.test.script; +package org.xbib.graphics.pdfbox.layout.test; import org.junit.jupiter.api.Test; -import org.xbib.graphics.pdfbox.layout.elements.Document; -import org.xbib.graphics.pdfbox.layout.script.Engine; +import org.xbib.graphics.pdfbox.layout.element.Document; +import org.xbib.graphics.pdfbox.layout.element.scripting.Engine; import org.xbib.settings.Settings; import java.io.FileOutputStream; -public class ScriptTest { +public class ScriptingTest { @Test public void script() throws Exception { diff --git a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/Section.java b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/Section.java index 7bbe3b4..1fec7f4 100644 --- a/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/Section.java +++ b/graphics-pdfbox-layout/src/test/java/org/xbib/graphics/pdfbox/layout/test/Section.java @@ -1,6 +1,6 @@ package org.xbib.graphics.pdfbox.layout.test; -import org.xbib.graphics.pdfbox.layout.elements.Paragraph; +import org.xbib.graphics.pdfbox.layout.element.Paragraph; import org.xbib.graphics.pdfbox.layout.font.BaseFont; public class Section extends Paragraph { diff --git a/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/deckblatt.json b/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/deckblatt.json similarity index 100% rename from graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/deckblatt.json rename to graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/deckblatt.json diff --git a/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/elements.json b/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/elements.json similarity index 100% rename from graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/elements.json rename to graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/elements.json diff --git a/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/image.json b/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/image.json similarity index 100% rename from graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/image.json rename to graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/image.json diff --git a/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/logo-print.png b/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/logo-print.png similarity index 100% rename from graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/logo-print.png rename to graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/logo-print.png diff --git a/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/logo-print.png.base64 b/graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/logo-print.png.base64 similarity index 100% rename from graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/script/logo-print.png.base64 rename to graphics-pdfbox-layout/src/test/resources/org/xbib/graphics/pdfbox/layout/test/logo-print.png.base64