GH-311 Fixed Logfile/Options location instructions on macOS

jisedlac · jisedlac · commit 47ac148c72be · 2021-06-25T18:13:21.000+02:00
- Tools | Options in profiler libs left hardcoded (no dependency on VisualVM-Core)
diff --git a/visualvm/core/manifest.mf b/visualvm/core/manifest.mf
@@ -5,5 +5,5 @@ OpenIDE-Module: org.graalvm.visualvm.core/2
 OpenIDE-Module-Layer: org/graalvm/visualvm/core/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/core/Bundle.properties
 OpenIDE-Module-Install: org/graalvm/visualvm/core/Install$Impl.class
-OpenIDE-Module-Specification-Version: 2.3
+OpenIDE-Module-Specification-Version: 2.4
 
diff --git a/visualvm/core/src/org/graalvm/visualvm/core/Bundle.properties b/visualvm/core/src/org/graalvm/visualvm/core/Bundle.properties
@@ -31,3 +31,7 @@ Services/AutoupdateType/com_sun_tools_visualvm_core_update_center.instance=Visua
 Menu/Applications=&Applications
 Toolbars/Snapshot=&Snapshot
 Toolbars/DataSource=&Data Source
+OptionsHandle=Tools | Options
+OptionsHandleMac=VisualVM | Preferences...
+LogfileHandle=Help | About | Logfile
+LogfileHandleMac=VisualVM | About VisualVM | Logfile
diff --git a/visualvm/core/src/org/graalvm/visualvm/core/VisualVM.java b/visualvm/core/src/org/graalvm/visualvm/core/VisualVM.java
@@ -28,7 +28,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import org.graalvm.visualvm.core.datasupport.ComparableWeakReference;
+import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
+import org.openide.util.Utilities;
 
 /**
  *
@@ -91,4 +93,17 @@ synchronized boolean closing() {
         return true;
     }
     
+    
+    public final String getOptionsHandle() {
+        return Utilities.isMac() ?
+                NbBundle.getMessage(VisualVM.class, "OptionsHandleMac") :       // NOI18N
+                NbBundle.getMessage(VisualVM.class, "OptionsHandle");           // NOI18N
+    }
+    
+    public final String getLogfileHandle() {
+        return Utilities.isMac() ?
+                NbBundle.getMessage(VisualVM.class, "LogfileHandleMac") :       // NOI18N
+                NbBundle.getMessage(VisualVM.class, "LogfileHandle");           // NOI18N
+    }
+    
 }
diff --git a/visualvm/coredump/manifest.mf b/visualvm/coredump/manifest.mf
@@ -5,5 +5,5 @@ OpenIDE-Module: org.graalvm.visualvm.coredump/2
 OpenIDE-Module-Layer: org/graalvm/visualvm/coredump/resources/layer.xml
 OpenIDE-Module-Install: org/graalvm/visualvm/coredump/Installer.class
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/coredump/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1
 
diff --git a/visualvm/coredump/nbproject/project.xml b/visualvm/coredump/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.4</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/coredump/src/org/graalvm/visualvm/coredump/impl/Bundle.properties b/visualvm/coredump/src/org/graalvm/visualvm/coredump/impl/Bundle.properties
@@ -89,4 +89,4 @@ Title_Unresolved_CoreDumps=Could Not Load Core Dump
 
 MSG_Unresolved_CoreDumps=<html><b>These core dumps could not be found:</b><br>Do you want to load them on next VisualVM session?<br><br></html>
 
-MSG_CoreDump_Failed=<b>Failed to read the VM coredump file.</b><br><br>Check the VisualVM logfile (Help | About | Logfile).
+MSG_CoreDump_Failed=<b>Failed to read the VM coredump file.</b><br><br>Check the VisualVM logfile ({0}).
diff --git a/visualvm/coredump/src/org/graalvm/visualvm/coredump/impl/CoreDumpOverviewView.java b/visualvm/coredump/src/org/graalvm/visualvm/coredump/impl/CoreDumpOverviewView.java
@@ -36,6 +36,7 @@
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
+import org.graalvm.visualvm.core.VisualVM;
 import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 
@@ -157,7 +158,7 @@ private String getGeneralProperties(SaModel saAgent) {
                 data.append("<b>"+jhLbl+":</b> " + saAgent.getJavaHome() + "<br>"); // NOI18N
                 data.append("<b>"+flagsLbl+":</b> " + (jvmFlags == null || jvmFlags.isEmpty() ? NbBundle.getMessage(CoreDumpOverviewView.class, "LBL_none") : jvmFlags) + "<br><br>");  // NOI18N
             } else {
-                data.append(NbBundle.getMessage(CoreDumpOverviewView.class, "MSG_CoreDump_Failed")); // NOI18N
+                data.append(NbBundle.getMessage(CoreDumpOverviewView.class, "MSG_CoreDump_Failed", VisualVM.getInstance().getLogfileHandle())); // NOI18N
             }
             
             return data.toString();
diff --git a/visualvm/host/manifest.mf b/visualvm/host/manifest.mf
@@ -6,5 +6,5 @@ OpenIDE-Module-Layer: org/graalvm/visualvm/host/resources/layer.xml
 OpenIDE-Module-Install: org/graalvm/visualvm/host/Installer.class
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/host/Bundle.properties
 OpenIDE-Module-Recommends: org.graalvm.visualvm.jvm
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1
 
diff --git a/visualvm/host/nbproject/project.xml b/visualvm/host/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.4</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/host/src/org/graalvm/visualvm/host/impl/Bundle.properties b/visualvm/host/src/org/graalvm/visualvm/host/impl/Bundle.properties
@@ -49,4 +49,4 @@ LBL_DnsName=DNS name\:
 LBL_IpAddress=IP address\:
 
 LBL_RememberAction=&Remember selected action
-TTP_RememberAction=Select to perform the action automatically on subsequent sessions. Can be reset using Tools | Options | General | Reset Do Not Show Again confirmations.
+TTP_RememberAction=Select to perform the action automatically on subsequent sessions. Can be reset using {0} | General | Reset Do Not Show Again confirmations.
diff --git a/visualvm/host/src/org/graalvm/visualvm/host/impl/HostProvider.java b/visualvm/host/src/org/graalvm/visualvm/host/impl/HostProvider.java
@@ -321,7 +321,7 @@ public void run() {
                     messagePanel.add(new JScrollPane(list), BorderLayout.CENTER);
                     JCheckBox dnsa = new JCheckBox();
                     Mnemonics.setLocalizedText(dnsa, NbBundle.getMessage(HostProvider.class, "LBL_RememberAction")); // NOI18N
-                    dnsa.setToolTipText(NbBundle.getMessage(HostProvider.class, "TTP_RememberAction")); // NOI18N
+                    dnsa.setToolTipText(NbBundle.getMessage(HostProvider.class, "TTP_RememberAction", VisualVM.getInstance().getOptionsHandle())); // NOI18N
                     JPanel p = new JPanel(new BorderLayout());
                     p.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 20));
                     p.add(dnsa, BorderLayout.WEST);
diff --git a/visualvm/jfr/manifest.mf b/visualvm/jfr/manifest.mf
@@ -5,5 +5,5 @@ OpenIDE-Module: org.graalvm.visualvm.jfr/2
 OpenIDE-Module-Layer: org/graalvm/visualvm/jfr/resources/layer.xml
 OpenIDE-Module-Install: org/graalvm/visualvm/jfr/Installer.class
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.2
+OpenIDE-Module-Specification-Version: 2.3
 OpenIDE-Module-Recommends: jfr.implementation
diff --git a/visualvm/jfr/nbproject/project.xml b/visualvm/jfr/nbproject/project.xml
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.4</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/overview/Bundle.properties b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/overview/Bundle.properties
@@ -53,7 +53,7 @@ LBL_JVM_arguments=JVM arguments
 
 LBL_System_properties=System properties
 
-MSG_JFR_Failed_General=<p><b>Failed to read the JFR snapshot.</b></p><br><p>Check the VisualVM logfile using Help | About | Logfile.</p>
+MSG_JFR_Failed_General=<p><b>Failed to read the JFR snapshot.</b></p><br><p>Check the VisualVM logfile ({0}).</p>
 
 MSG_JFR_Failed_No_Loader=<p><b>Failed to read the JFR snapshot.</b></p><br><p>Please install at least one of the following JFR loaders using Tools | Plugins | Available Plugins and try again:</p><ul><li><b>VisualVM-JFR-Generic:</b> Generic JFR loader reading all JFR snapshots (slightly worse performance and higher memory consumption than the other loaders).</li><br><li><b>VisualVM-JFR-JDK9:</b> Support for the JFR loader bundled with JDK 9 and JDK 10 (requires running VisualVM on JDK 9/10) reading JFR snapshots created from JDK 9 and JDK 10.</li><br><li><b>VisualVM-JFR-JDK11:</b> Support for the JFR loader bundled with JDK 11 and newer (requires running VisualVM on JDK 11+) reading JFR snapshots created from JDK 9 and newer. Requires VisualVM-JFR-JDK9 to be installed as well.</li></ul>
 
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/overview/JFRSnapshotOverviewView.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/overview/JFRSnapshotOverviewView.java
@@ -35,6 +35,7 @@
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
+import org.graalvm.visualvm.core.VisualVM;
 import org.graalvm.visualvm.core.ui.components.ScrollableContainer;
 import org.graalvm.visualvm.jfr.model.JFRModel;
 import org.graalvm.visualvm.jfr.model.JFRModelFactory;
@@ -224,7 +225,7 @@ private String getGeneralProperties(JFRModel model) {
                 if (!f.hasProviders()) return NbBundle.getMessage(JFRSnapshotOverviewView.class, "MSG_JFR_Failed_Install_Generic"); // NOI18N
 //                if (!f.hasProviders()) return NbBundle.getMessage(JFRSnapshotOverviewView.class, "MSG_JFR_Failed_No_Loader"); // NOI18N
 //                else if (!f.hasGenericProvider()) return NbBundle.getMessage(JFRSnapshotOverviewView.class, "MSG_JFR_Failed_Install_Generic"); // NOI18N
-                else return NbBundle.getMessage(JFRSnapshotOverviewView.class, "MSG_JFR_Failed_General"); // NOI18N
+                else return NbBundle.getMessage(JFRSnapshotOverviewView.class, "MSG_JFR_Failed_General", VisualVM.getInstance().getLogfileHandle()); // NOI18N
             }
             
         }
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/sampler/Bundle.properties b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/sampler/Bundle.properties
@@ -97,9 +97,9 @@ MSG_Unavailable_remote=Not available. Remote sampling is only supported for Java
 
 MSG_Unavailable_connect_jdk=Not available. Cannot connect to target application. Make sure the application is running on a supported Java 6+.
 
-MSG_Unavailable_connect_log=Not available. Cannot connect to target application. Check the logfile for details (use Help | About | Logfile).
+MSG_Unavailable_connect_log=Not available. Cannot connect to target application. Check the VisualVM logfile ({0}).
 
-MSG_Unavailable_read_log=Not available. Failed to read objects in target application. Check the logfile for details (use Help | About | Logfile).
+MSG_Unavailable_read_log=Not available. Failed to read objects in target application. Check the VisualVM logfile ({0}).
 
 MSG_Gc_unsupported=perform GC not supported
 
@@ -140,7 +140,7 @@ MSG_unavailable_init_jmx=Not available. Cannot initialize JMX connection to targ
 
 MSG_unavailable_create_jmx=Not available. Failed to create JMX connection to target application. Use 'Add JMX Connection' action to attach to the application.
 
-MSG_unavailable_threads=Not available. Cannot access threads in target application. Check the logfile for details (use Help | About | Logfile).
+MSG_unavailable_threads=Not available. Cannot access threads in target application. Check the VisualVM logfile ({0}).
 
 LBL_ThreadAlloc=Thread CPU load
 
diff --git a/visualvm/jmx/manifest.mf b/visualvm/jmx/manifest.mf
@@ -6,5 +6,5 @@ OpenIDE-Module-Layer: org/graalvm/visualvm/jmx/resources/layer.xml
 OpenIDE-Module-Install: org/graalvm/visualvm/jmx/Installer.class
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jmx/Bundle.properties
 OpenIDE-Module-Provides: org.graalvm.visualvm.jmx
-OpenIDE-Module-Specification-Version: 2.1
+OpenIDE-Module-Specification-Version: 2.2
 
diff --git a/visualvm/jmx/nbproject/project.xml b/visualvm/jmx/nbproject/project.xml
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.1</specification-version>
+                        <specification-version>2.4</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/Bundle.properties b/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/Bundle.properties
@@ -71,7 +71,7 @@ MSG_Insecure_SSL=<html><b>The connection to {0}<br>could not be made using SSL.
 Retry_Insecure_SSL=&Do not require SSL for this connection
 
 LBL_RememberAction=&Remember selected action
-TTP_RememberAction=Select to perform the action automatically on subsequent sessions. Can be reset using Tools | Options | General | Reset Do Not Show Again confirmations.
+TTP_RememberAction=Select to perform the action automatically on subsequent sessions. Can be reset using {0} | General | Reset Do Not Show Again confirmations.
 
 LBL_Connect=&Connect
 LBL_Disconnect=&Disconnect
diff --git a/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxApplicationProvider.java b/visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxApplicationProvider.java
@@ -495,7 +495,7 @@ public void run() {
                     messagePanel.add(new JScrollPane(list), BorderLayout.CENTER);
                     JCheckBox dnsa = new JCheckBox();
                     Mnemonics.setLocalizedText(dnsa, NbBundle.getMessage(JmxApplicationProvider.class, "LBL_RememberAction")); // NOI18N
-                    dnsa.setToolTipText(NbBundle.getMessage(JmxApplicationProvider.class, "TTP_RememberAction")); // NOI18N
+                    dnsa.setToolTipText(NbBundle.getMessage(JmxApplicationProvider.class, "TTP_RememberAction", VisualVM.getInstance().getOptionsHandle())); // NOI18N
                     JPanel p = new JPanel(new BorderLayout());
                     p.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 20));
                     p.add(dnsa, BorderLayout.WEST);
diff --git a/visualvm/profiler/manifest.mf b/visualvm/profiler/manifest.mf
@@ -5,5 +5,5 @@ OpenIDE-Module: org.graalvm.visualvm.profiler/2
 OpenIDE-Module-Layer: org/graalvm/visualvm/profiler/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/profiler/Bundle.properties
 OpenIDE-Module-Provides: org.graalvm.visualvm.lib.common.Profiler
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1
 
diff --git a/visualvm/profiler/nbproject/project.xml b/visualvm/profiler/nbproject/project.xml
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.4</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/profiler/src/org/graalvm/visualvm/profiler/ApplicationProfilerView.java b/visualvm/profiler/src/org/graalvm/visualvm/profiler/ApplicationProfilerView.java
@@ -472,7 +472,7 @@ public void run() {
         private void startProfiling(Application application, ProfilingSettings pSettings) {
           Runnable calibrationStartUpdater = new Runnable() {
               public void run() {
-                  ProfilerDialogs.displayInfo(NbBundle.getMessage(ApplicationProfilerView.class, "MSG_calibration")); // NOI18N
+                  ProfilerDialogs.displayInfo(NbBundle.getMessage(ApplicationProfilerView.class, "MSG_calibration", VisualVM.getInstance().getOptionsHandle())); // NOI18N
                   SwingUtilities.invokeLater(new Runnable() {
                       public void run() {
                           statusValueLabel.setText(NbBundle.getMessage(ApplicationProfilerView.class, "MSG_calibration_progress")); // NOI18N
diff --git a/visualvm/profiler/src/org/graalvm/visualvm/profiler/Bundle.properties b/visualvm/profiler/src/org/graalvm/visualvm/profiler/Bundle.properties
@@ -41,7 +41,7 @@ MSG_refreshing=refreshing...
 
 MSG_calibration_progress=calibration in progress...
 
-MSG_calibration=<html><br><b>Profiler calibration will be performed.</b><br><br>The profiler will perform initial calibration of the target Java platform.<br>You can manage the calibration data using Tools | Options | Profiling.</html>
+MSG_calibration=<html><br><b>Profiler calibration will be performed.</b><br><br>The profiler will perform initial calibration of the target Java platform.<br>You can manage the calibration data using {0} | Profiling.</html>
 
 MSG_profiling_running_methods=profiling running ({0} methods instrumented)
 
diff --git a/visualvm/sampler.truffle/manifest.mf b/visualvm/sampler.truffle/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.graalvm.visualvm.sampler.truffle/2
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/sampler/truffle/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1
 OpenIDE-Module-Install: org/graalvm/visualvm/sampler/truffle/Installer.class
diff --git a/visualvm/sampler.truffle/nbproject/project.xml b/visualvm/sampler.truffle/nbproject/project.xml
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.4</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/Bundle.properties b/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/Bundle.properties
@@ -109,9 +109,9 @@ MSG_Unavailable_remote=Not available. Remote sampling is only supported for Java
 
 MSG_Unavailable_connect_jdk=Not available. Cannot connect to target application. Make sure the application is running on a supported Java 6+.
 
-MSG_Unavailable_connect_log=Not available. Cannot connect to target application. Check the logfile for details (use Help | About | Logfile).
+MSG_Unavailable_connect_log=Not available. Cannot connect to target application. Check the VisualVM logfile ({0}).
 
-MSG_Unavailable_read_log=Not available. Failed to read objects in target application. Check the logfile for details (use Help | About | Logfile).
+MSG_Unavailable_read_log=Not available. Failed to read objects in target application. Check the VisualVM logfile ({0}).
 
 MSG_Gc_unsupported=perform GC not supported
 
diff --git a/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/cpu/Bundle.properties b/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/cpu/Bundle.properties
@@ -50,7 +50,7 @@ MSG_unavailable_init_jmx=Not available. Cannot initialize JMX connection to targ
 
 MSG_unavailable_create_jmx=Not available. Failed to create JMX connection to target application. Use 'Add JMX Connection' action to attach to the application.
 
-MSG_unavailable_threads=Not available. Cannot access truffle JMX in target application. Check the logfile for details (use Help | About | Logfile).
+MSG_unavailable_threads=Not available. Cannot access truffle JMX in target application. Check the VisualVM logfile ({0}).
 
 MSG_unavailable_stacktraces=Not available. StackTraces instrument is not available. Please start your application with --stacktraces commandline option.
 
diff --git a/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/cpu/ThreadInfoProvider.java b/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/cpu/ThreadInfoProvider.java
@@ -31,6 +31,7 @@
 import javax.management.MBeanException;
 import javax.management.ReflectionException;
 import org.graalvm.visualvm.application.Application;
+import org.graalvm.visualvm.core.VisualVM;
 import org.graalvm.visualvm.sampler.truffle.TruffleDataProvider;
 import org.openide.util.NbBundle;
 
@@ -50,7 +51,7 @@ private String initialize(Application application, String mode, boolean trackFla
         if (st != null) return st;
         try {
             if (!checkAndLoadJMX(application)) {
-                return NbBundle.getMessage(ThreadInfoProvider.class, "MSG_unavailable_threads");
+                return NbBundle.getMessage(ThreadInfoProvider.class, "MSG_unavailable_threads", VisualVM.getInstance().getLogfileHandle());
             }
             if (!tbean.isStackTracesEnabled()) {
                 return NbBundle.getMessage(ThreadInfoProvider.class, "MSG_unavailable_stacktraces");
@@ -60,10 +61,10 @@ private String initialize(Application application, String mode, boolean trackFla
             tbean.dumpAllThreads();
         } catch (SecurityException e) {
             LOGGER.log(Level.INFO, "threadBean.getThreadInfo(ids, maxDepth) throws SecurityException for " + application, e); // NOI18N
-            return NbBundle.getMessage(ThreadInfoProvider.class, "MSG_unavailable_threads"); // NOI18N
+            return NbBundle.getMessage(ThreadInfoProvider.class, "MSG_unavailable_threads", VisualVM.getInstance().getLogfileHandle()); // NOI18N
         } catch (Throwable t) {
             LOGGER.log(Level.INFO, "threadBean.getThreadInfo(ids, maxDepth) throws Throwable for " + application, t); // NOI18N
-            return NbBundle.getMessage(ThreadInfoProvider.class, "MSG_unavailable_threads"); // NOI18N
+            return NbBundle.getMessage(ThreadInfoProvider.class, "MSG_unavailable_threads", VisualVM.getInstance().getLogfileHandle()); // NOI18N
         }
         return null;
     }
diff --git a/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/memory/Bundle.properties b/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/memory/Bundle.properties
@@ -74,6 +74,6 @@ MSG_unavailable_init_jmx=Not available. Cannot initialize JMX connection to targ
 
 MSG_unavailable_create_jmx=Not available. Failed to create JMX connection to target application. Use 'Add JMX Connection' action to attach to the application.
 
-MSG_unavailable_threads=Not available. Cannot access truffle JMX in target application. Check the logfile for details (use Help | About | Logfile).
+MSG_unavailable_threads=Not available. Cannot access truffle JMX in target application. Check the VisualVM logfile ({0}).
 
 MSG_unavailable_heaphisto=Not available. Heap histogram instrument is not available. Please start your application with --heaphisto commandline option.
diff --git a/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/memory/MemoryHistogramProvider.java b/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/memory/MemoryHistogramProvider.java
diff --git a/visualvm/sampler/manifest.mf b/visualvm/sampler/manifest.mf
diff --git a/visualvm/sampler/nbproject/project.xml b/visualvm/sampler/nbproject/project.xml
diff --git a/visualvm/sampler/src/org/graalvm/visualvm/sampler/Bundle.properties b/visualvm/sampler/src/org/graalvm/visualvm/sampler/Bundle.properties
diff --git a/visualvm/sampler/src/org/graalvm/visualvm/sampler/SamplerImpl.java b/visualvm/sampler/src/org/graalvm/visualvm/sampler/SamplerImpl.java
diff --git a/visualvm/sampler/src/org/graalvm/visualvm/sampler/cpu/Bundle.properties b/visualvm/sampler/src/org/graalvm/visualvm/sampler/cpu/Bundle.properties
diff --git a/visualvm/sampler/src/org/graalvm/visualvm/sampler/cpu/ThreadInfoProvider.java b/visualvm/sampler/src/org/graalvm/visualvm/sampler/cpu/ThreadInfoProvider.java

Original file line number	Diff line number	Diff line change
`@@ -89,4 +89,4 @@ Title_Unresolved_CoreDumps=Could Not Load Core Dump`
`89`	`89`
`90`	`90`	`MSG_Unresolved_CoreDumps=<html><b>These core dumps could not be found:</b><br>Do you want to load them on next VisualVM session?<br><br></html>`
`91`	`91`
`92`		`-MSG_CoreDump_Failed=<b>Failed to read the VM coredump file.</b><br><br>Check the VisualVM logfile (Help \| About \| Logfile).`
	`92`	`+MSG_CoreDump_Failed=<b>Failed to read the VM coredump file.</b><br><br>Check the VisualVM logfile ({0}).`