From a2f809646f0398a29eb0d546e80925dc66914ef5 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 6 Dec 2017 12:00:15 +0100 Subject: [PATCH] move PluginConfigurationType defaults to class --- .../devkit/src/run/PluginConfigurationType.java | 17 +++-------------- resources/src/idea/RunManager.xml | 4 ---- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/plugins/devkit/src/run/PluginConfigurationType.java b/plugins/devkit/src/run/PluginConfigurationType.java index 050b4b8e8f0f..12ca65a8fc51 100644 --- a/plugins/devkit/src/run/PluginConfigurationType.java +++ b/plugins/devkit/src/run/PluginConfigurationType.java @@ -1,17 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package org.jetbrains.idea.devkit.run; @@ -37,7 +25,7 @@ import java.util.Collection; public class PluginConfigurationType implements ConfigurationType { private final ConfigurationFactory myFactory; - private String myVmParameters; + private String myVmParameters = "-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea"; public PluginConfigurationType() { myFactory = new ConfigurationFactory(this) { @@ -107,6 +95,7 @@ public class PluginConfigurationType implements ConfigurationType { if (myVmParameters == null) { String vmOptions; try { + //noinspection SpellCheckingInspection vmOptions = FileUtil.loadFile(new File(PathManager.getBinPath(), "idea.plugins.vmoptions")); } catch (IOException e) { diff --git a/resources/src/idea/RunManager.xml b/resources/src/idea/RunManager.xml index c73ed1a9143f..6f345aaf2868 100644 --- a/resources/src/idea/RunManager.xml +++ b/resources/src/idea/RunManager.xml @@ -34,8 +34,4 @@