Mark constructors of abstract classes as protected

pavel-alay · pavel-alay · commit 9b9a11b010e6 · 2016-04-27T15:07:43.000+03:00
diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/Barcode1D.java b/barcodes/src/main/java/com/itextpdf/barcodes/Barcode1D.java
@@ -145,7 +145,7 @@ public abstract class Barcode1D {
      */
     protected String altText;
 
-    public Barcode1D(PdfDocument document) {
+    protected Barcode1D(PdfDocument document) {
         this.document = document;
     }
 
diff --git a/barcodes/src/main/java/com/itextpdf/barcodes/Barcode2D.java b/barcodes/src/main/java/com/itextpdf/barcodes/Barcode2D.java
@@ -54,9 +54,6 @@ public abstract class Barcode2D {
 
     protected static final float DEFAULT_MODULE_SIZE = 1;
 
-    public Barcode2D() {
-    }
-
     /**
      * Gets the maximum area that the barcode and the text, if
      * any, will occupy. The lower left corner is always (0, 0).
diff --git a/io/src/main/java/com/itextpdf/io/font/otf/ContextualSubTable.java b/io/src/main/java/com/itextpdf/io/font/otf/ContextualSubTable.java
@@ -47,6 +47,7 @@ This file is part of the iText (R) project.
 import java.util.List;
 
 public abstract class ContextualSubTable {
+
     protected OpenTypeFontTableReader openReader;
     protected int lookupFlag;
 
diff --git a/io/src/main/java/com/itextpdf/io/font/otf/OpenTypeFontTableReader.java b/io/src/main/java/com/itextpdf/io/font/otf/OpenTypeFontTableReader.java
@@ -70,7 +70,7 @@ public abstract class OpenTypeFontTableReader {
 
     private final int unitsPerEm;
 
-	public OpenTypeFontTableReader(RandomAccessFileOrArray rf, int tableLocation, OpenTypeGdefTableReader gdef,
+	protected OpenTypeFontTableReader(RandomAccessFileOrArray rf, int tableLocation, OpenTypeGdefTableReader gdef,
                                    Map<Integer, Glyph> indexGlyphMap, int unitsPerEm) throws java.io.IOException {
 		this.rf = rf;
 		this.tableLocation = tableLocation;
@@ -79,52 +79,10 @@ public OpenTypeFontTableReader(RandomAccessFileOrArray rf, int tableLocation, Op
         this.unitsPerEm = unitsPerEm;
 	}
 	
-    protected int getGlyphWidth(int index) {
-        Glyph glyph = indexGlyphMap.get(index);
-        if (glyph == null) {
-            return 0;
-        } else {
-            return glyph.getWidth();
-        }
-    }
-    
-    public int getGlyphToCharacter(int index) {
-        Glyph glyph = indexGlyphMap.get(index);
-        if (glyph == null) {
-            return -1;
-        } else {
-            return glyph.getUnicode();
-        }
-    }
-
     public Glyph getGlyph(int index) {
         return indexGlyphMap.get(index);
     }
         
-	/**
-	 * This is the starting point of the class. A sub-class must call this
-	 * method to start getting call backs to the {@link #readLookupTable(int, int, int[])}
-	 * method.
-	 * @throws FontReadingException 
-	 */
-	protected final void startReadingTable() throws FontReadingException {
-		try {
-            rf.seek(tableLocation);
-            /*int version =*/ rf.readInt(); //version not used
-            int scriptListOffset = rf.readUnsignedShort();
-            int featureListOffset = rf.readUnsignedShort();
-            int lookupListOffset = rf.readUnsignedShort();
-			// read the Script tables
-            scriptsType = new OpenTypeScript(this, tableLocation + scriptListOffset);
-			// read Feature table
-            featuresType = new OpenTypeFeature(this, tableLocation + featureListOffset);
-			// read LookUpList table
-			readLookupListTable(tableLocation + lookupListOffset);
-		} catch (java.io.IOException e) {
-			throw new FontReadingException("Error reading font file", e);
-		}
-	}
-    
     public OpenTableLookup getLookupTable(int idx) {
         if (idx < 0 || idx >= lookupList.size()) {
             return null;
@@ -261,6 +219,30 @@ protected TagAndLocation[] readTagAndLocations(int baseLocation) throws java.io.
         return tagslLocs;
     }
 
+    /**
+     * This is the starting point of the class. A sub-class must call this
+     * method to start getting call backs to the {@link #readLookupTable(int, int, int[])}
+     * method.
+     * @throws FontReadingException
+     */
+    final void startReadingTable() throws FontReadingException {
+        try {
+            rf.seek(tableLocation);
+            /*int version =*/ rf.readInt(); //version not used
+            int scriptListOffset = rf.readUnsignedShort();
+            int featureListOffset = rf.readUnsignedShort();
+            int lookupListOffset = rf.readUnsignedShort();
+            // read the Script tables
+            scriptsType = new OpenTypeScript(this, tableLocation + scriptListOffset);
+            // read Feature table
+            featuresType = new OpenTypeFeature(this, tableLocation + featureListOffset);
+            // read LookUpList table
+            readLookupListTable(tableLocation + lookupListOffset);
+        } catch (java.io.IOException e) {
+            throw new FontReadingException("Error reading font file", e);
+        }
+    }
+
     private void readLookupListTable(int lookupListTableLocation) throws java.io.IOException {
         lookupList = new ArrayList<>();
         rf.seek(lookupListTableLocation);
diff --git a/io/src/main/java/com/itextpdf/io/font/otf/lookuptype6/SubTableLookup6.java b/io/src/main/java/com/itextpdf/io/font/otf/lookuptype6/SubTableLookup6.java
@@ -54,6 +54,7 @@ This file is part of the iText (R) project.
 import java.util.List;
 
 public abstract class SubTableLookup6 extends ContextualSubTable {
+
     protected SubTableLookup6(OpenTypeFontTableReader openReader, int lookupFlag) {
         super(openReader, lookupFlag);
     }
diff --git a/kernel/src/main/java/com/itextpdf/kernel/crypto/OutputStreamEncryption.java b/kernel/src/main/java/com/itextpdf/kernel/crypto/OutputStreamEncryption.java
@@ -54,7 +54,7 @@ public abstract class OutputStreamEncryption extends java.io.OutputStream {
     /**
      * Creates a new instance of OutputStreamCounter
      */
-    public OutputStreamEncryption(java.io.OutputStream out) {
+    protected OutputStreamEncryption(java.io.OutputStream out) {
         this.out = out;
     }
 
diff --git a/kernel/src/main/java/com/itextpdf/kernel/crypto/securityhandler/PubKeySecurityHandler.java b/kernel/src/main/java/com/itextpdf/kernel/crypto/securityhandler/PubKeySecurityHandler.java
@@ -105,7 +105,7 @@ public abstract class PubKeySecurityHandler extends SecurityHandler {
 
     private byte[] seed = new byte[SEED_LENGTH];
 
-    public PubKeySecurityHandler() {
+    protected PubKeySecurityHandler() {
         KeyGenerator key;
         try {
             key = KeyGenerator.getInstance("AES");
@@ -238,7 +238,9 @@ protected PdfArray createRecipientsArray() {
     }
 
     protected abstract void setPubSecSpecificHandlerDicEntries(PdfDictionary encryptionDictionary, boolean encryptMetadata, boolean embeddedFilesOnly);
+
     protected abstract String getDigestAlgorithm();
+
     protected abstract void initKey(byte[] globalKey, int keyLength);
 
     protected void initKeyAndFillDictionary(PdfDictionary encryptionDictionary, Certificate[] certs, int[] permissions,
diff --git a/kernel/src/main/java/com/itextpdf/kernel/crypto/securityhandler/SecurityHandler.java b/kernel/src/main/java/com/itextpdf/kernel/crypto/securityhandler/SecurityHandler.java
@@ -74,7 +74,7 @@ public abstract class SecurityHandler {
      */
     protected byte[] extra = new byte[5];
 
-    public SecurityHandler() {
+    protected SecurityHandler() {
         try {
             md5 = MessageDigest.getInstance("MD5");
         } catch (Exception e) {
@@ -105,5 +105,6 @@ public void setHashKeyForNextObject(int objNumber, int objGeneration) {
     }
 
     public abstract OutputStreamEncryption getEncryptionStream(java.io.OutputStream os);
+
     public abstract IDecryptor getDecryptor();
 }
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/PdfDocument.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/PdfDocument.java
@@ -309,10 +309,10 @@ public void createXmpMetadata() throws XMPException {
                         if (v.trim().length() > 0)
                             xmpMeta.appendArrayItem(XMPConst.NS_DC, PdfConst.Subject, new PropertyOptions(PropertyOptions.ARRAY), v.trim(), null);
                     xmpMeta.setProperty(XMPConst.NS_PDF, PdfConst.Keywords, value);
-                } else if (PdfName.Producer.equals(key)) {
-                    xmpMeta.setProperty(XMPConst.NS_PDF, PdfConst.Producer, value);
                 } else if (PdfName.Creator.equals(key)) {
                     xmpMeta.setProperty(XMPConst.NS_XMP, PdfConst.CreatorTool, value);
+                } else if (PdfName.Producer.equals(key)) {
+                xmpMeta.setProperty(XMPConst.NS_PDF, PdfConst.Producer, value);
                 } else if (PdfName.CreationDate.equals(key)) {
                     xmpMeta.setProperty(XMPConst.NS_XMP, PdfConst.CreateDate, PdfDate.getW3CDate(value));
                 } else if (PdfName.ModDate.equals(key)) {
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/PdfObject.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/PdfObject.java
@@ -108,10 +108,6 @@ public abstract class PdfObject implements Serializable {
      */
     private short state;
 
-    public PdfObject() {
-
-    }
-
     /**
      * Gets object type.
      *
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/PdfObjectWrapper.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/PdfObjectWrapper.java
@@ -54,7 +54,7 @@ public abstract class PdfObjectWrapper<T extends PdfObject> implements Serializa
 
     private T pdfObject = null;
 
-    public PdfObjectWrapper(T pdfObject) {
+    protected PdfObjectWrapper(T pdfObject) {
         this.pdfObject = pdfObject;
         if (isWrappedObjectMustBeIndirect()) {
             markObjectAsIndirect(this.pdfObject);
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/annot/PdfAnnotation.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/annot/PdfAnnotation.java
@@ -185,13 +185,13 @@ public static PdfAnnotation makeAnnotation(PdfObject pdfObject, PdfAnnotation pa
         return annotation;
     }
 
-    public PdfAnnotation(Rectangle rect) {
+    protected PdfAnnotation(Rectangle rect) {
         this(new PdfDictionary());
         put(PdfName.Rect, new PdfArray(rect));
         put(PdfName.Subtype, getSubtype());
     }
 
-    public PdfAnnotation(PdfDictionary pdfObject) {
+    protected PdfAnnotation(PdfDictionary pdfObject) {
         super(pdfObject);
         markObjectAsIndirect(getPdfObject());
     }
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/annot/PdfMarkupAnnotation.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/annot/PdfMarkupAnnotation.java
@@ -63,11 +63,11 @@ public abstract class PdfMarkupAnnotation extends PdfAnnotation {
     protected PdfAnnotation inReplyTo = null;
     protected PdfPopupAnnotation popup = null;
 
-    public PdfMarkupAnnotation(Rectangle rect) {
+    protected PdfMarkupAnnotation(Rectangle rect) {
         super(rect);
     }
 
-    public PdfMarkupAnnotation(PdfDictionary pdfObject) {
+    protected PdfMarkupAnnotation(PdfDictionary pdfObject) {
         super(pdfObject);
     }
 
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfCieBasedCs.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfCieBasedCs.java
@@ -65,7 +65,7 @@ protected boolean isWrappedObjectMustBeIndirect() {
         return true;
     }
 
-    public PdfCieBasedCs(PdfArray pdfObject) {
+    protected PdfCieBasedCs(PdfArray pdfObject) {
         super(pdfObject);
     }
 
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfDeviceCs.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfDeviceCs.java
@@ -55,8 +55,7 @@ protected boolean isWrappedObjectMustBeIndirect() {
         return false;
     }
 
-
-    public PdfDeviceCs(PdfName pdfObject) {
+    protected PdfDeviceCs(PdfName pdfObject) {
         super(pdfObject);
     }
 
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfPattern.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfPattern.java
@@ -57,7 +57,7 @@ public abstract class PdfPattern extends PdfObjectWrapper<PdfDictionary> {
 
     private static final long serialVersionUID = -6771280634868639993L;
 
-	public PdfPattern(PdfDictionary pdfObject) {
+	protected PdfPattern(PdfDictionary pdfObject) {
         super(pdfObject);
     }
 
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfShading.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfShading.java
@@ -113,13 +113,12 @@ public static PdfShading makeShading(PdfDictionary shadingDictionary) {
         return shading;
     }
 
-    public PdfShading(PdfDictionary pdfObject) {
+    protected PdfShading(PdfDictionary pdfObject) {
         super(pdfObject);
     }
 
-    public PdfShading(PdfDictionary pdfObject, int type, PdfObject colorSpace) {
+    protected PdfShading(PdfDictionary pdfObject, int type, PdfObject colorSpace) {
         super(pdfObject);
-
         getPdfObject().put(PdfName.ShadingType, new PdfNumber(type));
         getPdfObject().put(PdfName.ColorSpace, colorSpace);
     }
diff --git a/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfSpecialCs.java b/kernel/src/main/java/com/itextpdf/kernel/pdf/colorspace/PdfSpecialCs.java
@@ -60,7 +60,7 @@ public abstract class PdfSpecialCs extends PdfColorSpace {
 
     private static final long serialVersionUID = -2725455900398492836L;
 
-	public PdfSpecialCs(PdfArray pdfObject) {
+    protected PdfSpecialCs(PdfArray pdfObject) {
         super(pdfObject);
     }
 
diff --git a/layout/src/main/java/com/itextpdf/layout/border/Border.java b/layout/src/main/java/com/itextpdf/layout/border/Border.java
@@ -65,11 +65,11 @@ public abstract class Border {
     protected int type;
     private int hash;
 
-    public Border(float width) {
+    protected Border(float width) {
         this(Color.BLACK, width);
     }
 
-    public Border(Color color, float width) {
+    protected Border(Color color, float width) {
         this.color = color;
         this.width = width;
     }
diff --git a/layout/src/main/java/com/itextpdf/layout/border/Border3D.java b/layout/src/main/java/com/itextpdf/layout/border/Border3D.java
@@ -62,7 +62,7 @@ public abstract class Border3D extends Border {
      *
      * @param width with of the border
      */
-    public Border3D(float width) {
+    protected Border3D(float width) {
         this(GRAY, width);
     }
 
@@ -72,7 +72,7 @@ public Border3D(float width) {
      * @param color color of the border
      * @param width with of the border
      */
-    public Border3D(DeviceRgb color, float width) {
+    protected Border3D(DeviceRgb color, float width) {
         super(color, width);
     }
 
@@ -82,7 +82,7 @@ public Border3D(DeviceRgb color, float width) {
      * @param color color of the border
      * @param width with of the border
      */
-    public Border3D(DeviceCmyk color, float width) {
+    protected Border3D(DeviceCmyk color, float width) {
         super(color, width);
     }
 
@@ -92,7 +92,7 @@ public Border3D(DeviceCmyk color, float width) {
      * @param color color of the border
      * @param width with of the border
      */
-    public Border3D(DeviceGray color, float width) {
+    protected Border3D(DeviceGray color, float width) {
         super(color, width);
     }
 
diff --git a/pdfa/src/main/java/com/itextpdf/pdfa/PdfADocument.java b/pdfa/src/main/java/com/itextpdf/pdfa/PdfADocument.java
@@ -293,5 +293,4 @@ private static PdfVersion getPdfVersionForPdfA(PdfAConformanceLevel conformanceL
         }
         return version;
     }
-
 }
diff --git a/pdfa/src/main/java/com/itextpdf/pdfa/checker/PdfAChecker.java b/pdfa/src/main/java/com/itextpdf/pdfa/checker/PdfAChecker.java
@@ -87,7 +87,7 @@ public abstract class PdfAChecker {
     protected Set<PdfObject> checkedObjects = new HashSet<>();
     protected Map<PdfObject, PdfColorSpace> checkedObjectsColorspace = new HashMap<>();
 
-    public PdfAChecker(PdfAConformanceLevel conformanceLevel) {
+    protected PdfAChecker(PdfAConformanceLevel conformanceLevel) {
         this.conformanceLevel = conformanceLevel;
     }
 
diff --git a/pdftest/src/main/java/com/itextpdf/test/ExtendedITextTest.java b/pdftest/src/main/java/com/itextpdf/test/ExtendedITextTest.java
@@ -44,12 +44,10 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.test;
 
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 
-
 public abstract class ExtendedITextTest extends ITextTest {
 
     @Rule
@@ -62,5 +60,4 @@ public void beforeTestMethodAction(){
     @After
     public void afterTestMethodAction(){
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public abstract class Barcode1D {`
`145`	`145`	`*/`
`146`	`146`	`protected String altText;`
`147`	`147`
`148`		`- public Barcode1D(PdfDocument document) {`
	`148`	`+ protected Barcode1D(PdfDocument document) {`
`149`	`149`	`this.document = document;`
`150`	`150`	`}`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ This file is part of the iText (R) project.`
`54`	`54`	`import java.util.List;`
`55`	`55`
`56`	`56`	`public abstract class SubTableLookup6 extends ContextualSubTable {`
	`57`	`+`
`57`	`58`	`protected SubTableLookup6(OpenTypeFontTableReader openReader, int lookupFlag) {`
`58`	`59`	`super(openReader, lookupFlag);`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public abstract class OutputStreamEncryption extends java.io.OutputStream {`
`54`	`54`	`/**`
`55`	`55`	`* Creates a new instance of OutputStreamCounter`
`56`	`56`	`*/`
`57`		`- public OutputStreamEncryption(java.io.OutputStream out) {`
	`57`	`+ protected OutputStreamEncryption(java.io.OutputStream out) {`
`58`	`58`	`this.out = out;`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public abstract class SecurityHandler {`
`74`	`74`	`*/`
`75`	`75`	`protected byte[] extra = new byte[5];`
`76`	`76`
`77`		`- public SecurityHandler() {`
	`77`	`+ protected SecurityHandler() {`
`78`	`78`	`try {`
`79`	`79`	`md5 = MessageDigest.getInstance("MD5");`
`80`	`80`	`} catch (Exception e) {`
`@@ -105,5 +105,6 @@ public void setHashKeyForNextObject(int objNumber, int objGeneration) {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`public abstract OutputStreamEncryption getEncryptionStream(java.io.OutputStream os);`
	`108`	`+`
`108`	`109`	`public abstract IDecryptor getDecryptor();`
`109`	`110`	`}`