Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2017-03-30 15:54:23 -0400
committerThomas Watson2017-03-30 15:54:49 -0400
commit88536c09bca1b61f1a3e7ade8b3c0167315fe337 (patch)
treeb77cf2499cde9fe0bd047f95c2fbc66ec32bf8be
parent035a4d8dee43019c4415be941599ce3c9fefd817 (diff)
downloadrt.equinox.framework-88536c09bca1b61f1a3e7ade8b3c0167315fe337.tar.gz
rt.equinox.framework-88536c09bca1b61f1a3e7ade8b3c0167315fe337.tar.xz
rt.equinox.framework-88536c09bca1b61f1a3e7ade8b3c0167315fe337.zip
Revert "Bug 502220 - Default workspace is ${launcher.name}-workspace"I20170402-2000I20170401-2000I20170331-2000I20170330-2000
-rwxr-xr-xbundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java17
1 files changed, 2 insertions, 15 deletions
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 c1cce1c8e..8d623a74a 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 @@ public class EquinoxLocations {
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();

Back to the top