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

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-10-15 15:41:00 +02:00
parent 70fab7f2f6
commit 81c415f82b
1 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+28 -40
View File
@@ -674,27 +674,18 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
public void loadState(Element parentNode) {
clear();
final Comparator<Element> comparator = new Comparator<Element>() {
List<Element> sortedElements = new SmartList<Element>(parentNode.getChildren(CONFIGURATION));
// ensure templates are loaded first
Collections.sort(sortedElements, new Comparator<Element>() {
@Override
public int compare(@NotNull Element a, @NotNull Element b) {
final boolean aDefault = Boolean.valueOf(a.getAttributeValue("default", "false"));
final boolean bDefault = Boolean.valueOf(b.getAttributeValue("default", "false"));
return aDefault == bDefault ? 0 : aDefault ? -1 : 1;
}
};
});
final List children = parentNode.getChildren();
final List<Element> sortedElements = new ArrayList<Element>();
for (final Object aChildren : children) {
final Element element = (Element)aChildren;
if (Comparing.strEqual(element.getName(), CONFIGURATION)) {
sortedElements.add(element);
}
}
Collections.sort(sortedElements, comparator); // ensure templates are loaded first!
for (final Element element : sortedElements) {
for (Element element : sortedElements) {
RunnerAndConfigurationSettings configurationSettings;
try {
configurationSettings = loadConfiguration(element, false);
@@ -704,7 +695,9 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
continue;
}
if (configurationSettings == null) {
if (myUnknownElements == null) myUnknownElements = new ArrayList<Element>(2);
if (myUnknownElements == null) {
myUnknownElements = new SmartList<Element>();
}
myUnknownElements.add(element);
}
}
@@ -716,19 +709,9 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
throw new RuntimeException(e);
}
//Begin migration (old ids to UUIDs)
for (int i = 0; i < myOrder.size(); i++) {
String id = myOrder.get(i);
for (RunnerAndConfigurationSettings settings : myConfigurations.values()) {
RunConfiguration configuration = settings.getConfiguration();
if (configuration != null && id.equals(configuration.getType().getDisplayName() + "." + configuration.getName() +
(configuration instanceof UnknownRunConfiguration ? configuration.getUniqueID() : ""))) {
myOrder.set(i, settings.getUniqueID());
break;
}
}
}
//End migration
// migration (old ids to UUIDs)
readList(myOrder);
myRecentlyUsedTemporaries.clear();
Element recentNode = parentNode.getChild(RECENT);
if (recentNode != null) {
@@ -739,21 +722,12 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
catch (InvalidDataException e) {
throw new RuntimeException(e);
}
for (int i = 0; i < list.size(); i++) {
String id = list.get(i);
for (RunnerAndConfigurationSettings settings : myConfigurations.values()) {
RunConfiguration configuration = settings.getConfiguration();
if (configuration != null && id.equals(configuration.getType().getDisplayName() + "." + configuration.getName() +
(configuration instanceof UnknownRunConfiguration ? configuration.getUniqueID() : ""))) {
list.set(i, settings.getUniqueID());
break;
}
}
}
readList(list);
for (String name : list) {
RunnerAndConfigurationSettings settings = myConfigurations.get(name);
if (settings != null)
if (settings != null) {
myRecentlyUsedTemporaries.add(settings.getConfiguration());
}
}
}
myOrdered = false;
@@ -765,6 +739,20 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
fireRunConfigurationSelected();
}
private void readList(@NotNull JDOMExternalizableStringList list) {
for (int i = 0; i < list.size(); i++) {
for (RunnerAndConfigurationSettings settings : myConfigurations.values()) {
RunConfiguration configuration = settings.getConfiguration();
//noinspection deprecation
if (configuration != null && list.get(i).equals(configuration.getType().getDisplayName() + "." + configuration.getName() +
(configuration instanceof UnknownRunConfiguration ? configuration.getUniqueID() : ""))) {
list.set(i, settings.getUniqueID());
break;
}
}
}
}
public void readContext(Element parentNode) throws InvalidDataException {
myLoadedSelectedConfigurationUniqueName = parentNode.getAttributeValue(SELECTED_ATTR);