summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT Program
diff options
context:
space:
mode:
authorCarolyn MacLeod <carolyn>2010-03-08 19:29:16 +0000
committerCarolyn MacLeod <carolyn>2010-03-08 19:29:16 +0000
commitfdc33e6e4b296f93f2022c8f5abd1f56e1ba1aae (patch)
tree60b967d3deb4b2f7bc9a201f2065a4a2e78b8715 /bundles/org.eclipse.swt/Eclipse SWT Program
parent5e7f8dbbd52a9639a384f10da498b02dba55faa9 (diff)
downloadeclipse.platform.swt-fdc33e6e4b296f93f2022c8f5abd1f56e1ba1aae.tar.gz
eclipse.platform.swt-fdc33e6e4b296f93f2022c8f5abd1f56e1ba1aae.tar.xz
eclipse.platform.swt-fdc33e6e4b296f93f2022c8f5abd1f56e1ba1aae.zip
use workingDir param name consistently
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Program')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java2
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java4
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java6
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Program/wpf/org/eclipse/swt/program/Program.java6
5 files changed, 14 insertions, 14 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
index 7225cea25a..76f87c65f5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
@@ -995,7 +995,7 @@ public static boolean launch(String fileName) {
* that this method returns an appropriate result.
*
* @param fileName the file or program name or URL (http:// or https://)
-* @param workingDirectory the name of the working directory or null
+* @param workingDir the name of the working directory or null
* @return <code>true</code> if the file is launched, otherwise <code>false</code>
*
* @exception IllegalArgumentException <ul>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
index 5d3d0100c8..074815fae1 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
@@ -751,12 +751,12 @@ public static boolean launch(String fileName) {
* that this method returns an appropriate result.
*
* @param fileName the file or program name or URL (http:// or https://)
-* @param workingDirectory the name of the working directory or null
+* @param workingDir the name of the working directory or null
* @return <code>true</code> if the file is launched, otherwise <code>false</code>
*
* @exception IllegalArgumentException <ul>
* <li>ERROR_NULL_ARGUMENT when fileName is null</li>
-* <li>ERROR_INVALID_ARGUMENT when workingDirectory is not valid</li>
+* <li>ERROR_INVALID_ARGUMENT when workingDir is not valid</li>
* </ul>
*
* @since 3.6
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java
index da29445813..72f1eac66a 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java
@@ -184,17 +184,17 @@ public static boolean launch (String fileName) {
* that this method returns an appropriate result.
*
* @param fileName the file or program name or URL (http:// or https://)
- * @param workingDirectory the name of the working directory or null
+ * @param workingDir the name of the working directory or null
* @return <code>true</code> if the file is launched, otherwise <code>false</code>
*
* @exception IllegalArgumentException <ul>
* <li>ERROR_NULL_ARGUMENT when fileName is null</li>
- * <li>ERROR_INVALID_ARGUMENT when workingDirectory is not valid</li>
+ * <li>ERROR_INVALID_ARGUMENT when workingDir is not valid</li>
* </ul>
*
* @since 3.6
*/
-public static boolean launch (String fileName, String workingDirectory) {
+public static boolean launch (String fileName, String workingDir) {
if (fileName == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
int index = fileName.lastIndexOf ('.');
if (index == -1) return false;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
index 094aa2582f..ca8f276465 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
@@ -275,17 +275,17 @@ public static boolean launch (String fileName) {
* that this method returns an appropriate result.
*
* @param fileName the file or program name or URL (http:// or https://)
- * @param workingDirectory the name of the working directory or null
+ * @param workingDir the name of the working directory or null
* @return <code>true</code> if the file is launched, otherwise <code>false</code>
*
* @exception IllegalArgumentException <ul>
* <li>ERROR_NULL_ARGUMENT when fileName is null</li>
- * <li>ERROR_INVALID_ARGUMENT when workingDirectory is not valid</li>
+ * <li>ERROR_INVALID_ARGUMENT when workingDir is not valid</li>
* </ul>
*
* @since 3.6
*/
-public static boolean launch (String fileName, String workingDirectory) {
+public static boolean launch (String fileName, String workingDir) {
if (fileName == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
/* Use the character encoding for the default locale */
@@ -296,8 +296,8 @@ public static boolean launch (String fileName, String workingDirectory) {
OS.MoveMemory (lpFile, buffer, byteCount);
int /*long*/ lpDirectory = 0;
- if (workingDirectory != null && OS.PathIsExe(lpFile)) {
- TCHAR buffer1 = new TCHAR (0, workingDirectory, true);
+ if (workingDir != null && OS.PathIsExe(lpFile)) {
+ TCHAR buffer1 = new TCHAR (0, workingDir, true);
byteCount = buffer1.length () * TCHAR.sizeof;
lpDirectory = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (lpDirectory, buffer1, byteCount);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/wpf/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/wpf/org/eclipse/swt/program/Program.java
index 80bcf2125e..c0d0c106ed 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/wpf/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/wpf/org/eclipse/swt/program/Program.java
@@ -248,17 +248,17 @@ public static boolean launch (String fileName) {
* that this method returns an appropriate result.
*
* @param fileName the file or program name or URL (http:// or https://)
- * @param workingDirectory the name of the working directory or null
+ * @param workingDir the name of the working directory or null
* @return <code>true</code> if the file is launched, otherwise <code>false</code>
*
* @exception IllegalArgumentException <ul>
* <li>ERROR_NULL_ARGUMENT when fileName is null</li>
- * <li>ERROR_INVALID_ARGUMENT when workingDirectory is not valid</li>
+ * <li>ERROR_INVALID_ARGUMENT when workingDir is not valid</li>
* </ul>
*
* @since 3.6
*/
-public static boolean launch (String fileName, String workingDirectory) {
+public static boolean launch (String fileName, String workingDir) {
if (fileName == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
int hHeap = Win32.GetProcessHeap ();
int length = fileName.length ();