Move basics.geom to core.geom.

Create basics.util package.

Author: pavel-alay

barcodes/pom.xml

@@ -27,12 +27,6 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>basics</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

barcodes/src/main/java/com/itextpdf/barcodes/Barcode128.java

@@ -1,15 +1,17 @@
 package com.itextpdf.barcodes;
 
-import com.itextpdf.basics.IntHashtable;
 import com.itextpdf.basics.PdfException;
 import com.itextpdf.basics.font.FontConstants;
 import com.itextpdf.basics.font.PdfEncodings;
-import com.itextpdf.basics.geom.Rectangle;
+import com.itextpdf.core.geom.Rectangle;
 import com.itextpdf.core.font.PdfFontFactory;
 import com.itextpdf.core.pdf.canvas.PdfCanvas;
 import com.itextpdf.core.color.Color;
 import com.itextpdf.core.pdf.PdfDocument;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class Barcode128 extends Barcode1D {
 
     /** A type of barcode */
@@ -176,7 +178,7 @@ public class Barcode128 extends Barcode1D {
     public static final char STARTB = '\u00cc';
     public static final char STARTC = '\u00cd';
 
-    private static IntHashtable ais = new IntHashtable();
+    private static Map<Integer, Integer> ais = new HashMap<>();
 
     /**
      * Creates new Barcode128
@@ -261,7 +263,9 @@ public static String getHumanReadableUCCEAN(String code) {
             for (int k = 2; k < 5; ++k) {
                 if (code.length() < k)
                     break;
-                if ((n = ais.get(Integer.parseInt(code.substring(0, k)))) != 0) {
+                Integer subcode = Integer.parseInt(code.substring(0, k));
+                n = ais.containsKey(subcode) ? ais.get(subcode) : 0;
+                if (n != 0) {
                     idlen = k;
                     break;
                 }

barcodes/src/main/java/com/itextpdf/barcodes/Barcode1D.java

@@ -1,7 +1,7 @@
 package com.itextpdf.barcodes;
 
 import com.itextpdf.basics.font.FontProgram;
-import com.itextpdf.basics.geom.Rectangle;
+import com.itextpdf.core.geom.Rectangle;
 import com.itextpdf.core.pdf.canvas.PdfCanvas;
 import com.itextpdf.core.color.Color;
 import com.itextpdf.core.font.PdfFont;

barcodes/src/main/java/com/itextpdf/barcodes/Barcode2D.java

@@ -1,6 +1,6 @@
 package com.itextpdf.barcodes;
 
-import com.itextpdf.basics.geom.Rectangle;
+import com.itextpdf.core.geom.Rectangle;
 import com.itextpdf.core.pdf.canvas.PdfCanvas;
 import com.itextpdf.core.color.Color;
 import com.itextpdf.core.pdf.PdfDocument;

barcodes/src/main/java/com/itextpdf/barcodes/Barcode39.java

@@ -3,7 +3,7 @@
 import com.itextpdf.basics.PdfException;
 import com.itextpdf.basics.font.FontConstants;
 import com.itextpdf.basics.font.PdfEncodings;
-import com.itextpdf.basics.geom.Rectangle;
+import com.itextpdf.core.geom.Rectangle;
 import com.itextpdf.core.font.PdfFontFactory;
 import com.itextpdf.core.pdf.canvas.PdfCanvas;
 import com.itextpdf.core.color.Color;

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeCodabar.java

@@ -4,7 +4,7 @@
 import com.itextpdf.basics.PdfException;
 import com.itextpdf.basics.font.FontConstants;
 import com.itextpdf.basics.font.PdfEncodings;
-import com.itextpdf.basics.geom.Rectangle;
+import com.itextpdf.core.geom.Rectangle;
 import com.itextpdf.core.font.PdfFontFactory;
 import com.itextpdf.core.pdf.canvas.PdfCanvas;
 import com.itextpdf.core.color.Color;

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java

@@ -3,7 +3,7 @@
 import com.itextpdf.barcodes.dmcode.DmParams;
 import com.itextpdf.barcodes.dmcode.Placement;
 import com.itextpdf.barcodes.dmcode.ReedSolomon;
-import com.itextpdf.basics.geom.Rectangle;
+import com.itextpdf.core.geom.Rectangle;
 import com.itextpdf.core.pdf.canvas.PdfCanvas;
 import com.itextpdf.core.color.Color;
 import com.itextpdf.core.pdf.PdfArray;

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEAN.java

@@ -3,7 +3,7 @@
 import com.itextpdf.basics.PdfException;
 import com.itextpdf.basics.font.FontConstants;
 import com.itextpdf.basics.font.PdfEncodings;
-import com.itextpdf.basics.geom.Rectangle;
+import com.itextpdf.core.geom.Rectangle;
 import com.itextpdf.core.font.PdfFontFactory;
 import com.itextpdf.core.pdf.canvas.PdfCanvas;
 import com.itextpdf.core.color.Color;

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEANSUPP.java

@@ -3,7 +3,7 @@
 
 import com.itextpdf.basics.PdfException;
 import com.itextpdf.basics.font.FontProgram;
-import com.itextpdf.basics.geom.Rectangle;
+import com.itextpdf.core.geom.Rectangle;
 import com.itextpdf.core.pdf.canvas.PdfCanvas;
 import com.itextpdf.core.color.Color;
 

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeInter25.java

@@ -4,7 +4,7 @@
 import com.itextpdf.basics.PdfException;
 import com.itextpdf.basics.font.FontConstants;
 import com.itextpdf.basics.font.PdfEncodings;
-import com.itextpdf.basics.geom.Rectangle;
+import com.itextpdf.core.geom.Rectangle;
 import com.itextpdf.core.font.PdfFontFactory;
 import com.itextpdf.core.pdf.canvas.PdfCanvas;
 import com.itextpdf.core.color.Color;