Skip to content

Commit 35ded1c

Browse files
committed
Settings migration - commented out dev-only code
1 parent c20ca02 commit 35ded1c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

visualvm/startup/src/org/graalvm/visualvm/modules/startup/ImportSettings.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public static void main(String[] args) throws Exception {
111111

112112
// Check VisualVM userdirs root
113113
String userdirsRootS = System.getProperty("netbeans.default_userdir_root"); // NOI18
114-
/*DEV*/ if (userdirsRootS == null || userdirsRootS.isEmpty()) userdirsRootS = System.getProperty("netbeans.default_userdir_root.dev"); // NOI18
114+
///*DEV*/ if (userdirsRootS == null || userdirsRootS.isEmpty()) userdirsRootS = System.getProperty("netbeans.default_userdir_root.dev"); // NOI18
115115
File userdirsRoot = userdirsRootS == null || userdirsRootS.isEmpty() ? null : new File(userdirsRootS);
116116
if (userdirsRoot == null || !userdirsRoot.isDirectory()) {
117117
LOGGER.info("Skipping import, could not resolve VisualVM userdirs root: " + userdirsRootS); // NOI18N
@@ -240,12 +240,12 @@ private static void copyToUserdir(File source, File userdir) throws IOException,
240240
File netBeansDir = InstalledFileLocator.getDefault().locate("modules", null, false).getParentFile().getParentFile(); // NOI18N
241241

242242
File importFile = new File(netBeansDir, "etc/visualvm.import"); // NOI18N
243-
/*DEV*/ if (!importFile.isFile() && "testuserdir".equals(userdir.getName())) { // NOI18N
244-
/*DEV*/ File parent = netBeansDir.getParentFile();
245-
/*DEV*/ if (parent != null && parent.isDirectory()) {
246-
/*DEV*/ importFile = new File(parent, "launcher/visualvm.import"); // NOI18N
247-
/*DEV*/ }
248-
/*DEV*/ }
243+
///*DEV*/ if (!importFile.isFile() && "testuserdir".equals(userdir.getName())) { // NOI18N
244+
///*DEV*/ File parent = netBeansDir.getParentFile();
245+
///*DEV*/ if (parent != null && parent.isDirectory()) {
246+
///*DEV*/ importFile = new File(parent, "launcher/visualvm.import"); // NOI18N
247+
///*DEV*/ }
248+
///*DEV*/ }
249249

250250
LOGGER.fine("Import file: " + importFile); // NOI18N
251251
LOGGER.info("Importing from " + source + " to " + userdir); // NOI18N

0 commit comments

Comments
 (0)