summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis Windatt2013-05-06 15:53:03 (EDT)
committerGerrit Code Review @ Eclipse.org2013-05-07 17:11:34 (EDT)
commit9b82b38e0508b07a1f5d2040840571306060b9a6 (patch)
tree256828727eec128a2854fa415a21970ee398cf31
parent397df01dc9a97c0506905beefd586ff040d4bc38 (diff)
downloadeclipse.pde.ui-9b82b38e0508b07a1f5d2040840571306060b9a6.zip
eclipse.pde.ui-9b82b38e0508b07a1f5d2040840571306060b9a6.tar.gz
eclipse.pde.ui-9b82b38e0508b07a1f5d2040840571306060b9a6.tar.bz2
Bug 406608 - PDE has renamed LauncherUtils.clearWorkspace()I20130508-1200I20130507-2000refs/changes/48/12548/2
-rw-r--r--ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java2
-rw-r--r--ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/EclipseApplicationLaunchConfiguration.java2
-rw-r--r--ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java2
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseApplicationLaunchConfiguration.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java
index 9951fa3..0c29f97 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LauncherUtils.java
@@ -60,7 +60,7 @@ public class LauncherUtils {
* @return whether to continue launching
* @throws CoreException
*/
- public static boolean checkWorkspace(ILaunchConfiguration configuration, String workspace, IProgressMonitor monitor) throws CoreException {
+ public static boolean clearWorkspace(ILaunchConfiguration configuration, String workspace, IProgressMonitor monitor) throws CoreException {
// If the workspace is not defined, there is no workspace to clear
// Unless the user has added the -data program arugment themselves,
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/EclipseApplicationLaunchConfiguration.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/EclipseApplicationLaunchConfiguration.java
index 7bd9c05..b002d2b 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/EclipseApplicationLaunchConfiguration.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/EclipseApplicationLaunchConfiguration.java
@@ -234,7 +234,7 @@ public class EclipseApplicationLaunchConfiguration extends AbstractPDELaunchConf
SubMonitor subMon = SubMonitor.convert(monitor, 50);
// Clear workspace and prompt, if necessary
- if (!LauncherUtils.checkWorkspace(configuration, fWorkspaceLocation, subMon.newChild(25)))
+ if (!LauncherUtils.clearWorkspace(configuration, fWorkspaceLocation, subMon.newChild(25)))
throw new CoreException(Status.CANCEL_STATUS);
subMon.setWorkRemaining(25);
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java
index eec7007..c150edc 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java
@@ -470,7 +470,7 @@ public class JUnitLaunchConfigurationDelegate extends org.eclipse.jdt.junit.laun
SubMonitor subMon = SubMonitor.convert(monitor, 50);
// Clear workspace and prompt, if necessary
- if (!LauncherUtils.checkWorkspace(configuration, fWorkspaceLocation, subMon.newChild(25))) {
+ if (!LauncherUtils.clearWorkspace(configuration, fWorkspaceLocation, subMon.newChild(25))) {
throw new CoreException(Status.CANCEL_STATUS);
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseApplicationLaunchConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseApplicationLaunchConfiguration.java
index 1086b5c..ed2256d 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseApplicationLaunchConfiguration.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseApplicationLaunchConfiguration.java
@@ -234,7 +234,7 @@ public class EclipseApplicationLaunchConfiguration extends AbstractPDELaunchConf
SubMonitor subMon = SubMonitor.convert(monitor, 50);
// Clear workspace and prompt, if necessary
- if (!LauncherUtils.checkWorkspace(configuration, fWorkspaceLocation, subMon.newChild(25)))
+ if (!LauncherUtils.clearWorkspace(configuration, fWorkspaceLocation, subMon.newChild(25)))
throw new CoreException(Status.CANCEL_STATUS);
subMon.setWorkRemaining(25);