--- old/application/tests/org.openjdk.jmc.ui.common.test/src/test/java/org/openjdk/jmc/ui/common/jvm/JVMCommandLineToolkitTest.java	2019-02-27 20:12:52.000000000 +0100
+++ new/application/tests/org.openjdk.jmc.ui.common.test/src/test/java/org/openjdk/jmc/ui/common/jvm/JVMCommandLineToolkitTest.java	2019-02-27 20:12:52.000000000 +0100
@@ -45,37 +45,37 @@
 	@Test
 	public void testEclipseJar() {
 		assertEquals(
-				"D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar", //$NON-NLS-1$
+				"D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar",
 				JVMCommandLineToolkit.getMainClassOrJar(
-						"D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -os win32 -ws win32 -arch x86_64 -showsplash -launcher D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\eclipse.exe -name Eclipse --launcher.library D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher.win32.win32.x86_64_1.1.0.v20100503\\eclipse_1307.dll -startup D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -exitdata 1528_5c -product org.eclipse.epp.package.rcp.product -showlocation -vm d:/jrockits/R28.0.1_R28.0.1-21_1.6.0/bin/javaw.exe -vmargs -Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m -jar D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar")); //$NON-NLS-1$
+						"D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -os win32 -ws win32 -arch x86_64 -showsplash -launcher D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\eclipse.exe -name Eclipse --launcher.library D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher.win32.win32.x86_64_1.1.0.v20100503\\eclipse_1307.dll -startup D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -exitdata 1528_5c -product org.eclipse.epp.package.rcp.product -showlocation -vm d:/jrockits/R28.0.1_R28.0.1-21_1.6.0/bin/javaw.exe -vmargs -Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m -jar D:\\eclipse\\install\\eclipse-rcp-helios-win32-x86_64\\eclipse\\plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar"));
 	}
 
 	@Test
 	public void testSimpleClass() {
-		assertEquals("org.openjdk.jmc.test.Runner1", //$NON-NLS-1$
-				JVMCommandLineToolkit.getMainClassOrJar("org.openjdk.jmc.test.Runner1")); //$NON-NLS-1$
+		assertEquals("org.openjdk.jmc.test.Runner1",
+				JVMCommandLineToolkit.getMainClassOrJar("org.openjdk.jmc.test.Runner1"));
 	}
 
 	@Test
 	public void testJarAndMoreFlags() {
-		assertEquals("/path1/path2/mc.jar", JVMCommandLineToolkit //$NON-NLS-1$
-				.getMainClassOrJar("/path1/path2/mc.jar -consoleLog -data /work/path3")); //$NON-NLS-1$
+		assertEquals("/path1/path2/mc.jar", JVMCommandLineToolkit
+				.getMainClassOrJar("/path1/path2/mc.jar -consoleLog -data /work/path3"));
 	}
 
 	@Test
 	public void testSlashClassAndFlags() {
-		assertEquals("org/netbeans/Main", JVMCommandLineToolkit.getMainClassOrJar("org/netbeans/Main --branding nb")); //$NON-NLS-1$ //$NON-NLS-2$
+		assertEquals("org/netbeans/Main", JVMCommandLineToolkit.getMainClassOrJar("org/netbeans/Main --branding nb"));
 	}
 
 	@Test
 	public void testEclipsClassAndFlOags() {
-		assertEquals("org.eclipse.equinox.launcher.Main", JVMCommandLineToolkit.getMainClassOrJar( //$NON-NLS-1$
-				"org.eclipse.equinox.launcher.Main -launcher C:\\path1\\path2\\eclipse\\eclipse.exe -name Eclipse -showsplash 600 -product org.openjdk.jmc.rcp.application.product -data C:\\workspaces\\mcmain/../jmc_rcp -configuration file:C:/workspaces/mcmain/.metadata/.plugins/org.eclipse.pde.core/JMC RCP/ -dev file:C:/workspaces/mcmain/.metadata/.plugins/org.eclipse.pde.core/JMC RCP/dev.properties -os win32 -ws win32 -arch x86_64 -consoleLog")); //$NON-NLS-1$
+		assertEquals("org.eclipse.equinox.launcher.Main", JVMCommandLineToolkit.getMainClassOrJar(
+				"org.eclipse.equinox.launcher.Main -launcher C:\\path1\\path2\\eclipse\\eclipse.exe -name Eclipse -showsplash 600 -product org.openjdk.jmc.rcp.application.product -data C:\\workspaces\\mcmain/../jmc_rcp -configuration file:C:/workspaces/mcmain/.metadata/.plugins/org.eclipse.pde.core/JMC RCP/ -dev file:C:/workspaces/mcmain/.metadata/.plugins/org.eclipse.pde.core/JMC RCP/dev.properties -os win32 -ws win32 -arch x86_64 -consoleLog"));
 	}
 
 	@Test
 	public void testEmptyString() {
-		assertEquals("", JVMCommandLineToolkit.getMainClassOrJar("")); //$NON-NLS-1$ //$NON-NLS-2$
+		assertEquals("", JVMCommandLineToolkit.getMainClassOrJar(""));
 	}
 
 	@Test
@@ -87,40 +87,40 @@
 
 	@Test
 	public void testCpAndClass() {
-		assertEquals("org.openjdk.jmc.test.Runner2", //$NON-NLS-1$
-				JVMCommandLineToolkit.getJavaCommandLine("-cp application.jar org.openjdk.jmc.test.Runner2")); //$NON-NLS-1$
+		assertEquals("org.openjdk.jmc.test.Runner2",
+				JVMCommandLineToolkit.getJavaCommandLine("-cp application.jar org.openjdk.jmc.test.Runner2"));
 	}
 
 	@Test
 	public void testCpWithSpaceDashAndClass() {
-		assertEquals("org.openjdk.jmc.test.Runner2", JVMCommandLineToolkit //$NON-NLS-1$
-				.getJavaCommandLine("-cp \"foo -bar/application.jar\" org.openjdk.jmc.test.Runner2")); //$NON-NLS-1$
+		assertEquals("org.openjdk.jmc.test.Runner2", JVMCommandLineToolkit
+				.getJavaCommandLine("-cp \"foo -bar/application.jar\" org.openjdk.jmc.test.Runner2"));
 	}
 
 	@Test
 	public void testCpPropClassAndArg() {
-		assertEquals("org.openjdk.jmc.test.Runner3 arg", JVMCommandLineToolkit //$NON-NLS-1$
-				.getJavaCommandLine("-cp application.jar -Darg1=foo org.openjdk.jmc.test.Runner3 arg")); //$NON-NLS-1$
+		assertEquals("org.openjdk.jmc.test.Runner3 arg", JVMCommandLineToolkit
+				.getJavaCommandLine("-cp application.jar -Darg1=foo org.openjdk.jmc.test.Runner3 arg"));
 	}
 
 	@Test
 	public void testJarFlag() {
-		assertEquals("C:/path1/path2/mc.jar -consoleLog -data C:/path3/path4", //$NON-NLS-1$
+		assertEquals("C:/path1/path2/mc.jar -consoleLog -data C:/path3/path4",
 				JVMCommandLineToolkit.getJavaCommandLine(
-						"-jar C:/path1/path2/mc.jar -consoleLog -data C:/path3/path4")); //$NON-NLS-1$
+						"-jar C:/path1/path2/mc.jar -consoleLog -data C:/path3/path4"));
 	}
 
 	@Test
 	public void testClassPathJarAndFlags() {
 		// not really a valid cmdline
-		assertEquals("C:/path1/path2/mc.jar -consoleLog -data C:/path3/path4", //$NON-NLS-1$
+		assertEquals("C:/path1/path2/mc.jar -consoleLog -data C:/path3/path4",
 				JVMCommandLineToolkit.getJavaCommandLine(
-						"-classpath application.jar -jar C:/path1/path2/mc.jar -consoleLog -data C:/path3/path4")); //$NON-NLS-1$
+						"-classpath application.jar -jar C:/path1/path2/mc.jar -consoleLog -data C:/path3/path4"));
 	}
 
 	@Test
 	public void testEmptyString2() {
-		assertEquals("", JVMCommandLineToolkit.getJavaCommandLine("")); //$NON-NLS-1$ //$NON-NLS-2$
+		assertEquals("", JVMCommandLineToolkit.getJavaCommandLine(""));
 	}
 
 	@Test