Implemented GH-229 - Settings migration from another VisualVM userdir

Author: jisedlac

visualvm/build.xml

@@ -81,6 +81,7 @@
         <copy file="launcher/visualvm" todir="${build.launcher.dir}/bin/"/>
         <copy file="launcher/visualvm.conf" todir="${build.launcher.dir}/etc/"/>
         <copy file="launcher/visualvm.icns" todir="${build.launcher.dir}/etc/"/>
+        <copy file="launcher/visualvm.import" todir="${build.launcher.dir}/etc/"/>
         <echo message="${app.name}" file="${build.launcher.dir}/etc/${app.name}.clusters"/>
         <echo message="&#10;" file="${build.launcher.dir}/etc/${app.name}.clusters" append="true"/>
         <echo message="${zip.platform.clusters.bare}" file="${build.launcher.dir}/etc/${app.name}.clusters" append="true"/>

visualvm/launcher/visualvm.conf

@@ -58,7 +58,7 @@ visualvm_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"
 # (can be overridden by explicit command line switches)
 #
 
-visualvm_default_options="-J-client -J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions -J-Dnetbeans.logger.console=true -J-ea"
+visualvm_default_options="-J-client -J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dnetbeans.importclass=org.graalvm.visualvm.modules.startup.ImportSettings -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions -J-Dnetbeans.logger.console=true -J-ea"
 # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
 
 # Default location of JDK:

visualvm/launcher/visualvm.import

@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+
+# persistent storage
+include repository/.*
+# preferences
+include config/Preferences/.*
+# toolbars
+include config/Toolbars/.*
+# window system
+include config/Windows2Local/.*

visualvm/startup/src/org/graalvm/visualvm/modules/startup/Bundle.properties

@@ -55,3 +55,21 @@ OpenIDE-Module-Short-Description=VisualVM startup Module
 VisualVMStartup_ErrorStartupCaption=Error Starting VisualVM
 VisualVMStartup_IncorrectVersionMsg=<html><br><b>You are running VisualVM using an unsupported Java version: {0}.</b><br><br>Please use JDK 8 to JDK 15 to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {1}<br>JVM: {2}<br>Location: {3}</i><br><br></html>
 VisualVMStartup_JreMsg=<html><br><b>You are running VisualVM using Java Runtime Environment (JRE).</b><br><br>Please use Java Development Kit (JDK) to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {0}<br>JVM: {1}<br>Location: {2}</i><br><br></html>
+
+ImportSettings_Caption=Import Settings
+
+ImportPanel_Msg1=<nobr><b>Existing VisualVM settings are available on this system.</b></nobr><br><br><nobr>Select the settings directory to import:</nobr>
+ImportPanel_Msg2=<nobr>Click <b>Import</b> to start VisualVM with the imported settings.</nobr><br><nobr>Click <b>Skip</b> to start VisualVM with the default settings.</nobr>
+ImportPanel_OptionLatestRelease=(latest release)
+ImportPanel_OptionRecentlyUsed=(recently used)
+ImportPanel_OptionSelectCustom=select custom...
+ImportPanel_OptionSelectCustomTooltip=Select custom settings directory after clicking the Import button
+ImportPanel_ProgressText=Importing settings...
+ImportPanel_ImportButton=Import
+ImportPanel_SkipButton=Skip
+ImportPanel_OpenButton=Open
+ImportPanel_ImportButtonTooltip=Import selected settings directory
+ImportPanel_OpenButtonTooltip=Open selected directory
+ImportPanel_CustomDirCaption=Select Custom Settings Directory To Import
+ImportPanel_SettingsFilter=VisualVM Settings Directory
+ImportPanel_ImportFailed=Failed to import selected settings: