MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[ui] suggesting IDE restart when imported configs contain custom VM options (IDEA-22407/IDEA-26855)

Browse Source 
GitOrigin-RevId: 0884671088518a13eb6f9b036339f026caed5122
This commit is contained in:
Roman Shevchenko
2020-01-13 13:12:43 +00:00
committed by intellij-monorepo-bot
parent 48b120eb62
commit f64be2cf2c
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/application/ConfigImportHelper.java
+23
View File
@@ -10,6 +10,7 @@ import com.intellij.idea.SplashManager;
import com.intellij.openapi.components.StoragePathMacros;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileTypeRegistry;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.SystemInfo;
@@ -19,6 +20,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.AppUIUtil;
import com.intellij.util.PlatformUtils;
import com.intellij.util.ReflectionUtil;
import com.intellij.util.Restarter;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.io.Decompressor;
import com.intellij.util.text.VersionComparatorUtil;
@@ -26,6 +28,7 @@ import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.io.File;
import java.io.IOException;
@@ -93,9 +96,29 @@ public final class ConfigImportHelper {
if (!result.isNull()) {
doImport(result.get().first, newConfigDir, result.get().second, log);
if (settings != null) {
settings.importFinished(newConfigDir);
}
if (Files.isRegularFile(newConfigDir.resolve(VMOptions.getCustomVMOptionsFileName()))) {
String title = ApplicationBundle.message("title.import.settings", ApplicationNamesInfo.getInstance().getFullProductName());
String message = ApplicationBundle.message("restart.import.settings");
String[] options = {ApplicationBundle.message("restart.import.now"), ApplicationBundle.message("restart.import.later")};
if (JOptionPane.showOptionDialog(JOptionPane.getRootFrame(), message, title, JOptionPane.YES_NO_OPTION,
JOptionPane.INFORMATION_MESSAGE, Messages.getInformationIcon(), options, null) == 0) {
if (Restarter.isSupported()) {
try {
Restarter.scheduleRestart(false);
}
catch (IOException e) {
Main.showMessage("Restart failed", e);
}
}
System.exit(0);
}
}
System.setProperty(CONFIG_IMPORTED_IN_CURRENT_SESSION_KEY, Boolean.TRUE.toString());
}
}
platform/platform-resources-en/src/messages/ApplicationBundle.properties
+4 -1
View File
@@ -8,7 +8,10 @@ error.no.read.permissions=You do not have read permissions to {0}
radio.do.not.import=Do not import settings
radio.import.auto=Previous version
radio.import=Config or installation folder:
title.import.settings=Import {0} Settings From...
title.import.settings=Import {0} Settings
restart.import.settings=Imported settings contain custom VM options.\nPlease restart the IDE to apply these options.
restart.import.now=Restart now
restart.import.later=Restart later
button.ok=OK
title.code.completion=Code Completion
editbox.lookup.height=Lookup height (items):