Skip to content

Commit 18e1387

Browse files
thurkathurka
committed
Merge branch 'master' into graal
2 parents 4114e5a + 6e204b3 commit 18e1387

File tree

40 files changed

+93
-356
lines changed

40 files changed

+93
-356
lines changed

‎integrations/eclipse/org.eclipse.visualvm.launcher.common/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: VisualVM Launcher Plug-in
44
Bundle-SymbolicName: org.eclipse.visualvm.launcher.common;singleton:=true
5-
Bundle-Version: 1.1.2
5+
Bundle-Version: 1.1.3
66
Bundle-Activator: org.eclipse.visualvm.launcher.Activator
77
Bundle-Vendor: Oracle Corporation
88
Require-Bundle: org.eclipse.ui,

‎integrations/eclipse/org.eclipse.visualvm.launcher.common/src/org/eclipse/visualvm/launcher/Activator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*/
2525
package org.eclipse.visualvm.launcher;
2626

27+
import org.eclipse.core.runtime.IStatus;
28+
import org.eclipse.core.runtime.Status;
2729
import org.eclipse.jface.resource.ImageDescriptor;
2830
import org.eclipse.ui.plugin.AbstractUIPlugin;
2931
import org.osgi.framework.BundleContext;

‎integrations/eclipse/org.eclipse.visualvm.launcher.common/src/org/eclipse/visualvm/launcher/api/VisualVMHelper.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import java.io.InputStreamReader;
3232
import java.util.StringTokenizer;
3333

34+
import org.eclipse.core.runtime.IStatus;
35+
import org.eclipse.core.runtime.Status;
3436
import org.eclipse.jface.dialogs.MessageDialog;
3537
import org.eclipse.swt.widgets.Display;
3638
import org.eclipse.swt.widgets.Shell;
@@ -66,18 +68,13 @@ public static String[] getJvmArgs(long id) {
6668
public static void openInVisualVM(long id) throws IOException {
6769
SpecVersion sv = getJavaVersion();
6870
if (sv == null || (sv.major == 1 && sv.minor < 6)) {
69-
try {
70-
final Display d = Display.getDefault();
71-
d.asyncExec(new Runnable() {
72-
public void run() {
73-
Shell s = new Shell(d);
74-
MessageDialog.openError(s, "VisualVM requires JDK1.6+ to run", "You are trying to launch VisualVM using an unsupported JDK.\n\nUse 'Window\\Preferences\\Run/Debug\\Launching\\VisualVM Configuration' to set the VisualVM JDK_HOME.");
75-
}
76-
});
77-
78-
} catch (Exception e) {
79-
e.printStackTrace();
80-
}
71+
final Display d = Display.getDefault();
72+
d.asyncExec(new Runnable() {
73+
public void run() {
74+
Shell s = new Shell(d);
75+
MessageDialog.openError(s, "VisualVM requires JDK1.6+ to run", "You are trying to launch VisualVM using an unsupported JDK.\n\nUse 'Window\\Preferences\\Run/Debug\\Launching\\VisualVM Configuration' to set the VisualVM JDK_HOME.");
76+
}
77+
});
8178
return;
8279
}
8380

@@ -90,6 +87,11 @@ public void run() {
9087
String.valueOf(id)
9188
});
9289
}
90+
91+
public static void logException(Exception ex) {
92+
IStatus s = new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getLocalizedMessage(), ex);
93+
Activator.getDefault().getLog().log(s);
94+
}
9395

9496
private static SpecVersion getJavaVersion() {
9597
try {
@@ -107,7 +109,7 @@ private static SpecVersion getJavaVersion() {
107109
}
108110
return new SpecVersion(version);
109111
} catch (IOException e) {
110-
e.printStackTrace();
112+
logException(e);
111113
}
112114
return null;
113115
}

‎integrations/eclipse/org.eclipse.visualvm.launcher.common/src/org/eclipse/visualvm/launcher/preferences/LocationPreferencePage.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ public LocationPreferencePage() {
6363
* restore itself.
6464
*/
6565
public void createFieldEditors() {
66+
final boolean isWindows = System.getProperty("os.name").toUpperCase().contains("WIN"); //$NON-NLS-1$ //$NON-NLS-2$
6667
FileFieldEditor ffe = new FileFieldEditor(PreferenceConstants.P_PATH,
6768
PreferencesMessages.LocationPreferencePage_1, getFieldEditorParent()) {
6869
@Override
6970
protected void refreshValidState() {
7071
super.refreshValidState();
7172
if (isValid()) {
72-
boolean isWindows = System.getProperty("os.name").toUpperCase().contains("WIN"); //$NON-NLS-1$ //$NON-NLS-2$
7373
boolean validated = isWindows ? getStringValue().endsWith("visualvm.exe") : getStringValue().endsWith("visualvm"); //$NON-NLS-1$ //$NON-NLS-2$
7474
if (!validated) {
7575
setErrorMessage(PreferencesMessages.LocationPreferencePage_6);
@@ -90,9 +90,10 @@ PreferencesMessages.LocationPreferencePage_2, getFieldEditorParent()) {
9090
protected void refreshValidState() {
9191
super.refreshValidState();
9292
if (isValid()) {
93-
String toolsJarPath = getStringValue() + File.separator + "lib" + File.separator + "tools.jar";
94-
File toolsJarFile = new File(toolsJarPath);
95-
boolean validated = toolsJarFile.exists() && toolsJarFile.isFile();
93+
String javacPath = getStringValue() + File.separator + "bin" + File.separator +
94+
(isWindows ? "javac.exe" : "javac");
95+
File javacFile = new File(javacPath);
96+
boolean validated = javacFile.exists() && javacFile.isFile();
9697
if (!validated) {
9798
setErrorMessage(PreferencesMessages.LocationPreferencePage_7);
9899
}

‎integrations/eclipse/org.eclipse.visualvm.launcher.java/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: VisualVM Launcher - Java
44
Bundle-SymbolicName: org.eclipse.visualvm.launcher.java;singleton:=true
5-
Bundle-Version: 1.1.0
5+
Bundle-Version: 1.1.1
66
Bundle-Vendor: Oracle Corporation
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
88
Require-Bundle: org.eclipse.debug.core,
9-
org.eclipse.visualvm.launcher.common;bundle-version="1.0.0"
9+
org.eclipse.visualvm.launcher.common;bundle-version="1.1.3"
1010
Import-Package: org.eclipse.core.runtime,
1111
org.eclipse.jdt.internal.launching,
1212
org.eclipse.jdt.junit.launcher,

‎integrations/eclipse/org.eclipse.visualvm.launcher.java/src/org/eclipse/visualvm/launcher/java/VisualVMAppletDelegate.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,10 @@ public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode)
6464
throws CoreException {
6565
try {
6666
VisualVMHelper.openInVisualVM(usedId);
67-
return super.getVMRunner(configuration, mode);
6867
} catch (IOException e) {
69-
e.printStackTrace();
70-
return null;
68+
VisualVMHelper.logException(e);
7169
}
70+
return super.getVMRunner(configuration, mode);
7271
}
7372

7473
}

‎integrations/eclipse/org.eclipse.visualvm.launcher.java/src/org/eclipse/visualvm/launcher/java/VisualVMJUnitDelegate.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode)
3535
throws CoreException {
3636
try {
3737
VisualVMHelper.openInVisualVM(usedId);
38-
return super.getVMRunner(configuration, mode);
3938
} catch (IOException e) {
40-
e.printStackTrace();
41-
return null;
39+
VisualVMHelper.logException(e);
4240
}
41+
return super.getVMRunner(configuration, mode);
4342
}
4443
}

‎integrations/eclipse/org.eclipse.visualvm.launcher.java/src/org/eclipse/visualvm/launcher/java/VisualVMJavaDelegate.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@ public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode)
5959
throws CoreException {
6060
try {
6161
VisualVMHelper.openInVisualVM(usedId);
62-
return super.getVMRunner(configuration, mode);
6362
} catch (IOException e) {
64-
e.printStackTrace();
65-
return null;
63+
VisualVMHelper.logException(e);
6664
}
65+
return super.getVMRunner(configuration, mode);
6766
}
6867

6968
}

‎integrations/eclipse/org.eclipse.visualvm.launcher.pde/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: VisualVM Launcher - PDE
44
Bundle-SymbolicName: org.eclipse.visualvm.launcher.pde;singleton:=true
5-
Bundle-Version: 1.1.0
5+
Bundle-Version: 1.1.1
66
Bundle-Vendor: Oracle Corporation
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
8-
Require-Bundle: org.eclipse.visualvm.launcher.common;bundle-version="1.0.0",
8+
Require-Bundle: org.eclipse.visualvm.launcher.common;bundle-version="1.1.3",
99
org.eclipse.debug.core
1010
Import-Package: org.eclipse.core.runtime,
1111
org.eclipse.jdt.junit.launcher,

‎integrations/eclipse/org.eclipse.visualvm.launcher.pde/src/org/eclipse/visualvm/launcher/pde/VisualVMJUnitPluginDelegate.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode)
3535
throws CoreException {
3636
try {
3737
VisualVMHelper.openInVisualVM(usedId);
38-
return super.getVMRunner(configuration, mode);
3938
} catch (IOException e) {
40-
e.printStackTrace();
41-
return null;
39+
VisualVMHelper.logException(e);
4240
}
41+
return super.getVMRunner(configuration, mode);
4342
}
4443
}

0 commit comments

Comments
 (0)