Reduce delta between master and java7

- Reformat code - rearranged code - organized imports
V-F · Oct 16, 2019 · f73467c · f73467c
1 parent 7327d2f
commit f73467c
Show file tree

Hide file tree

Showing 33 changed files with 195 additions and 233 deletions.
diff --git a/openpdf/src/main/java/com/lowagie/text/SimpleCell.java b/openpdf/src/main/java/com/lowagie/text/SimpleCell.java
@@ -48,18 +48,15 @@
  */
 package com.lowagie.text;
 
-import java.util.ArrayList;
-import java.util.Optional;
-
 import com.lowagie.text.alignment.HorizontalAlignment;
 import com.lowagie.text.alignment.VerticalAlignment;
 import com.lowagie.text.error_messages.MessageLocalization;
-
-import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.pdf.PdfPCellEvent;
 import com.lowagie.text.pdf.PdfPTable;
+import java.util.ArrayList;
+import java.util.Optional;
 
 
 /**

diff --git a/openpdf/src/main/java/com/lowagie/text/SimpleTable.java b/openpdf/src/main/java/com/lowagie/text/SimpleTable.java
@@ -48,16 +48,13 @@
  */
 package com.lowagie.text;
 
-import java.util.ArrayList;
-import java.util.Optional;
-
 import com.lowagie.text.alignment.HorizontalAlignment;
 import com.lowagie.text.error_messages.MessageLocalization;
-
-import com.lowagie.text.ExceptionConverter;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfPTable;
 import com.lowagie.text.pdf.PdfPTableEvent;
+import java.util.ArrayList;
+import java.util.Optional;
 
 
 /**

diff --git a/openpdf/src/main/java/com/lowagie/text/Table.java b/openpdf/src/main/java/com/lowagie/text/Table.java
@@ -55,17 +55,15 @@
 import com.lowagie.text.alignment.HorizontalAlignment;
 import com.lowagie.text.alignment.VerticalAlignment;
 import com.lowagie.text.alignment.WithHorizontalAlignment;
+import com.lowagie.text.error_messages.MessageLocalization;
+import com.lowagie.text.pdf.PdfPCell;
+import com.lowagie.text.pdf.PdfPTable;
 import java.awt.Dimension;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Optional;
 
-import com.lowagie.text.error_messages.MessageLocalization;
-
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-
 
 /**
  * A <CODE>Table</CODE> is a <CODE>Rectangle</CODE> that contains <CODE>Cell</CODE>s,
@@ -773,9 +771,11 @@ public void addCell(Phrase content, Point location) throws BadElementException {
         cell.setBorderWidth(defaultCell.getBorderWidth());
         cell.setBorderColor(defaultCell.getBorderColor());
         cell.setBackgroundColor(defaultCell.getBackgroundColor());
-        Optional<HorizontalAlignment> optionalHorizontalAlignment = HorizontalAlignment.of(defaultCell.getHorizontalAlignment());
+        Optional<HorizontalAlignment> optionalHorizontalAlignment = HorizontalAlignment
+                .of(defaultCell.getHorizontalAlignment());
         cell.setHorizontalAlignment(optionalHorizontalAlignment.orElse(HorizontalAlignment.UNDEFINED));
-        Optional<VerticalAlignment> optionalVerticalAlignment = VerticalAlignment.of(defaultCell.getVerticalAlignment());
+        Optional<VerticalAlignment> optionalVerticalAlignment = VerticalAlignment
+                .of(defaultCell.getVerticalAlignment());
         cell.setVerticalAlignment(optionalVerticalAlignment.orElse(VerticalAlignment.UNDEFINED));
         cell.setColspan(defaultCell.getColspan());
         cell.setRowspan(defaultCell.getRowspan());
@@ -1265,11 +1265,13 @@ private void assumeTableDefaults(Cell aCell) {
             aCell.setBackgroundColor(defaultCell.getBackgroundColor());
         }
         if (aCell.getHorizontalAlignment() == Element.ALIGN_UNDEFINED) {
-            final Optional<HorizontalAlignment> of = HorizontalAlignment.of(defaultCell.getHorizontalAlignment());
+            final Optional<HorizontalAlignment> of = HorizontalAlignment
+                    .of(defaultCell.getHorizontalAlignment());
             aCell.setHorizontalAlignment(of.orElse(HorizontalAlignment.UNDEFINED));
         }
         if (aCell.getVerticalAlignment() == Element.ALIGN_UNDEFINED) {
-            final Optional<VerticalAlignment> of = VerticalAlignment.of(defaultCell.getVerticalAlignment());
+            final Optional<VerticalAlignment> of = VerticalAlignment
+                    .of(defaultCell.getVerticalAlignment());
             aCell.setVerticalAlignment(of.orElse(VerticalAlignment.UNDEFINED));
         }
     }

diff --git a/openpdf/src/main/java/com/lowagie/text/Utilities.java b/openpdf/src/main/java/com/lowagie/text/Utilities.java
@@ -48,6 +48,7 @@
  */
 package com.lowagie.text;
 
+import com.lowagie.text.pdf.PRTokeniser;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -59,8 +60,6 @@
 import java.util.Properties;
 import java.util.Set;
 
-import com.lowagie.text.pdf.PRTokeniser;
-
 /**
  * A collection of convenience methods that were present in many different iText
  * classes.

diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ChainedProperties.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/ChainedProperties.java
@@ -51,13 +51,12 @@
 package com.lowagie.text.html.simpleparser;
 
 import com.lowagie.text.ElementTags;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class ChainedProperties {
 

diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/FactoryProperties.java
@@ -50,6 +50,8 @@
 
 package com.lowagie.text.html.simpleparser;
 
+import static com.lowagie.text.html.Markup.parseLength;
+
 import com.lowagie.text.Chunk;
 import com.lowagie.text.Element;
 import com.lowagie.text.ElementTags;
@@ -64,15 +66,12 @@
 import com.lowagie.text.pdf.HyphenationAuto;
 import com.lowagie.text.pdf.HyphenationEvent;
 import com.lowagie.text.utils.NumberUtilities;
-
-import javax.annotation.Nullable;
 import java.awt.Color;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
-
-import static com.lowagie.text.html.Markup.parseLength;
+import javax.annotation.Nullable;
 
 /**
  * @author psoares

diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/HTMLWorker.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/HTMLWorker.java
@@ -50,6 +50,8 @@
 
 package com.lowagie.text.html.simpleparser;
 
+import static com.lowagie.text.html.Markup.parseLength;
+
 import com.lowagie.text.Chunk;
 import com.lowagie.text.DocListener;
 import com.lowagie.text.DocumentException;
@@ -72,8 +74,6 @@
 import com.lowagie.text.utils.NumberUtilities;
 import com.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
 import com.lowagie.text.xml.simpleparser.SimpleXMLParser;
-
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
@@ -83,8 +83,7 @@
 import java.util.Map;
 import java.util.Stack;
 import java.util.StringTokenizer;
-
-import static com.lowagie.text.html.Markup.parseLength;
+import javax.annotation.Nullable;
 
 public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 

diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncCell.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/IncCell.java
@@ -54,7 +54,6 @@
 import com.lowagie.text.html.Markup;
 import com.lowagie.text.pdf.PdfPCell;
 import com.lowagie.text.utils.NumberUtilities;
-
 import java.util.ArrayList;
 
 

diff --git a/openpdf/src/main/java/com/lowagie/text/html/simpleparser/StyleSheet.java b/openpdf/src/main/java/com/lowagie/text/html/simpleparser/StyleSheet.java
@@ -55,16 +55,17 @@
 import java.util.Map;
 
 public class StyleSheet {
-    public HashMap classMap = new HashMap();
-    public HashMap tagMap = new HashMap();
+
+    private Map<String, Map<String, String>> classMap = new HashMap<>();
+    private Map<String, Map<String, String>> tagMap = new HashMap<>();
 
     @Deprecated
     public void applyStyle(String tag, HashMap props) {
         applyStyle(tag, (Map<String, String>) props);
     }
 
     public void applyStyle(String tag, Map<String, String> props) {
-        HashMap map = (HashMap) tagMap.get(tag.toLowerCase());
+        Map<String, String> map = tagMap.get(tag.toLowerCase());
         if (map != null) {
             Map<String, String> temp = new HashMap<>(map);
             temp.putAll(props);
@@ -73,7 +74,7 @@ public void applyStyle(String tag, Map<String, String> props) {
         String cm = props.get(Markup.HTML_ATTR_CSS_CLASS);
         if (cm == null)
             return;
-        map = (HashMap) classMap.get(cm.toLowerCase());
+        map = classMap.get(cm.toLowerCase());
         if (map == null)
             return;
         props.remove(Markup.HTML_ATTR_CSS_CLASS);
@@ -88,7 +89,7 @@ public void loadStyle(String style, Map<String, String> props) {
 
     public void loadStyle(String style, String key, String value) {
         style = style.toLowerCase();
-        HashMap props = (HashMap) classMap.computeIfAbsent(style, k -> new HashMap<>());
+        Map<String, String> props = classMap.computeIfAbsent(style, k -> new HashMap<>());
         props.put(key, value);
     }
 
@@ -98,7 +99,7 @@ public void loadTagStyle(String tag, Map<String, String> props) {
 
     public void loadTagStyle(String tag, String key, String value) {
         tag = tag.toLowerCase();
-        Map<String, String> props = (Map<String, String>) tagMap.computeIfAbsent(tag, k -> new HashMap<>());
+        Map<String, String> props = tagMap.computeIfAbsent(tag, k -> new HashMap<>());
         props.put(key, value);
     }
 

diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java b/openpdf/src/main/java/com/lowagie/text/pdf/AcroFields.java
@@ -46,6 +46,13 @@
  */
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.Element;
+import com.lowagie.text.ExceptionConverter;
+import com.lowagie.text.Font;
+import com.lowagie.text.Image;
+import com.lowagie.text.Rectangle;
+import com.lowagie.text.error_messages.MessageLocalization;
 import java.awt.Color;
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,14 +62,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.Element;
-import com.lowagie.text.ExceptionConverter;
-import com.lowagie.text.Font;
-import com.lowagie.text.Image;
-import com.lowagie.text.Rectangle;
-import com.lowagie.text.error_messages.MessageLocalization;
 import org.w3c.dom.Node;
 
 /**

diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java b/openpdf/src/main/java/com/lowagie/text/pdf/MappedRandomAccessFile.java
@@ -218,7 +218,8 @@ private static boolean cleanJava9(final java.nio.ByteBuffer buffer) {
                 final Field theUnsafeField = unsafeClass.getDeclaredField("theUnsafe");
                 theUnsafeField.setAccessible(true);
                 final Object theUnsafe = theUnsafeField.get(null);
-                final Method invokeCleanerMethod = unsafeClass.getMethod("invokeCleaner", ByteBuffer.class);
+                final Method invokeCleanerMethod = unsafeClass
+                        .getMethod("invokeCleaner", ByteBuffer.class);
                 invokeCleanerMethod.invoke(theUnsafe, buffer);
                 success = Boolean.TRUE;
             } catch (Exception ignore) {
@@ -234,7 +235,8 @@ private static boolean cleanOldsJDK(final java.nio.ByteBuffer buffer) {
         Boolean b = AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> {
             Boolean success = Boolean.FALSE;
             try {
-                Method getCleanerMethod = buffer.getClass().getMethod("cleaner", (Class[])null);
+                Method getCleanerMethod = buffer.getClass()
+                        .getMethod("cleaner", (Class[]) null);
                 if (!getCleanerMethod.isAccessible()) {
                     getCleanerMethod.setAccessible(true);
                 }

diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfCopy.java
@@ -48,17 +48,14 @@
  */
 package com.lowagie.text.pdf;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
-
-import com.lowagie.text.Rectangle;
 import com.lowagie.text.ExceptionConverter;
-
+import com.lowagie.text.Rectangle;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -397,7 +394,8 @@ public void addPage(PdfImportedPage iPage) throws IOException, BadPdfFormatExcep
   public void addPage(Rectangle rect, int rotation) {
     PdfRectangle mediabox = new PdfRectangle(rect, rotation);
     PageResources resources = new PageResources();
-    PdfPage page = new PdfPage(mediabox, new HashMap<>(), resources.getResources(), 0);
+    PdfPage page = new PdfPage(mediabox, new HashMap<>(),
+            resources.getResources(), 0);
     page.put(PdfName.TABS, getTabs());
     root.addPage(page);
     ++currentPageNumber;

diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfDocument.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfDocument.java
@@ -76,7 +76,6 @@
 import com.lowagie.text.pdf.draw.DrawInterface;
 import com.lowagie.text.pdf.internal.PdfAnnotationsImp;
 import com.lowagie.text.pdf.internal.PdfViewerPreferencesImp;
-
 import java.awt.Color;
 import java.io.IOException;
 import java.text.DecimalFormat;
@@ -1460,7 +1459,7 @@ else if (isJustified) {
                     if (chunk.isTab()) {
                         Object[] tab = (Object[])chunk.getAttribute(Chunk.TAB);
                         DrawInterface di = (DrawInterface)tab[0];
-                        tabPosition = (Float) tab[1] + (Float) tab[3];
+                        tabPosition = tab[1] + tab[3];
                         float fontSize = chunk.font().size();
                         float ascender = chunk.font().getFont().getFontDescriptor(BaseFont.ASCENT, fontSize);
                         float descender = chunk.font().getFont().getFontDescriptor(BaseFont.DESCENT, fontSize);

diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java b/openpdf/src/main/java/com/lowagie/text/pdf/PdfGraphics2D.java
@@ -49,6 +49,7 @@
 
 package com.lowagie.text.pdf;
 
+import com.lowagie.text.pdf.internal.PolylineShape;
 import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -66,11 +67,11 @@
 import java.awt.Polygon;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
+import java.awt.RenderingHints.Key;
 import java.awt.Shape;
 import java.awt.Stroke;
 import java.awt.TexturePaint;
 import java.awt.Transparency;
-import java.awt.RenderingHints.Key;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.font.TextAttribute;
@@ -99,13 +100,11 @@
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
-
-import com.lowagie.text.pdf.internal.PolylineShape;
-import java.util.Locale;
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriteParam;
@@ -811,7 +810,7 @@ public RenderingHints getRenderingHints() {
      * @see Graphics#translate(int, int)
      */
     public void translate(int x, int y) {
-        translate((double)x, (double)y);
+        translate(x, y);
     }
 
     /**
@@ -1896,7 +1895,8 @@ boolean isCompositeFont(Font font) {
             String fontFamily = compositeFont.getFamily();
             if (!isSupported() || (fontFamily != null && !fontFamilyComposite.get(fontFamily))) {
                 assert false;
-                return defaultDrawingFunction.drawString(s, fontConverter.apply(compositeFont), x, y);
+                return defaultDrawingFunction
+                        .drawString(s, fontConverter.apply(compositeFont), x, y);
             }
 
             try {
@@ -1906,7 +1906,9 @@ boolean isCompositeFont(Font font) {
                     String strPart = stringParts.get(i);
                     Font correspondingFont = correspondingFontsForParts.get(i);
                     BaseFont correspondingBaseFont = fontConverter.apply(correspondingFont);
-                    BaseFont baseFont = correspondingBaseFont == null ? fontConverter.apply(compositeFont) : correspondingBaseFont;
+                    BaseFont baseFont = correspondingBaseFont == null
+                            ? fontConverter.apply(compositeFont)
+                            : correspondingBaseFont;
                     width += defaultDrawingFunction.drawString(strPart, baseFont, x + width, y);
                 }
                 return width;