You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/07/26 06:13:51 UTC
[pdfbox-jbig2] branch master updated: PDFBOX-5246,
reorganize imports, replace deprecated classes
This is an automated email from the ASF dual-hosted git repository.
lehmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pdfbox-jbig2.git
The following commit(s) were added to refs/heads/master by this push:
new 1b1343e PDFBOX-5246, reorganize imports, replace deprecated classes
1b1343e is described below
commit 1b1343e0d75a70ad0e429b6536983f72ec57b590
Author: Andreas Lehmkühler <an...@lehmi.de>
AuthorDate: Mon Jul 26 08:12:07 2021 +0200
PDFBOX-5246, reorganize imports, replace deprecated classes
---
src/test/java/org/apache/pdfbox/jbig2/BitmapTest.java | 13 +++++--------
.../java/org/apache/pdfbox/jbig2/ChecksumCalculator.java | 2 --
src/test/java/org/apache/pdfbox/jbig2/ChecksumTest.java | 5 +----
src/test/java/org/apache/pdfbox/jbig2/GithubIssuesTest.java | 7 ++-----
.../java/org/apache/pdfbox/jbig2/JBIG2DocumentFacade.java | 5 -----
.../java/org/apache/pdfbox/jbig2/JBIG2ImageReaderDemo.java | 5 -----
.../java/org/apache/pdfbox/jbig2/JBIG2ImageReaderTest.java | 5 +----
src/test/java/org/apache/pdfbox/jbig2/JBIG2PageTest.java | 4 ----
.../jbig2/decoder/arithmetic/ArithmeticDecoderTest.java | 5 ++---
.../decoder/arithmetic/ArithmeticIntegerDecoderTest.java | 5 +----
.../java/org/apache/pdfbox/jbig2/image/BitmapsBlitTest.java | 1 -
.../pdfbox/jbig2/image/BitmapsByteCombinationTest.java | 1 -
.../org/apache/pdfbox/jbig2/segments/GenericRegionTest.java | 4 +---
.../apache/pdfbox/jbig2/segments/HalftoneRegionTest.java | 4 +---
.../apache/pdfbox/jbig2/segments/PageInformationTest.java | 6 +++---
.../apache/pdfbox/jbig2/segments/PatternDictionaryTest.java | 9 +++++----
.../org/apache/pdfbox/jbig2/util/ServiceLookupTest.java | 2 --
17 files changed, 22 insertions(+), 61 deletions(-)
diff --git a/src/test/java/org/apache/pdfbox/jbig2/BitmapTest.java b/src/test/java/org/apache/pdfbox/jbig2/BitmapTest.java
index f649768..1728f65 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/BitmapTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/BitmapTest.java
@@ -17,11 +17,8 @@
package org.apache.pdfbox.jbig2;
-import static org.junit.Assert.*;
-import org.apache.pdfbox.jbig2.Bitmap;
-
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
@@ -76,8 +73,8 @@ public class BitmapTest
bitmap.setByte(0, byteValue);
bitmap.setByte(31, byteValue);
- Assert.assertEquals(integerValue, bitmap.getByteAsInteger(0));
- Assert.assertEquals(integerValue, bitmap.getByteAsInteger(31));
+ assertEquals(integerValue, bitmap.getByteAsInteger(0));
+ assertEquals(integerValue, bitmap.getByteAsInteger(31));
}
@@ -93,7 +90,7 @@ public class BitmapTest
{
int height = 16;
Bitmap bitmap = new Bitmap(1, height);
- Assert.assertEquals(height, bitmap.getHeight());
+ assertEquals(height, bitmap.getHeight());
}
@Test
@@ -101,7 +98,7 @@ public class BitmapTest
{
int width = 16;
Bitmap bitmap = new Bitmap(width, 1);
- Assert.assertEquals(width, bitmap.getWidth());
+ assertEquals(width, bitmap.getWidth());
}
}
diff --git a/src/test/java/org/apache/pdfbox/jbig2/ChecksumCalculator.java b/src/test/java/org/apache/pdfbox/jbig2/ChecksumCalculator.java
index 1ebc219..8cacc8f 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/ChecksumCalculator.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/ChecksumCalculator.java
@@ -25,8 +25,6 @@ import java.util.Arrays;
import javax.imageio.stream.ImageInputStream;
-import org.apache.pdfbox.jbig2.Bitmap;
-import org.apache.pdfbox.jbig2.JBIG2Document;
import org.apache.pdfbox.jbig2.err.JBIG2Exception;
import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
import org.junit.Ignore;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/ChecksumTest.java b/src/test/java/org/apache/pdfbox/jbig2/ChecksumTest.java
index 82776fc..eee945e 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/ChecksumTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/ChecksumTest.java
@@ -28,11 +28,8 @@ import java.util.Collection;
import javax.imageio.stream.ImageInputStream;
-import junit.framework.Assert;
-
-import org.apache.pdfbox.jbig2.Bitmap;
-import org.apache.pdfbox.jbig2.JBIG2Document;
import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/GithubIssuesTest.java b/src/test/java/org/apache/pdfbox/jbig2/GithubIssuesTest.java
index b5464c5..e4ceb00 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/GithubIssuesTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/GithubIssuesTest.java
@@ -17,17 +17,14 @@
package org.apache.pdfbox.jbig2;
-import static org.apache.pdfbox.jbig2.ChecksumCalculator.*;
-import static org.apache.pdfbox.jbig2.JBIG2DocumentFacade.*;
+import static org.apache.pdfbox.jbig2.ChecksumCalculator.md5;
+import static org.apache.pdfbox.jbig2.JBIG2DocumentFacade.doc;
import java.io.InputStream;
import javax.imageio.ImageIO;
import javax.imageio.stream.ImageInputStream;
-import org.apache.pdfbox.jbig2.Bitmap;
-import org.apache.pdfbox.jbig2.JBIG2Document;
-import org.apache.pdfbox.jbig2.JBIG2Page;
import org.junit.Assert;
import org.junit.Test;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/JBIG2DocumentFacade.java b/src/test/java/org/apache/pdfbox/jbig2/JBIG2DocumentFacade.java
index b72858b..20dab85 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/JBIG2DocumentFacade.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/JBIG2DocumentFacade.java
@@ -20,11 +20,6 @@ package org.apache.pdfbox.jbig2;
import java.io.IOException;
import javax.imageio.stream.ImageInputStream;
-
-import org.apache.pdfbox.jbig2.Bitmap;
-import org.apache.pdfbox.jbig2.JBIG2Document;
-import org.apache.pdfbox.jbig2.JBIG2Globals;
-import org.apache.pdfbox.jbig2.JBIG2Page;
import org.apache.pdfbox.jbig2.err.JBIG2Exception;
public class JBIG2DocumentFacade extends JBIG2Document
diff --git a/src/test/java/org/apache/pdfbox/jbig2/JBIG2ImageReaderDemo.java b/src/test/java/org/apache/pdfbox/jbig2/JBIG2ImageReaderDemo.java
index 8e4965a..19f29c5 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/JBIG2ImageReaderDemo.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/JBIG2ImageReaderDemo.java
@@ -29,11 +29,6 @@ import java.net.URL;
import javax.imageio.ImageReadParam;
import javax.imageio.stream.ImageInputStream;
-import org.apache.pdfbox.jbig2.Bitmap;
-import org.apache.pdfbox.jbig2.JBIG2Document;
-import org.apache.pdfbox.jbig2.JBIG2ImageReader;
-import org.apache.pdfbox.jbig2.JBIG2ImageReaderSpi;
-import org.apache.pdfbox.jbig2.TestImage;
import org.apache.pdfbox.jbig2.err.JBIG2Exception;
import org.apache.pdfbox.jbig2.image.Bitmaps;
import org.apache.pdfbox.jbig2.image.FilterType;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/JBIG2ImageReaderTest.java b/src/test/java/org/apache/pdfbox/jbig2/JBIG2ImageReaderTest.java
index ef0ee69..4e1361b 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/JBIG2ImageReaderTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/JBIG2ImageReaderTest.java
@@ -30,13 +30,10 @@ import javax.imageio.ImageReadParam;
import javax.imageio.ImageReader;
import javax.imageio.stream.ImageInputStream;
-import junit.framework.Assert;
-
-import org.apache.pdfbox.jbig2.JBIG2ImageReader;
-import org.apache.pdfbox.jbig2.JBIG2ImageReaderSpi;
import org.apache.pdfbox.jbig2.err.IntegerMaxValueException;
import org.apache.pdfbox.jbig2.err.InvalidHeaderValueException;
import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
+import org.junit.Assert;
import org.junit.Test;
public class JBIG2ImageReaderTest
diff --git a/src/test/java/org/apache/pdfbox/jbig2/JBIG2PageTest.java b/src/test/java/org/apache/pdfbox/jbig2/JBIG2PageTest.java
index b682360..fab0a1b 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/JBIG2PageTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/JBIG2PageTest.java
@@ -28,10 +28,6 @@ import java.io.InputStream;
import javax.imageio.stream.ImageInputStream;
-import org.apache.pdfbox.jbig2.Bitmap;
-import org.apache.pdfbox.jbig2.JBIG2Document;
-import org.apache.pdfbox.jbig2.JBIG2ReadParam;
-import org.apache.pdfbox.jbig2.TestImage;
import org.apache.pdfbox.jbig2.err.JBIG2Exception;
import org.apache.pdfbox.jbig2.image.Bitmaps;
import org.apache.pdfbox.jbig2.image.FilterType;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/decoder/arithmetic/ArithmeticDecoderTest.java b/src/test/java/org/apache/pdfbox/jbig2/decoder/arithmetic/ArithmeticDecoderTest.java
index d45d674..e8a06a7 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/decoder/arithmetic/ArithmeticDecoderTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/decoder/arithmetic/ArithmeticDecoderTest.java
@@ -20,10 +20,9 @@ package org.apache.pdfbox.jbig2.decoder.arithmetic;
import java.io.InputStream;
import javax.imageio.stream.ImageInputStream;
-import org.apache.pdfbox.jbig2.decoder.arithmetic.ArithmeticDecoder;
-import org.apache.pdfbox.jbig2.decoder.arithmetic.CX;
import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
-import org.junit.*;
+import org.junit.Assert;
+import org.junit.Test;
public class ArithmeticDecoderTest
{
diff --git a/src/test/java/org/apache/pdfbox/jbig2/decoder/arithmetic/ArithmeticIntegerDecoderTest.java b/src/test/java/org/apache/pdfbox/jbig2/decoder/arithmetic/ArithmeticIntegerDecoderTest.java
index 2448cbd..bff6e63 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/decoder/arithmetic/ArithmeticIntegerDecoderTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/decoder/arithmetic/ArithmeticIntegerDecoderTest.java
@@ -21,11 +21,8 @@ import java.io.InputStream;
import javax.imageio.stream.ImageInputStream;
-import junit.framework.Assert;
-
-import org.apache.pdfbox.jbig2.decoder.arithmetic.ArithmeticDecoder;
-import org.apache.pdfbox.jbig2.decoder.arithmetic.ArithmeticIntegerDecoder;
import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
+import org.junit.Assert;
import org.junit.Test;
public class ArithmeticIntegerDecoderTest
diff --git a/src/test/java/org/apache/pdfbox/jbig2/image/BitmapsBlitTest.java b/src/test/java/org/apache/pdfbox/jbig2/image/BitmapsBlitTest.java
index fb63dac..67958bc 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/image/BitmapsBlitTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/image/BitmapsBlitTest.java
@@ -31,7 +31,6 @@ import javax.imageio.stream.ImageInputStream;
import org.apache.pdfbox.jbig2.Bitmap;
import org.apache.pdfbox.jbig2.JBIG2DocumentFacade;
import org.apache.pdfbox.jbig2.err.JBIG2Exception;
-import org.apache.pdfbox.jbig2.image.Bitmaps;
import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
import org.apache.pdfbox.jbig2.util.CombinationOperator;
import org.junit.Test;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/image/BitmapsByteCombinationTest.java b/src/test/java/org/apache/pdfbox/jbig2/image/BitmapsByteCombinationTest.java
index 7fd5fd2..381e668 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/image/BitmapsByteCombinationTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/image/BitmapsByteCombinationTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import java.util.Collection;
-import org.apache.pdfbox.jbig2.image.Bitmaps;
import org.apache.pdfbox.jbig2.util.CombinationOperator;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/segments/GenericRegionTest.java b/src/test/java/org/apache/pdfbox/jbig2/segments/GenericRegionTest.java
index ad29882..545a05d 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/segments/GenericRegionTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/segments/GenericRegionTest.java
@@ -26,15 +26,13 @@ import java.io.InputStream;
import javax.imageio.stream.ImageInputStream;
-import junit.framework.Assert;
-
import org.apache.pdfbox.jbig2.TestImage;
import org.apache.pdfbox.jbig2.err.InvalidHeaderValueException;
import org.apache.pdfbox.jbig2.image.Bitmaps;
import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
import org.apache.pdfbox.jbig2.io.SubInputStream;
-import org.apache.pdfbox.jbig2.segments.GenericRegion;
import org.apache.pdfbox.jbig2.util.CombinationOperator;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/segments/HalftoneRegionTest.java b/src/test/java/org/apache/pdfbox/jbig2/segments/HalftoneRegionTest.java
index 7457220..6de0a80 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/segments/HalftoneRegionTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/segments/HalftoneRegionTest.java
@@ -26,13 +26,11 @@ import java.io.InputStream;
import javax.imageio.stream.ImageInputStream;
-import junit.framework.Assert;
-
import org.apache.pdfbox.jbig2.err.InvalidHeaderValueException;
import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
import org.apache.pdfbox.jbig2.io.SubInputStream;
-import org.apache.pdfbox.jbig2.segments.HalftoneRegion;
import org.apache.pdfbox.jbig2.util.CombinationOperator;
+import org.junit.Assert;
import org.junit.Test;
public class HalftoneRegionTest
diff --git a/src/test/java/org/apache/pdfbox/jbig2/segments/PageInformationTest.java b/src/test/java/org/apache/pdfbox/jbig2/segments/PageInformationTest.java
index d8b2a9a..dc0659f 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/segments/PageInformationTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/segments/PageInformationTest.java
@@ -25,12 +25,12 @@ import java.io.IOException;
import java.io.InputStream;
import javax.imageio.stream.ImageInputStream;
-import junit.framework.Assert;
import org.apache.pdfbox.jbig2.err.InvalidHeaderValueException;
-import org.apache.pdfbox.jbig2.io.*;
-import org.apache.pdfbox.jbig2.segments.PageInformation;
+import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
+import org.apache.pdfbox.jbig2.io.SubInputStream;
import org.apache.pdfbox.jbig2.util.CombinationOperator;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/segments/PatternDictionaryTest.java b/src/test/java/org/apache/pdfbox/jbig2/segments/PatternDictionaryTest.java
index 43c5c56..6f8b2fb 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/segments/PatternDictionaryTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/segments/PatternDictionaryTest.java
@@ -27,11 +27,12 @@ import java.util.ArrayList;
import javax.imageio.stream.ImageInputStream;
-import junit.framework.Assert;
-
-import org.apache.pdfbox.jbig2.*;
+import org.apache.pdfbox.jbig2.Bitmap;
+import org.apache.pdfbox.jbig2.TestImage;
import org.apache.pdfbox.jbig2.err.InvalidHeaderValueException;
-import org.apache.pdfbox.jbig2.io.*;
+import org.apache.pdfbox.jbig2.io.DefaultInputStreamFactory;
+import org.apache.pdfbox.jbig2.io.SubInputStream;
+import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/src/test/java/org/apache/pdfbox/jbig2/util/ServiceLookupTest.java b/src/test/java/org/apache/pdfbox/jbig2/util/ServiceLookupTest.java
index 0e85f1f..79bba00 100644
--- a/src/test/java/org/apache/pdfbox/jbig2/util/ServiceLookupTest.java
+++ b/src/test/java/org/apache/pdfbox/jbig2/util/ServiceLookupTest.java
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.Iterator;
-
-import org.apache.pdfbox.jbig2.util.ServiceLookup;
import org.junit.Test;
public class ServiceLookupTest