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:01 +02:00
parent 81c415f82b
commit 4c08efbe9f
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java
+1 -4
View File
@@ -32,7 +32,6 @@ import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -75,12 +74,10 @@ public class ProjectRunConfigurationManager implements ProjectComponent, Persist
@Override
public void initComponent() {
}
@Override
public void disposeComponent() {
}
@Override
@@ -106,7 +103,7 @@ public class ProjectRunConfigurationManager implements ProjectComponent, Persist
RunnerAndConfigurationSettings configuration = myManager.loadConfiguration(child, true);
if (configuration == null && Comparing.strEqual(state.getName(), RunManagerImpl.CONFIGURATION)) {
if (myUnloadedElements == null) {
myUnloadedElements = new ArrayList<Element>(2);
myUnloadedElements = new SmartList<Element>();
}
myUnloadedElements.add(state);
}
platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
+17 -13
View File
@@ -198,16 +198,18 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
*/
@Override
@NotNull
public List<RunConfiguration> getConfigurationsList(@NotNull final ConfigurationType type) {
final List<RunConfiguration> list = new ArrayList<RunConfiguration>();
for (RunnerAndConfigurationSettings myConfiguration : getSortedConfigurations()) {
final RunConfiguration configuration = myConfiguration.getConfiguration();
final ConfigurationType configurationType = configuration.getType();
if (type.getId().equals(configurationType.getId())) {
list.add(configuration);
public List<RunConfiguration> getConfigurationsList(@NotNull ConfigurationType type) {
List<RunConfiguration> result = null;
for (RunnerAndConfigurationSettings settings : getSortedConfigurations()) {
RunConfiguration configuration = settings.getConfiguration();
if (type.getId().equals(configuration.getType().getId())) {
if (result == null) {
result = new SmartList<RunConfiguration>();
}
result.add(configuration);
}
}
return list;
return ContainerUtil.notNullize(result);
}
@Override
@@ -218,7 +220,7 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
return Collections.emptyList();
}
List<RunConfiguration> result = new ArrayList<RunConfiguration>(myConfigurations.size());
List<RunConfiguration> result = new ArrayList<RunConfiguration>(sortedConfigurations.size());
for (RunnerAndConfigurationSettings settings : sortedConfigurations) {
result.add(settings.getConfiguration());
}
@@ -327,8 +329,6 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
public void addConfiguration(RunnerAndConfigurationSettings settings,
boolean shared,
List<BeforeRunTask> tasks, boolean addEnabledTemplateTasksIfAbsent) {
final RunConfiguration configuration = settings.getConfiguration();
String existingId = findExistingConfigurationId(settings);
String newId = settings.getUniqueID();
RunnerAndConfigurationSettings existingSettings = null;
@@ -342,6 +342,8 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
setSelectedConfigurationId(newId);
}
myConfigurations.put(newId, settings);
RunConfiguration configuration = settings.getConfiguration();
if (existingId == null) {
refreshUsagesList(configuration);
}
@@ -398,7 +400,9 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
public void saveOrder() {
myOrder.clear();
for (RunnerAndConfigurationSettings each : myConfigurations.values()) {
if (each.getType() instanceof UnknownConfigurationType) continue;
if (each.getType() instanceof UnknownConfigurationType) {
continue;
}
myOrder.add(each.getUniqueID());
}
}
@@ -791,7 +795,7 @@ public class RunManagerImpl extends RunManagerEx implements PersistentStateCompo
}
private void clear() {
final List<RunnerAndConfigurationSettings> configurations = new ArrayList<RunnerAndConfigurationSettings>(myConfigurations.values());
List<RunnerAndConfigurationSettings> configurations = new ArrayList<RunnerAndConfigurationSettings>(myConfigurations.values());
myConfigurations.clear();
myUnknownElements = null;
myConfigurationToBeforeTasksMap.clear();