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: redundant throws and try/catch

Browse Source
This commit is contained in:
Ivan Chirkov
2019-03-27 11:16:42 +01:00
parent 9990795ca9
commit c7c1c12b17
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java
+18 -23
View File
@@ -1109,34 +1109,29 @@ public class PluginManagerConfigurableNew
Set<IdeaPluginDescriptor> result = new LinkedHashSet<>();
try {
ApplicationManager.getApplication().executeOnPooledThread(() -> {
try {
Pair<Map<String, IdeaPluginDescriptor>, Map<String, List<IdeaPluginDescriptor>>> p = loadPluginRepositories();
Map<String, IdeaPluginDescriptor> allRepositoriesMap = p.first;
Map<String, List<IdeaPluginDescriptor>> customRepositoriesMap = p.second;
Pair<Map<String, IdeaPluginDescriptor>, Map<String, List<IdeaPluginDescriptor>>> p = loadPluginRepositories();
Map<String, IdeaPluginDescriptor> allRepositoriesMap = p.first;
Map<String, List<IdeaPluginDescriptor>> customRepositoriesMap = p.second;
if (query.length() > 1) {
try {
for (String pluginId : requestToPluginRepository(createSearchSuggestUrl(query), forceHttps())) {
IdeaPluginDescriptor descriptor = allRepositoriesMap.get(pluginId);
if (descriptor != null) {
result.add(descriptor);
}
}
}
catch (IOException ignore) {
}
}
for (List<IdeaPluginDescriptor> descriptors : customRepositoriesMap.values()) {
for (IdeaPluginDescriptor descriptor : descriptors) {
if (StringUtil.containsIgnoreCase(descriptor.getName(), query)) {
if (query.length() > 1) {
try {
for (String pluginId : requestToPluginRepository(createSearchSuggestUrl(query), forceHttps())) {
IdeaPluginDescriptor descriptor = allRepositoriesMap.get(pluginId);
if (descriptor != null) {
result.add(descriptor);
}
}
}
catch (IOException ignore) {
}
}
catch (IOException e) {
PluginManagerMain.LOG.info(e);
for (List<IdeaPluginDescriptor> descriptors : customRepositoriesMap.values()) {
for (IdeaPluginDescriptor descriptor : descriptors) {
if (StringUtil.containsIgnoreCase(descriptor.getName(), query)) {
result.add(descriptor);
}
}
}
}).get(300, TimeUnit.MILLISECONDS);
}
@@ -1373,7 +1368,7 @@ public class PluginManagerConfigurableNew
}
@NotNull
private Pair<Map<String, IdeaPluginDescriptor>, Map<String, List<IdeaPluginDescriptor>>> loadPluginRepositories() throws IOException {
private Pair<Map<String, IdeaPluginDescriptor>, Map<String, List<IdeaPluginDescriptor>>> loadPluginRepositories() {
synchronized (myRepositoriesLock) {
if (myAllRepositoriesMap != null) {
return Pair.create(myAllRepositoriesMap, myCustomRepositoriesMap);