Merge branch 'master' into changeSignature
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 17 Apr 2010 10:44:40 +0000 (14:44 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 17 Apr 2010 10:44:40 +0000 (14:44 +0400)
1  2 
resources/src/META-INF/IdeaPlugin.xml

index 0a10fd7ead3206bf53e9a31badfbb6cf0785c3d6,d8fc6927ba0a276e98cd4cd9239ce0215a52ed38..5c73edf1d7938c86b73eec1fdbf5cd712f80fd40
      <xi:include href="/META-INF/PlatformExtensions.xml" xpointer="xpointer(/extensions/*)"/>
      <xi:include href="/META-INF/VcsExtensions.xml" xpointer="xpointer(/extensions/*)"/>
      <xi:include href="/META-INF/LangExtensions.xml" xpointer="xpointer(/extensions/*)"/>
-     <xi:include href="/META-INF/LocalHistoryExtensions.xml" xpointer="xpointer(/extensions/*)"/>
  
      <constantExpressionEvaluator language="JAVA" implementationClass="com.intellij.psi.impl.PsiExpressionEvaluator" />
      <annotationSupport language="JAVA" implementationClass="com.intellij.psi.impl.source.tree.java.JavaAnnotationSupport" />
      <autoImportOptionsProvider implementation="com.intellij.application.options.editor.JavaAutoImportOptions"/>
      <codeFoldingOptionsProvider implementation="com.intellij.application.options.editor.JavaCodeFoldingOptionsProvider"/>
  
 -    <refactoring.introduceParameterMethodUsagesProcessor implementation="com.intellij.refactoring.introduceParameter.JavaIntroduceParameterMethodUsagesProcessor"/>
 +
  
      <!--<expectedTypesProvider implementation="com.intellij.codeInsight.JavaExpectedTypesProvider"/>-->
  
  
      <!-- Resources -->
  
-     <!-- Local History -->
-     <!-- RubyMine includes a reduced version of this configurable: the days of keeping local history are specified
-          in the general settings -->
-     <applicationConfigurable implementation="com.intellij.history.integration.ui.views.LocalHistoryConfigurable"/>
      <!--TODO <applicationConfigurable implementation="com.intellij.ide.plugins.PluginManagerConfigurable"/>--> <!-- Plugins -->
      <!-- Intention Actions -->
      <!--TODO <applicationConfigurable implementation="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable"/>  --><!-- Updates -->
  
      <refactoring.safeDeleteProcessor implementation="com.intellij.refactoring.safeDelete.JavaSafeDeleteProcessor"/>
  
 +    <refactoring.introduceParameterMethodUsagesProcessor implementation="com.intellij.refactoring.introduceParameter.JavaIntroduceParameterMethodUsagesProcessor"/>
 +    <refactoring.changeSignatureUsageProcessor implementation="com.intellij.refactoring.changeSignature.JavaChangeSignatureUsageProcessor"/>
 +
      <refactoring.helper implementation="com.intellij.refactoring.OptimizeImportsRefactoringHelper"/>
  
      <projectService serviceInterface="com.intellij.ide.projectView.impl.nodes.ProjectViewDirectoryHelper"