From ffdf8be1dacc0b7ace69e151567fe5e7aeaf90a1 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 2 Jul 2018 15:11:38 +0200 Subject: [PATCH] IDEA-165834 Export settings to .zip by default --- .../src/ChooseComponentsToExportDialog.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/configuration-store-impl/src/ChooseComponentsToExportDialog.java b/platform/configuration-store-impl/src/ChooseComponentsToExportDialog.java index 86ed2f86765d..f0a5d2433e06 100644 --- a/platform/configuration-store-impl/src/ChooseComponentsToExportDialog.java +++ b/platform/configuration-store-impl/src/ChooseComponentsToExportDialog.java @@ -19,7 +19,6 @@ import com.intellij.ui.FieldPanel; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.concurrency.AsyncPromise; import org.jetbrains.concurrency.Promise; @@ -35,12 +34,13 @@ import java.util.*; import java.util.List; public class ChooseComponentsToExportDialog extends DialogWrapper { + private static final String DEFAULT_FILE_NAME = "settings.zip"; + private static final String DEFAULT_PATH = FileUtil.toSystemDependentName(PathManager.getConfigPath() + "/") + DEFAULT_FILE_NAME; + private static final Logger LOG = Logger.getInstance(ChooseComponentsToExportDialog.class); private final ElementsChooser myChooser; private final FieldPanel myPathPanel; - @NonNls - public static final String DEFAULT_PATH = FileUtil.toSystemDependentName(PathManager.getConfigPath()+"/"+"settings.jar"); private final boolean myShowFilePath; private final String myDescription; @@ -171,7 +171,7 @@ public class ChooseComponentsToExportDialog extends DialogWrapper { public void consume(List files) { VirtualFile file = files.get(0); if (file.isDirectory()) { - result.setResult(file.getPath() + '/' + new File(DEFAULT_PATH).getName()); + result.setResult(file.getPath() + '/' + DEFAULT_FILE_NAME); } else { result.setResult(file.getPath());