From 13232a3a3b9c736ca50016e1cb0bae1e357813fc Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>
Date: Wed, 10 Apr 2013 19:35:58 +0000
Subject: Change -o argument to allow setting output filename
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@404 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
---
.../gui/cliarguments/OutputFolderArgument.java | 27 ++++++++--------------
.../at/asit/pdfover/gui/messages.properties | 2 +-
.../at/asit/pdfover/gui/messages_de.properties | 2 +-
3 files changed, 12 insertions(+), 19 deletions(-)
(limited to 'pdf-over-gui')
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/OutputFolderArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/OutputFolderArgument.java
index 9e06be17..037a4226 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/OutputFolderArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/OutputFolderArgument.java
@@ -16,10 +16,6 @@
package at.asit.pdfover.gui.cliarguments;
// Imports
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,21 +48,18 @@ public class OutputFolderArgument extends CLIArgument {
throws InitializationException {
try {
if (args.length > argOffset + 1) {
-
String outputFolder = args[argOffset + 1];
-
- File outputFolderDir = new File(outputFolder);
-
- if(!outputFolderDir.exists()) {
- throw new FileNotFoundException(outputFolder);
- }
-
- if(!outputFolderDir.isDirectory()) {
- throw new IOException(outputFolderDir + Messages.getString("argument.error.output")); //$NON-NLS-1$
- }
-
+
+// File outputFolderDir = new File(outputFolder);
+// if(!outputFolderDir.exists()) {
+// throw new FileNotFoundException(outputFolder);
+// }
+// if(!outputFolderDir.isDirectory()) {
+// throw new IOException(outputFolderDir + Messages.getString("argument.error.output")); //$NON-NLS-1$
+// }
+
getConfiguration().setDefaultOutputFolderOverlay(outputFolder);
-
+
return argOffset + 1;
}
} catch (Exception ex) {
diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
index 8960cd75..83e30e18 100644
--- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
+++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
@@ -28,7 +28,7 @@ argument.help.emblem=Sets the signature logo file to use for the signature. Exam
argument.help.help=Shows this help message
argument.help.input=Sets the document to sign. Example: -i <input document>
argument.help.number=Sets the telephone number to use for mobile CCE. Example: -n <number>
-argument.help.output=Sets the output folder to use. Example: -o <folder>
+argument.help.output=Sets the output folder or file to use. Example: -o <folder>
argument.help.password=Sets the password to use for mobile CCE. Example: -p <password>
argument.help.proxyhost=Sets the proxy host to use. Example: -proxy <hostname/IP>
argument.help.proxyport=Sets the proxy port to use. Example: -proxyport <port>
diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties
index 500ddeed..3b9b841c 100644
--- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties
+++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties
@@ -28,7 +28,7 @@ argument.help.emblem=W
argument.help.help=Zeigt diese Hilfe an
argument.help.input=W�hlt das zu signierende Dokument. Bsp.: -i <Dateiname>
argument.help.number=W�hlt die Telefonnummer f�r die Handy-BKU. Bsp.: -n <Nummer>
-argument.help.output=W�hlt den Ausgabeordner. Bsp.: -o <Ordner>
+argument.help.output=W�hlt den Ausgabeordner oder die Ausgabedatei. Bsp.: -o <Ordner>
argument.help.password=W�hlt das Passwort f�r die Handy-BKU. Bsp.: -p <Passwort>
argument.help.proxyhost=W�hlt den Proxy-Server. Bsp.: -proxy <Hostname/IP>
argument.help.proxyport=W�hlt den Proxy-Server-Port. Bsp.: -proxyport <Portnummer>
--
cgit v1.2.3