diff options
Diffstat (limited to 'plugins')
10 files changed, 30 insertions, 14 deletions
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml index be9f257bed05..17ad0f7d5d36 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml @@ -703,6 +703,12 @@ key="simplifiable.conditional.expression.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.controlflow.SimplifiableConditionalExpressionInspection"/> + <!-- Moved in Android Studio over to the Code Style category where it more logically belongs since this is the only one enabled by default + in the J2ME category and it's really just a code style issue (and there are 4 other Simplifiable-Something conditions here) --> + <localInspection language="JAVA" shortName="SimplifiableIfStatement" bundle="com.siyeh.InspectionGadgetsBundle" + key="simplifiable.if.statement.display.name" groupBundle="messages.InspectionsBundle" + groupKey="group.names.code.style.issues" enabledByDefault="true" level="WARNING" + implementationClass="com.siyeh.ig.j2me.SimplifiableIfStatementInspection"/> <localInspection language="JAVA" shortName="SwitchStatementDensity" bundle="com.siyeh.InspectionGadgetsBundle" key="switch.statement.density.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING" @@ -1191,10 +1197,6 @@ bundle="com.siyeh.InspectionGadgetsBundle" key="recordstore.opened.not.safely.closed.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.j2me.RecordStoreResourceInspection"/> - <localInspection language="JAVA" shortName="SimplifiableIfStatement" bundle="com.siyeh.InspectionGadgetsBundle" - key="simplifiable.if.statement.display.name" groupBundle="messages.InspectionsBundle" - groupKey="group.names.j2me.issues" enabledByDefault="true" level="WARNING" - implementationClass="com.siyeh.ig.j2me.SimplifiableIfStatementInspection"/> <localInspection language="JAVA" shortName="SingleCharacterStartsWith" bundle="com.siyeh.InspectionGadgetsBundle" key="single.character.startswith.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING" diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/SimplifiableIfStatement.html b/plugins/InspectionGadgets/src/inspectionDescriptions/SimplifiableIfStatement.html index 398d5cbb1b59..99642963522d 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/SimplifiableIfStatement.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/SimplifiableIfStatement.html @@ -1,8 +1,5 @@ <html> <body> -This inspection is intended for J2ME and other highly resource constrained environments. -Applying the results of this inspection without consideration might have negative effects on code clarity and design. -<p> Reports if statements of the form <b>if (<i>condition</i>) return true else return <i>foo</i></b> or <b>if (<i>condition</i>) return false else return <i>foo</i></b>. @@ -13,4 +10,4 @@ These expressions may be safely simplified to <p> </body> -</html>
\ No newline at end of file +</html> diff --git a/plugins/android/lib/guava-15.0.jar b/plugins/android/lib/guava-15.0.jar Binary files differnew file mode 100644 index 000000000000..eb9ef8ad5fff --- /dev/null +++ b/plugins/android/lib/guava-15.0.jar diff --git a/plugins/android/lib/jarutils.jar b/plugins/android/lib/jarutils.jar Binary files differnew file mode 100644 index 000000000000..1259ccfd6e44 --- /dev/null +++ b/plugins/android/lib/jarutils.jar diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java index 30fb81af6075..d17b9fdea764 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java @@ -331,6 +331,10 @@ public class GradleScriptType extends GroovyRunnableScriptType { } } + if (result == GlobalSearchScope.EMPTY_SCOPE) { + result = baseScope; + } + String modulePath = module.getOptionValue(ExternalSystemConstants.LINKED_PROJECT_PATH_KEY); if(modulePath == null) return result; diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml index db15a38a2a2c..cabf8e7f5739 100644 --- a/plugins/groovy/src/META-INF/plugin.xml +++ b/plugins/groovy/src/META-INF/plugin.xml @@ -1488,7 +1488,7 @@ <projectStructureDetector implementation="org.jetbrains.plugins.groovy.griffon.GriffonProjectStructureDetector" order="before groovyDetector"/> <programRunner implementation="org.jetbrains.plugins.groovy.griffon.GriffonDebuggerRunner"/> - <configurationType implementation="org.jetbrains.plugins.groovy.griffon.GriffonRunConfigurationType"/> + <!-- <configurationType implementation="org.jetbrains.plugins.groovy.griffon.GriffonRunConfigurationType"/> --> <toolWindow id="Griffon View" anchor="left" secondary="false" icon="JetgroovyIcons.Griffon.GriffonToolWindow" factoryClass="org.jetbrains.plugins.groovy.griffon.GriffonToolWindowFactory" conditionClass="org.jetbrains.plugins.groovy.griffon.GriffonToolWindowFactory"/> diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java index 199db3a52538..bfe3d1466ae3 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerIndexerImpl.java @@ -207,7 +207,8 @@ public class Maven3ServerIndexerImpl extends MavenRemoteObject implements MavenS throw new MavenServerProcessCanceledException(); } catch (Exception e) { - throw new MavenServerIndexerException(wrapException(e)); + // Disabled in Android Studio, no need to know about this exception + // throw new MavenServerIndexerException(wrapException(e)); } } diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml index 562bb3a3cb00..41a8ad3c6040 100644 --- a/plugins/maven/src/main/resources/META-INF/plugin.xml +++ b/plugins/maven/src/main/resources/META-INF/plugin.xml @@ -64,8 +64,8 @@ <stepsBeforeRunProvider implementation="org.jetbrains.idea.maven.tasks.MavenBeforeRunTasksProvider"/> <keymapExtension implementation="org.jetbrains.idea.maven.tasks.MavenKeymapExtension"/> <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/> - <configurationType implementation="org.jetbrains.idea.maven.execution.MavenRunConfigurationType"/> - <configurationProducer implementation="org.jetbrains.idea.maven.execution.MavenConfigurationProducer"/> + <!-- <configurationType implementation="org.jetbrains.idea.maven.execution.MavenRunConfigurationType"/> + <configurationProducer implementation="org.jetbrains.idea.maven.execution.MavenConfigurationProducer"/> --> <orderEnumerationHandlerFactory implementation="org.jetbrains.idea.maven.execution.MavenOrderEnumeratorHandler$FactoryImpl"/> <junitPatcher implementation="org.jetbrains.idea.maven.execution.MavenJUnitPatcher" /> diff --git a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/CreationTool.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/CreationTool.java index 83ed5047b023..5f301ac7a15e 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/CreationTool.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/tools/CreationTool.java @@ -16,8 +16,10 @@ package com.intellij.designer.designSurface.tools; import com.intellij.designer.designSurface.OperationContext; +import com.intellij.designer.model.RadComponent; import java.util.Collections; +import java.util.List; /** * @author Alexander Lobas @@ -49,6 +51,11 @@ public class CreationTool extends AbstractCreationTool { @Override protected void updateTarget() { - myTargetOperation.setComponent(myContext.getComponents().get(0)); + if (myTargetOperation != null && myContext != null) { + List<RadComponent> components = myContext.getComponents(); + if (components != null && !components.isEmpty()) { + myTargetOperation.setComponent(components.get(0)); + } + } } }
\ No newline at end of file diff --git a/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/PropertyTablePanel.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/PropertyTablePanel.java index a44a34398d3c..5ad9e4465ec5 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/PropertyTablePanel.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/PropertyTablePanel.java @@ -23,6 +23,7 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.impl.ActionButton; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; +import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.PopupHandler; @@ -85,7 +86,11 @@ public final class PropertyTablePanel extends JPanel implements ListSelectionLis actionGroup.addSeparator(); RestoreDefault restoreDefault = new RestoreDefault(myPropertyTable); - restoreDefault.registerCustomShortcutSet(actionManager.getAction(IdeActions.ACTION_DELETE).getShortcutSet(), myPropertyTable); + // Don't register ACTION_DELETE on Mac; on Mac, the default delete key is VK_DELETE rather than VK_BACK_SPACE + // which means users end up accidentally restoring to default when trying to edit inside property editors. + if (!SystemInfo.isMac) { + restoreDefault.registerCustomShortcutSet(actionManager.getAction(IdeActions.ACTION_DELETE).getShortcutSet(), myPropertyTable); + } actionGroup.add(restoreDefault); actionGroup.add(new ShowExpert(myPropertyTable)); |