From af57b2bcc80edcf8df85d5d0ab939ba970d5e544 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Mon, 7 Dec 2009 12:47:43 +0300 Subject: [PATCH] =?utf8?q?IDEA-26403:=20Maia=2092=E2=80=8B.=E2=80=8B65=20a?= =?utf8?q?nd=2092=E2=80=8B.=E2=80=8B81=20overwrite=20and=20destroy=20exist?= =?utf8?q?ing=20Grails=20run=20configurations=20on=20startup.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../plugins/groovy/config/GroovyProjectConverter.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyProjectConverter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyProjectConverter.java index 4380a122f0..f8d76b8b0f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyProjectConverter.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyProjectConverter.java @@ -26,6 +26,7 @@ import org.jetbrains.annotations.NonNls; public class GroovyProjectConverter extends ProjectConverter { @NonNls private static final String GRAILS_TESTS_RUN_CONFIGURATION_TYPE = "GrailsTestsRunConfigurationType"; @NonNls private static final String GANT_SCRIPT_RUN_CONFIGURATION = "GantScriptRunConfiguration"; + @NonNls private static final String GRAILS_RUN_CONFIGURATION_TYPE = "GrailsRunConfigurationType"; @Override public ConversionProcessor createModuleFileConverter() { @@ -42,8 +43,10 @@ public class GroovyProjectConverter extends ProjectConverter { if (GRAILS_TESTS_RUN_CONFIGURATION_TYPE.equals(confType) || GANT_SCRIPT_RUN_CONFIGURATION.equals(confType)) { return true; } + if (GRAILS_RUN_CONFIGURATION_TYPE.equals(confType) && "Grails Application".equals(element.getAttributeValue("factoryName"))) { + return true; + } } - return false; } @@ -55,10 +58,15 @@ public class GroovyProjectConverter extends ProjectConverter { if (wasGrails || GANT_SCRIPT_RUN_CONFIGURATION.equals(confType)) { if ("true".equals(element.getAttributeValue("default"))) { element.detach(); - } else { - element.setAttribute("type", wasGrails ? "GrailsRunConfigurationType" : "GroovyScriptRunConfiguration"); - element.setAttribute("factoryName", wasGrails ? "Grails Application" : "Groovy Script"); } + else { + element.setAttribute("type", wasGrails ? GRAILS_RUN_CONFIGURATION_TYPE : "GroovyScriptRunConfiguration"); + element.setAttribute("factoryName", wasGrails ? "Grails" : "Groovy Script"); + } + } + else if (GRAILS_RUN_CONFIGURATION_TYPE.equals(confType) && + "Grails Application".equals(element.getAttributeValue("factoryName"))) { + element.setAttribute("factoryName", "Grails"); } } -- 2.11.4.GIT