Unify the OOME messages, replace NetBeans IDE by VisualVM.

jisedlac · jisedlac · commit 5db2232c58b3 · 2018-11-29T14:17:23.000+01:00
diff --git a/visualvm/branding/modules/org-netbeans-modules-profiler.jar/org/netbeans/modules/profiler/heapwalk/model/Bundle.properties b/visualvm/branding/modules/org-netbeans-modules-profiler.jar/org/netbeans/modules/profiler/heapwalk/model/Bundle.properties
@@ -23,5 +23,5 @@
 # questions.
 
 
-BrowserUtils_OutOfMemoryMsg=<html><b>Out of memory in HeapWalker</b><br><br>To avoid this error, increase the -Xmx value<br>in the etc/visualvm.conf file in VisualVM installation directory.</html>
+BrowserUtils_OutOfMemoryMsg=<html><b>Out of memory in HeapWalker</b><br><br>To avoid this error please increase the -Xmx value<br>in the etc/visualvm.conf file in VisualVM directory.</html>
 
diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/Bundle.properties b/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/Bundle.properties
@@ -45,7 +45,7 @@ ProfilerClient_CannotOpenServerTempFileMsg=Cannot open temporary communication f
 ProfilerClient_PerformingInstrumentationString=Performing instrumentation, please wait...
 ProfilerClient_InvalidCodeRegionMsg=Invalid location was specified for code region instrumentation.\nInstrumentation cannot be performed.
 ProfilerClient_ClassNotFoundMsg=Could not find class {0} on the class path.\nInstrumentation cannot be performed.
-ProfilerClient_OutOfMemoryMsg=Too much data collected - the profiler ran out of memory.\nCollected profiling data has been deleted and profiling resumed.\nTo avoid this error in future, increase the -Xmx value\n in the etc/netbeans.conf file in NetBeans installation\nor lower the amount of details in profiling settings.
+ProfilerClient_OutOfMemoryMsg=Too much data collected - the profiler ran out of memory.\nCollected profiling data has been deleted and profiling resumed.\nTo avoid this error please increase the -Xmx value\nin the etc/visualvm.conf file in VisualVM directory\nor lower the amount of details in profiling settings.
 ProfilerClient_IncorrectAgentVersionMsg=Warning\: The profiler agent you are connecting to is a different version than this profiler.\nYou may encounter errors and unexpected behavior.
 ProfilerClient_ErrorGettingCalibrationDataMsg=Error when retrieving saved calibration data for target JVM\:\n{0}
 ProfilerClient_MustCalibrateFirstMsg=Since you did not run the Profiler on this machine or target JVM before,\ndeleted the saved calibration data, or this data is corrupt, profiling will STOP now.\n\nYou have to run the calibration command for your target JVM\nbefore running the Profiler with it again.\nThe obtained calibration data will be saved and re-used\non subsequent runs, so you will not see this message anymore.\n\nTo perform the calibration, use\n\"Tools | Options | Java | Profiler | General | Manage calibration data\".\n\n
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/api/ExportAction.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/details/api/ExportAction.java
@@ -80,7 +80,7 @@
     "ExportAction_ExportDialogBINFilter=Binary File (*.bin)",
     "ExportAction_ExportingViewMsg=Exporting...",
     "ExportAction_NoViewMsg=No view to export.",
-    "ExportAction_OomeExportingMsg=<html><b>Not enough memory to save the file.</b><br><br>To avoid this error increase the -Xmx<br>value in the etc/netbeans.conf file in NetBeans IDE installation.</html>",
+    "ExportAction_OomeExportingMsg=<html><b>Not enough memory to save the file.</b><br><br>To avoid this error please increase the -Xmx value<br>in the etc/visualvm.conf file in VisualVM directory.</html>",
     "ExportAction_IOException_Exporting_Msg=<html>IOException occurred during export, see IDE log for details</html>",
     "ExportAction_CannotWriteFileMsg=Failed to export File. Reason: {0}."})
 public final class ExportAction extends AbstractAction {
diff --git a/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/BrowserUtils.java b/visualvm/libs.profiler/profiler.heapwalker/src/org/graalvm/visualvm/lib/profiler/heapwalk/model/BrowserUtils.java
@@ -72,7 +72,7 @@
  * @author Jiri Sedlacek
  */
 @NbBundle.Messages({
-    "BrowserUtils_OutOfMemoryMsg=<html><b>Out of memory in HeapWalker</b><br><br>To avoid this error, increase the -Xmx value<br>in the etc/netbeans.conf file in NetBeans IDE installation directory.</html>",
+    "BrowserUtils_OutOfMemoryMsg=<html><b>Out of memory in HeapWalker</b><br><br>To avoid this error please increase the -Xmx value<br>in the etc/visualvm.conf file in VisualVM directory.</html>",
     "BrowserUtils_TruncatedMsg=...<truncated>...",
     "BrowserUtils_PathCopiedToClipboard=Path from root copied to the clipboard."
 })
diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/LoadedSnapshot.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/LoadedSnapshot.java
@@ -84,7 +84,7 @@
     "LoadedSnapshot_SnapshotFileShortMsg=File too short",
     "LoadedSnapshot_SnapshotFileCorrupted=Snapshot file corrupted",
     "LoadedSnapshot_SnapshotFileCorruptedReason=Snapshot file is corrupted: {0}",
-    "LoadedSnapshot_OutOfMemoryLoadingMsg=Not enough memory to load snapshot.\n\nTo avoid this error, increase the -Xmx value\nin the etc/netbeans.conf file in NetBeans IDE installation and restart the IDE."
+    "LoadedSnapshot_OutOfMemoryLoadingMsg=Not enough memory to load snapshot.\n\nTo avoid this error please increase the -Xmx value\nin the etc/visualvm.conf file in VisualVM directory."
 })
 public class LoadedSnapshot {
     //~ Static fields/initializers -----------------------------------------------------------------------------------------------
diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/ProfilingMonitor.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/ProfilingMonitor.java
@@ -66,7 +66,7 @@
 public final class ProfilingMonitor {
     
     @NbBundle.Messages({
-        "ProfilingMonitor_OomeMsg=<html><b>Not enough memory to store profiling data.</b><br><br>To avoid this error, increase the -Xmx value<br>in the etc/netbeans.conf file in NetBeans IDE installation.</html>"
+        "ProfilingMonitor_OomeMsg=<html><b>Not enough memory to store profiling data.</b><br><br>To avoid this error please increase the -Xmx value<br>in the etc/visualvm.conf file in VisualVM directory.</html>"
     })
     //~ Inner Classes ------------------------------------------------------------------------------------------------------------
 
diff --git a/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/ResultsManager.java b/visualvm/libs.profiler/profiler/src/org/graalvm/visualvm/lib/profiler/ResultsManager.java
@@ -106,7 +106,7 @@
     "ResultsManager_SnapshotCreateFailedMsg=Failed to create snapshot file: {0}",
     "ResultsManager_ProfiledAppTerminatedMsg=Failed to obtain results snapshot. The profiled application terminated.",
     "ResultsManager_DataNotAvailableMsg=Failed to obtain results snapshot. Data is not available yet.",
-    "ResultsManager_OutOfMemoryMsg=Too much data collected - the profiler ran out of memory.\n\nCollected profiling data has been deleted and profiling resumed.\nTo avoid this error, increase the -Xmx value\nin the etc/netbeans.conf file in NetBeans IDE installation\nor decrease the amount of detail in profiling settings.",
+    "ResultsManager_OutOfMemoryMsg=Too much data collected - the profiler ran out of memory.\n\nCollected profiling data has been deleted and profiling resumed.\nTo avoid this error please increase the -Xmx value\nin the etc/visualvm.conf file in VisualVM directory\nor decrease the amount of detail in profiling settings.",
     "ResultsManager_SnapshotDeleteFailedMsg=Failed to delete the snapshot file: {0}",
     "ResultsManager_CantFindSnapshotLocationMsg=Cannot find default location for snapshot in project: {0}",
     "ResultsManager_SnapshotCreateInProjectFailedMsg=Failed to create snapshot file in project: {0}",
@@ -123,7 +123,7 @@
     "ResultsManager_SelectFileOrDirDialogCaption=Select File or Directory",
     "ResultsManager_ProfilerSnapshotFileFilter=Profiler Snapshot File (*.{0})",
     "ResultsManager_ProfilerHeapdumpFileFilter=Heap Dump File (*.{0})",
-    "ResultsManager_OutOfMemorySavingMsg=<html><b>Not enough memory to save the snapshot.</b><br><br>To avoid this error, increase the -Xmx value<br>in the etc/netbeans.conf file in NetBeans IDE installation.</html>",
+    "ResultsManager_OutOfMemorySavingMsg=<html><b>Not enough memory to save the snapshot.</b><br><br>To avoid this error please increase the -Xmx value<br>in the etc/visualvm.conf file in VisualVM directory.</html>",
     "ResultsManager_CannotCompareSnapshotsMsg=<html><b>Cannot compare snapshots:</b><br><br>  {0}<br>  {1}<br><br>Make sure that both snaphots are the same type.</html>",
     "ResultsManager_DirectoryDoesntExistCaption=Selected Directory Does Not Exist",
     "ResultsManager_DirectoryDoesntExistMsg=The directory you have selected does not exist.\nDo you want to create the directory?",

Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@`
`23`	`23`	`# questions.`
`24`	`24`
`25`	`25`
`26`		`-BrowserUtils_OutOfMemoryMsg=<html><b>Out of memory in HeapWalker</b><br><br>To avoid this error, increase the -Xmx value<br>in the etc/visualvm.conf file in VisualVM installation directory.</html>`
	`26`	`+BrowserUtils_OutOfMemoryMsg=<html><b>Out of memory in HeapWalker</b><br><br>To avoid this error please increase the -Xmx value<br>in the etc/visualvm.conf file in VisualVM directory.</html>`
`27`	`27`