azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #60 from maxmanuylov/KT-2041

Browse Source 
Converter for KT-2041: JetRunConfiguration should store its settings in ...
This commit is contained in:
Nikolay Krasko
2012-05-30 04:05:15 -07:00
parent 69e74cb147 5bb489befb
commit 251cc560aa
4 changed files with 109 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+2
View File
@@ -200,5 +200,7 @@
<category>Kotlin</category>
</intentionAction>
<project.converterProvider implementation="org.jetbrains.jet.plugin.converters.JetRunConfigurationSettingsFormatConverterProvider"/>
</extensions>
</idea-plugin>
idea/src/org/jetbrains/jet/plugin/converters/JetRunConfigurationSettingsFormatConverterProvider.java
+107
View File
@@ -0,0 +1,107 @@
/*
* Copyright 2010-2012 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.
*/
package org.jetbrains.jet.plugin.converters;
import com.intellij.conversion.*;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author Maxim.Manuylov
* Date: 29.05.12
*/
public class JetRunConfigurationSettingsFormatConverterProvider extends ConverterProvider {
protected JetRunConfigurationSettingsFormatConverterProvider() {
super("jet-run-configuration-should-store-its-settings-as-java-app-configuration");
}
@NotNull
@Override
public String getConversionDescription() {
return "Kotlin run configurations settings will be converted to Java run configurations format";
}
@NotNull
@Override
public ProjectConverter createConverter(@NotNull final ConversionContext context) {
return new ProjectConverter() {
@NotNull
@Override
public ConversionProcessor<RunManagerSettings> createRunConfigurationsConverter() {
return new ConversionProcessor<RunManagerSettings>() {
@Override
public boolean isConversionNeeded(@NotNull final RunManagerSettings settings) {
for (final Element runConfiguration : settings.getRunConfigurations()) {
if (isJetRunConfiguration(runConfiguration) && getOldSettings(runConfiguration) != null) {
return true;
}
}
return false;
}
@Override
public void process(@NotNull final RunManagerSettings settings) throws CannotConvertException {
for (final Element runConfiguration : settings.getRunConfigurations()) {
if (isJetRunConfiguration(runConfiguration)) {
final Element oldSettings = getOldSettings(runConfiguration);
if (oldSettings == null) continue;
for (final Object optionObj : oldSettings.getChildren("option")) {
if (optionObj instanceof Element) {
final Element option = (Element)optionObj;
final String optionName = option.getAttributeValue("name");
final String optionValue = option.getAttributeValue("value");
if ("mainClassName".equals(optionName)) {
runConfiguration.addContent(createOption("MAIN_CLASS_NAME", optionValue));
}
else if ("programParameters".equals(optionName)) {
runConfiguration.addContent(createOption("PROGRAM_PARAMETERS", optionValue));
}
else if ("vmParameters".equals(optionName)) {
runConfiguration.addContent(createOption("VM_PARAMETERS", optionValue));
}
else if ("workingDirectory".equals(optionName)) {
runConfiguration.addContent(createOption("WORKING_DIRECTORY", optionValue));
}
}
}
runConfiguration.removeContent(oldSettings);
}
}
}
};
}
};
}
private static boolean isJetRunConfiguration(@NotNull final Element runConfiguration) {
return "JetRunConfigurationType".equals(runConfiguration.getAttributeValue("type"));
}
@Nullable
private static Element getOldSettings(@NotNull final Element runConfiguration) {
return runConfiguration.getChild("JetRunConfigurationSettings");
}
@NotNull
private static Element createOption(@NotNull final String name, @Nullable final String value) {
final Element option = new Element("option");
option.setAttribute("name", name);
option.setAttribute("value", value == null ? "" : value);
return option;
}
}
idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java
-13
View File
@@ -27,7 +27,6 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.util.*;
import com.intellij.util.xmlb.XmlSerializer;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
@@ -82,18 +81,6 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<RunConfigurati
readModule(element);
EnvironmentVariablesComponent.readExternal(element, getEnvs());
//TODO remove the following code (left for backward compatibility)
Element settingsElement = element.getChild(JetRunConfigurationSettings.class.getSimpleName());
if (settingsElement != null) {
JetRunConfigurationSettings settings = XmlSerializer.deserialize(settingsElement, JetRunConfigurationSettings.class);
if (settings != null) {
MAIN_CLASS_NAME = settings.getMainClassName();
VM_PARAMETERS = settings.getVmParameters();
PROGRAM_PARAMETERS = settings.getProgramParameters();
WORKING_DIRECTORY = settings.getWorkingDirectory();
}
}
}
@Override
idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationSettings.java
-83
View File
@@ -1,83 +0,0 @@
/*
* Copyright 2010-2012 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.
*/
package org.jetbrains.jet.plugin.run;
import org.jetbrains.annotations.Nullable;
/**
* Should be serializable.
*
* @deprecated this class was left just for backward compatibility
* @author Nikolay Krasko
*
* TODO remove this class
*/
@Deprecated
public class JetRunConfigurationSettings {
public static String DEFAULT_MAIN_CLASS_NAME = "";
public static String DEFAULT_VM_PARAMETERS = "";
public static String DEFAULT_PROGRAM_PARAMETERS = "";
public static String DEFAULT_WORKING_DIRECTORY = "";
@Nullable
private String mainClassName = DEFAULT_MAIN_CLASS_NAME;
@Nullable
private String vmParameters = DEFAULT_VM_PARAMETERS;
@Nullable
private String programParameters = DEFAULT_PROGRAM_PARAMETERS;
@Nullable
private String workingDirectory = DEFAULT_WORKING_DIRECTORY;
@Nullable
public String getMainClassName() {
return mainClassName;
}
public void setMainClassName(@Nullable String mainClassName) {
this.mainClassName = mainClassName;
}
@Nullable
public String getVmParameters() {
return vmParameters;
}
public void setVmParameters(@Nullable String vmParameters) {
this.vmParameters = vmParameters;
}
@Nullable
public String getProgramParameters() {
return programParameters;
}
public void setProgramParameters(@Nullable String programParameters) {
this.programParameters = programParameters;
}
@Nullable
public String getWorkingDirectory() {
return workingDirectory;
}
public void setWorkingDirectory(@Nullable String workingDirectory) {
this.workingDirectory = workingDirectory;
}
}