Moved messages to the right bundle

Author: iloveeclipse

bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/WorkbenchSWTMessages.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2025 IBM Corporation and others.
+ * Copyright (c) 2005, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -42,17 +42,6 @@ public class WorkbenchSWTMessages extends NLS {
 	public static String InternalError;
 	public static String IDEApplication_versionTitle;
 	public static String IDEApplication_versionMessage;
-	public static String IDEApplication_workspaceLockMessage;
-
-	public static String IDEApplication_workspaceLockOwner;
-
-	public static String IDEApplication_workspaceLockHost;
-
-	public static String IDEApplication_workspaceLockDisplay;
-
-	public static String IDEApplication_workspaceLockPID;
-
-	public static String IDEApplication_workspaceCannotLockMessage2;
 
 	static {
 		// load message values from bundle file

bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/messages.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2025 IBM Corporation and others.
+# Copyright (c) 2000, 2019 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -42,9 +42,3 @@ This workspace was written with a different version of the product and needs to
 {0}\n\n\
 Updating the workspace may make it incompatible with other versions of the product.\n\
 Press OK to update the workspace and open it. Press Cancel to select a different workspace.
-IDEApplication_workspaceLockOwner=User:\t\t{0}\n
-IDEApplication_workspaceLockHost=Host:\t\t{0}\n
-IDEApplication_workspaceLockDisplay=Display:\t\t{0}\n
-IDEApplication_workspaceLockPID=Process ID:\t{0}\n
-IDEApplication_workspaceLockMessage=Workspace lock is currently held by:\n{0}
-IDEApplication_workspaceCannotLockMessage2=Could not switch to the selected workspace ''{0}'' because it is currently in use by another Eclipse instance.

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchMessages.java

@@ -1043,4 +1043,12 @@ public class WorkbenchMessages extends NLS {
 	public static String Workbench_RestartButton;
 	public static String Workbench_DontRestartButton;
 
+	public static String IDEApplication_workspaceLockOwner;
+	public static String IDEApplication_workspaceLockHost;
+	public static String IDEApplication_workspaceLockDisplay;
+	public static String IDEApplication_workspaceLockPID;
+	public static String IDEApplication_workspaceLockMessage;
+	public static String IDEApplication_workspaceCannotLockMessage2;
+	public static String IDEApplication_workspaceCannotLockTitle;
+
 }

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkspaceLock.java

@@ -21,7 +21,6 @@
 import java.nio.file.Path;
 import java.util.Properties;
 import org.eclipse.core.runtime.URIUtil;
-import org.eclipse.e4.ui.workbench.swt.internal.copy.WorkbenchSWTMessages;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Shell;
@@ -68,7 +67,6 @@ public class WorkspaceLock {
 	 * @return <code>String</code> details of lock owned workspace,
 	 *         <code>null or Empty</code> if not locked
 	 */
-	@SuppressWarnings("restriction")
 	public static String getWorkspaceLockDetails(URL workspaceUrl) {
 		Path lockFile = getLockInfoFile(workspaceUrl);
 		if (lockFile != null && Files.exists(lockFile)) {
@@ -78,19 +76,19 @@ public static String getWorkspaceLockDetails(URL workspaceUrl) {
 				properties.load(is);
 				String prop = properties.getProperty(USER);
 				if (prop != null) {
-					lockDetails.append(NLS.bind(WorkbenchSWTMessages.IDEApplication_workspaceLockOwner, prop));
+					lockDetails.append(NLS.bind(WorkbenchMessages.IDEApplication_workspaceLockOwner, prop));
 				}
 				prop = properties.getProperty(HOST);
 				if (prop != null) {
-					lockDetails.append(NLS.bind(WorkbenchSWTMessages.IDEApplication_workspaceLockHost, prop));
+					lockDetails.append(NLS.bind(WorkbenchMessages.IDEApplication_workspaceLockHost, prop));
 				}
 				prop = properties.getProperty(DISPLAY);
 				if (prop != null) {
-					lockDetails.append(NLS.bind(WorkbenchSWTMessages.IDEApplication_workspaceLockDisplay, prop));
+					lockDetails.append(NLS.bind(WorkbenchMessages.IDEApplication_workspaceLockDisplay, prop));
 				}
 				prop = properties.getProperty(PROCESS_ID);
 				if (prop != null) {
-					lockDetails.append(NLS.bind(WorkbenchSWTMessages.IDEApplication_workspaceLockPID, prop));
+					lockDetails.append(NLS.bind(WorkbenchMessages.IDEApplication_workspaceLockPID, prop));
 				}
 
 			} catch (IOException e) {
@@ -132,14 +130,13 @@ public static Path getLockInfoFile(URL workspaceUrl) {
 	 *                           be locked
 	 * @param workspaceLockOwner a formatted description of the existing lock owner
 	 */
-	@SuppressWarnings("restriction")
 	public static void showWorkspaceLockedDialog(Shell shell, String workspacePath, String workspaceLockOwner) {
-		String lockMessage = NLS.bind(WorkbenchSWTMessages.IDEApplication_workspaceCannotLockMessage2, workspacePath);
+		String lockMessage = NLS.bind(WorkbenchMessages.IDEApplication_workspaceCannotLockMessage2, workspacePath);
 		String wsLockedError = lockMessage + System.lineSeparator() + System.lineSeparator()
-				+ NLS.bind(WorkbenchSWTMessages.IDEApplication_workspaceLockMessage, workspaceLockOwner);
+				+ NLS.bind(WorkbenchMessages.IDEApplication_workspaceLockMessage, workspaceLockOwner);
 
 		MessageDialog.openError(shell,
-				WorkbenchSWTMessages.IDEApplication_workspaceCannotLockTitle, wsLockedError);
+				WorkbenchMessages.IDEApplication_workspaceCannotLockTitle, wsLockedError);
 	}
 
 }

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/messages.properties

@@ -1055,3 +1055,12 @@ Workbench_zoomChangedTitle=Zoom Changed
 Workbench_zoomChangedMessage=Restart for the zoom changes to take full effect?
 Workbench_RestartButton=&Restart
 Workbench_DontRestartButton=&Don't restart
+
+# Workspace lock messages
+IDEApplication_workspaceLockOwner=User:\t\t{0}\n
+IDEApplication_workspaceLockHost=Host:\t\t{0}\n
+IDEApplication_workspaceLockDisplay=Display:\t\t{0}\n
+IDEApplication_workspaceLockPID=Process ID:\t{0}\n
+IDEApplication_workspaceLockMessage=Workspace lock is currently held by:\n{0}
+IDEApplication_workspaceCannotLockMessage2=Could not switch to the selected workspace ''{0}'' because it is currently in use by another Eclipse instance.
+IDEApplication_workspaceCannotLockTitle=Workspace Cannot Be Locked