Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2015-02-18 15:23:22 +0000
committerMarkus Tiede2015-02-18 15:23:22 +0000
commitded109cff09f44bdf763d4ba42cf085ae63db0ec (patch)
tree2112e05264d2833cc5b2364351486fd4f1880526 /org.eclipse.jubula.app.autrun
parent8fdd476fd1d9a6656ef72bc0361bb826c5bc63e4 (diff)
downloadorg.eclipse.jubula.core-ded109cff09f44bdf763d4ba42cf085ae63db0ec.tar.gz
org.eclipse.jubula.core-ded109cff09f44bdf763d4ba42cf085ae63db0ec.tar.xz
org.eclipse.jubula.core-ded109cff09f44bdf763d4ba42cf085ae63db0ec.zip
Sprint task - use memorable and 'meaningful' version numbers for our builds - part 2: move version information for commandline tools to help option output.
Diffstat (limited to 'org.eclipse.jubula.app.autrun')
-rw-r--r--org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java19
-rw-r--r--org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/Messages.java1
-rw-r--r--org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/messages.properties1
3 files changed, 1 insertions, 20 deletions
diff --git a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java
index fb7b44d46..44436e031 100644
--- a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java
+++ b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java
@@ -96,9 +96,6 @@ public class AutRunApplication implements IApplication {
/** help option */
private static final String OPT_HELP = "h"; //$NON-NLS-1$
- /** version option */
- private static final String OPT_VERSION = "v"; //$NON-NLS-1$
-
/** hostname for the Aut Agent with which to register */
private static final String OPT_HELP_LONG = "help"; //$NON-NLS-1$
@@ -168,6 +165,7 @@ public class AutRunApplication implements IApplication {
* @param pe a parse Exception - may also be null
*/
private static void printHelp(ParseException pe) {
+ System.out.println(Vn.getDefault().getVersion());
HelpFormatter formatter = new HelpFormatter();
formatter.setOptionComparator(new OptionComparator());
if (pe != null) {
@@ -285,10 +283,6 @@ public class AutRunApplication implements IApplication {
helpOption.setLongOpt(OPT_HELP_LONG);
options.addOption(helpOption);
- Option versionOption = new Option(OPT_VERSION, false,
- Messages.infoVersion);
- options.addOption(versionOption);
-
OptionBuilder.hasArgs();
Option autExecutableFileOption = OptionBuilder.create(OPT_EXECUTABLE);
autExecutableFileOption.setDescription(Messages.infoExecutableFile);
@@ -387,10 +381,6 @@ public class AutRunApplication implements IApplication {
return IApplication.EXIT_OK;
}
- if (cmdLine.hasOption(OPT_VERSION)) {
- printVersion();
- return IApplication.EXIT_OK;
- }
String toolkit = StringConstants.EMPTY;
if (cmdLine.hasOption(TK_SWING)) {
toolkit = SWING_AUT_TOOLKIT_CLASS_PREFIX;
@@ -434,13 +424,6 @@ public class AutRunApplication implements IApplication {
}
/**
- * print version information
- */
- private void printVersion() {
- System.out.println(Vn.getDefault().getVersion());
- }
-
- /**
*
* {@inheritDoc}
*/
diff --git a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/Messages.java b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/Messages.java
index aee0d1192..e64cff6cd 100644
--- a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/Messages.java
+++ b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/Messages.java
@@ -26,7 +26,6 @@ public class Messages extends NLS {
public static String infoKbLayout;
public static String infoAutWorkingDirectory;
public static String infoHelp;
- public static String infoVersion;
public static String infoExecutableFile;
public static String infoConnectionToAutAgentFailed;
public static String infoNonAutAgentConnectionInfo;
diff --git a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/messages.properties b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/messages.properties
index bbc9b2da2..f2f43f459 100644
--- a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/messages.properties
+++ b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/i18n/messages.properties
@@ -15,7 +15,6 @@ infoGenerateTechnicalComponentNames = Generate Names for Technical Components (t
infoKbLayout = Keyboard Layout
infoAutWorkingDirectory = AUT Working Directory
infoHelp = Displays this help
-infoVersion = Displays version information
infoExecutableFile = AUT Executable File
infoConnectionToAutAgentFailed = Could not connect to AUT Agent.
infoNonAutAgentConnectionInfo = The connection to the AUT Agent could not be made. \n\nPlease check that you have started the AUT Agent, and \nthat your connection settings (hostname, port number) are correct.

Back to the top