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

avoid empty set creation

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-09-21 17:14:01 +02:00
parent 3e11cba55f
commit b3d605437d
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileContainerImpl.java
+14 -12
View File
@@ -25,13 +25,11 @@ import com.intellij.openapi.vfs.*;
import com.intellij.util.EventDispatcher;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.descriptors.*;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.*;
/**
* @author nik
@@ -129,9 +127,9 @@ public class ConfigFileContainerImpl extends SimpleModificationTracker implement
return myMetaDataProvider;
}
public void updateDescriptors(final MultiValuesMap<ConfigFileMetaData, ConfigFileInfo> descriptorsMap) {
Set<ConfigFile> toDelete = new HashSet<ConfigFile>(myConfigFiles.values());
Set<ConfigFile> added = new HashSet<ConfigFile>();
public void updateDescriptors(@NotNull MultiValuesMap<ConfigFileMetaData, ConfigFileInfo> descriptorsMap) {
Set<ConfigFile> toDelete = myConfigFiles.isEmpty() ? Collections.<ConfigFile>emptySet() : new HashSet<ConfigFile>(myConfigFiles.values());
Set<ConfigFile> added = null;
for (Map.Entry<ConfigFileMetaData, Collection<ConfigFileInfo>> entry : descriptorsMap.entrySet()) {
ConfigFileMetaData metaData = entry.getKey();
@@ -139,8 +137,7 @@ public class ConfigFileContainerImpl extends SimpleModificationTracker implement
final Collection<ConfigFile> oldDescriptors = myConfigFiles.get(metaData);
if (oldDescriptors != null) {
for (ConfigFile descriptor : oldDescriptors) {
if (newDescriptors.contains(descriptor.getInfo())) {
newDescriptors.remove(descriptor.getInfo());
if (newDescriptors.remove(descriptor.getInfo())) {
toDelete.remove(descriptor);
}
}
@@ -149,6 +146,9 @@ public class ConfigFileContainerImpl extends SimpleModificationTracker implement
final ConfigFileImpl configFile = new ConfigFileImpl(this, configuration);
Disposer.register(this, configFile);
myConfigFiles.put(metaData, configFile);
if (added == null) {
added = new THashSet<ConfigFile>();
}
added.add(configFile);
}
}
@@ -159,9 +159,11 @@ public class ConfigFileContainerImpl extends SimpleModificationTracker implement
}
myCachedConfigFiles = null;
for (ConfigFile configFile : added) {
incModificationCount();
myDispatcher.getMulticaster().configFileAdded(configFile);
if (added != null) {
for (ConfigFile configFile : added) {
incModificationCount();
myDispatcher.getMulticaster().configFileAdded(configFile);
}
}
for (ConfigFile configFile : toDelete) {
incModificationCount();