summaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2013-04-24 10:43:41 -0700
committerTor Norbye <tnorbye@google.com>2013-04-24 10:43:41 -0700
commitb17587c84879dd2ea42495f1fbdadbc806b9475b (patch)
treeb4d9014f69cb8289627ddc75339a6b0b3fe1bc5e /resources
parentb569bc6aa78f6eacf72e8b90622d300e1a9db25f (diff)
downloadidea-b17587c84879dd2ea42495f1fbdadbc806b9475b.tar.gz
Snapshot e242282deb41c328afbe971fc167e47ddfb26df9 from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: Ifdc1818cde7b63f6d7bf42801f18c7f1557b8d85
Diffstat (limited to 'resources')
-rw-r--r--resources/src/META-INF/IdeaPlugin.xml2
-rw-r--r--resources/src/idea/RichPlatformActions.xml5
2 files changed, 2 insertions, 5 deletions
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index bdef39604a44..e5a32554f5ab 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -454,6 +454,8 @@
<lang.foldingBuilder language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.actions.SuppressWarningsFoldingBuilder" />
<moduleConfigurationEditorProvider implementation="com.intellij.openapi.module.WebModuleConfigurationEditorProvider"/>
+ <externalProjectDataService implementation="com.intellij.externalSystem.JavaProjectDataService"/>
+
<specialTool shortName="UnusedDeclaration" displayName="Unused declaration" groupBundle="messages.InspectionsBundle"
groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
implementationClass="com.intellij.codeInspection.deadCode.UnusedDeclarationInspection"/>
diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml
index 9cebfea990a5..e8c09006be0a 100644
--- a/resources/src/idea/RichPlatformActions.xml
+++ b/resources/src/idea/RichPlatformActions.xml
@@ -247,7 +247,6 @@
<reference ref="RefactoringMenu"/>
<separator/>
<reference ref="AddToFavorites"/>
- <reference ref="MoveToChangeList"/>
<separator/>
<reference ref="RunContextPopupGroup"/>
<separator/>
@@ -273,7 +272,6 @@
<reference ref="RefactoringMenu"/>
<separator/>
<reference ref="AddToFavorites"/>
- <reference ref="MoveToChangeList"/>
<separator/>
<reference ref="Compile"/>
<reference ref="RunContextPopupGroup"/>
@@ -296,7 +294,6 @@
<reference ref="RefactoringMenu"/>
<separator/>
<reference ref="AddToFavorites"/>
- <reference ref="MoveToChangeList"/>
<separator/>
<reference ref="Compile"/>
<reference ref="RunAPT"/>
@@ -332,7 +329,6 @@
<reference ref="RefactoringMenu"/>
<separator/>
<reference ref="AddToFavorites"/>
- <reference ref="MoveToChangeList"/>
<separator/>
<reference ref="TypeHierarchy"/>
<reference ref="ReformatCode"/>
@@ -366,7 +362,6 @@
<!--<action id="UsageView.Exclude" class="com.intellij.usages.actions.ExcludeUsageAction"/>-->
<!--<separator/>-->
<!--<reference ref="AddToFavorites"/>-->
- <!--<reference ref="MoveToChangeList"/>-->
<!--<reference ref="FindUsages"/>-->
<!--<action id="UsageView.ShowRecentFindUsages" class="com.intellij.find.impl.ShowRecentFindUsagesAction" icon="/actions/back.png"/>-->
<!--<separator/>-->