From 4efd0298ea60f89cbe99255e112df866b54179a1 Mon Sep 17 00:00:00 2001 From: irengrig Date: Thu, 14 Oct 2010 17:38:11 +0400 Subject: [PATCH] remove skipForDummyProject - it wasn't used --- .../openapi/components/impl/ComponentManagerImpl.java | 4 +++- platform/platform-resources/src/META-INF/xdebugger.xml | 2 -- platform/platform-resources/src/componentSets/Editor.xml | 3 --- .../platform-resources/src/componentSets/Execution.xml | 3 --- platform/platform-resources/src/componentSets/Lang.xml | 8 -------- .../platform-resources/src/componentSets/Platform.xml | 7 ------- .../src/componentSets/PlatformComponents.xml | 2 -- .../src/componentSets/PlatformLangComponents.xml | 1 - .../platform-resources/src/componentSets/Profiles.xml | 1 - platform/platform-resources/src/componentSets/UICore.xml | 2 -- platform/platform-resources/src/componentSets/VCS.xml | 4 ---- .../src/componentSets/WindowManagement.xml | 2 -- plugins/ant/src/META-INF/plugin.xml | 1 - plugins/devkit/src/dom/Component.java | 5 ----- plugins/properties/src/META-INF/plugin.xml | 1 - plugins/ui-designer/src/META-INF/plugin.xml | 2 -- resources/src/componentSets/Compiler.xml | 2 -- resources/src/componentSets/Configurables.xml | 1 - resources/src/componentSets/Core.xml | 3 --- resources/src/componentSets/Debugger.xml | 4 ---- resources/src/componentSets/IdeaComponents.xml | 2 -- resources/src/componentSets/Misc.xml | 1 - resources/src/componentSets/Toolwindows.xml | 1 - 23 files changed, 3 insertions(+), 59 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java index 0875b2ccf9f8..534fa9481095 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java @@ -279,7 +279,9 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements if (isHeadless()) { String headlessImplClass = config.headlessImplementationClass; if (headlessImplClass != null) { - if (headlessImplClass.trim().length() == 0) return; + if (headlessImplClass.trim().length() == 0) { + return; + } config.implementationClass = headlessImplClass; } } diff --git a/platform/platform-resources/src/META-INF/xdebugger.xml b/platform/platform-resources/src/META-INF/xdebugger.xml index b427b831d37d..f26877c1d973 100644 --- a/platform/platform-resources/src/META-INF/xdebugger.xml +++ b/platform/platform-resources/src/META-INF/xdebugger.xml @@ -3,13 +3,11 @@ com.intellij.xdebugger.XDebuggerManager com.intellij.xdebugger.impl.XDebuggerManagerImpl - com.intellij.xdebugger.impl.evaluate.quick.common.ValueLookupManager com.intellij.xdebugger.impl.evaluate.quick.common.ValueLookupManager - diff --git a/platform/platform-resources/src/componentSets/Editor.xml b/platform/platform-resources/src/componentSets/Editor.xml index 47cdd13876a4..4362f1b6dbad 100644 --- a/platform/platform-resources/src/componentSets/Editor.xml +++ b/platform/platform-resources/src/componentSets/Editor.xml @@ -22,17 +22,14 @@ com.intellij.openapi.editor.impl.DocumentMarkupModelManager com.intellij.openapi.editor.impl.DocumentMarkupModelManager - com.intellij.openapi.fileEditor.impl.EditorHistoryManager com.intellij.openapi.fileEditor.ex.IdeDocumentHistory com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl - com.intellij.openapi.editor.LazyRangeMarkerFactory diff --git a/platform/platform-resources/src/componentSets/Execution.xml b/platform/platform-resources/src/componentSets/Execution.xml index 4ec20ef747f7..61b5a11ff244 100644 --- a/platform/platform-resources/src/componentSets/Execution.xml +++ b/platform/platform-resources/src/componentSets/Execution.xml @@ -15,16 +15,13 @@ com.intellij.execution.RunManager com.intellij.execution.impl.RunManagerImpl com.intellij.execution.impl.ProjectRunConfigurationManager - com.intellij.execution.ExecutionManager com.intellij.execution.impl.ExecutionManagerImpl - \ No newline at end of file diff --git a/platform/platform-resources/src/componentSets/Lang.xml b/platform/platform-resources/src/componentSets/Lang.xml index 81c65520a746..cac6b3fcd3d2 100644 --- a/platform/platform-resources/src/componentSets/Lang.xml +++ b/platform/platform-resources/src/componentSets/Lang.xml @@ -39,7 +39,6 @@ com.intellij.codeInsight.highlighting.HighlightManager com.intellij.codeInsight.highlighting.HighlightManagerImpl - @@ -74,7 +73,6 @@ com.intellij.codeInsight.folding.CodeFoldingManager com.intellij.codeInsight.folding.impl.CodeFoldingManagerImpl - @@ -82,7 +80,6 @@ com.intellij.openapi.fileEditor.impl.PsiAwareFileEditorManagerImpl com.intellij.testFramework.TestEditorManagerImpl @@ -104,11 +101,9 @@ com.intellij.codeInsight.daemon.DaemonCodeAnalyzer com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl com.intellij.codeInsight.daemon.impl.EditorTracker - com.intellij.codeInsight.daemon.impl.GeneralHighlightingPassFactory @@ -185,18 +180,15 @@ com.intellij.pom.wrappers.PsiEventWrapperAspect com.intellij.pom.wrappers.PsiEventWrapperAspect - com.intellij.openapi.vcs.changes.VcsEventWatcher - com.intellij.codeInsight.preview.ImageOrColorPreviewProjectComponent com.intellij.codeInsight.preview.ImageOrColorPreviewProjectComponent - diff --git a/platform/platform-resources/src/componentSets/Platform.xml b/platform/platform-resources/src/componentSets/Platform.xml index e2462c86fa1f..d88f33c0a1b7 100644 --- a/platform/platform-resources/src/componentSets/Platform.xml +++ b/platform/platform-resources/src/componentSets/Platform.xml @@ -124,37 +124,31 @@ com.intellij.ide.util.PropertiesComponent com.intellij.ide.util.ProjectPropertiesComponentImpl com.intellij.openapi.command.undo.UndoManager com.intellij.openapi.command.impl.UndoManagerImpl - com.intellij.openapi.project.ProjectReloadState com.intellij.openapi.project.impl.ProjectReloadStateImpl com.intellij.openapi.vcs.FileStatusManager com.intellij.openapi.vcs.impl.FileStatusManagerImpl - com.intellij.ui.EditorNotifications - com.intellij.openapi.vfs.encoding.EncodingProjectManager com.intellij.openapi.vfs.encoding.EncodingProjectManagerImpl - @@ -163,7 +157,6 @@ com.intellij.notification.impl.ProjectNotificationsComponent - diff --git a/platform/platform-resources/src/componentSets/PlatformComponents.xml b/platform/platform-resources/src/componentSets/PlatformComponents.xml index 2cbb9f3ec2d0..5ccba837c053 100644 --- a/platform/platform-resources/src/componentSets/PlatformComponents.xml +++ b/platform/platform-resources/src/componentSets/PlatformComponents.xml @@ -52,12 +52,10 @@ com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl com.intellij.testFramework.TestEditorManagerImpl com.intellij.platform.PlatformVcsDetector - diff --git a/platform/platform-resources/src/componentSets/PlatformLangComponents.xml b/platform/platform-resources/src/componentSets/PlatformLangComponents.xml index 64a5bf872417..8b66914a36fd 100644 --- a/platform/platform-resources/src/componentSets/PlatformLangComponents.xml +++ b/platform/platform-resources/src/componentSets/PlatformLangComponents.xml @@ -46,7 +46,6 @@ com.intellij.platform.PlatformVcsDetector - diff --git a/platform/platform-resources/src/componentSets/Profiles.xml b/platform/platform-resources/src/componentSets/Profiles.xml index 025c74496aee..538a092fdd86 100644 --- a/platform/platform-resources/src/componentSets/Profiles.xml +++ b/platform/platform-resources/src/componentSets/Profiles.xml @@ -2,7 +2,6 @@ com.intellij.profile.codeInspection.InspectionProjectProfileManager - \ No newline at end of file diff --git a/platform/platform-resources/src/componentSets/UICore.xml b/platform/platform-resources/src/componentSets/UICore.xml index 4eb656496bf1..6bdbbc9d69af 100644 --- a/platform/platform-resources/src/componentSets/UICore.xml +++ b/platform/platform-resources/src/componentSets/UICore.xml @@ -7,7 +7,6 @@ com.intellij.openapi.wm.IdeFocusManager com.intellij.openapi.wm.impl.FocusManagerImpl com.intellij.openapi.wm.impl.IdeFocusManagerHeadless - com.intellij.ide.DataManager @@ -65,7 +64,6 @@ com.intellij.execution.ui.RunnerLayoutUi$Factory com.intellij.execution.ui.layout.impl.RunnerLayoutUiFactoryImpl - com.intellij.openapi.actionSystem.impl.ActionPreloader diff --git a/platform/platform-resources/src/componentSets/VCS.xml b/platform/platform-resources/src/componentSets/VCS.xml index f1c6ab9ac4f6..1f9ebf4f36eb 100644 --- a/platform/platform-resources/src/componentSets/VCS.xml +++ b/platform/platform-resources/src/componentSets/VCS.xml @@ -14,17 +14,14 @@ com.intellij.openapi.vcs.VcsConfiguration com.intellij.openapi.vcs.ProjectLevelVcsManager com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl com.intellij.openapi.vcs.impl.VcsDirectoryMappingStorage - com.intellij.openapi.vcs.impl.LineStatusTrackerManager @@ -59,7 +56,6 @@ com.intellij.openapi.vcs.changes.shelf.ShelveChangesManager com.intellij.openapi.vcs.changes.shelf.ShelvedChangesViewManager diff --git a/platform/platform-resources/src/componentSets/WindowManagement.xml b/platform/platform-resources/src/componentSets/WindowManagement.xml index bca044d7b092..6a4b4a9b85e0 100644 --- a/platform/platform-resources/src/componentSets/WindowManagement.xml +++ b/platform/platform-resources/src/componentSets/WindowManagement.xml @@ -13,13 +13,11 @@ com.intellij.openapi.wm.impl.ToolWindowManagerImpl com.intellij.openapi.wm.impl.ToolWindowHeadlessManagerImpl com.intellij.openapi.wm.IdeFocusManager com.intellij.openapi.wm.impl.IdeFocusManagerImpl com.intellij.openapi.wm.impl.IdeFocusManagerHeadless - \ No newline at end of file diff --git a/plugins/ant/src/META-INF/plugin.xml b/plugins/ant/src/META-INF/plugin.xml index 25498418f3ff..adabd25c7cfa 100644 --- a/plugins/ant/src/META-INF/plugin.xml +++ b/plugins/ant/src/META-INF/plugin.xml @@ -71,7 +71,6 @@ com.intellij.lang.ant.config.impl.AntToolwindowRegistrar - diff --git a/plugins/devkit/src/dom/Component.java b/plugins/devkit/src/dom/Component.java index 0ec760843349..0cc774f87916 100644 --- a/plugins/devkit/src/dom/Component.java +++ b/plugins/devkit/src/dom/Component.java @@ -58,11 +58,6 @@ public interface Component extends DomElement { } interface Project extends Component { - - @NotNull - @SubTag(value = "skipForDummyProject", indicator = true) - GenericDomValue getSkipForDummyProject(); - @NotNull @SubTag(value = "skipForDefaultProject", indicator = true) GenericDomValue getSkipForDefaultProject(); diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml index 8a99895d1ad8..9b186440ac84 100644 --- a/plugins/properties/src/META-INF/plugin.xml +++ b/plugins/properties/src/META-INF/plugin.xml @@ -61,7 +61,6 @@ com.intellij.lang.properties.PropertiesFilesManager - diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml index 073110c20c35..6c1f403e23aa 100644 --- a/plugins/ui-designer/src/META-INF/plugin.xml +++ b/plugins/ui-designer/src/META-INF/plugin.xml @@ -116,7 +116,6 @@ com.intellij.uiDesigner.palette.Palette - com.intellij.uiDesigner.propertyInspector.UIDesignerToolWindowManager @@ -125,7 +124,6 @@ com.intellij.uiDesigner.clientProperties.ClientPropertiesManager - diff --git a/resources/src/componentSets/Compiler.xml b/resources/src/componentSets/Compiler.xml index 01cb22a0e9b3..dd58573060fc 100644 --- a/resources/src/componentSets/Compiler.xml +++ b/resources/src/componentSets/Compiler.xml @@ -13,11 +13,9 @@ com.intellij.compiler.CompilerConfiguration com.intellij.compiler.CompilerConfigurationImpl - com.intellij.compiler.impl.CompilerCacheManager - diff --git a/resources/src/componentSets/Configurables.xml b/resources/src/componentSets/Configurables.xml index cf7c734deedc..2dc65706f863 100644 --- a/resources/src/componentSets/Configurables.xml +++ b/resources/src/componentSets/Configurables.xml @@ -3,7 +3,6 @@ com.intellij.openapi.roots.ui.configuration.ModuleEditorState