Skip to content

Commit 6ea8d07

Browse files
asturioasturio
committed
fix: consolidate common package name to org.openpdf
- pdf-swing classes moved to correct directory - imports optimised
1 parent 32185f0 commit 6ea8d07

339 files changed

Lines changed: 838 additions & 840 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,5 +187,5 @@ buildNumber.properties
187187
!openpdf/src/test/resources/*.pdf
188188
!openpdf/src/test/resources/*.html
189189
!openpdf/src/test/resources/issue375/*.pdf
190-
!pdf-toolbox/src/test/resources/com/lowagie/examples/html/parseHelloWorld.html
190+
!pdf-toolbox/src/test/resources/*
191191
!pdf-toolbox/src/test/resources/*.pdf

pdf-toolbox/src/test/java/org/librepdf/openpdf/text/pdf/ImageAfterTextExample.java renamed to openpdf-core-modern/src/test/java/org/openpdf/text/pdf/ImageAfterTextExample.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
package org.librepdf.openpdf.text.pdf;
1+
package org.openpdf.text.pdf;
22

3+
import java.io.IOException;
4+
import java.net.URL;
5+
import java.nio.file.Files;
6+
import java.nio.file.Paths;
7+
import java.util.Objects;
38
import org.openpdf.text.Chunk;
49
import org.openpdf.text.Document;
510
import org.openpdf.text.DocumentException;
611
import org.openpdf.text.Image;
712
import org.openpdf.text.PageSize;
813
import org.openpdf.text.Paragraph;
9-
import org.openpdf.text.pdf.PdfPCell;
10-
import org.openpdf.text.pdf.PdfPTable;
11-
import org.openpdf.text.pdf.PdfWriter;
12-
import java.io.IOException;
13-
import java.net.URL;
14-
import java.nio.file.Files;
15-
import java.nio.file.Paths;
16-
import java.util.Objects;
1714

1815
public class ImageAfterTextExample {
1916

pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Chinese.java renamed to pdf-toolbox/src/main/java/org/openpdf/examples/fonts/languages/Chinese.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package org.librepdf.openpdf.examples.fonts.languages;
1+
package org.openpdf.examples.fonts.languages;
22

3+
import java.awt.Color;
4+
import java.io.ByteArrayOutputStream;
5+
import java.io.IOException;
6+
import java.nio.file.Files;
7+
import java.nio.file.Path;
8+
import java.nio.file.Paths;
39
import org.openpdf.text.Chunk;
410
import org.openpdf.text.Document;
511
import org.openpdf.text.Font;
612
import org.openpdf.text.Paragraph;
713
import org.openpdf.text.pdf.BaseFont;
814
import org.openpdf.text.pdf.PdfWriter;
915
import org.openpdf.toolbox.plugins.watermarker.Watermarker;
10-
import java.awt.Color;
11-
import java.io.ByteArrayOutputStream;
12-
import java.io.IOException;
13-
import java.nio.file.Files;
14-
import java.nio.file.Path;
15-
import java.nio.file.Paths;
1616

1717
public class Chinese {
1818

pdf-toolbox/src/main/java/org/librepdf/openpdf/examples/fonts/languages/Japanese.java renamed to pdf-toolbox/src/main/java/org/openpdf/examples/fonts/languages/Japanese.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package org.librepdf.openpdf.examples.fonts.languages;
1+
package org.openpdf.examples.fonts.languages;
22

3+
import java.io.ByteArrayOutputStream;
4+
import java.io.IOException;
5+
import java.nio.file.Files;
6+
import java.nio.file.Paths;
37
import org.openpdf.text.Chunk;
48
import org.openpdf.text.Document;
59
import org.openpdf.text.Font;
610
import org.openpdf.text.pdf.BaseFont;
711
import org.openpdf.text.pdf.PdfWriter;
8-
import java.io.ByteArrayOutputStream;
9-
import java.io.IOException;
10-
import java.nio.file.Files;
11-
import java.nio.file.Paths;
1212

1313
public class Japanese {
1414

pdf-toolbox/src/main/java/com/lowagie/toolbox/AbstractTool.java renamed to pdf-toolbox/src/main/java/org/openpdf/toolbox/AbstractTool.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535

3636
package org.openpdf.toolbox;
3737

38-
import org.openpdf.toolbox.arguments.AbstractArgument;
39-
import org.openpdf.tools.Executable;
4038
import java.awt.Desktop;
4139
import java.awt.event.ActionEvent;
4240
import java.awt.event.ActionListener;
@@ -48,6 +46,8 @@
4846
import javax.swing.JMenuBar;
4947
import javax.swing.JMenuItem;
5048
import javax.swing.JOptionPane;
49+
import org.openpdf.toolbox.arguments.AbstractArgument;
50+
import org.openpdf.tools.Executable;
5151

5252
/**
5353
* Every iText tool has to extend this abstract class.

pdf-toolbox/src/main/java/com/lowagie/toolbox/ToolMenuItems.java renamed to pdf-toolbox/src/main/java/org/openpdf/toolbox/ToolMenuItems.java

File renamed without changes.

pdf-toolbox/src/main/java/com/lowagie/toolbox/Toolbox.java renamed to pdf-toolbox/src/main/java/org/openpdf/toolbox/Toolbox.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
package org.openpdf.toolbox;
3737

38-
import org.openpdf.tools.Executable;
3938
import java.awt.Color;
4039
import java.awt.Dimension;
4140
import java.awt.Frame;
@@ -73,6 +72,7 @@
7372
import javax.swing.text.Style;
7473
import javax.swing.text.StyleConstants;
7574
import javax.swing.text.StyleContext;
75+
import org.openpdf.tools.Executable;
7676

7777
/**
7878
* This is a utility that allows you to use a number of iText tools.
@@ -124,7 +124,7 @@ public Toolbox() {
124124
desktop = new JDesktopPane();
125125
setJMenuBar(getMenubar());
126126
try {
127-
setIconImage(new ImageIcon(org.openpdf.toolbox.Toolbox.class.getResource(
127+
setIconImage(new ImageIcon(Toolbox.class.getResource(
128128
"1t3xt.gif")).getImage());
129129
} catch (Exception err) {
130130
System.err.println("Problem loading icon image.");

pdf-toolbox/src/main/java/com/lowagie/toolbox/Versions.java renamed to pdf-toolbox/src/main/java/org/openpdf/toolbox/Versions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
package org.openpdf.toolbox;
4444

45-
import org.openpdf.text.Document;
4645
import java.awt.BorderLayout;
4746
import java.text.DateFormat;
4847
import java.text.ParseException;
@@ -58,6 +57,7 @@
5857
import javax.swing.table.AbstractTableModel;
5958
import javax.swing.table.TableModel;
6059
import javax.swing.table.TableRowSorter;
60+
import org.openpdf.text.Document;
6161

6262
/**
6363
* JFrame that shows the plugin_versions of all the plugins.

pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/AbstractArgument.java renamed to pdf-toolbox/src/main/java/org/openpdf/toolbox/arguments/AbstractArgument.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.openpdf.toolbox.arguments;
22

3-
import org.openpdf.toolbox.AbstractTool;
43
import java.awt.event.ActionEvent;
54
import java.awt.event.ActionListener;
65
import java.beans.PropertyChangeEvent;
76
import java.beans.PropertyChangeListener;
87
import java.beans.PropertyChangeSupport;
8+
import org.openpdf.toolbox.AbstractTool;
99

1010
/**
1111
* @since 2.1.1 (imported from itexttoolbox project)

pdf-toolbox/src/main/java/com/lowagie/toolbox/arguments/BitsetArgument.java renamed to pdf-toolbox/src/main/java/org/openpdf/toolbox/arguments/BitsetArgument.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535

3636
package org.openpdf.toolbox.arguments;
3737

38-
import org.openpdf.toolbox.AbstractTool;
3938
import java.awt.event.ActionEvent;
4039
import javax.swing.JCheckBox;
4140
import javax.swing.JOptionPane;
41+
import org.openpdf.toolbox.AbstractTool;
4242

4343
/**
4444
* Argument that results in a set of "1" and "0" values.
@@ -71,7 +71,7 @@ public BitsetArgument(AbstractTool tool, String name, String description,
7171

7272
/**
7373
* @return String
74-
* @see org.openpdf.toolbox.arguments.StringArgument#getUsage()
74+
* @see StringArgument#getUsage()
7575
*/
7676
public String getUsage() {
7777
StringBuilder buf = new StringBuilder(super.getUsage());

0 commit comments

Comments
 (0)