diff options
author | Andras Timar <atimar@suse.com> | 2012-01-11 19:21:33 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-01-11 19:25:45 +0100 |
commit | aab14cb9fbc7d82b804a89e4cc61fb874c8636c8 (patch) | |
tree | 06076784fd47291174d9d51811da496191ae5cf4 /qadevOOo/runner/util/utils.java | |
parent | export vertical and horizontal flip attribute for customshapes (diff) | |
download | core-aab14cb9fbc7d82b804a89e4cc61fb874c8636c8.tar.gz core-aab14cb9fbc7d82b804a89e4cc61fb874c8636c8.zip |
fix prefix of command line switches (-- instead of -)
Diffstat (limited to 'qadevOOo/runner/util/utils.java')
-rw-r--r-- | qadevOOo/runner/util/utils.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index f51b79aaad6c..541ca750e36c 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -816,14 +816,14 @@ public class utils { boolean gotNoAccept = true; while (commandTokens.hasMoreElements()) { String officeParam = commandTokens.nextToken(); - if (officeParam.indexOf("-accept=") != -1) { + if (officeParam.indexOf("--accept=") != -1) { gotNoAccept = false; errorMessage = validateConnectString(officeParam, true); } } if (gotNoAccept) { errorMessage = "Error: Your 'AppExecutionCommand' parameter does not " + - "contain a '-accept' parameter for connecting the office."; + "contain a '--accept' parameter for connecting the office."; } } } @@ -841,7 +841,7 @@ public class utils { public static String validateConnectString(String connectString, boolean checkAppExecutionCommand) { String acceptPrefix = ""; if (checkAppExecutionCommand) { - acceptPrefix = "-accept="; + acceptPrefix = "--accept="; } String errorMessage = "OK"; @@ -850,7 +850,7 @@ public class utils { if (connectString.indexOf(acceptPrefix + "socket,host=") == -1 || connectString.indexOf("port=") == -1) { if (checkAppExecutionCommand) { - errorMessage = "Error: The '-accept' parameter contains a syntax error: It should be like: '-accept=socket,host=localhost,port=8100;urp;"; + errorMessage = "Error: The '--accept' parameter contains a syntax error: It should be like: '--accept=socket,host=localhost,port=8100;urp;"; } else { errorMessage = "Error: The 'ConnectionString' parameter contains a syntax error: It should be like: 'socket,host=localhost,port=8100'"; } @@ -858,14 +858,14 @@ public class utils { } else if (connectString.indexOf("pipe") != -1) { if (connectString.indexOf(acceptPrefix + "pipe,name=") == -1) { if (checkAppExecutionCommand) { - errorMessage = "Error: The '-accept' parameter contains a syntax error: It should be like: '-accept=pipe,name=myuniquename;urp;'"; + errorMessage = "Error: The '--accept' parameter contains a syntax error: It should be like: '--accept=pipe,name=myuniquename;urp;'"; } else { errorMessage = "Error: The 'ConnectionString' parameter contains a syntax error: It should be like: 'pipe,name=myuniquename'"; } } } else { if (checkAppExecutionCommand) { - errorMessage = "Warning: The '-accept' parameter contains an unknown connection method."; + errorMessage = "Warning: The '--accept' parameter contains an unknown connection method."; } else { errorMessage = "Warning: The 'ConnectionString' parameter contains an unknown connection method."; } |