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

do not write default TEMPLATE_FLAG_ATTRIBUTE

Browse Source 
(cherry picked from commit b7e745ae604ad4b9f1fc4c098a3cb93b353ccc8b)
This commit is contained in:
Vladimir Krivosheev
2017-04-10 18:19:50 +02:00
parent 002f9c6500
commit cdaae99bd7
2 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+5 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 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.
@@ -628,8 +628,7 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
}
public void writeContext(@NotNull Element parentNode) {
Collection<RunnerAndConfigurationSettings> values = new ArrayList<>(myConfigurations.values());
for (RunnerAndConfigurationSettings configurationSettings : values) {
for (RunnerAndConfigurationSettings configurationSettings : new ArrayList<>(myConfigurations.values())) {
if (configurationSettings.isTemporary()) {
addConfigurationElement(parentNode, configurationSettings, CONFIGURATION);
}
@@ -648,12 +647,7 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
private void addConfigurationElement(@NotNull Element parentNode, RunnerAndConfigurationSettings settings, String elementType) {
Element configurationElement = new Element(elementType);
parentNode.addContent(configurationElement);
try {
((RunnerAndConfigurationSettingsImpl)settings).writeExternal(configurationElement);
}
catch (WriteExternalException e) {
throw new RuntimeException(e);
}
((RunnerAndConfigurationSettingsImpl)settings).writeExternal(configurationElement);
if (settings.getConfiguration() instanceof UnknownRunConfiguration) {
return;
@@ -707,7 +701,7 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
}
@Override
public void loadState(Element parentNode) {
public void loadState(@NotNull Element parentNode) {
clear(false);
List<Element> children = parentNode.getChildren(CONFIGURATION);
@@ -719,10 +713,7 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
return aDefault == bDefault ? 0 : aDefault ? -1 : 1;
});
// element could be detached, so, we must not use for each
//noinspection ForLoopReplaceableByForEach
for (int i = 0, length = sortedElements.length; i < length; i++) {
Element element = sortedElements[i];
for (Element element : sortedElements) {
RunnerAndConfigurationSettings configurationSettings;
try {
configurationSettings = loadConfiguration(element, false);
platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java
+14 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 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.
@@ -38,7 +38,7 @@ import java.util.*;
/**
* @author dyoma
*/
public class RunnerAndConfigurationSettingsImpl implements JDOMExternalizable, Cloneable, RunnerAndConfigurationSettings, Comparable {
public class RunnerAndConfigurationSettingsImpl implements Cloneable, RunnerAndConfigurationSettings, Comparable {
private static final Logger LOG = Logger.getInstance("#com.intellij.execution.impl.RunnerAndConfigurationSettings");
@NonNls
@@ -336,11 +336,10 @@ public class RunnerAndConfigurationSettingsImpl implements JDOMExternalizable, C
return myManager.getFactory(typeName, factoryName, !myIsTemplate);
}
@Override
public void readExternal(Element element) {
myIsTemplate = Boolean.valueOf(element.getAttributeValue(TEMPLATE_FLAG_ATTRIBUTE)).booleanValue();
myTemporary = Boolean.valueOf(element.getAttributeValue(TEMPORARY_ATTRIBUTE)).booleanValue() || TEMP_CONFIGURATION.equals(element.getName());
myEditBeforeRun = Boolean.valueOf(element.getAttributeValue(EDIT_BEFORE_RUN)).booleanValue();
myIsTemplate = Boolean.parseBoolean(element.getAttributeValue(TEMPLATE_FLAG_ATTRIBUTE));
myTemporary = Boolean.parseBoolean(element.getAttributeValue(TEMPORARY_ATTRIBUTE)) || TEMP_CONFIGURATION.equals(element.getName());
myEditBeforeRun = Boolean.parseBoolean(element.getAttributeValue(EDIT_BEFORE_RUN));
String value = element.getAttributeValue(ACTIVATE_TOOLWINDOW_BEFORE_RUN);
myActivateToolWindowBeforeRun = value == null || Boolean.valueOf(value).booleanValue();
myFolderName = element.getAttributeValue(FOLDER_NAME);
@@ -385,32 +384,33 @@ public class RunnerAndConfigurationSettingsImpl implements JDOMExternalizable, C
myConfigurationPerRunnerSettings.loadState(element);
}
@Override
public void writeExternal(Element element) {
public void writeExternal(@NotNull Element element) {
final ConfigurationFactory factory = myConfiguration.getFactory();
if (!(myConfiguration instanceof UnknownRunConfiguration)) {
element.setAttribute(TEMPLATE_FLAG_ATTRIBUTE, String.valueOf(myIsTemplate));
if (!myIsTemplate) {
if (myIsTemplate) {
element.setAttribute(TEMPLATE_FLAG_ATTRIBUTE, "true");
}
else {
element.setAttribute(NAME_ATTR, myConfiguration.getName());
}
element.setAttribute(CONFIGURATION_TYPE_ATTRIBUTE, factory.getType().getId());
element.setAttribute(FACTORY_NAME_ATTRIBUTE, factory.getName());
if (myFolderName != null) {
element.setAttribute(FOLDER_NAME, myFolderName);
}
//element.setAttribute(UNIQUE_ID, getUniqueID());
if (isEditBeforeRun()) {
element.setAttribute(EDIT_BEFORE_RUN, String.valueOf(true));
element.setAttribute(EDIT_BEFORE_RUN, "true");
}
if (!isActivateToolWindowBeforeRun()) {
element.setAttribute(ACTIVATE_TOOLWINDOW_BEFORE_RUN, String.valueOf(false));
element.setAttribute(ACTIVATE_TOOLWINDOW_BEFORE_RUN, "false");
}
if (myWasSingletonSpecifiedExplicitly || mySingleton != factory.isConfigurationSingletonByDefault()) {
element.setAttribute(SINGLETON, String.valueOf(mySingleton));
}
if (myTemporary) {
element.setAttribute(TEMPORARY_ATTRIBUTE, Boolean.toString(true));
element.setAttribute(TEMPORARY_ATTRIBUTE, "true");
}
}