summaryrefslogtreecommitdiff
path: root/java/java-impl/src/com/intellij/ide
diff options
context:
space:
mode:
Diffstat (limited to 'java/java-impl/src/com/intellij/ide')
-rw-r--r--java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java92
-rw-r--r--java/java-impl/src/com/intellij/ide/actions/CreatePackageInfoAction.java4
-rw-r--r--java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java5
-rw-r--r--java/java-impl/src/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java30
4 files changed, 112 insertions, 19 deletions
diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
index 2f684304ae58..c6c4f6c144d2 100644
--- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
+++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
@@ -19,6 +19,7 @@ import com.intellij.application.options.IndentOptionsEditor;
import com.intellij.application.options.JavaIndentOptionsEditor;
import com.intellij.lang.Language;
import com.intellij.lang.java.JavaLanguage;
+import com.intellij.openapi.application.ApplicationBundle;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.pom.java.LanguageLevel;
@@ -57,8 +58,8 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
@Override
public void customizeSettings(@NotNull CodeStyleSettingsCustomizable consumer, @NotNull SettingsType settingsType) {
- consumer.showAllStandardOptions();
if (settingsType == SettingsType.SPACING_SETTINGS) {
+ consumer.showAllStandardOptions();
consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACES_WITHIN_ANGLE_BRACKETS", "Angle brackets",CodeStyleSettingsCustomizable.SPACES_WITHIN);
String groupName = CodeStyleSettingsCustomizable.SPACES_IN_TYPE_ARGUMENTS;
@@ -69,6 +70,95 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_TYPE_PARAMETER", "Before opening angle bracket", groupName);
consumer.showCustomOption(JavaCodeStyleSettings.class, "SPACE_AROUND_TYPE_BOUNDS_IN_TYPE_PARAMETERS", "Around type bounds", groupName);
}
+ else if (settingsType == SettingsType.WRAPPING_AND_BRACES_SETTINGS) {
+ consumer.showStandardOptions("RIGHT_MARGIN",
+ "KEEP_CONTROL_STATEMENT_IN_ONE_LINE",
+ "LINE_COMMENT_AT_FIRST_COLUMN",
+ "BLOCK_COMMENT_AT_FIRST_COLUMN",
+ "KEEP_LINE_BREAKS",
+ "KEEP_FIRST_COLUMN_COMMENT",
+ "CALL_PARAMETERS_WRAP",
+ "PREFER_PARAMETERS_WRAP",
+ "CALL_PARAMETERS_LPAREN_ON_NEXT_LINE",
+ "CALL_PARAMETERS_RPAREN_ON_NEXT_LINE",
+ "METHOD_PARAMETERS_WRAP",
+ "METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE",
+ "METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE",
+ "RESOURCE_LIST_WRAP",
+ "RESOURCE_LIST_LPAREN_ON_NEXT_LINE",
+ "RESOURCE_LIST_RPAREN_ON_NEXT_LINE",
+ "EXTENDS_LIST_WRAP",
+ "THROWS_LIST_WRAP",
+ "EXTENDS_KEYWORD_WRAP",
+ "THROWS_KEYWORD_WRAP",
+ "METHOD_CALL_CHAIN_WRAP",
+ "PARENTHESES_EXPRESSION_LPAREN_WRAP",
+ "PARENTHESES_EXPRESSION_RPAREN_WRAP",
+ "BINARY_OPERATION_WRAP",
+ "BINARY_OPERATION_SIGN_ON_NEXT_LINE",
+ "TERNARY_OPERATION_WRAP",
+ "TERNARY_OPERATION_SIGNS_ON_NEXT_LINE",
+ "MODIFIER_LIST_WRAP",
+ "KEEP_SIMPLE_BLOCKS_IN_ONE_LINE",
+ "KEEP_SIMPLE_METHODS_IN_ONE_LINE",
+ "KEEP_SIMPLE_CLASSES_IN_ONE_LINE",
+ "KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE",
+ "FOR_STATEMENT_WRAP",
+ "FOR_STATEMENT_LPAREN_ON_NEXT_LINE",
+ "FOR_STATEMENT_RPAREN_ON_NEXT_LINE",
+ "ARRAY_INITIALIZER_WRAP",
+ "ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE",
+ "ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE",
+ "ASSIGNMENT_WRAP",
+ "PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE",
+ "LABELED_STATEMENT_WRAP",
+ "ASSERT_STATEMENT_WRAP",
+ "ASSERT_STATEMENT_COLON_ON_NEXT_LINE",
+ "IF_BRACE_FORCE",
+ "DOWHILE_BRACE_FORCE",
+ "WHILE_BRACE_FORCE",
+ "FOR_BRACE_FORCE",
+ "WRAP_LONG_LINES",
+ "METHOD_ANNOTATION_WRAP",
+ "CLASS_ANNOTATION_WRAP",
+ "FIELD_ANNOTATION_WRAP",
+ "PARAMETER_ANNOTATION_WRAP",
+ "VARIABLE_ANNOTATION_WRAP",
+ "ALIGN_MULTILINE_CHAINED_METHODS",
+ "ALIGN_MULTILINE_PARAMETERS",
+ "ALIGN_MULTILINE_PARAMETERS_IN_CALLS",
+ "ALIGN_MULTILINE_RESOURCES",
+ "ALIGN_MULTILINE_FOR",
+ "INDENT_WHEN_CASES",
+ "ALIGN_MULTILINE_BINARY_OPERATION",
+ "ALIGN_MULTILINE_ASSIGNMENT",
+ "ALIGN_MULTILINE_TERNARY_OPERATION",
+ "ALIGN_MULTILINE_THROWS_LIST",
+ "ALIGN_THROWS_KEYWORD",
+ "ALIGN_MULTILINE_EXTENDS_LIST",
+ "ALIGN_MULTILINE_METHOD_BRACKETS",
+ "ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION",
+ "ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION",
+ "ALIGN_GROUP_FIELD_DECLARATIONS",
+ "BRACE_STYLE",
+ "CLASS_BRACE_STYLE",
+ "METHOD_BRACE_STYLE",
+ "USE_FLYING_GEESE_BRACES",
+ "FLYING_GEESE_BRACES_GAP",
+ "DO_NOT_INDENT_TOP_LEVEL_CLASS_MEMBERS",
+ "ELSE_ON_NEW_LINE",
+ "WHILE_ON_NEW_LINE",
+ "CATCH_ON_NEW_LINE",
+ "FINALLY_ON_NEW_LINE",
+ "INDENT_CASE_FROM_SWITCH",
+ "SPECIAL_ELSE_IF_TREATMENT",
+ "ENUM_CONSTANTS_WRAP");
+ String groupName = ApplicationBundle.message("wrapping.fields.annotation");
+ consumer.showCustomOption(JavaCodeStyleSettings.class, "DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION", "Do not wrap after single annotation", groupName);
+ }
+ else {
+ consumer.showAllStandardOptions();
+ }
}
@Override
diff --git a/java/java-impl/src/com/intellij/ide/actions/CreatePackageInfoAction.java b/java/java-impl/src/com/intellij/ide/actions/CreatePackageInfoAction.java
index 64a8c1bcfcb5..8fd9f0d422db 100644
--- a/java/java-impl/src/com/intellij/ide/actions/CreatePackageInfoAction.java
+++ b/java/java-impl/src/com/intellij/ide/actions/CreatePackageInfoAction.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes;
*/
public class CreatePackageInfoAction extends CreateFromTemplateActionBase implements DumbAware {
- protected CreatePackageInfoAction() {
+ public CreatePackageInfoAction() {
super(IdeBundle.message("action.create.new.package-info.title"),
IdeBundle.message("action.create.new.package-info.description"), AllIcons.FileTypes.Java);
}
diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java b/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java
index 7e0515726610..ef745b3aaa8b 100644
--- a/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java
+++ b/java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java
@@ -62,8 +62,9 @@ public class ClassesTreeStructureProvider implements SelectableTreeStructureProv
if (originalElement instanceof PsiFile) {
PsiFile classFile = (PsiFile)originalElement;
final VirtualFile virtualClassFile = classFile.getVirtualFile();
- if (virtualClassFile != null && fileIndex.isInLibraryClasses(virtualClassFile) &&
- classOwner.getManager().areElementsEquivalent(classOwner.getContainingDirectory(), classFile.getContainingDirectory())) {
+ if (virtualClassFile != null && fileIndex.isInLibraryClasses(virtualClassFile)
+ && !classOwner.getManager().areElementsEquivalent(classOwner, classFile)
+ && classOwner.getManager().areElementsEquivalent(classOwner.getContainingDirectory(), classFile.getContainingDirectory())) {
continue;
}
}
diff --git a/java/java-impl/src/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java b/java/java-impl/src/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java
index 356933823226..05b2578e5df1 100644
--- a/java/java-impl/src/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java
+++ b/java/java-impl/src/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java
@@ -69,23 +69,25 @@ public class ClassHierarchyScopeDescriptor extends ScopeDescriptor {
chooser.showDialog();
PsiClass aClass = chooser.getSelected();
- if (aClass == null) return null;
+ if (aClass == null) {
+ myCachedScope = GlobalSearchScope.EMPTY_SCOPE;
+ } else {
+ final List<PsiElement> classesToSearch = new LinkedList<PsiElement>();
+ classesToSearch.add(aClass);
- final List<PsiElement> classesToSearch = new LinkedList<PsiElement>();
- classesToSearch.add(aClass);
+ classesToSearch.addAll(ClassInheritorsSearch.search(aClass, true).findAll());
- classesToSearch.addAll(ClassInheritorsSearch.search(aClass, true).findAll());
+ FunctionalExpressionSearch.search(aClass).forEach(new Processor<PsiFunctionalExpression>() {
+ @Override
+ public boolean process(PsiFunctionalExpression expression) {
+ classesToSearch.add(expression);
+ return true;
+ }
+ });
- FunctionalExpressionSearch.search(aClass).forEach(new Processor<PsiFunctionalExpression>() {
- @Override
- public boolean process(PsiFunctionalExpression expression) {
- classesToSearch.add(expression);
- return true;
- }
- });
-
- myCachedScope = new LocalSearchScope(PsiUtilCore.toPsiElementArray(classesToSearch),
- IdeBundle.message("scope.hierarchy", ClassPresentationUtil.getNameForClass(aClass, true)));
+ myCachedScope = new LocalSearchScope(PsiUtilCore.toPsiElementArray(classesToSearch),
+ IdeBundle.message("scope.hierarchy", ClassPresentationUtil.getNameForClass(aClass, true)));
+ }
}
return myCachedScope;