collect Java-dependent stuff in IdeaPlugin.xml and remove it from FlexPlugin.xml

This commit is contained in:
Kirill.Safonov
2011-06-03 19:04:28 +04:00
parent c6e49b932c
commit af7403b364
3 changed files with 14 additions and 16 deletions
+12 -2
View File
@@ -7,6 +7,8 @@
<module value="com.intellij.modules.all"/>
<xi:include href="/idea/JavaActions.xml" xpointer="xpointer(/component/*)"/>
<xi:include href="/componentSets/Debugger.xml" xpointer="xpointer(/components/*)"/>
<application-components>
<component>
<implementation-class>com.intellij.util.xml.impl.JavaDomApplicationComponent</implementation-class>
@@ -651,8 +653,6 @@
<liveTemplateContext implementation="com.intellij.codeInsight.template.JavaStringContextType"/>
<liveTemplateContext implementation="com.intellij.codeInsight.template.SmartCompletionContextType"/>
<projectExtension implementation="com.intellij.openapi.roots.impl.LanguageLevelProjectExtensionImpl$MyProjectExtension"/>
<projectExtension implementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl$MyProjectExtension"/>
<roots.watchedRootsProvider implementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl$MyWatchedRootsProvider"/>
<moduleExtension implementation="com.intellij.openapi.roots.impl.CompilerModuleExtensionImpl"/>
@@ -688,8 +688,11 @@
<configurationType implementation="com.intellij.execution.applet.AppletConfigurationType"/>
<configurationProducer implementation="com.intellij.execution.applet.AppletConfigurationProducer"/>
<configurationType implementation="com.intellij.execution.application.ApplicationConfigurationType"/>
<configurationProducer implementation="com.intellij.execution.application.ApplicationConfigurationProducer"/>
<configurationType implementation="com.intellij.execution.remote.RemoteConfigurationType"/>
<javaExpressionSurrounder implementation="com.intellij.debugger.codeinsight.JavaWithRuntimeCastSurrounder"/>
<applicationService serviceInterface="com.intellij.packageDependencies.DependenciesVisitorFactory"
serviceImplementation="com.intellij.packageDependencies.JavaDependenciesVisitorFactory"/>
@@ -883,6 +886,13 @@
serviceImplementation="com.intellij.profile.codeInspection.JavaAwareInspectionProfileManager"/>
<resolveScopeEnlarger implementation="com.intellij.psi.NonClasspathResolveScopeEnlarger"/>
<xdebugger.debuggerSupport implementation="com.intellij.debugger.ui.JavaDebuggerSupport"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.LineBreakpointFactory"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.ExceptionBreakpointFactory"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.AnyExceptionBreakpointFactory"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.FieldBreakpointFactory"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.MethodBreakpointFactory"/>
</extensions>
</idea-plugin>
@@ -35,7 +35,6 @@
<xi:include href="Toolwindows.xml" xpointer="xpointer(/components/*)"/>
<xi:include href="/componentSets/Editor.xml" xpointer="xpointer(/components/*)"/>
<xi:include href="Misc.xml" xpointer="xpointer(/components/*)"/>
<xi:include href="Debugger.xml" xpointer="xpointer(/components/*)"/>
<xi:include href="Compiler.xml" xpointer="xpointer(/components/*)"/>
<xi:include href="/componentSets/Execution.xml" xpointer="xpointer(/components/*)"/>
<xi:include href="/componentSets/VCS.xml" xpointer="xpointer(/components/*)"/>
+2 -13
View File
@@ -234,12 +234,6 @@
<daemon.highlightInfoFilter implementation="com.intellij.codeInsight.daemon.impl.HighlightInfoFilterImpl"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.LineBreakpointFactory"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.ExceptionBreakpointFactory"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.AnyExceptionBreakpointFactory"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.FieldBreakpointFactory"/>
<debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.MethodBreakpointFactory"/>
<projectService serviceInterface="com.intellij.debugger.ui.DebuggerRecents"
serviceImplementation="com.intellij.debugger.ui.DebuggerRecents"/>
@@ -283,10 +277,6 @@
<checkinHandlerFactory implementation="com.intellij.openapi.vcs.checkin.CodeAnalysisCheckinHandlerFactory"/>
<checkinHandlerFactory implementation="com.intellij.openapi.vcs.checkin.TodoCheckinHandlerFactory"/>
<configurationProducer implementation="com.intellij.execution.application.ApplicationConfigurationProducer"/>
<javaExpressionSurrounder implementation="com.intellij.debugger.codeinsight.JavaWithRuntimeCastSurrounder"/>
<checkoutListener implementation="com.intellij.openapi.vcs.checkout.ProjectCheckoutListener"/>
<checkoutListener implementation="com.intellij.openapi.vcs.checkout.ProjectDirCheckoutListener"/>
<checkoutCompletedListener implementation="com.intellij.openapi.vcs.checkout.NewProjectCheckoutListener"/>
@@ -365,12 +355,11 @@
<applicationService serviceInterface="com.intellij.openapi.roots.ModifiableModelsProvider"
serviceImplementation="com.intellij.openapi.roots.IdeaModifiableModelsProvider"/>
<projectExtension implementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl$MyProjectExtension"/>
<roots.watchedRootsProvider implementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl$MyWatchedRootsProvider"/>
</extensions>
<xi:include href="/META-INF/xdebugger.xml" xpointer="xpointer(/root/*)"/>
<extensions defaultExtensionNs="com.intellij">
<xdebugger.debuggerSupport implementation="com.intellij.debugger.ui.JavaDebuggerSupport"/>
</extensions>
<xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/RegExpPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>