aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Besedin2011-11-25 10:17:48 (EST)
committerOleg Besedin2011-11-25 10:22:40 (EST)
commitb7d1f7d2265b33124651890f1c3edf71e5b5280d (patch)
tree75f2cca16ad13cd9fd7f857e1028d53e8d67e447
parent7102254b013de0590e4a3759e7de21f4dca38f6f (diff)
downloadeclipse.platform.ui-b7d1f7d2265b33124651890f1c3edf71e5b5280d.zip
eclipse.platform.ui-b7d1f7d2265b33124651890f1c3edf71e5b5280d.tar.gz
eclipse.platform.ui-b7d1f7d2265b33124651890f1c3edf71e5b5280d.tar.bz2
Bug 359838 - [workspace selection] The "Workspace Unavailable" errorv20111125-1522
message does not list the workspace location
-rw-r--r--bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java5
-rw-r--r--bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties5
2 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
index 2a1b319..a3cdf07 100644
--- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
+++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Helmut J. Haigermoser - Bug 359838 - The "Workspace Unavailable" error
*******************************************************************************/
package org.eclipse.ui.internal.ide.application;
@@ -209,7 +210,7 @@ public class IDEApplication implements IApplication, IExecutableExtension {
MessageDialog.openError(
shell,
IDEWorkbenchMessages.IDEApplication_workspaceCannotLockTitle,
- IDEWorkbenchMessages.IDEApplication_workspaceCannotLockMessage);
+ NLS.bind(IDEWorkbenchMessages.IDEApplication_workspaceCannotLockMessage, workspaceDirectory.getAbsolutePath()));
} else {
MessageDialog.openError(
shell,
@@ -263,7 +264,7 @@ public class IDEApplication implements IApplication, IExecutableExtension {
// by this point it has been determined that the workspace is
// already in use -- force the user to choose again
MessageDialog.openError(shell, IDEWorkbenchMessages.IDEApplication_workspaceInUseTitle,
- IDEWorkbenchMessages.IDEApplication_workspaceInUseMessage);
+ NLS.bind(IDEWorkbenchMessages.IDEApplication_workspaceInUseMessage, workspaceUrl.getFile()));
}
}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties
index e4cac6c..b1aec37 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties
@@ -17,6 +17,7 @@
# Serge Beauchamp (Freescale Semiconductor) - [229633] Group Support
# Markus Schorn (Wind River Systems) - bug 284447
# James Blackburn (Broadcom Corp.) - bug 340978
+# Helmut J. Haigermoser (Wind River Systems) - bug 359838
###############################################################################
# package: org.eclipse.ui.ide
@@ -955,7 +956,7 @@ ChooseWorkspaceWithSettingsDialog_ClassCreationFailed= Could not instantiate {0}
IDEApplication_workspaceMandatoryTitle=Workspace is Mandatory
IDEApplication_workspaceMandatoryMessage=IDEs need a valid workspace. Restart without the @none option.
IDEApplication_workspaceInUseTitle=Workspace Unavailable
-IDEApplication_workspaceInUseMessage=Workspace in use or cannot be created, choose a different one.
+IDEApplication_workspaceInUseMessage=Workspace at ''{0}'' in use or cannot be created, choose a different one.
IDEApplication_workspaceEmptyTitle=Workspace Required
IDEApplication_workspaceEmptyMessage=Workspace field must not be empty; enter a path to continue.
IDEApplication_workspaceInvalidTitle=Invalid Workspace
@@ -963,7 +964,7 @@ IDEApplication_workspaceInvalidMessage=Selected workspace is not valid; choose a
IDEApplication_workspaceCannotBeSetTitle=Workspace Cannot Be Created
IDEApplication_workspaceCannotBeSetMessage=Could not launch the product because the specified workspace cannot be created. The specified workspace directory is either invalid or read-only.
IDEApplication_workspaceCannotLockTitle=Workspace Cannot Be Locked
-IDEApplication_workspaceCannotLockMessage=Could not launch the product because the associated workspace is currently in use by another Eclipse application.
+IDEApplication_workspaceCannotLockMessage=Could not launch the product because the associated workspace at ''{0}'' is currently in use by another Eclipse application.
IDEApplication_versionTitle = Different Workspace Version
IDEApplication_versionMessage = \
This workspace was written with a different version of the product and needs to be updated.\n\n\