MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

folowup to IDEA-149950: changed "package local" to JLS-conformant "package-private"

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-02-18 13:53:04 +03:00
parent ced90d82dd
commit 86b6ee7f18
33 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
View File

@@ -181,7 +181,7 @@ public class HighlightUtil extends HighlightUtilBase {
}
/**
* make element protected/package local/public suggestion
* make element protected/package-private/public suggestion
*/
static void registerAccessQuickFixAction(@NotNull PsiMember refElement,
@NotNull PsiJavaCodeReferenceElement place,
@@ -243,7 +243,7 @@ public class HighlightUtil extends HighlightUtilBase {
@Nullable
private static PsiClass getPackageLocalClassInTheMiddle(@NotNull PsiElement place) {
if (place instanceof PsiReferenceExpression) {
// check for package local classes in the middle
// check for package-private classes in the middle
PsiReferenceExpression expression = (PsiReferenceExpression)place;
while (true) {
PsiElement resolved = expression.resolve();

15
java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -44,6 +44,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.usageView.UsageViewTypeLocation;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.VisibilityUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -61,9 +62,9 @@ public class VisibilityInspection extends GlobalJavaBatchInspectionTool {
public boolean SUGGEST_PRIVATE_FOR_INNERS = false;
private static final String DISPLAY_NAME = InspectionsBundle.message("inspection.visibility.display.name");
@NonNls public static final String SHORT_NAME = "WeakerAccess";
private static final String CAN_BE_PRIVATE = InspectionsBundle.message("inspection.visibility.compose.suggestion", "private");
private static final String CAN_BE_PACKAGE_LOCAL = InspectionsBundle.message("inspection.visibility.compose.suggestion", "package local");
private static final String CAN_BE_PROTECTED = InspectionsBundle.message("inspection.visibility.compose.suggestion", "protected");
private static final String CAN_BE_PRIVATE = InspectionsBundle.message("inspection.visibility.compose.suggestion", VisibilityUtil.toPresentableText(PsiModifier.PRIVATE));
private static final String CAN_BE_PACKAGE_LOCAL = InspectionsBundle.message("inspection.visibility.compose.suggestion", VisibilityUtil.toPresentableText(PsiModifier.PACKAGE_LOCAL));
private static final String CAN_BE_PROTECTED = InspectionsBundle.message("inspection.visibility.compose.suggestion", VisibilityUtil.toPresentableText(PsiModifier.PROTECTED));
private class OptionsPanel extends JPanel {
private final JCheckBox myPackageLocalForMembersCheckbox;
@@ -204,16 +205,16 @@ public class VisibilityInspection extends GlobalJavaBatchInspectionTool {
String quickFixName = "Make " + ElementDescriptionUtil.getElementDescription(element, UsageViewTypeLocation.INSTANCE) + " ";
if (access.equals(PsiModifier.PRIVATE)) {
message = CAN_BE_PRIVATE;
quickFixName += PsiModifier.PRIVATE;
quickFixName += VisibilityUtil.toPresentableText(PsiModifier.PRIVATE);
}
else {
if (access.equals(PsiModifier.PACKAGE_LOCAL)) {
message = CAN_BE_PACKAGE_LOCAL;
quickFixName += "package local";
quickFixName += VisibilityUtil.toPresentableText(PsiModifier.PACKAGE_LOCAL);
}
else {
message = CAN_BE_PROTECTED;
quickFixName += PsiModifier.PROTECTED;
quickFixName += VisibilityUtil.toPresentableText(PsiModifier.PROTECTED);
}
}
return new ProblemDescriptor[]{manager.createProblemDescriptor(nameIdentifier,

4
java/java-impl/src/com/intellij/psi/filters/element/ExcludeDeclaredFilter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -67,7 +67,7 @@ public class ExcludeDeclaredFilter extends PositionElementFilter{
return true;
}
//TODO check exotic conditions like overriding method in package local class from class in other package
//TODO check exotic conditions like overriding method in package-private class from class in other package
private static boolean isOverridingMethod(final PsiMethod method, final PsiMethod candidate) {
if (method.getManager().areElementsEquivalent(method, candidate)) return false;
if (!MethodSignatureUtil.areSignaturesEqual(method,candidate)) return false;

4
java/java-psi-api/src/com/intellij/codeInsight/ClassUtil.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -80,7 +80,7 @@ public class ClassUtil {
@Nullable
private static PsiMethod checkPackageLocalInSuperClass(@NotNull PsiClass aClass) {
// super class can have package local abstract methods not accessible for overriding
// super class can have package-private abstract methods not accessible for overriding
PsiClass superClass = aClass.getSuperClass();
if (superClass == null) return null;
if (CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) return null;

16
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -82,7 +82,7 @@ public class PsiModifierListImpl extends JavaStubPsiElement<PsiModifierListStub>
if (type == JavaTokenType.PUBLIC_KEYWORD) {
return true;
}
if (type == null /* package local */) {
if (type == null /* package-private */) {
return false;
}
if (type == JavaTokenType.STATIC_KEYWORD) {
@@ -127,7 +127,7 @@ public class PsiModifierListImpl extends JavaStubPsiElement<PsiModifierListStub>
if (type == JavaTokenType.PUBLIC_KEYWORD) {
return true;
}
if (type == null /* package local */) {
if (type == null /* package-private */) {
return false;
}
if (type == JavaTokenType.ABSTRACT_KEYWORD) {
@@ -153,7 +153,7 @@ public class PsiModifierListImpl extends JavaStubPsiElement<PsiModifierListStub>
if (type == JavaTokenType.PUBLIC_KEYWORD) {
return true;
}
if (type == null /* package local */) {
if (type == null /* package-private */) {
return false;
}
if (type == JavaTokenType.STATIC_KEYWORD) {
@@ -172,7 +172,7 @@ public class PsiModifierListImpl extends JavaStubPsiElement<PsiModifierListStub>
if (type == JavaTokenType.FINAL_KEYWORD) return true;
}
if (type == null /* package local */) {
if (type == null /* package-private */) {
return !hasModifierProperty(PsiModifier.PUBLIC) &&
!hasModifierProperty(PsiModifier.PRIVATE) &&
!hasModifierProperty(PsiModifier.PROTECTED);
@@ -208,7 +208,7 @@ public class PsiModifierListImpl extends JavaStubPsiElement<PsiModifierListStub>
if (type == JavaTokenType.PUBLIC_KEYWORD ||
type == JavaTokenType.PRIVATE_KEYWORD ||
type == JavaTokenType.PROTECTED_KEYWORD ||
type == null /* package local */) {
type == null /* package-private */) {
if (type != JavaTokenType.PUBLIC_KEYWORD) {
setModifierProperty(PsiModifier.PUBLIC, false);
}
@@ -240,8 +240,8 @@ public class PsiModifierListImpl extends JavaStubPsiElement<PsiModifierListStub>
}
}
else {
if (type == null /* package local */) {
throw new IncorrectOperationException("Cannot reset package local modifier."); //?
if (type == null /* package-private */) {
throw new IncorrectOperationException("Cannot reset package-private modifier."); //?
}
ASTNode child = treeElement.findChildByType(type);

4
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -149,7 +149,7 @@ public class JavaResolveUtil {
if (!facade.arePackagesTheSame(member, place)) return false;
//if (modifierList.hasModifierProperty(PsiModifier.STATIC)) return true;
// maybe inheritance lead through package local class in other package ?
// maybe inheritance lead through package-private class in other package ?
final PsiClass placeClass = getContextClass(place);
if (memberClass == null || placeClass == null) return true;
// check only classes since interface members are public, and if placeClass is interface,

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AccessInner.java
View File

@@ -11,7 +11,7 @@ class a extends Component {
s.<error descr="'createBuffers(int, java.awt.BufferCapabilities)' has protected access in 'java.awt.Component.FlipBufferStrategy'">createBuffers</error>(1,null);
// TODO
// now cannot distinquish private from package local in class files
// now cannot distinquish private from package-private in class files
//< error descr="'java.awt.Component.SingleBufferStrategy' has private access in 'java.awt.Component'">SingleBufferStrategy< /error> s2 = null;
//Object o = s2.< error descr="'caps' has private access in 'java.awt.Component.SingleBufferStrategy'">caps< /error>;
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AccessLevelClash.java
View File

@@ -4,7 +4,7 @@ interface i {
}
public class a implements i {
void <error descr="'ff()' in 'a' clashes with 'ff()' in 'i'; attempting to assign weaker access privileges ('package local'); was 'public'">ff</error>() {}
void <error descr="'ff()' in 'a' clashes with 'ff()' in 'i'; attempting to assign weaker access privileges ('package-private'); was 'public'">ff</error>() {}
}
class ai implements i {
public <error descr="'ff()' in 'ai' clashes with 'ff()' in 'i'; attempting to use incompatible return type">int</error> ff() { return 0;}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StaticOverride.java
View File

@@ -34,7 +34,7 @@ interface i2 {
class weak {
void f1() {}
}
<error descr="'f1()' in 'weak' clashes with 'f1()' in 'i'; attempting to assign weaker access privileges ('package local'); was 'public'">class a2 extends weak implements i</error> {
<error descr="'f1()' in 'weak' clashes with 'f1()' in 'i'; attempting to assign weaker access privileges ('package-private'); was 'public'">class a2 extends weak implements i</error> {
}
class a3 {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/packageLocals/x/A.java
View File

@@ -6,7 +6,7 @@ public class A extends D{
class C extends x.sub.B {
int n=<error descr="'k' is not public in 'x.A'. Cannot be accessed from outside package">k</error>;
// can call despite inherited through package local from other package
// can call despite inherited through package-private from other package
void f() { A.staticF(); }
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/packageLocals/x/ContainerClass.java
View File

@@ -1,4 +1,4 @@
// package local class in the middle
// package-private class in the middle
package x;
class ComponentClass {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/after23.java
View File

@@ -1,4 +1,4 @@
// "Make 'a.i' package local" "true"
// "Make 'a.i' package-private" "true"
import java.io.*;
class a {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/before23.java
View File

@@ -1,4 +1,4 @@
// "Make 'a.i' package local" "true"
// "Make 'a.i' package-private" "true"
import java.io.*;
class a {

2
java/java-tests/testData/inspection/visibility/SCR5008/expected.xml
View File

@@ -3,7 +3,7 @@
<problem>
<file>SuperClass.java</file>
<line>3</line>
<description>package local</description>
<description>package-private</description>
</problem>
</problems>

2
java/java-tests/testData/inspection/visibility/packageLevelTops/expected.xml
View File

@@ -3,7 +3,7 @@
<problem>
<file>PackageLevelServer.java</file>
<line>3</line>
<description>package local</description>
<description>package-private</description>
</problem>
</problems>

4
java/java-tests/testData/inspection/visibility/usedFromAnnotationsExtendsList/expected.xml
View File

@@ -7,7 +7,7 @@
<hints>
<hint value="packageLocal" />
</hints>
<description>Can be package local</description>
<description>Can be package-private</description>
</problem>
<problem>
<file>ThisClass.java</file>
@@ -16,7 +16,7 @@
<hints>
<hint value="packageLocal" />
</hints>
<description>Can be package local</description>
<description>Can be package-private</description>
</problem>
</problems>

4
java/java-tests/testSrc/com/intellij/refactoring/PullUpMultifileTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -87,7 +87,7 @@ public class PullUpMultifileTest extends MultiFileTestCase {
public void testInaccessible() throws Exception {
doTest("Method <b><code>A.foo()</code></b> is package local and will not be accessible from method <b><code>method2Move()</code></b>.",
doTest("Method <b><code>A.foo()</code></b> is package-private and will not be accessible from method <b><code>method2Move()</code></b>.",
"Method <b><code>method2Move()</code></b> uses method <b><code>A.foo()</code></b>, which is not moved to the superclass");
}

5
java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -21,7 +21,6 @@
package com.intellij.refactoring;
import com.intellij.JavaTestUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiMethod;
@@ -129,7 +128,7 @@ public class PushDownMultifileTest extends MultiFileTestCase {
});
}
catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
assertEquals(e.getMessage(), "Class <b><code>b.B</code></b> is package local and will not be accessible from file <b><code>A.form</code></b>.");
assertEquals(e.getMessage(), "Class <b><code>b.B</code></b> is package-private and will not be accessible from file <b><code>A.form</code></b>.");
return;
}
fail("Conflict was not detected");

4
jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -1841,7 +1841,7 @@ public class Mappings {
}
if (diff.packageLocalOn()) {
debug("Introduction of 'package local' access detected, adding class usage + package constraint to affected usages");
debug("Introduction of 'package-private' access detected, adding class usage + package constraint to affected usages");
final UsageRepr.Usage usage = changedClass.createUsage();
state.myAffectedUsages.add(usage);

4
platform/editor-ui-api/src/com/intellij/openapi/actionSystem/AnActionEvent.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -58,7 +58,7 @@ public class AnActionEvent implements PlaceProvider<String> {
@NotNull Presentation presentation,
@NotNull ActionManager actionManager,
@JdkConstants.InputEventMask int modifiers) {
// TODO[vova,anton] make this constructor package local. No one is allowed to create AnActionEvents
// TODO[vova,anton] make this constructor package-private. No one is allowed to create AnActionEvents
myInputEvent = inputEvent;
myActionManager = actionManager;
myDataContext = dataContext;

6
platform/forms_rt/src/com/intellij/uiDesigner/core/GridLayoutManager.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -57,11 +57,11 @@ public final class GridLayoutManager extends AbstractLayout {
private LayoutState myLayoutState;
/**
* package local because is used in tests
* package-private because is used in tests
*/
DimensionInfo myHorizontalInfo;
/**
* package local because is used in tests
* package-private because is used in tests
*/
DimensionInfo myVerticalInfo;

6
platform/platform-resources-en/src/messages/InspectionsBundle.properties
View File

@@ -159,11 +159,11 @@ inspection.test.only.problems.test.only.method.call=Test-only method is called i
inspection.test.only.problems.test.only.class.reference=Test-only class is referenced in production code
inspection.visibility.display.name=Declaration access can be weaker
inspection.visibility.option=Suggest package local visibility level for class members
inspection.visibility.option1=Suggest package local visibility level for top-level classes
inspection.visibility.option=Suggest package-private visibility level for class members
inspection.visibility.option1=Suggest package-private visibility level for top-level classes
inspection.visibility.option2=<html>Suggest private for inner class members when referenced from outer class only</html>
#can be private|package local|protected|public
#can be private|package-private|protected|public
inspection.visibility.compose.suggestion=Can be {0}
inspection.visibility.accept.quickfix=Accept suggested access level

2
platform/platform-resources-en/src/messages/PsiBundle.properties
View File

@@ -83,7 +83,7 @@ cannot.delete.a.read.only.file=Cannot delete a read-only file ''{0}''.
cannot.resolve.symbol=Cannot resolve symbol ''{0}''
# suppress inspection "UnusedProperty"
packageLocal.visibility.presentation=package local
packageLocal.visibility.presentation=package-private
# suppress inspection "UnusedProperty"
protected.visibility.presentation=protected
# suppress inspection "UnusedProperty"

2
platform/structuralsearch/source/messages/SSRBundle.properties
View File

@@ -145,7 +145,7 @@ predefined.configuration.constructors.of.the.class=constructors of the class
predefined.configuration.typed.symbol=typed symbol
predefined.configuration.all.fields.of.the.class=all fields of the class
predefined.configuration.instance.fields.of.the.class=instance fields of the class
predefined.configuration.packagelocal.fields.of.the.class=package local fields of the class
predefined.configuration.packagelocal.fields.of.the.class=package-private fields of the class
predefined.configuration.classes=classes
predefined.configuration.new.expressions=new expressions
predefined.configuration.lambdas=lambdas

8
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -2709,12 +2709,12 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
String s2_2 = "@Modifier({\"packageLocal\",\"private\"}) '_Type '_Variable = '_Value?;";
String s2_3 = "@Modifier({\"PackageLocal\",\"private\"}) '_Type '_Variable = '_Value?;";
assertEquals("Finding package local dcls",1,findMatchesCount(s1,s2));
assertEquals("Finding package local dcls",3,findMatchesCount(s1,s2_2));
assertEquals("Finding package-private dcls",1,findMatchesCount(s1,s2));
assertEquals("Finding package-private dcls",3,findMatchesCount(s1,s2_2));
try {
findMatchesCount(s1,s2_3);
assertTrue("Finding package local dcls",false);
assertTrue("Finding package-private dcls",false);
} catch(MalformedPatternException ex) {
}

4
platform/util/src/com/intellij/util/io/Bits.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -20,7 +20,7 @@
package com.intellij.util.io;
/**
* Barely, a copy of java.io.Bits, which is for unknown reason package local.
* Barely, a copy of java.io.Bits, which is for unknown reason package-private.
*/
public class Bits {

6
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
View File

@@ -1987,8 +1987,8 @@ junit3.style.test.method.in.junit4.class.display.name=Old style JUnit test metho
junit3.style.test.method.in.junit4.class.problem.descriptor=Old style JUnit test method <code>#ref()</code> in JUnit 4 class #loc
none=none
private=private
package.local.private=package local \\& private
protected.package.local.private=protected, package local \\& private
package.local.private=package-private \\& private
protected.package.local.private=protected, package-private \\& private
non.final.utility.class.display.name=Utility class is not final
non.final.utility.class.problem.descriptor=Utility class <code>#ref</code> is not 'final' #loc
0.will.no.longer.be.overridable.by.1={0} will no longer be overridable by {1}
@@ -2159,7 +2159,7 @@ field.incorrect.type.problem.descriptor=Field ''{0}'' does not have type ''{1}''
field.missing.volatile.modifier.problem.descriptor=Field ''{0}'' does not have ''volatile'' modifier
field.has.static.modifier.problem.descriptor=Field ''{0}'' has ''static'' modifier
private.field.not.accessible.problem.descriptor=''private'' field ''{0}'' is not accessible from here
package.local.field.not.accessible=package local field ''{0}'' is not accessible from here
package.local.field.not.accessible=package-private field ''{0}'' is not accessible from here
protected.field.not.accessible.problem.descriptor=''protected'' field ''{0}'' is not accessible from here
interface.clashes.with.object.class.display.name=Interface method clashes with method in 'java.lang.Object'
interface.clashes.with.object.class.problem.descriptor=<code>#ref()</code> clashes with method in 'java.lang.Object'

4
plugins/InspectionGadgets/src/inspectionDescriptions/MethodOverridesPackageLocalMethod.html
View File

@@ -2,8 +2,8 @@
<body>
Reports methods having the same name as a package
local method of a superclass in other package. Such methods may result in
confusing semantics, particularly if the package local method is ever made
publicly visible. A package local method can only properly be overridden if
confusing semantics, particularly if the package-private method is ever made
publicly visible. A package-private method can only properly be overridden if
the subclass resides in the same package.
<!-- tooltip end -->
<p>

2
plugins/InspectionGadgets/src/inspectionDescriptions/ParametersPerConstructor.html
View File

@@ -6,7 +6,7 @@ with too many parameters can be a good sign that refactoring is necessary.
<p>
Use the field below to specify the maximum number of parameters a constructor is allowed to have.
<p>
Use the combobox below to specify if the inspection should ignore private, package local & private or protected, package local and
Use the combobox below to specify if the inspection should ignore private, package-private & private or protected, package-private and
private constructors
<p>

2
plugins/InspectionGadgets/src/inspectionDescriptions/PrivateMemberAccessBetweenOuterAndInnerClass.html
View File

@@ -11,7 +11,7 @@ class files. The virtual machine normally prohibits access from a class to priva
another class. To enable access from an inner class to private members of a
containing class or the other way around javac and other compilers create package private
synthetic accessor methods. Less use of memory and greater performance may be achieved by making the
member package local, thus allowing direct access without the creation of synthetic accessor methods.
member package-private, thus allowing direct access without the creation of synthetic accessor methods.
<!-- tooltip end -->
<p>

4
plugins/InspectionGadgets/testsrc/com/intellij/codeInspection/visibility/AccessCanBeTightenedInspectionTest.java
View File

@@ -27,7 +27,7 @@ public class AccessCanBeTightenedInspectionTest extends LightInspectionTestCase
"class C {\n" +
" final int /*Access can be private*/fd/**/ = 0;\n" +
" /*Access can be private*/public/**/ int fd2;\n" +
" /*Access can be package local*/public/**/ int forSubClass;\n" +
" /*Access can be package-private*/public/**/ int forSubClass;\n" +
" @Override\n" +
" public int hashCode() {\n" +
" return fd + fd2;\n" + // use field
@@ -58,7 +58,7 @@ public class AccessCanBeTightenedInspectionTest extends LightInspectionTestCase
"@interface Ann{ String value(); }\n" +
"@Ann(value = C.VAL\n)" +
"class C {\n" +
" /*Access can be package local*/public/**/ static final String VAL = \"xx\";\n" +
" /*Access can be package-private*/public/**/ static final String VAL = \"xx\";\n" +
"}");
}

20
plugins/properties/testData/propertiesFile/enter/Performance.properties
View File

@@ -1999,8 +1999,8 @@ junit3.style.test.method.in.junit4.class.display.name=Old style JUnit test metho
junit3.style.test.method.in.junit4.class.problem.descriptor=Old style JUnit test method <code>#ref()</code> in JUnit 4 class #loc
none=none
private=private
package.local.private=package local & private
protected.package.local.private=protected, package local & private
package.local.private=package-private & private
protected.package.local.private=protected, package-private & private
non.final.utility.class.display.name=Utility class is not final
non.final.utility.class.problem.descriptor=Utility class <code>#ref</code> is not 'final' #loc
0.will.no.longer.be.overridable.by.1={0} will no longer be overridable by {1}
@@ -10609,11 +10609,11 @@ inspection.test.only.problems.display.name=Test-only method call in production c
inspection.test.only.problems.test.only.method.call=Test-only method is called in production code
inspection.visibility.display.name=Declaration access can be weaker
inspection.visibility.option=Suggest package local visibility level for class members
inspection.visibility.option1=Suggest package local visibility level for top-level classes
inspection.visibility.option=Suggest package-private visibility level for class members
inspection.visibility.option1=Suggest package-private visibility level for top-level classes
inspection.visibility.option2=<html>Suggest private for inner class members when referenced from outer class only</html>
#can be private|package local|protected|public
#can be private|package-private|protected|public
inspection.visibility.compose.suggestion=Can be {0}
inspection.visibility.accept.quickfix=Accept Suggested Access Level
@@ -17490,8 +17490,8 @@ junit3.style.test.method.in.junit4.class.display.name=Old style JUnit test metho
junit3.style.test.method.in.junit4.class.problem.descriptor=Old style JUnit test method <code>#ref()</code> in JUnit 4 class #loc
none=none
private=private
package.local.private=package local & private
protected.package.local.private=protected, package local & private
package.local.private=package-private & private
protected.package.local.private=protected, package-private & private
non.final.utility.class.display.name=Utility class is not final
non.final.utility.class.problem.descriptor=Utility class <code>#ref</code> is not 'final' #loc
0.will.no.longer.be.overridable.by.1={0} will no longer be overridable by {1}
@@ -26097,11 +26097,11 @@ inspection.test.only.problems.display.name=Test-only method call in production c
inspection.test.only.problems.test.only.method.call=Test-only method is called in production code
inspection.visibility.display.name=Declaration access can be weaker
inspection.visibility.option=Suggest package local visibility level for class members
inspection.visibility.option1=Suggest package local visibility level for top-level classes
inspection.visibility.option=Suggest package-private visibility level for class members
inspection.visibility.option1=Suggest package-private visibility level for top-level classes
inspection.visibility.option2=<html>Suggest private for inner class members when referenced from outer class only</html>
#can be private|package local|protected|public
#can be private|package-private|protected|public
inspection.visibility.compose.suggestion=Can be {0}
inspection.visibility.accept.quickfix=Accept Suggested Access Level

2
plugins/ui-designer/src/com/intellij/uiDesigner/GeneralConfigurable.form
View File

@@ -93,7 +93,7 @@
<properties>
<model>
<item value="private"/>
<item value="package local"/>
<item value="package-private"/>
<item value="protected"/>
<item value="public"/>
</model>