Revert "Bug 502220 - Default workspace is ${launcher.name}-workspace"
This reverts commit 60a423633ebd7246d33e8f95eb642e1dbeb2ea07.
Change-Id: I7aad1e0ff3d3e870595fe4fa3883451dce434b89
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java
index c1cce1c..8d623a7 100755
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java
@@ -8,7 +8,6 @@
* Contributors:
* IBM Corporation - initial API and implementation
* Rapicorp, Inc - Support for Mac Layout (bug 431116)
- * Mickael Istria (Red Hat Inc.) - [502220] Default ws ${launcher}-workspace
*******************************************************************************/
package org.eclipse.osgi.internal.location;
@@ -93,20 +92,8 @@
temp = buildLocation(PROP_INSTANCE_AREA_DEFAULT, null, "", false, false, INSTANCE_DATA_AREA_PREFIX); //$NON-NLS-1$
defaultLocation = temp == null ? null : temp.getURL();
- if (defaultLocation == null) {
- StringBuilder instanceAreaDefault = new StringBuilder();
- String launcherPath = equinoxConfig.getConfiguration(PROP_LAUNCHER);
- if (launcherPath != null) {
- String launcherName = new File(launcherPath).getName();
- if (launcherName.endsWith(".exe")) { //$NON-NLS-1$
- launcherName = launcherName.substring(0, launcherName.length() - ".exe".length()); //$NON-NLS-1$
- }
- instanceAreaDefault.append(launcherName);
- instanceAreaDefault.append('-');
- }
- instanceAreaDefault.append("workspace"); //$NON-NLS-1$
- defaultLocation = buildURL(new File(System.getProperty(PROP_USER_DIR), instanceAreaDefault.toString()).getAbsolutePath(), true);
- }
+ if (defaultLocation == null)
+ defaultLocation = buildURL(new File(System.getProperty(PROP_USER_DIR), "workspace").getAbsolutePath(), true); //$NON-NLS-1$
instanceLocation = buildLocation(PROP_INSTANCE_AREA, defaultLocation, "", false, false, INSTANCE_DATA_AREA_PREFIX); //$NON-NLS-1$
mungeConfigurationLocation();
