From b48e8af5dab994db357b18d7908daa6e35721735 Mon Sep 17 00:00:00 2001 From: Martin Gropp Date: Sat, 12 Sep 2020 16:12:30 +0200 Subject: [PATCH] fix travis build --- .travis.yml | 2 +- README.md | 42 +++++-------------- .../pdfjumbler/DocumentManager.java | 2 +- .../net/sourceforge/pdfjumbler/Icons.java | 6 +-- .../sourceforge/pdfjumbler/PdfJumbler.java | 4 +- .../net/sourceforge/pdfjumbler/PdfList.java | 2 +- .../pdfjumbler/ProgressDialog.java | 2 +- .../pdfjumbler/TrashDropTargetListener.java | 2 +- .../pdfjumbler/i18n/PdfJumblerResources.java | 4 +- .../i18n/PdfJumblerResources_de.java | 4 +- .../i18n/PdfJumblerResources_es.java | 2 +- .../jdragdroplist/DropListener.java | 2 +- .../pdfjumbler/pdf/PdfProcessorListener.java | 3 ++ .../sourceforge/pdfjumbler/pdf/Plugin.java | 3 ++ .../pdfjumbler/pdf/PluginException.java | 3 ++ .../pdfjumbler/pdfbox/PdfRenderer.java | 5 +++ .../pdfjumbler/util/FileUtils.java | 2 +- 17 files changed, 41 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9bcf999..94d2a22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: java jdk: - - oraclejdk8 + - openjdk11 diff --git a/README.md b/README.md index bccd459..0879d25 100644 --- a/README.md +++ b/README.md @@ -6,32 +6,12 @@ PdfJumbler Installation ------------ PdfJumbler requires a Java Runtime Environment (JRE). -You can download one at . -(Linux users should use their package management -system and install, for example, the packages -`default-jre` and `libopenjfx-java`, -MacOS usually comes with a preinstalled JRE). +You can download one at or . -Windows users can simply download and run the -installer (setup-pdfjumbler.exe), which -creates a start menu entry for PdfJumbler. +Windows users can simply download and run the installer (setup-pdfjumbler.exe), +which creates a start menu entry for PdfJumbler. -Alternatively, there is a runnable jar file (just -doubleclick), pdfjumbler.jar. - - -Plugins -------- -Both the installer and the runnable jar include -the iText editor and the JPedal renderer. - -In the rare case that these standard plugins can't -handle a particular file, other plugins can be -installed simply by putting the respective jar files -in the installation directory (often something like -`C:\users\\Local Settings\Application Data\ -PdfJumbler`, or wherever you put the main jar file -- -when in doubt search for files named `pdfjumbler-*.jar`). +Alternatively, there is a runnable jar file (just double-click), pdfjumbler.jar. User Interface @@ -62,15 +42,13 @@ PdfJumbler accepts pdf files as command line arguments. Several settings can be changed using Java system properties: -* `pdfjumbler.editor`: sets the editor plugin (if installed) - * iText: `net.sourceforge.pdfjumbler.pdf.itext.PdfEditor` - * PDFBox: `net.sourceforge.pdfjumbler.pdf.PdfEditor` +* `pdfjumbler.editor`: sets the editor plugin (if installed; previous plugins are no longer supported) + * PDFBox: `net.sourceforge.pdfjumbler.pdfbox.PdfEditor` -* `pdfjumbler.renderer`: sets the renderer plugin (if installed) - * JPedal: `net.sourceforge.pdfjumbler.pdf.jpedal.PdfRenderer` - * JPod: `net.sourceforge.pdfjumbler.pdf.jpod.PdfRenderer` +* `pdfjumbler.renderer`: sets the renderer plugin (if installed; previous plugins are no longer supported) + * PDFBox: `net.sourceforge.pdfjumbler.pdfbox.PdfRenderer` -* `pdfjumbler.lookandfeel`: sets the user interface look-and-feel +* `pdfjumbler.lookandfeel`: sets the user interface look-and-feel Possible values depend on the installed Swing look-and-feels. Run PdfJumbler on the command line and set the property to ? to see a list. @@ -81,5 +59,5 @@ Several settings can be changed using Java system properties: ### Example ### ``` -java -Dpdfjumbler.editor=net.sourceforge.pdfjumbler.pdf.PdfEditor -jar pdfjumbler.jar foo.pdf bar.pdf +java -Dpdfjumbler.editor=net.sourceforge.pdfjumbler.pdfbox.PdfEditor -jar pdfjumbler.jar foo.pdf bar.pdf ``` diff --git a/src/main/java/net/sourceforge/pdfjumbler/DocumentManager.java b/src/main/java/net/sourceforge/pdfjumbler/DocumentManager.java index cc3e1e4..d615731 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/DocumentManager.java +++ b/src/main/java/net/sourceforge/pdfjumbler/DocumentManager.java @@ -15,7 +15,7 @@ /** * Creates & keeps track of open pages. * - * @author Martin Gropp + * @author Martin Gropp */ public class DocumentManager { private static Map> pageMap = new HashMap>(); diff --git a/src/main/java/net/sourceforge/pdfjumbler/Icons.java b/src/main/java/net/sourceforge/pdfjumbler/Icons.java index 7880e03..b235149 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/Icons.java +++ b/src/main/java/net/sourceforge/pdfjumbler/Icons.java @@ -14,9 +14,9 @@ public class Icons { public static final ImageIcon HELP_ABOUT = getIcon("help-about.png"); public static final ImageIcon WRENCH = getIcon("wrench.png"); - public static interface Size16 { - public static final ImageIcon DOCUMENT_OPEN = getIcon("document-open-16.png"); - public static final ImageIcon DOCUMENT_SAVE = getIcon("document-save-16.png"); + public interface Size16 { + ImageIcon DOCUMENT_OPEN = getIcon("document-open-16.png"); + ImageIcon DOCUMENT_SAVE = getIcon("document-save-16.png"); } private static ImageIcon getIcon(String name) { diff --git a/src/main/java/net/sourceforge/pdfjumbler/PdfJumbler.java b/src/main/java/net/sourceforge/pdfjumbler/PdfJumbler.java index d55025b..5ea4518 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/PdfJumbler.java +++ b/src/main/java/net/sourceforge/pdfjumbler/PdfJumbler.java @@ -326,7 +326,7 @@ public static void main(String[] args) { * Actions & workers for the main PdfJumbler class. * Moved to an extra class for readability. * - * @author Martin Gropp + * @author Martin Gropp */ class Actions { private static final ResourceBundle resources = ResourceBundle.getBundle(PdfJumblerResources.class.getCanonicalName()); @@ -886,7 +886,7 @@ public void actionPerformed(ActionEvent e) { * (implemented as remove + add compound edits) and * is simpler than using insignificant edits. * - * @author Martin Gropp + * @author Martin Gropp */ class UniqueUndoManager extends UndoManager { private static final long serialVersionUID = -2740016241678747836L; diff --git a/src/main/java/net/sourceforge/pdfjumbler/PdfList.java b/src/main/java/net/sourceforge/pdfjumbler/PdfList.java index 4c534f8..e3dd34d 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/PdfList.java +++ b/src/main/java/net/sourceforge/pdfjumbler/PdfList.java @@ -22,7 +22,7 @@ import net.sourceforge.pdfjumbler.pdf.PdfProcessingFactory; /** - * @author Martin Gropp + * @author Martin Gropp */ public class PdfList extends JDragDropList { private static final long serialVersionUID = 7475943073466784769L; diff --git a/src/main/java/net/sourceforge/pdfjumbler/ProgressDialog.java b/src/main/java/net/sourceforge/pdfjumbler/ProgressDialog.java index e53cdcc..43704e4 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/ProgressDialog.java +++ b/src/main/java/net/sourceforge/pdfjumbler/ProgressDialog.java @@ -24,7 +24,7 @@ import net.sourceforge.pdfjumbler.i18n.PdfJumblerResources; /** - * @author Martin Gropp + * @author Martin Gropp */ public class ProgressDialog extends JDialog { private static final long serialVersionUID = 5790932640733135316L; diff --git a/src/main/java/net/sourceforge/pdfjumbler/TrashDropTargetListener.java b/src/main/java/net/sourceforge/pdfjumbler/TrashDropTargetListener.java index f50dc86..5e2e06a 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/TrashDropTargetListener.java +++ b/src/main/java/net/sourceforge/pdfjumbler/TrashDropTargetListener.java @@ -13,7 +13,7 @@ import net.sourceforge.pdfjumbler.pdf.Page; /** - * @author Martin Gropp + * @author Martin Gropp */ public class TrashDropTargetListener implements DropTargetListener { @Override diff --git a/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources.java b/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources.java index 43ada1e..6303dda 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources.java +++ b/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources.java @@ -7,7 +7,7 @@ import javax.swing.KeyStroke; /** - * @author Martin Gropp + * @author Martin Gropp */ public class PdfJumblerResources extends ListResourceBundle { @Override @@ -61,7 +61,7 @@ protected Object[][] getContents() { }, { "ABOUT_TEXT", - "PdfJumbler %s \nCopyright (C) 2017 Martin Gropp\n" + + "PdfJumbler %s \nCopyright (C) 2020 Martin Gropp\n" + "\n" + "PDF Editor: %s\n" + "PDF Renderer: %s\n" + diff --git a/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources_de.java b/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources_de.java index 60b184c..2d4c021 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources_de.java +++ b/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources_de.java @@ -7,7 +7,7 @@ import javax.swing.KeyStroke; /** - * @author Martin Gropp + * @author Martin Gropp */ public class PdfJumblerResources_de extends ListResourceBundle { @Override @@ -59,7 +59,7 @@ protected Object[][] getContents() { }, { "ABOUT_TEXT", - "PdfJumbler %s \nCopyright (C) 2017 Martin Gropp\n" + + "PdfJumbler %s \nCopyright (C) 2020 Martin Gropp\n" + "\n" + "PDF Editor: %s\n" + "PDF Renderer: %s\n" + diff --git a/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources_es.java b/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources_es.java index c68263e..c08f10a 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources_es.java +++ b/src/main/java/net/sourceforge/pdfjumbler/i18n/PdfJumblerResources_es.java @@ -61,7 +61,7 @@ protected Object[][] getContents() { }, { "ABOUT_TEXT", - "PdfJumbler %s \nCopyright (C) 2017 Martin Gropp\n" + + "PdfJumbler %s \nCopyright (C) 2020 Martin Gropp\n" + "\n" + "PDF Editor: %s\n" + "PDF Renderer: %s\n" + diff --git a/src/main/java/net/sourceforge/pdfjumbler/jdragdroplist/DropListener.java b/src/main/java/net/sourceforge/pdfjumbler/jdragdroplist/DropListener.java index d188f87..b59caea 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/jdragdroplist/DropListener.java +++ b/src/main/java/net/sourceforge/pdfjumbler/jdragdroplist/DropListener.java @@ -3,7 +3,7 @@ import javax.swing.TransferHandler; /** - * @author Martin Gropp + * @author Martin Gropp */ public interface DropListener { /** diff --git a/src/main/java/net/sourceforge/pdfjumbler/pdf/PdfProcessorListener.java b/src/main/java/net/sourceforge/pdfjumbler/pdf/PdfProcessorListener.java index f47bb4b..d24da44 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/pdf/PdfProcessorListener.java +++ b/src/main/java/net/sourceforge/pdfjumbler/pdf/PdfProcessorListener.java @@ -1,5 +1,8 @@ package net.sourceforge.pdfjumbler.pdf; +/** + * @author Martin Gropp + */ public interface PdfProcessorListener { public void pdfEditorChanged(PdfEditor oldEditor, PdfEditor newEditor); public void pdfRendererChanged(PdfRenderer oldRenderer, PdfRenderer newRenderer); diff --git a/src/main/java/net/sourceforge/pdfjumbler/pdf/Plugin.java b/src/main/java/net/sourceforge/pdfjumbler/pdf/Plugin.java index e8f2ab3..d2244f7 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/pdf/Plugin.java +++ b/src/main/java/net/sourceforge/pdfjumbler/pdf/Plugin.java @@ -17,6 +17,9 @@ import net.sourceforge.pdfjumbler.PdfJumbler; import net.sourceforge.pdfjumbler.i18n.PdfJumblerResources; +/** + * @author Martin Gropp + */ public class Plugin { public static final String REQUIRED_VERSION_KEY = "pdfjumbler-required-version"; public static final String PDF_EDITOR_KEY = "pdfjumbler-plugin-editor"; diff --git a/src/main/java/net/sourceforge/pdfjumbler/pdf/PluginException.java b/src/main/java/net/sourceforge/pdfjumbler/pdf/PluginException.java index e4b7162..39e4a2c 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/pdf/PluginException.java +++ b/src/main/java/net/sourceforge/pdfjumbler/pdf/PluginException.java @@ -1,5 +1,8 @@ package net.sourceforge.pdfjumbler.pdf; +/** + * @author Martin Gropp + */ public class PluginException extends Exception { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/sourceforge/pdfjumbler/pdfbox/PdfRenderer.java b/src/main/java/net/sourceforge/pdfjumbler/pdfbox/PdfRenderer.java index c38e85c..ced15be 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/pdfbox/PdfRenderer.java +++ b/src/main/java/net/sourceforge/pdfjumbler/pdfbox/PdfRenderer.java @@ -13,6 +13,11 @@ import java.util.Iterator; import java.util.Map; +/** + * PdfJumbler interface to PDFBox. + * + * @author Martin Gropp + */ public class PdfRenderer implements net.sourceforge.pdfjumbler.pdf.PdfRenderer { public static String getFriendlyName() { return "PDFBox"; diff --git a/src/main/java/net/sourceforge/pdfjumbler/util/FileUtils.java b/src/main/java/net/sourceforge/pdfjumbler/util/FileUtils.java index d068361..16ad49c 100644 --- a/src/main/java/net/sourceforge/pdfjumbler/util/FileUtils.java +++ b/src/main/java/net/sourceforge/pdfjumbler/util/FileUtils.java @@ -8,7 +8,7 @@ /** * Methods to move & copy files. * - * @author Martin Gropp + * @author Martin Gropp */ public class FileUtils { public static void copyFile(File sourceFile, File destFile) throws IOException {