Organise imports

plutext · Aug 16, 2014 · 4bac764 · 4bac764
1 parent 25c3760
commit 4bac764
Show file tree

Hide file tree

Showing 215 changed files with 281 additions and 1,119 deletions.
diff --git a/src/glox4j/java/org/glox4j/openpackaging/packages/GloxPackage.java b/src/glox4j/java/org/glox4j/openpackaging/packages/GloxPackage.java
@@ -1,20 +1,14 @@
 package org.glox4j.openpackaging.packages;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.docx4j.openpackaging.contenttype.ContentType;
 import org.docx4j.openpackaging.contenttype.ContentTypeManager;
-import org.docx4j.openpackaging.contenttype.ContentTypes;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.packages.OpcPackage;
-import org.docx4j.openpackaging.packages.PresentationMLPackage;
-import org.docx4j.openpackaging.parts.DocPropsCorePart;
-import org.docx4j.openpackaging.parts.DocPropsCustomPart;
-import org.docx4j.openpackaging.parts.DocPropsExtendedPart;
 import org.docx4j.openpackaging.parts.Part;
 import org.docx4j.openpackaging.parts.DrawingML.DiagramLayoutHeaderPart;
 import org.docx4j.openpackaging.parts.DrawingML.DiagramLayoutPart;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @since 2.7.0

diff --git a/src/main/java/org/docx4j/TraversalUtil.java b/src/main/java/org/docx4j/TraversalUtil.java
@@ -25,12 +25,9 @@
 
 import javax.xml.bind.JAXBElement;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.docx4j.dml.CTHyperlink;
 import org.docx4j.dml.CTNonVisualDrawingProps;
 import org.docx4j.dml.diagram.CTDataModel;
-import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.WordprocessingML.CommentsPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.EndnotesPart;
@@ -45,15 +42,14 @@
 import org.docx4j.utils.SingleTraversalUtilVisitorCallback;
 import org.docx4j.utils.TraversalUtilVisitor;
 import org.docx4j.wml.Body;
-import org.docx4j.wml.CTFtnEdn;
 import org.docx4j.wml.CTObject;
+import org.docx4j.wml.Comments.Comment;
 import org.docx4j.wml.FldChar;
-import org.docx4j.wml.P;
 import org.docx4j.wml.Pict;
-import org.docx4j.wml.SdtContentBlock;
-import org.docx4j.wml.Comments.Comment;
 import org.docx4j.wml.SdtBlock;
 import org.jvnet.jaxb2_commons.ppp.Child;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -200,12 +196,19 @@ public boolean shouldTraverse(Object o) {
 
 	Callback cb;
 
+	/**
+	 * Traverse the object using your callback.  Invoking this constructor starts the 
+	 * traverse, by invoking the callback's walkJAXBElements method.
+	 * 
+	 * @param parent
+	 * @param cb
+	 */
 	public TraversalUtil(Object parent, Callback cb) {
 
 		this.cb = cb;
 		cb.walkJAXBElements(parent);
 	}
-
+	
 	static void visitChildrenImpl(Object o) {
 
 	}

diff --git a/src/main/java/org/docx4j/convert/out/common/AbstractConversionContext.java b/src/main/java/org/docx4j/convert/out/common/AbstractConversionContext.java
@@ -22,14 +22,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.docx4j.Docx4J;
 import org.docx4j.convert.out.AbstractConversionSettings;
 import org.docx4j.convert.out.ConversionHyperlinkHandler;
 import org.docx4j.convert.out.common.writer.AbstractMessageWriter;
 import org.docx4j.model.images.ConversionImageHandler;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.packages.OpcPackage;
-import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.Part;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/main/java/org/docx4j/convert/out/common/AbstractVisitorExporterDelegate.java b/src/main/java/org/docx4j/convert/out/common/AbstractVisitorExporterDelegate.java
@@ -22,8 +22,6 @@
 import java.io.OutputStream;
 import java.util.List;
 
-import javax.xml.transform.Result;
-import javax.xml.transform.Templates;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;

diff --git a/src/main/java/org/docx4j/convert/out/common/AbstractVisitorExporterGenerator.java b/src/main/java/org/docx4j/convert/out/common/AbstractVisitorExporterGenerator.java
@@ -25,20 +25,18 @@
 import org.docx4j.TraversalUtil;
 import org.docx4j.XmlUtils;
 import org.docx4j.convert.out.common.writer.AbstractBookmarkStartWriter;
-import org.docx4j.convert.out.common.writer.AbstractBrWriter;
 import org.docx4j.convert.out.common.writer.AbstractFldSimpleWriter;
 import org.docx4j.convert.out.common.writer.AbstractHyperlinkWriter;
+import org.docx4j.convert.out.common.writer.AbstractPictWriter;
 import org.docx4j.convert.out.common.writer.AbstractSymbolWriter;
 import org.docx4j.convert.out.common.writer.AbstractTableWriter;
-import org.docx4j.convert.out.common.writer.AbstractPictWriter;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
 import org.docx4j.wml.Br;
 import org.docx4j.wml.ContentAccessor;
 import org.docx4j.wml.P;
 import org.docx4j.wml.PPr;
 import org.docx4j.wml.R;
 import org.docx4j.wml.RPr;
-import org.docx4j.wml.STBrType;
 import org.docx4j.wml.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,7 +45,6 @@
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 /**
  * The …ExporterGenerator is the visitor, that gets used in those cases where a document is done 

diff --git a/src/main/java/org/docx4j/convert/out/common/AbstractWmlConversionContext.java b/src/main/java/org/docx4j/convert/out/common/AbstractWmlConversionContext.java
@@ -24,9 +24,7 @@
 import org.docx4j.convert.out.AbstractConversionSettings;
 import org.docx4j.convert.out.ConversionHyperlinkHandler;
 import org.docx4j.convert.out.common.writer.AbstractMessageWriter;
-import org.docx4j.convert.out.fo.FOExporterVisitorGenerator;
 import org.docx4j.fonts.RunFontSelector;
-import org.docx4j.fonts.RunFontSelector.RunFontCharacterVisitor;
 import org.docx4j.model.PropertyResolver;
 import org.docx4j.model.styles.StyleTree;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
@@ -36,9 +34,6 @@
 import org.docx4j.wml.STFldCharType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Element;
 
 /**
  * See /docs/developer/Convert_Out.docx for an overview of

diff --git a/src/main/java/org/docx4j/convert/out/common/Preprocess.java b/src/main/java/org/docx4j/convert/out/common/Preprocess.java
@@ -22,18 +22,16 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.docx4j.XmlUtils;
 import org.docx4j.convert.out.ConversionFeatures;
 import org.docx4j.convert.out.common.preprocess.BookmarkMover;
 import org.docx4j.convert.out.common.preprocess.Containerization;
 import org.docx4j.convert.out.common.preprocess.CoverPageSectPrMover;
-import org.docx4j.convert.out.common.preprocess.FopWorkaroundDisablePageBreakOnFirstParagraph;
 import org.docx4j.convert.out.common.preprocess.FieldsCombiner;
+import org.docx4j.convert.out.common.preprocess.FopWorkaroundDisablePageBreakOnFirstParagraph;
 import org.docx4j.convert.out.common.preprocess.FopWorkaroundReplacePageBreakInEachList;
 import org.docx4j.convert.out.common.preprocess.PageBreak;
 import org.docx4j.convert.out.common.preprocess.ParagraphStylesInTableFix;
 import org.docx4j.convert.out.common.preprocess.PartialDeepCopy;
-import org.docx4j.convert.out.common.wrappers.ConversionSectionWrapperFactory;
 import org.docx4j.events.EventFinished;
 import org.docx4j.events.StartEvent;
 import org.docx4j.events.WellKnownProcessSteps;

diff --git a/src/main/java/org/docx4j/convert/out/common/XsltCommonFunctions.java b/src/main/java/org/docx4j/convert/out/common/XsltCommonFunctions.java
@@ -24,8 +24,6 @@
 import javax.xml.bind.Unmarshaller;
 
 import org.docx4j.XmlUtils;
-import org.docx4j.convert.out.fo.XsltFOFunctions;
-import org.docx4j.convert.out.html.HTMLConversionContext;
 import org.docx4j.jaxb.Context;
 import org.docx4j.model.styles.StyleUtil;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;

diff --git a/src/main/java/org/docx4j/convert/out/common/preprocess/Containerization.java b/src/main/java/org/docx4j/convert/out/common/preprocess/Containerization.java
@@ -24,8 +24,6 @@
 
 import javax.xml.bind.JAXBElement;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.docx4j.XmlUtils;
 import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
@@ -40,18 +38,20 @@
 import org.docx4j.relationships.Relationship;
 import org.docx4j.wml.CTBorder;
 import org.docx4j.wml.CTShd;
+import org.docx4j.wml.Comments.Comment;
 import org.docx4j.wml.P;
+import org.docx4j.wml.PPrBase.PBdr;
 import org.docx4j.wml.R;
 import org.docx4j.wml.RPr;
 import org.docx4j.wml.SdtBlock;
 import org.docx4j.wml.SdtContentBlock;
 import org.docx4j.wml.SdtPr;
 import org.docx4j.wml.Tag;
-import org.docx4j.wml.Comments.Comment;
-import org.docx4j.wml.PPrBase.PBdr;
 import org.docx4j.wml.Tbl;
 import org.docx4j.wml.Tc;
 import org.docx4j.wml.Tr;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * In Word, adjacent paragraphs with the same borders are enclosed in a single border

diff --git a/src/main/java/org/docx4j/convert/out/common/preprocess/ParagraphStylesInTableFix.java b/src/main/java/org/docx4j/convert/out/common/preprocess/ParagraphStylesInTableFix.java
@@ -28,29 +28,27 @@
 import java.util.Set;
 
 import org.docx4j.TraversalUtil;
-import org.docx4j.XmlUtils;
 import org.docx4j.TraversalUtil.CallbackImpl;
+import org.docx4j.XmlUtils;
 import org.docx4j.jaxb.Context;
 import org.docx4j.model.PropertyResolver;
 import org.docx4j.model.styles.StyleUtil;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
-import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.WordprocessingML.DocumentSettingsPart;
-import org.docx4j.wml.CTCompat;
 import org.docx4j.wml.CTCompatSetting;
 import org.docx4j.wml.HpsMeasure;
 import org.docx4j.wml.Jc;
 import org.docx4j.wml.JcEnumeration;
 import org.docx4j.wml.P;
 import org.docx4j.wml.PPr;
+import org.docx4j.wml.PPrBase.PStyle;
 import org.docx4j.wml.RPr;
 import org.docx4j.wml.SdtBlock;
 import org.docx4j.wml.Style;
 import org.docx4j.wml.Styles;
 import org.docx4j.wml.Tbl;
 import org.docx4j.wml.TblPr;
-import org.docx4j.wml.PPrBase.PStyle;
 import org.jvnet.jaxb2_commons.ppp.Child;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/main/java/org/docx4j/convert/out/common/writer/AbstractPagerefHandler.java b/src/main/java/org/docx4j/convert/out/common/writer/AbstractPagerefHandler.java
@@ -26,7 +26,6 @@
 
 import org.docx4j.XmlUtils;
 import org.docx4j.convert.out.common.AbstractWmlConversionContext;
-import org.docx4j.convert.out.common.writer.AbstractFldSimpleWriter;
 import org.docx4j.model.fields.FldSimpleModel;
 import org.docx4j.model.fields.FormattingSwitchHelper;
 import org.w3c.dom.Document;

diff --git a/src/main/java/org/docx4j/convert/out/common/writer/RefHandler.java b/src/main/java/org/docx4j/convert/out/common/writer/RefHandler.java
@@ -22,7 +22,6 @@
 import javax.xml.transform.TransformerException;
 
 import org.docx4j.convert.out.common.AbstractWmlConversionContext;
-import org.docx4j.convert.out.common.writer.AbstractFldSimpleWriter;
 import org.docx4j.model.fields.FldSimpleModel;
 import org.docx4j.model.fields.FormattingSwitchHelper;
 import org.w3c.dom.Document;

diff --git a/src/main/java/org/docx4j/convert/out/fo/FOConversionContext.java b/src/main/java/org/docx4j/convert/out/fo/FOConversionContext.java
@@ -24,8 +24,8 @@
 import org.docx4j.convert.out.AbstractConversionSettings;
 import org.docx4j.convert.out.FORenderer;
 import org.docx4j.convert.out.FOSettings;
-import org.docx4j.convert.out.common.AbstractWriterRegistry;
 import org.docx4j.convert.out.common.AbstractWmlConversionContext;
+import org.docx4j.convert.out.common.AbstractWriterRegistry;
 import org.docx4j.convert.out.common.ConversionSectionWrapper;
 import org.docx4j.convert.out.common.ConversionSectionWrappers;
 import org.docx4j.convert.out.common.writer.AbstractMessageWriter;
@@ -41,7 +41,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /**
  * See /docs/developer/Convert_Out.docx for an overview of

diff --git a/src/main/java/org/docx4j/convert/out/fo/FOConversionImageHandler.java b/src/main/java/org/docx4j/convert/out/fo/FOConversionImageHandler.java
@@ -22,9 +22,9 @@
 import java.io.File;
 import java.net.MalformedURLException;
 
+import org.docx4j.model.images.FileConversionImageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.docx4j.model.images.FileConversionImageHandler;
 
 /** This is a File-based ImageHandler, for generating images used in FO/PDF-documents
  */

diff --git a/src/main/java/org/docx4j/convert/out/fo/FOExporterVisitorGenerator.java b/src/main/java/org/docx4j/convert/out/fo/FOExporterVisitorGenerator.java
@@ -24,9 +24,8 @@
 import org.docx4j.XmlUtils;
 import org.docx4j.convert.out.common.AbstractVisitorExporterDelegate;
 import org.docx4j.convert.out.common.AbstractVisitorExporterDelegate.AbstractVisitorExporterGeneratorFactory;
-import org.docx4j.convert.out.common.writer.AbstractBrWriter;
 import org.docx4j.convert.out.common.AbstractVisitorExporterGenerator;
-import org.docx4j.fonts.PhysicalFonts;
+import org.docx4j.convert.out.common.writer.AbstractBrWriter;
 import org.docx4j.model.PropertyResolver;
 import org.docx4j.model.images.WordXmlPictureE10;
 import org.docx4j.model.images.WordXmlPictureE20;
@@ -40,14 +39,13 @@
 import org.docx4j.model.properties.paragraph.PShading;
 import org.docx4j.model.styles.StyleUtil;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.docx4j.wml.PPr;
-import org.docx4j.wml.PPrBase.NumPr.Ilvl;
 import org.docx4j.wml.Br;
 import org.docx4j.wml.CTTabStop;
 import org.docx4j.wml.JcEnumeration;
 import org.docx4j.wml.P;
+import org.docx4j.wml.PPr;
+import org.docx4j.wml.PPrBase.NumPr.Ilvl;
 import org.docx4j.wml.R;
-import org.docx4j.wml.RFonts;
 import org.docx4j.wml.RPr;
 import org.docx4j.wml.STBrType;
 import org.docx4j.wml.STTabJc;

diff --git a/src/main/java/org/docx4j/convert/out/fo/FOPictWriterAbstract.java b/src/main/java/org/docx4j/convert/out/fo/FOPictWriterAbstract.java
@@ -41,7 +41,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.traversal.NodeIterator;
 
 /**
  * Note that despite its name, this currently only handles v:textbox.

diff --git a/src/main/java/org/docx4j/convert/out/fo/LayoutMasterSetBuilder.java b/src/main/java/org/docx4j/convert/out/fo/LayoutMasterSetBuilder.java
@@ -25,7 +25,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.fop.apps.MimeConstants;
 import org.docx4j.UnitsOfMeasurement;
 import org.docx4j.XmlUtils;
 import org.docx4j.convert.out.FOSettings;

diff --git a/src/main/java/org/docx4j/convert/out/fo/TableWriter.java b/src/main/java/org/docx4j/convert/out/fo/TableWriter.java
@@ -21,15 +21,14 @@
 
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.docx4j.UnitsOfMeasurement;
 import org.docx4j.convert.out.common.AbstractWmlConversionContext;
-import org.docx4j.convert.out.common.Writer.TransformState;
 import org.docx4j.convert.out.common.writer.AbstractTableWriter;
-import org.docx4j.convert.out.common.writer.AbstractTableWriterModelCell;
 import org.docx4j.convert.out.common.writer.AbstractTableWriterModel;
+import org.docx4j.convert.out.common.writer.AbstractTableWriterModelCell;
 import org.docx4j.model.properties.Property;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

diff --git a/src/main/java/org/docx4j/convert/out/fo/renderers/FORendererApacheFOP.java b/src/main/java/org/docx4j/convert/out/fo/renderers/FORendererApacheFOP.java
@@ -25,9 +25,7 @@
 import java.io.StringReader;
 import java.lang.reflect.Method;
 import java.net.URI;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
@@ -51,22 +49,16 @@
 import org.docx4j.XmlUtils;
 import org.docx4j.convert.out.FORenderer;
 import org.docx4j.convert.out.FOSettings;
-import org.docx4j.convert.out.common.AbstractWmlConversionContext;
 import org.docx4j.convert.out.fo.AbstractPlaceholderLookup;
 import org.docx4j.convert.out.fo.PlaceholderReplacementHandler;
-import org.docx4j.convert.out.fo.PlaceholderReplacementHandler.PlaceholderLookup;
 import org.docx4j.events.EventFinished;
 import org.docx4j.events.StartEvent;
 import org.docx4j.events.WellKnownProcessSteps;
 import org.docx4j.fonts.fop.util.FopConfigUtil;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
-import org.docx4j.vml.wordprocessingDrawing.STWrapType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
 
 /** The Apache FO Renderer uses Apache FOP to render the fo document
  *  and is the default FO Renderer