Skip to content

Commit

Permalink
fix travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
mgropp committed Sep 12, 2020
1 parent 207b1b4 commit b48e8af
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
language: java
jdk:
- oraclejdk8
- openjdk11
42 changes: 10 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,12 @@ PdfJumbler
Installation
------------
PdfJumbler requires a Java Runtime Environment (JRE).
You can download one at <http://www.java.com>.
(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 <http://www.java.com> or <https://adoptopenjdk.net/>.

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\<user>\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
Expand Down Expand Up @@ -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.
Expand All @@ -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
```
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/**
* Creates & keeps track of open pages.
*
* @author Martin Gropp <[email protected]>
* @author Martin Gropp
*/
public class DocumentManager {
private static Map<File,List<Page>> pageMap = new HashMap<File,List<Page>>();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/sourceforge/pdfjumbler/Icons.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/sourceforge/pdfjumbler/PdfJumbler.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
* @author Martin Gropp
*/
class Actions {
private static final ResourceBundle resources = ResourceBundle.getBundle(PdfJumblerResources.class.getCanonicalName());
Expand Down Expand Up @@ -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 <[email protected]>
* @author Martin Gropp
*/
class UniqueUndoManager extends UndoManager {
private static final long serialVersionUID = -2740016241678747836L;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/sourceforge/pdfjumbler/PdfList.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import net.sourceforge.pdfjumbler.pdf.PdfProcessingFactory;

/**
* @author Martin Gropp <[email protected]>
* @author Martin Gropp
*/
public class PdfList extends JDragDropList<Page> {
private static final long serialVersionUID = 7475943073466784769L;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import net.sourceforge.pdfjumbler.i18n.PdfJumblerResources;

/**
* @author Martin Gropp <[email protected]>
* @author Martin Gropp
*/
public class ProgressDialog extends JDialog {
private static final long serialVersionUID = 5790932640733135316L;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import net.sourceforge.pdfjumbler.pdf.Page;

/**
* @author Martin Gropp <[email protected]>
* @author Martin Gropp
*/
public class TrashDropTargetListener implements DropTargetListener {
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import javax.swing.KeyStroke;

/**
* @author Martin Gropp <[email protected]>
* @author Martin Gropp
*/
public class PdfJumblerResources extends ListResourceBundle {
@Override
Expand Down Expand Up @@ -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" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import javax.swing.KeyStroke;

/**
* @author Martin Gropp <[email protected]>
* @author Martin Gropp
*/
public class PdfJumblerResources_de extends ListResourceBundle {
@Override
Expand Down Expand Up @@ -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" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import javax.swing.TransferHandler;

/**
* @author Martin Gropp <[email protected]>
* @author Martin Gropp
*/
public interface DropListener {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/net/sourceforge/pdfjumbler/pdf/Plugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package net.sourceforge.pdfjumbler.pdf;

/**
* @author Martin Gropp
*/
public class PluginException extends Exception {
private static final long serialVersionUID = 1L;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* Methods to move & copy files.
*
* @author Martin Gropp <[email protected]>
* @author Martin Gropp
*/
public class FileUtils {
public static void copyFile(File sourceFile, File destFile) throws IOException {
Expand Down

0 comments on commit b48e8af

Please sign in to comment.