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

CR-IC-6374

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-09-25 12:47:37 +02:00
parent 4ee1f6d781
commit ac5e3c3c69
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class ExportSettingsAction extends AnAction implements DumbAware {
return;
}
Set<File> exportFiles = new THashSet<File>();
Set<File> exportFiles = new THashSet<File>(FileUtil.FILE_HASHING_STRATEGY);
for (final ExportableComponent markedComponent : markedComponents) {
ContainerUtil.addAll(exportFiles, markedComponent.getExportFiles());
}
platform/platform-impl/src/com/intellij/openapi/components/impl/ServiceManagerImpl.java
+8 -2
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.components.BaseComponent;
import com.intellij.openapi.components.ComponentManager;
import com.intellij.openapi.components.ServiceDescriptor;
import com.intellij.openapi.components.ex.ComponentManagerEx;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
@@ -38,6 +39,8 @@ import java.util.Collection;
import java.util.List;
public class ServiceManagerImpl implements BaseComponent {
private static final Logger LOG = Logger.getInstance(ServiceManagerImpl.class);
private static final ExtensionPointName<ServiceDescriptor> APP_SERVICES = new ExtensionPointName<ServiceDescriptor>("com.intellij.applicationService");
private static final ExtensionPointName<ServiceDescriptor> PROJECT_SERVICES = new ExtensionPointName<ServiceDescriptor>("com.intellij.projectService");
private ExtensionPointName<ServiceDescriptor> myExtensionPointName;
@@ -103,10 +106,13 @@ public class ServiceManagerImpl implements BaseComponent {
}
catch (RuntimeException e) {
// ignore ClassNotFoundException - invalid entry (GithubSslSupport, for example)
if (!(e.getCause() instanceof ClassNotFoundException)) {
if (e.getCause() instanceof ClassNotFoundException) {
LOG.warn(e);
continue;
}
else {
throw e;
}
continue;
}
if (!processor.process(aClass, adapter.myPluginDescriptor)) {