diff --git a/java-analysis-api/src/main/java/com/intellij/java/analysis/refactoring/JavaRefactoringActionHandlerFactory.java b/java-analysis-api/src/main/java/com/intellij/java/analysis/refactoring/JavaRefactoringActionHandlerFactory.java index cce98d6996..3b3d3ad9e1 100644 --- a/java-analysis-api/src/main/java/com/intellij/java/analysis/refactoring/JavaRefactoringActionHandlerFactory.java +++ b/java-analysis-api/src/main/java/com/intellij/java/analysis/refactoring/JavaRefactoringActionHandlerFactory.java @@ -80,7 +80,7 @@ public static JavaRefactoringActionHandlerFactory getInstance() { * Creates handler for Introduce Parameter refactoring.

* * {@link RefactoringActionHandler#invoke(Project, PsiElement[], DataContext)} - * accepts either 1 PsiExpression, that will be an initialzier for introduced parameter, + * accepts either 1 PsiExpression, that will be an initializer for introduced parameter, * or 1 PsiLocalVariable, that will be replaced with introduced parameter. */ public abstract RefactoringActionHandler createIntroduceParameterHandler(); @@ -181,7 +181,7 @@ public static JavaRefactoringActionHandlerFactory getInstance() { * Creates handler for Introduce Field refactoring.

* * {@link RefactoringActionHandler#invoke(Project, PsiElement[], DataContext)} - * accepts either 1 PsiExpression, that will be an initialzier for introduced field, + * accepts either 1 PsiExpression, that will be an initializer for introduced field, * or 1 PsiLocalVariable, that will be replaced with introduced field. */ public abstract RefactoringActionHandler createIntroduceFieldHandler(); @@ -190,7 +190,7 @@ public static JavaRefactoringActionHandlerFactory getInstance() { * Creates handler for Introduce Variable refactoring.

* * {@link RefactoringActionHandler#invoke(Project, PsiElement[], DataContext)} - * accepts 1 PsiExpression, that will be an initialzier for introduced variable. + * accepts 1 PsiExpression, that will be an initializer for introduced variable. */ public abstract RefactoringActionHandler createIntroduceVariableHandler(); @@ -198,7 +198,7 @@ public static JavaRefactoringActionHandlerFactory getInstance() { * Creates handler for Introduce Constant refactoring.

* * {@link RefactoringActionHandler#invoke(Project, PsiElement[], DataContext)} - * accepts either 1 PsiExpression, that will be an initialzier for introduced constant, + * accepts either 1 PsiExpression, that will be an initializer for introduced constant, * or 1 PsiLocalVariable, that will be replaced with introduced constant. */ public abstract IntroduceConstantHandler createIntroduceConstantHandler(); diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/deadCode/UnusedDeclarationInspectionBase.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/deadCode/UnusedDeclarationInspectionBase.java index 8f031fac4a..e40b0c1df5 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/deadCode/UnusedDeclarationInspectionBase.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInspection/deadCode/UnusedDeclarationInspectionBase.java @@ -13,16 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * Created by IntelliJ IDEA. - * User: max - * Date: Oct 12, 2001 - * Time: 9:40:45 PM - * To change template for new class use - * Code Style | Class Templates options (Tools | IDE Options). - */ - package com.intellij.java.analysis.impl.codeInspection.deadCode; import com.intellij.java.analysis.codeInspection.GlobalJavaInspectionContext; @@ -77,6 +67,10 @@ import java.util.*; +/** + * @author max + * @since 2001-10-12 + */ public abstract class UnusedDeclarationInspectionBase extends GlobalInspectionTool implements OldStyleInspection { @Deprecated public boolean ADD_MAINS_TO_ENTRIES = true; @@ -661,7 +655,7 @@ private static class CodeScanner extends RefJavaVisitor { @Override public void visitMethod(@Nonnull RefMethod method) { if (!myProcessedMethods.contains(method)) { - // Process class's static intitializers + // Process class's static initializers if (method.isStatic() || method.isConstructor()) { if (method.isConstructor()) { addInstantiatedClass(method.getOwnerClass()); @@ -695,7 +689,7 @@ public void visitClass(@Nonnull RefClass refClass) { ((RefClassImpl)refClass).setReachable(true); if (!alreadyActive) { - // Process class's static intitializers. + // Process class's static initializers. makeClassInitializersReachable(refClass); } @@ -704,7 +698,7 @@ public void visitClass(@Nonnull RefClass refClass) { @Override public void visitField(@Nonnull RefField field) { - // Process class's static intitializers. + // Process class's static initializers. if (!field.isReachable()) { makeContentReachable((RefJavaElementImpl)field); makeClassInitializersReachable(field.getOwnerClass()); diff --git a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/BoundsParser.java b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/BoundsParser.java index 2d1c8ff6b1..e4146266ea 100644 --- a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/BoundsParser.java +++ b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/cache/BoundsParser.java @@ -58,7 +58,7 @@ public void parseClassTypeSignature(CharacterIterator it, StringBuilder buf) thr super.parseClassTypeSignature(it, buf); - final String qName = convertToQalifiedName(buf.substring(start + 1, buf.length() - 1)); + final String qName = convertToQualifiedName(buf.substring(start + 1, buf.length() - 1)); myInterfaceBounds.add(qName); } else { @@ -66,7 +66,7 @@ public void parseClassTypeSignature(CharacterIterator it, StringBuilder buf) thr } } - private static String convertToQalifiedName(String ifaceSignature) { + private static String convertToQualifiedName(String ifaceSignature) { ifaceSignature = ifaceSignature.replaceAll("<.*>", ""); return ifaceSignature.replace('/', '.'); } diff --git a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/javaCompiler/TargetOptionsComponent.java b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/javaCompiler/TargetOptionsComponent.java index 7931a002e0..0525c630fc 100644 --- a/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/javaCompiler/TargetOptionsComponent.java +++ b/java-compiler-impl/src/main/java/com/intellij/java/compiler/impl/javaCompiler/TargetOptionsComponent.java @@ -285,19 +285,19 @@ public TargetOptionsComponent(Project project) { add(tableComp, constraints(0, 2, 2, 1, 1.0, 1.0, GridBagConstraints.BOTH)); } - private static GridBagConstraints constraints(final int gridx, - final int gridy, - final int gridwidth, - final int gridheight, - final double weightx, - final double weighty, + private static GridBagConstraints constraints(final int gridX, + final int gridY, + final int gridWidth, + final int gridHeight, + final double weightX, + final double weightY, final int fill) { - return new GridBagConstraints(gridx, - gridy, - gridwidth, - gridheight, - weightx, - weighty, + return new GridBagConstraints(gridX, + gridY, + gridWidth, + gridHeight, + weightX, + weightY, GridBagConstraints.WEST, fill, new Insets(5, 5, 0, 0), diff --git a/java-compiler-impl/src/main/java/consulo/java/compiler/bytecodeProcessing/JavaBytecodeProcessor.java b/java-compiler-impl/src/main/java/consulo/java/compiler/bytecodeProcessing/JavaBytecodeProcessor.java index 3ee2c6c543..1eadf16fec 100644 --- a/java-compiler-impl/src/main/java/consulo/java/compiler/bytecodeProcessing/JavaBytecodeProcessor.java +++ b/java-compiler-impl/src/main/java/consulo/java/compiler/bytecodeProcessing/JavaBytecodeProcessor.java @@ -43,6 +43,6 @@ byte[] processClassFile(CompileContext compileContext, Cache newClassesCache, int classId, File file, - ThrowableComputable bytesCompitable, + ThrowableComputable bytesComputable, InstrumentationClassFinder classFinder) throws IOException, CacheCorruptedException; } diff --git a/java-compiler-impl/src/main/java/consulo/java/compiler/bytecodeProcessing/impl/NotNullJavaBytecodeProcessorCompiler.java b/java-compiler-impl/src/main/java/consulo/java/compiler/bytecodeProcessing/impl/NotNullJavaBytecodeProcessorCompiler.java index 76373576b1..8d8b1b28b4 100644 --- a/java-compiler-impl/src/main/java/consulo/java/compiler/bytecodeProcessing/impl/NotNullJavaBytecodeProcessorCompiler.java +++ b/java-compiler-impl/src/main/java/consulo/java/compiler/bytecodeProcessing/impl/NotNullJavaBytecodeProcessorCompiler.java @@ -56,7 +56,7 @@ public byte[] processClassFile(CompileContext compileContext, Cache newClassesCache, int classId, File file, - ThrowableComputable bytesCompitable, + ThrowableComputable bytesComputable, InstrumentationClassFinder classFinder) throws IOException, CacheCorruptedException { Sdk jdk = JavaCompilerUtil.getSdkForCompilation(affectedModule); @@ -70,7 +70,7 @@ public byte[] processClassFile(CompileContext compileContext, return null; } - byte[] bytes = bytesCompitable.compute(); + byte[] bytes = bytesComputable.compute(); FailSafeClassReader reader = new FailSafeClassReader(bytes, 0, bytes.length); assert classFinder != null; diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebugUIEnvironment.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebugUIEnvironment.java index 4476348ca8..5cf0e937c0 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebugUIEnvironment.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/DebugUIEnvironment.java @@ -23,8 +23,7 @@ import jakarta.annotation.Nullable; /** - * Created by IntelliJ IDEA. - * User: michael.golubev + * @author michael.golubev */ public interface DebugUIEnvironment { DebugEnvironment getEnvironment(); diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/AnyExceptionBreakpoint.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/AnyExceptionBreakpoint.java index 8eb55a61f3..2ad782728c 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/AnyExceptionBreakpoint.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/ui/breakpoints/AnyExceptionBreakpoint.java @@ -71,7 +71,7 @@ public void createRequest(DebugProcessImpl debugProcess) @Override public void processClassPrepare(DebugProcess debugProcess, ReferenceType refType) { - // should be emty - does not make sense for this breakpoint + // should be empty - does not make sense for this breakpoint } @Override diff --git a/java-execution-api/src/main/java/com/intellij/java/execution/filters/ExceptionFilterFactory.java b/java-execution-api/src/main/java/com/intellij/java/execution/filters/ExceptionFilterFactory.java index 12c35ff3e4..b5b3c064ad 100644 --- a/java-execution-api/src/main/java/com/intellij/java/execution/filters/ExceptionFilterFactory.java +++ b/java-execution-api/src/main/java/com/intellij/java/execution/filters/ExceptionFilterFactory.java @@ -24,9 +24,8 @@ import jakarta.annotation.Nonnull; /** - * User: Irina.Chernushina - * Date: 8/5/11 - * Time: 7:46 PM + * @author Irina.Chernushina + * @since 2011-08-05 */ @ExtensionAPI(ComponentScope.APPLICATION) public interface ExceptionFilterFactory { diff --git a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/filters/ExceptionBaseFilterFactory.java b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/filters/ExceptionBaseFilterFactory.java index 66e020c064..6ba97b00f9 100644 --- a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/filters/ExceptionBaseFilterFactory.java +++ b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/filters/ExceptionBaseFilterFactory.java @@ -23,10 +23,8 @@ import jakarta.annotation.Nonnull; /** - * Created by IntelliJ IDEA. - * User: Irina.Chernushina - * Date: 8/8/11 - * Time: 12:11 PM + * @author Irina.Chernushina + * @since 2011-08-08 */ @ExtensionImpl public class ExceptionBaseFilterFactory implements ExceptionFilterFactory { diff --git a/java-language-api/src/main/java/com/intellij/java/language/psi/PsiAssertStatement.java b/java-language-api/src/main/java/com/intellij/java/language/psi/PsiAssertStatement.java index a3484c9cbc..77c06c9680 100644 --- a/java-language-api/src/main/java/com/intellij/java/language/psi/PsiAssertStatement.java +++ b/java-language-api/src/main/java/com/intellij/java/language/psi/PsiAssertStatement.java @@ -24,7 +24,7 @@ public interface PsiAssertStatement extends PsiStatement{ /** * Returns the expression representing the asserted condition. * - * @return the asserted conditione expression, or null if the assert statement + * @return the asserted condition expression, or null if the assert statement * is incomplete. */ @Nullable diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/javadoc/JavaDocUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/javadoc/JavaDocUtil.java index 587dee59e4..b628cb9b49 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/javadoc/JavaDocUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/codeInsight/javadoc/JavaDocUtil.java @@ -36,9 +36,7 @@ public class JavaDocUtil { private static final Logger LOG = Logger.getInstance(JavaDocUtil.class); - private static final - @NonNls - Pattern ourTypePattern = Pattern.compile("[ ]+[^ ^\\[^\\]]"); + private static final Pattern ourTypePattern = Pattern.compile("[ ]+[^ ^\\[^\\]]"); private JavaDocUtil() { } @@ -49,22 +47,22 @@ private JavaDocUtil() { * @return length of the extracted reference */ public static int extractReference(String text) { - int lparenthIndex = text.indexOf('('); + int lParenIndex = text.indexOf('('); int spaceIndex = text.indexOf(' '); if (spaceIndex < 0) { spaceIndex = text.length(); } - if (lparenthIndex < 0) { + if (lParenIndex < 0) { return spaceIndex; } else { - if (spaceIndex < lparenthIndex) { + if (spaceIndex < lParenIndex) { return spaceIndex; } - int rparenthIndex = text.indexOf(')', lparenthIndex); - if (rparenthIndex < 0) { - rparenthIndex = text.length() - 1; + int rParenIndex = text.indexOf(')', lParenIndex); + if (rParenIndex < 0) { + rParenIndex = text.length() - 1; } - return rparenthIndex + 1; + return rParenIndex + 1; } } @@ -124,8 +122,8 @@ public static PsiElement findReferenceTarget(PsiManager manager, String refText, @Nullable private static PsiElement findReferencedMember(PsiClass aClass, String memberRefText, PsiElement context) { - int parenthIndex = memberRefText.indexOf('('); - if (parenthIndex < 0) { + int parenIndex = memberRefText.indexOf('('); + if (parenIndex < 0) { String name = memberRefText; PsiField field = aClass.findFieldByName(name, true); if (field != null) { @@ -143,25 +141,25 @@ private static PsiElement findReferencedMember(PsiClass aClass, String memberRef } return null; } else { - String name = memberRefText.substring(0, parenthIndex).trim(); + String name = memberRefText.substring(0, parenIndex).trim(); int rparenIndex = memberRefText.lastIndexOf(')'); if (rparenIndex == -1) { return null; } - String parmsText = memberRefText.substring(parenthIndex + 1, rparenIndex).trim(); - StringTokenizer tokenizer = new StringTokenizer(parmsText.replaceAll("[*]", ""), ","); + String paramsText = memberRefText.substring(parenIndex + 1, rparenIndex).trim(); + StringTokenizer tokenizer = new StringTokenizer(paramsText.replaceAll("[*]", ""), ","); PsiType[] types = new PsiType[tokenizer.countTokens()]; int i = 0; PsiElementFactory factory = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory(); while (tokenizer.hasMoreTokens()) { - String parmText = tokenizer.nextToken().trim(); + String paramText = tokenizer.nextToken().trim(); try { - Matcher typeMatcher = ourTypePattern.matcher(parmText); - String typeText = parmText; + Matcher typeMatcher = ourTypePattern.matcher(paramText); + String typeText = paramText; if (typeMatcher.find()) { - typeText = parmText.substring(0, typeMatcher.start()); + typeText = paramText.substring(0, typeMatcher.start()); } PsiType type = factory.createTypeFromText(typeText, context); @@ -173,19 +171,19 @@ private static PsiElement findReferencedMember(PsiClass aClass, String memberRef PsiMethod[] methods = aClass.findMethodsByName(name, true); MethodsLoop: for (PsiMethod method : methods) { - PsiParameter[] parms = method.getParameterList().getParameters(); - if (parms.length != types.length) { + PsiParameter[] params = method.getParameterList().getParameters(); + if (params.length != types.length) { continue; } - for (int k = 0; k < parms.length; k++) { - PsiParameter parm = parms[k]; - final PsiType parmType = parm.getType(); + for (int k = 0; k < params.length; k++) { + PsiParameter param = params[k]; + final PsiType paramType = param.getType(); if (types[k] != null && - !TypeConversionUtil.erasure(parmType).getCanonicalText().equals(types[k].getCanonicalText + !TypeConversionUtil.erasure(paramType).getCanonicalText().equals(types[k].getCanonicalText ()) && - !parmType.getCanonicalText().equals(types[k].getCanonicalText()) && - !TypeConversionUtil.isAssignable(parmType, types[k])) { + !paramType.getCanonicalText().equals(types[k].getCanonicalText()) && + !TypeConversionUtil.isAssignable(paramType, types[k])) { continue MethodsLoop; } } @@ -193,7 +191,7 @@ private static PsiElement findReferencedMember(PsiClass aClass, String memberRef int hashIndex = memberRefText.indexOf('#', rparenIndex); if (hashIndex != -1) { int parameterNumber = Integer.parseInt(memberRefText.substring(hashIndex + 1)); - if (parameterNumber < parms.length) { + if (parameterNumber < params.length) { return method.getParameterList().getParameters()[parameterNumber].getNavigationElement(); } } @@ -233,14 +231,14 @@ public static String getReferenceText(Project project, PsiElement element) { buffer.append("#"); buffer.append(name); buffer.append("("); - PsiParameter[] parms = method.getParameterList().getParameters(); + PsiParameter[] params = method.getParameterList().getParameters(); boolean spaceBeforeComma = JavaDocCodeStyle.getInstance(project).spaceBeforeComma(); boolean spaceAfterComma = JavaDocCodeStyle.getInstance(project).spaceAfterComma(); - for (int i = 0; i < parms.length; i++) { - PsiParameter parm = parms[i]; - String typeText = TypeConversionUtil.erasure(parm.getType()).getCanonicalText(); + for (int i = 0; i < params.length; i++) { + PsiParameter param = params[i]; + String typeText = TypeConversionUtil.erasure(param.getType()).getCanonicalText(); buffer.append(typeText); - if (i < parms.length - 1) { + if (i < params.length - 1) { if (spaceBeforeComma) { buffer.append(" "); } @@ -335,18 +333,18 @@ public static String getLabelText(Project project, PsiManager manager, String re private static String getMemberLabelText(Project project, PsiManager manager, String memberText, PsiElement context) { - int parenthIndex = memberText.indexOf('('); - if (parenthIndex < 0) { + int parenIndex = memberText.indexOf('('); + if (parenIndex < 0) { return memberText; } if (!StringUtil.endsWithChar(memberText, ')')) { return memberText; } - String parms = memberText.substring(parenthIndex + 1, memberText.length() - 1); + String params = memberText.substring(parenIndex + 1, memberText.length() - 1); StringBuffer buffer = new StringBuffer(); boolean spaceBeforeComma = JavaDocCodeStyle.getInstance(project).spaceBeforeComma(); boolean spaceAfterComma = JavaDocCodeStyle.getInstance(project).spaceAfterComma(); - StringTokenizer tokenizer = new StringTokenizer(parms, ","); + StringTokenizer tokenizer = new StringTokenizer(params, ","); while (tokenizer.hasMoreTokens()) { String param = tokenizer.nextToken().trim(); int index1 = param.indexOf('['); @@ -372,7 +370,7 @@ private static String getMemberLabelText(Project project, PsiManager manager, St } } } - return memberText.substring(0, parenthIndex + 1) + buffer.toString() + ")"; + return memberText.substring(0, parenIndex + 1) + buffer.toString() + ")"; } public static PsiClassType[] getImplementsList(PsiClass aClass) { diff --git a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/FunctionalInterfaceParameterizationUtil.java b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/FunctionalInterfaceParameterizationUtil.java index f813cbf5c8..7d1548cad6 100644 --- a/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/FunctionalInterfaceParameterizationUtil.java +++ b/java-language-impl/src/main/java/com/intellij/java/language/impl/psi/impl/source/resolve/graphInference/FunctionalInterfaceParameterizationUtil.java @@ -72,7 +72,7 @@ public static PsiType getGroundTargetType(@Nullable PsiType psiClassType, @Nulla } /** - * 18.5.3. Functional Interface Parameterization Inference + * 18.5.3. Functional Interface Parametrization Inference */ private static PsiType getFunctionalTypeExplicit(PsiType psiClassType, PsiLambdaExpression expr, boolean performFinalCheck) { final PsiParameter[] lambdaParams = expr.getParameterList().getParameters(); diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/unwrap/JavaWhileUnwrapper.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/unwrap/JavaWhileUnwrapper.java index 705c9f1b93..21fad4b290 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/unwrap/JavaWhileUnwrapper.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/unwrap/JavaWhileUnwrapper.java @@ -30,7 +30,7 @@ public JavaWhileUnwrapper() { @Override public boolean isApplicableTo(PsiElement e) { - return e instanceof PsiWhileStatementImpl // Don't use "e instanceof PsiWhileStatement" because JspWhileStatement intanceof PsiWhileStatement, + return e instanceof PsiWhileStatementImpl // Don't use "e instanceof PsiWhileStatement" because JspWhileStatement instanceof PsiWhileStatement, // but we doesn't support unwrap JspWhileStatement. || e instanceof PsiDoWhileStatement; } diff --git a/plugin/src/main/java/com/intellij/java/impl/generate/element/ClassElement.java b/plugin/src/main/java/com/intellij/java/impl/generate/element/ClassElement.java index fd11e1f3c6..02c477bea3 100644 --- a/plugin/src/main/java/com/intellij/java/impl/generate/element/ClassElement.java +++ b/plugin/src/main/java/com/intellij/java/impl/generate/element/ClassElement.java @@ -43,7 +43,7 @@ public class ClassElement * Does the class implement the given interface? *

* The name should not be the qualified name. - *
The interface name can also be a comma seperated list to test against several interfaces. Will return true if the class implement just one of the interfaces. + *
The interface name can also be a comma separated list to test against several interfaces. Will return true if the class implement just one of the interfaces. * * @param interfaceName interface name. * @return true if the class implements this interface, false if not. @@ -64,7 +64,7 @@ public boolean isImplements(String interfaceName) /** * Does the class extends any of the given classnames? * - * @param classNames list of classes seperated by comma. + * @param classNames list of classes separated by comma. * @return true if this class extends one of the given classnames. */ public boolean isExtends(String classNames) diff --git a/plugin/src/main/java/com/intellij/java/impl/generate/velocity/VelocityFactory.java b/plugin/src/main/java/com/intellij/java/impl/generate/velocity/VelocityFactory.java index 1a346aef39..37febe55cc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/generate/velocity/VelocityFactory.java +++ b/plugin/src/main/java/com/intellij/java/impl/generate/velocity/VelocityFactory.java @@ -30,11 +30,11 @@ public class VelocityFactory { private static class Holder { - private static final VelocityEngine engine = newVeloictyEngine(); + private static final VelocityEngine engine = newVelocityEngine(); } /** - * Privte constructor. + * Private constructor. */ private VelocityFactory() { @@ -47,7 +47,7 @@ private VelocityFactory() * * @return a new velocity engine that is initialized. */ - private static VelocityEngine newVeloictyEngine() + private static VelocityEngine newVelocityEngine() { Properties prop = new Properties(); prop.setProperty("runtime.log.logsystem.log4j.category", "GenerateToString"); @@ -59,7 +59,7 @@ private static VelocityEngine newVeloictyEngine() } /** - * Get's a shared instance of the VelocityEngine. + * Gets a shared instance of the VelocityEngine. *

* The engine is initialized and outputs its logging to IDEA logging. * diff --git a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/method/MethodHierarchyUtil.java b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/method/MethodHierarchyUtil.java index 5fc8643596..71ed14e2bc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/method/MethodHierarchyUtil.java +++ b/plugin/src/main/java/com/intellij/java/impl/ide/hierarchy/method/MethodHierarchyUtil.java @@ -24,7 +24,7 @@ public static PsiMethod findBaseMethodInClass(PsiMethod baseMethod, PsiClass aCl if (baseMethod == null) { return null; // base method is invalid } - if (cannotBeOverridding(baseMethod)) { + if (cannotBeOverriding(baseMethod)) { return null; } /*if (!checkBases) return MethodSignatureUtil.findMethodBySignature(aClass, signature, false);*/ @@ -33,7 +33,7 @@ public static PsiMethod findBaseMethodInClass(PsiMethod baseMethod, PsiClass aCl return signature == null ? null : signature.getMethod();*/ } - private static boolean cannotBeOverridding(PsiMethod method) { + private static boolean cannotBeOverriding(PsiMethod method) { PsiClass parentClass = method.getContainingClass(); return parentClass == null || method.isConstructor() || method.isStatic() || method.isPrivate(); } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/portability/HardcodedFileSeparatorsInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/portability/HardcodedFileSeparatorsInspection.java index 104c945077..42397497b5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/portability/HardcodedFileSeparatorsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/portability/HardcodedFileSeparatorsInspection.java @@ -68,7 +68,7 @@ public class HardcodedFileSeparatorsInspection extends BaseInspection { Pattern.compile("^[a-z][a-z0-9+\\-:]+://.*$"); /** - * All mimetypes, see http://www.iana.org/assignments/media-types/ + * All mime-types, see http://www.iana.org/assignments/media-types/ */ private static final Set mimeTypes = new HashSet(); diff --git a/plugin/src/main/java/com/intellij/java/impl/psi/statistics/JavaStatisticsManager.java b/plugin/src/main/java/com/intellij/java/impl/psi/statistics/JavaStatisticsManager.java index ed764c5d7c..1e1caca103 100644 --- a/plugin/src/main/java/com/intellij/java/impl/psi/statistics/JavaStatisticsManager.java +++ b/plugin/src/main/java/com/intellij/java/impl/psi/statistics/JavaStatisticsManager.java @@ -38,21 +38,21 @@ public abstract class JavaStatisticsManager { private static StatisticsInfo createVariableUseInfo(final String name, final VariableKind variableKind, final String propertyName, - final String canonialTypeText) { - String key1 = getVariableNameUseKey1(propertyName, canonialTypeText); + final String canonicalTypeText) { + String key1 = getVariableNameUseKey1(propertyName, canonicalTypeText); String key2 = getVariableNameUseKey2(variableKind, name); return new StatisticsInfo(key1, key2); } - private static String getVariableNameUseKey1(String propertyName, String canonialTypeText) { + private static String getVariableNameUseKey1(String propertyName, String canonicalTypeText) { @NonNls StringBuilder buffer = new StringBuilder(); buffer.append("variableName#"); if (propertyName != null) { buffer.append(propertyName); } buffer.append("#"); - if (canonialTypeText != null) { - buffer.append(canonialTypeText); + if (canonicalTypeText != null) { + buffer.append(canonicalTypeText); } return buffer.toString(); } @@ -73,8 +73,8 @@ public static void incVariableNameUseCount(String name, VariableKind variableKin incVariableNameUseCount(name, variableKind, propertyName, type == null ? null : type.getCanonicalText()); } - public static void incVariableNameUseCount(String name, VariableKind variableKind, String propertyName, String canonialTypeText) { - createVariableUseInfo(name, variableKind, propertyName, canonialTypeText).incUseCount(); + public static void incVariableNameUseCount(String name, VariableKind variableKind, String propertyName, String canonicalTypeText) { + createVariableUseInfo(name, variableKind, propertyName, canonicalTypeText).incUseCount(); } @Nullable diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/DetectedJavaChangeInfo.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/DetectedJavaChangeInfo.java index a6cb3a8be5..710c188d3c 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/DetectedJavaChangeInfo.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/DetectedJavaChangeInfo.java @@ -122,7 +122,7 @@ DetectedJavaChangeInfo createNextInfo(final PsiMethod method, boolean delegate) return null; } if (!this.equals(fromMethod)) { - if (!createParametersInfo(fromMethod.newParms)) { + if (!createParametersInfo(fromMethod.newParams)) { return null; } if ((fromMethod.newReturnType != null && getNewReturnType() == null) || (fromMethod.newReturnType == null && getNewReturnType() != null) || (fromMethod.newReturnType != null && @@ -135,7 +135,7 @@ DetectedJavaChangeInfo createNextInfo(final PsiMethod method, boolean delegate) } try { - final DetectedJavaChangeInfo javaChangeInfo = new DetectedJavaChangeInfo(fromMethod.getNewVisibility(), getMethod(), fromMethod.newReturnType, fromMethod.newParms, getNewExceptions() + final DetectedJavaChangeInfo javaChangeInfo = new DetectedJavaChangeInfo(fromMethod.getNewVisibility(), getMethod(), fromMethod.newReturnType, fromMethod.newParams, getNewExceptions() , method.getName(), getOldName(), delegate) { @Override protected void fillOldParams(PsiMethod method) { @@ -150,8 +150,8 @@ protected void fillOldParams(PsiMethod method) { } } - for (int i = 0, length = Math.min(newParms.length, oldParameterNames.length); i < length; i++) { - ParameterInfoImpl parm = newParms[i]; + for (int i = 0, length = Math.min(newParams.length, oldParameterNames.length); i < length; i++) { + ParameterInfoImpl parm = newParams[i]; if (parm.getName().equals(oldParameterNames[i]) && parm.getTypeText().equals(oldParameterTypes[i])) { parm.oldParameterIndex = i; } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeInfo.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeInfo.java index 24b76a8149..e9e254ef99 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeInfo.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeInfo.java @@ -52,7 +52,7 @@ public interface JavaChangeInfo extends ChangeInfo { boolean isRetainsVarargs(); - boolean isObtainsVarags(); + boolean isObtainsVarargs(); boolean isArrayToVarargs(); diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeInfoImpl.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeInfoImpl.java index 3e9d521503..28d1c18ccc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeInfoImpl.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeInfoImpl.java @@ -46,9 +46,9 @@ public class JavaChangeInfoImpl implements JavaChangeInfo { String[] oldParameterTypes; final String newName; final CanonicalTypes.Type newReturnType; - final ParameterInfoImpl[] newParms; + final ParameterInfoImpl[] newParams; ThrownExceptionInfo[] newExceptions; - final boolean[] toRemoveParm; + final boolean[] toRemoveParam; boolean isVisibilityChanged = false; boolean isNameChanged = false; boolean isReturnTypeChanged = false; @@ -60,7 +60,7 @@ public class JavaChangeInfoImpl implements JavaChangeInfo { boolean isPropagationEnabled = true; final boolean wasVararg; final boolean retainsVarargs; - final boolean obtainsVarags; + final boolean obtainsVarargs; final boolean arrayToVarargs; PsiIdentifier newNameIdentifier; // PsiType newTypeElement; @@ -77,12 +77,12 @@ public JavaChangeInfoImpl(@PsiModifier.ModifierConstant String newVisibility, PsiMethod method, String newName, CanonicalTypes.Type newType, - @Nonnull ParameterInfoImpl[] newParms, + @Nonnull ParameterInfoImpl[] newParams, ThrownExceptionInfo[] newExceptions, boolean generateDelegate, Set propagateParametersMethods, Set propagateExceptionsMethods) { - this(newVisibility, method, newName, newType, newParms, newExceptions, generateDelegate, propagateParametersMethods, + this(newVisibility, method, newName, newType, newParams, newExceptions, generateDelegate, propagateParametersMethods, propagateExceptionsMethods, method.getName()); } @@ -94,7 +94,7 @@ public JavaChangeInfoImpl(@PsiModifier.ModifierConstant String newVisibility, PsiMethod method, String newName, CanonicalTypes.Type newType, - @Nonnull ParameterInfoImpl[] newParms, + @Nonnull ParameterInfoImpl[] newParams, ThrownExceptionInfo[] newExceptions, boolean generateDelegate, Set propagateParametersMethods, @@ -104,7 +104,7 @@ public JavaChangeInfoImpl(@PsiModifier.ModifierConstant String newVisibility, this.method = method; this.newName = newName; newReturnType = newType; - this.newParms = newParms; + this.newParams = newParams; wasVararg = method.isVarArgs(); this.isGenerateDelegate =generateDelegate; @@ -125,22 +125,22 @@ public JavaChangeInfoImpl(@PsiModifier.ModifierConstant String newVisibility, isNameChanged = !newName.equals(this.oldName); - if (oldParameterNames.length != newParms.length){ + if (oldParameterNames.length != newParams.length){ isParameterSetOrOrderChanged = true; } else { - for(int i = 0; i < newParms.length; i++){ - ParameterInfoImpl parmInfo = newParms[i]; + for(int i = 0; i < newParams.length; i++){ + ParameterInfoImpl paramInfo = newParams[i]; - if (i != parmInfo.oldParameterIndex){ + if (i != paramInfo.oldParameterIndex){ isParameterSetOrOrderChanged = true; break; } - if (!parmInfo.getName().equals(oldParameterNames[i])){ + if (!paramInfo.getName().equals(oldParameterNames[i])){ isParameterNamesChanged = true; } try { - if (!parmInfo.getTypeText().equals(oldParameterTypes[i])){ + if (!paramInfo.getTypeText().equals(oldParameterTypes[i])){ isParameterTypesChanged = true; } } @@ -150,21 +150,21 @@ public JavaChangeInfoImpl(@PsiModifier.ModifierConstant String newVisibility, } } - setupPropagationEnabled(method.getParameterList().getParameters(), newParms); + setupPropagationEnabled(method.getParameterList().getParameters(), newParams); setupExceptions(newExceptions, method); - toRemoveParm = new boolean[oldParameterNames.length]; - Arrays.fill(toRemoveParm, true); - for (ParameterInfoImpl info : newParms) { + toRemoveParam = new boolean[oldParameterNames.length]; + Arrays.fill(toRemoveParam, true); + for (ParameterInfoImpl info : newParams) { if (info.oldParameterIndex < 0) continue; - toRemoveParm[info.oldParameterIndex] = false; + toRemoveParam[info.oldParameterIndex] = false; } PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory(); - defaultValues = new PsiExpression[newParms.length]; - for(int i = 0; i < newParms.length; i++){ - ParameterInfoImpl info = newParms[i]; + defaultValues = new PsiExpression[newParams.length]; + for(int i = 0; i < newParams.length; i++){ + ParameterInfoImpl info = newParams[i]; if (info.oldParameterIndex < 0 && !info.isVarargType()){ if (StringUtil.isEmpty(info.defaultValue)) continue; try{ @@ -176,17 +176,17 @@ public JavaChangeInfoImpl(@PsiModifier.ModifierConstant String newVisibility, } } - if (this.newParms.length == 0) { + if (this.newParams.length == 0) { retainsVarargs = false; - obtainsVarags = false; + obtainsVarargs = false; arrayToVarargs = false; } else { - final ParameterInfoImpl lastNewParm = this.newParms[this.newParms.length - 1]; - obtainsVarags = lastNewParm.isVarargType(); - retainsVarargs = lastNewParm.oldParameterIndex >= 0 && obtainsVarags; + final ParameterInfoImpl lastNewParam = this.newParams[this.newParams.length - 1]; + obtainsVarargs = lastNewParam.isVarargType(); + retainsVarargs = lastNewParam.oldParameterIndex >= 0 && obtainsVarargs; if (retainsVarargs) { - arrayToVarargs = oldParameterTypes[lastNewParm.oldParameterIndex].endsWith("[]"); + arrayToVarargs = oldParameterTypes[lastNewParam.oldParameterIndex].endsWith("[]"); } else { arrayToVarargs = false; @@ -221,7 +221,7 @@ protected void fillOldParams(PsiMethod method) { @Nonnull public JavaParameterInfo[] getNewParameters() { - return newParms; + return newParams; } @PsiModifier.ModifierConstant @@ -258,14 +258,14 @@ private void setupExceptions(ThrownExceptionInfo[] newExceptions, final PsiMetho isExceptionSetOrOrderChanged |= isExceptionSetChanged; } - protected void setupPropagationEnabled(final PsiParameter[] parameters, final ParameterInfoImpl[] newParms) { - if (parameters.length != newParms.length) { + protected void setupPropagationEnabled(final PsiParameter[] parameters, final ParameterInfoImpl[] newParams) { + if (parameters.length != newParams.length) { isPropagationEnabled = false; } else { for (int i = 0; i < parameters.length; i++) { - final ParameterInfoImpl newParm = newParms[i]; - if (newParm.oldParameterIndex != i) { + final ParameterInfoImpl newParam = newParams[i]; + if (newParam.oldParameterIndex != i) { isPropagationEnabled = false; break; } @@ -292,9 +292,9 @@ public Collection getMethodsToPropagateParameters() { public ParameterInfoImpl[] getCreatedParmsInfoWithoutVarargs() { List result = new ArrayList(); - for (ParameterInfoImpl newParm : newParms) { - if (newParm.oldParameterIndex < 0 && !newParm.isVarargType()) { - result.add(newParm); + for (ParameterInfoImpl newParam : newParams) { + if (newParam.oldParameterIndex < 0 && !newParam.isVarargType()) { + result.add(newParam); } } return result.toArray(new ParameterInfoImpl[result.size()]); @@ -303,7 +303,7 @@ public ParameterInfoImpl[] getCreatedParmsInfoWithoutVarargs() { @Nullable public PsiExpression getValue(int i, PsiCallExpression expr) throws IncorrectOperationException { if (defaultValues[i] != null) return defaultValues[i]; - return newParms[i].getValue(expr); + return newParams[i].getValue(expr); } public boolean isVisibilityChanged() { @@ -364,8 +364,8 @@ public boolean isRetainsVarargs() { return retainsVarargs; } - public boolean isObtainsVarags() { - return obtainsVarags; + public boolean isObtainsVarargs() { + return obtainsVarargs; } public boolean isArrayToVarargs() { @@ -385,7 +385,7 @@ public boolean wasVararg() { } public boolean[] toRemoveParm() { - return toRemoveParm; + return toRemoveParam; } protected boolean checkMethodEquality() { @@ -410,7 +410,7 @@ public boolean equals(Object o) { if (isPropagationEnabled != that.isPropagationEnabled) return false; if (isReturnTypeChanged != that.isReturnTypeChanged) return false; if (isVisibilityChanged != that.isVisibilityChanged) return false; - if (obtainsVarags != that.obtainsVarags) return false; + if (obtainsVarargs != that.obtainsVarargs) return false; if (retainsVarargs != that.retainsVarargs) return false; if (wasVararg != that.wasVararg) return false; if (!Arrays.equals(defaultValues, that.defaultValues)) return false; @@ -418,7 +418,7 @@ public boolean equals(Object o) { if (!Arrays.equals(newExceptions, that.newExceptions)) return false; if (!newName.equals(that.newName)) return false; if (newNameIdentifier != null ? !newNameIdentifier.equals(that.newNameIdentifier) : that.newNameIdentifier != null) return false; - if (!Arrays.equals(newParms, that.newParms)) return false; + if (!Arrays.equals(newParams, that.newParams)) return false; if (newReturnType != null ? that.newReturnType == null || !Comparing.strEqual(newReturnType.getTypeText(), that.newReturnType.getTypeText()) : that.newReturnType != null) return false; if (newVisibility != null ? !newVisibility.equals(that.newVisibility) : that.newVisibility != null) return false; if (!oldName.equals(that.oldName)) return false; @@ -427,7 +427,7 @@ public boolean equals(Object o) { if (oldType != null ? !oldType.equals(that.oldType): that.oldType != null) return false; if (!propagateExceptionsMethods.equals(that.propagateExceptionsMethods)) return false; if (!propagateParametersMethods.equals(that.propagateParametersMethods)) return false; - if (!Arrays.equals(toRemoveParm, that.toRemoveParm)) return false; + if (!Arrays.equals(toRemoveParam, that.toRemoveParam)) return false; return true; } @@ -444,9 +444,9 @@ public int hashCode() { result = 31 * result + Arrays.hashCode(oldParameterTypes); result = 31 * result + newName.hashCode(); result = 31 * result + (newReturnType != null ? newReturnType.getTypeText().hashCode() : 0); - result = 31 * result + Arrays.hashCode(newParms); + result = 31 * result + Arrays.hashCode(newParams); result = 31 * result + Arrays.hashCode(newExceptions); - result = 31 * result + Arrays.hashCode(toRemoveParm); + result = 31 * result + Arrays.hashCode(toRemoveParam); result = 31 * result + (isVisibilityChanged ? 1 : 0); result = 31 * result + (isNameChanged ? 1 : 0); result = 31 * result + (isReturnTypeChanged ? 1 : 0); @@ -458,7 +458,7 @@ public int hashCode() { result = 31 * result + (isPropagationEnabled ? 1 : 0); result = 31 * result + (wasVararg ? 1 : 0); result = 31 * result + (retainsVarargs ? 1 : 0); - result = 31 * result + (obtainsVarags ? 1 : 0); + result = 31 * result + (obtainsVarargs ? 1 : 0); result = 31 * result + (arrayToVarargs ? 1 : 0); result = 31 * result + (newNameIdentifier != null ? newNameIdentifier.hashCode() : 0); result = 31 * result + (defaultValues != null ? Arrays.hashCode(defaultValues) : 0); diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java index 74fd8f8602..37998fbe7e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java @@ -277,7 +277,7 @@ private static void processMethodUsage( boolean toChangeArguments, boolean toCatchExceptions, PsiMethod callee, - PsiSubstitutor subsitutor, + PsiSubstitutor substitutor, UsageInfo[] usages ) throws IncorrectOperationException { if (changeInfo.isNameChanged() @@ -299,7 +299,7 @@ private static void processMethodUsage( } } - fixActualArgumentsList(list, changeInfo, toInsertDefaultValue, subsitutor); + fixActualArgumentsList(list, changeInfo, toInsertDefaultValue, substitutor); } if (toCatchExceptions) { @@ -443,8 +443,8 @@ private static void fixActualArgumentsList( PsiElementFactory factory = JavaPsiFacade.getInstance(list.getProject()).getElementFactory(); if (changeInfo.isParameterSetOrOrderChanged()) { if (changeInfo instanceof JavaChangeInfoImpl changeInfoImpl && changeInfoImpl.isPropagationEnabled) { - ParameterInfoImpl[] createdParmsInfo = changeInfoImpl.getCreatedParmsInfoWithoutVarargs(); - for (ParameterInfoImpl info : createdParmsInfo) { + ParameterInfoImpl[] createdParamsInfo = changeInfoImpl.getCreatedParmsInfoWithoutVarargs(); + for (ParameterInfoImpl info : createdParamsInfo) { PsiExpression newArg; if (toInsertDefaultValue) { newArg = createDefaultValue(changeInfoImpl, factory, info, list); @@ -468,30 +468,30 @@ private static void fixActualArgumentsList( int newArgsLength; int newNonVarargCount; - JavaParameterInfo[] newParms = changeInfo.getNewParameters(); + JavaParameterInfo[] newParams = changeInfo.getNewParameters(); if (changeInfo.isArrayToVarargs()) { - newNonVarargCount = newParms.length - 1; - JavaParameterInfo lastNewParm = newParms[newParms.length - 1]; - PsiExpression arrayToConvert = args[lastNewParm.getOldIndex()]; + newNonVarargCount = newParams.length - 1; + JavaParameterInfo lastNewParam = newParams[newParams.length - 1]; + PsiExpression arrayToConvert = args[lastNewParam.getOldIndex()]; if (arrayToConvert instanceof PsiNewExpression newExpr) { PsiArrayInitializerExpression arrayInitializer = newExpr.getArrayInitializer(); if (arrayInitializer != null) { newVarargInitializers = arrayInitializer.getInitializers(); } } - newArgsLength = newVarargInitializers == null ? newParms.length : newNonVarargCount + newVarargInitializers.length; + newArgsLength = newVarargInitializers == null ? newParams.length : newNonVarargCount + newVarargInitializers.length; } else if (changeInfo.isRetainsVarargs()) { - newNonVarargCount = newParms.length - 1; + newNonVarargCount = newParams.length - 1; newArgsLength = newNonVarargCount + varargCount; } - else if (changeInfo.isObtainsVarags()) { - newNonVarargCount = newParms.length - 1; + else if (changeInfo.isObtainsVarargs()) { + newNonVarargCount = newParams.length - 1; newArgsLength = newNonVarargCount; } else { - newNonVarargCount = newParms.length; - newArgsLength = newParms.length; + newNonVarargCount = newParams.length; + newArgsLength = newParams.length; } String[] oldVarargs = null; @@ -504,8 +504,8 @@ else if (changeInfo.isObtainsVarags()) { PsiExpression[] newArgs = new PsiExpression[newArgsLength]; for (int i = 0; i < newNonVarargCount; i++) { - if (newParms[i].getOldIndex() == nonVarargCount && oldVarargs != null) { - PsiType type = newParms[i].createType(changeInfo.getMethod(), list.getManager()); + if (newParams[i].getOldIndex() == nonVarargCount && oldVarargs != null) { + PsiType type = newParams[i].createType(changeInfo.getMethod(), list.getManager()); if (type instanceof PsiArrayType) { type = substitutor.substitute(type); type = TypeConversionUtil.erasure(type); @@ -518,12 +518,12 @@ else if (changeInfo.isObtainsVarags()) { continue; } } - newArgs[i] = createActualArgument(changeInfo, list, newParms[i], toInsertDefaultValue, args); + newArgs[i] = createActualArgument(changeInfo, list, newParams[i], toInsertDefaultValue, args); } if (changeInfo.isArrayToVarargs()) { if (newVarargInitializers == null) { newArgs[newNonVarargCount] = - createActualArgument(changeInfo, list, newParms[newNonVarargCount], toInsertDefaultValue, args); + createActualArgument(changeInfo, list, newParams[newNonVarargCount], toInsertDefaultValue, args); } else { System.arraycopy(newVarargInitializers, 0, newArgs, newNonVarargCount, newVarargInitializers.length); @@ -533,9 +533,9 @@ else if (changeInfo.isObtainsVarags()) { int newVarargCount = newArgsLength - newNonVarargCount; LOG.assertTrue(newVarargCount == 0 || newVarargCount == varargCount); for (int i = newNonVarargCount; i < newArgsLength; i++) { - int oldIndex = newParms[newNonVarargCount].getOldIndex(); + int oldIndex = newParams[newNonVarargCount].getOldIndex(); if (oldIndex >= 0 && oldIndex != nonVarargCount) { - newArgs[i] = createActualArgument(changeInfo, list, newParms[newNonVarargCount], toInsertDefaultValue, args); + newArgs[i] = createActualArgument(changeInfo, list, newParams[newNonVarargCount], toInsertDefaultValue, args); } else { System.arraycopy(args, nonVarargCount, newArgs, newNonVarargCount, newVarargCount); @@ -758,13 +758,13 @@ private static void addDelegateArguments( PsiElementFactory factory, PsiCallExpression callExpression ) throws IncorrectOperationException { - JavaParameterInfo[] newParms = changeInfo.getNewParameters(); + JavaParameterInfo[] newParams = changeInfo.getNewParameters(); String[] oldParameterNames = changeInfo.getOldParameterNames(); - for (int i = 0; i < newParms.length; i++) { - JavaParameterInfo newParm = newParms[i]; + for (int i = 0; i < newParams.length; i++) { + JavaParameterInfo newParam = newParams[i]; PsiExpression actualArg; - if (newParm.getOldIndex() >= 0) { - actualArg = factory.createExpressionFromText(oldParameterNames[newParm.getOldIndex()], callExpression); + if (newParam.getOldIndex() >= 0) { + actualArg = factory.createExpressionFromText(oldParameterNames[newParam.getOldIndex()], callExpression); } else { actualArg = changeInfo.getValue(i, callExpression); @@ -826,15 +826,15 @@ private static void processPrimaryMethod( JavaParameterInfo[] parameterInfos = changeInfo.getNewParameters(); int delta = baseMethod != null ? baseMethod.getParameterList().getParametersCount() - method.getParameterList().getParametersCount() : 0; - PsiParameter[] newParms = new PsiParameter[Math.max(parameterInfos.length - delta, 0)]; + PsiParameter[] newParams = new PsiParameter[Math.max(parameterInfos.length - delta, 0)]; String[] oldParameterNames = changeInfo.getOldParameterNames(); String[] oldParameterTypes = changeInfo.getOldParameterTypes(); - for (int i = 0; i < newParms.length; i++) { + for (int i = 0; i < newParams.length; i++) { JavaParameterInfo info = parameterInfos[i]; int index = info.getOldIndex(); if (index >= 0) { PsiParameter parameter = parameters[index]; - newParms[i] = parameter; + newParams[i] = parameter; String oldName = oldParameterNames[index]; if (!oldName.equals(info.getName()) && oldName.equals(parameter.getName())) { @@ -852,12 +852,12 @@ private static void processPrimaryMethod( } } else { - newParms[i] = createNewParameter(changeInfo, info, substitutor); + newParams[i] = createNewParameter(changeInfo, info, substitutor); } } - resolveParameterVsFieldsConflicts(newParms, method, list, changeInfo.toRemoveParm()); - fixJavadocsForChangedMethod(method, changeInfo, newParms.length); + resolveParameterVsFieldsConflicts(newParams, method, list, changeInfo.toRemoveParm()); + fixJavadocsForChangedMethod(method, changeInfo, newParams.length); if (changeInfo.isExceptionSetOrOrderChanged()) { PsiClassType[] newExceptions = getPrimaryChangedExceptionInfo(changeInfo); fixPrimaryThrowsLists(method, newExceptions); @@ -886,7 +886,7 @@ private static void processCallerMethod( if (toInsertParams) { List newParameters = new ArrayList<>(); ContainerUtil.addAll(newParameters, caller.getParameterList().getParameters()); - JavaParameterInfo[] primaryNewParms = changeInfo.getNewParameters(); + JavaParameterInfo[] primaryNewParams = changeInfo.getNewParameters(); PsiSubstitutor substitutor = baseMethod == null ? PsiSubstitutor.EMPTY : ChangeSignatureProcessor.calculateSubstitutor(caller, baseMethod); PsiClass aClass = changeInfo.getMethod().getContainingClass(); @@ -896,15 +896,15 @@ private static void processCallerMethod( true ) ? TypeConversionUtil.getSuperClassSubstitutor (aClass, callerContainingClass, substitutor) : PsiSubstitutor.EMPTY; - for (JavaParameterInfo info : primaryNewParms) { + for (JavaParameterInfo info : primaryNewParams) { if (info.getOldIndex() < 0) { newParameters.add(createNewParameter(changeInfo, info, psiSubstitutor, substitutor)); } } PsiParameter[] arrayed = newParameters.toArray(new PsiParameter[newParameters.size()]); - boolean[] toRemoveParm = new boolean[arrayed.length]; - Arrays.fill(toRemoveParm, false); - resolveParameterVsFieldsConflicts(arrayed, caller, caller.getParameterList(), toRemoveParm); + boolean[] toRemoveParam = new boolean[arrayed.length]; + Arrays.fill(toRemoveParam, false); + resolveParameterVsFieldsConflicts(arrayed, caller, caller.getParameterList(), toRemoveParam); } if (toInsertThrows) { @@ -921,9 +921,9 @@ private static void processCallerMethod( } } PsiJavaCodeReferenceElement[] arrayed = newThrowns.toArray(new PsiJavaCodeReferenceElement[newThrowns.size()]); - boolean[] toRemoveParm = new boolean[arrayed.length]; - Arrays.fill(toRemoveParm, false); - ChangeSignatureUtil.synchronizeList(throwsList, Arrays.asList(arrayed), ThrowsList.INSTANCE, toRemoveParm); + boolean[] toRemoveParam = new boolean[arrayed.length]; + Arrays.fill(toRemoveParam, false); + ChangeSignatureUtil.synchronizeList(throwsList, Arrays.asList(arrayed), ThrowsList.INSTANCE, toRemoveParam); } } @@ -948,15 +948,15 @@ private static void fixJavadocsForChangedMethod( int newParamsLength ) throws IncorrectOperationException { PsiParameter[] parameters = method.getParameterList().getParameters(); - JavaParameterInfo[] newParms = changeInfo.getNewParameters(); + JavaParameterInfo[] newParams = changeInfo.getNewParameters(); LOG.assertTrue(parameters.length <= newParamsLength); Set newParameters = new HashSet<>(); String[] oldParameterNames = changeInfo.getOldParameterNames(); for (int i = 0; i < newParamsLength; i++) { - JavaParameterInfo newParm = newParms[i]; - if (newParm.getOldIndex() < 0 - || newParm.getOldIndex() == i && !(newParm.getName().equals(oldParameterNames[newParm.getOldIndex()]) - && newParm.getTypeText().equals(changeInfo.getOldParameterTypes()[newParm.getOldIndex()]))) { + JavaParameterInfo newParam = newParams[i]; + if (newParam.getOldIndex() < 0 + || newParam.getOldIndex() == i && !(newParam.getName().equals(oldParameterNames[newParam.getOldIndex()]) + && newParam.getTypeText().equals(changeInfo.getOldParameterTypes()[newParam.getOldIndex()]))) { newParameters.add(parameters[i]); } } @@ -975,30 +975,30 @@ private static void fixJavadocsForChangedMethod( private static PsiParameter createNewParameter( JavaChangeInfo changeInfo, - JavaParameterInfo newParm, + JavaParameterInfo newParam, PsiSubstitutor... substitutor ) throws IncorrectOperationException { PsiParameterList list = changeInfo.getMethod().getParameterList(); PsiElementFactory factory = JavaPsiFacade.getInstance(list.getProject()).getElementFactory(); - PsiType type = newParm.createType(list, list.getManager()); + PsiType type = newParam.createType(list, list.getManager()); for (PsiSubstitutor psiSubstitutor : substitutor) { type = psiSubstitutor.substitute(type); } - return factory.createParameter(newParm.getName(), type); + return factory.createParameter(newParam.getName(), type); } private static void resolveParameterVsFieldsConflicts( - PsiParameter[] newParms, + PsiParameter[] newParams, PsiMethod method, PsiParameterList list, - boolean[] toRemoveParm + boolean[] toRemoveParam ) throws IncorrectOperationException { List conflictResolvers = new ArrayList<>(); - for (PsiParameter parameter : newParms) { + for (PsiParameter parameter : newParams) { conflictResolvers.add(new FieldConflictsResolver(parameter.getName(), method.getBody())); } - ChangeSignatureUtil.synchronizeList(list, Arrays.asList(newParms), ParameterList.INSTANCE, toRemoveParm); + ChangeSignatureUtil.synchronizeList(list, Arrays.asList(newParams), ParameterList.INSTANCE, toRemoveParam); JavaCodeStyleManager.getInstance(list.getProject()).shortenClassReferences(list); for (FieldConflictsResolver fieldConflictsResolver : conflictResolvers) { fieldConflictsResolver.fix(); diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/extractSuperclass/ExtractSuperClassUtil.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/extractSuperclass/ExtractSuperClassUtil.java index 6394bd180e..4cd401edba 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/extractSuperclass/ExtractSuperClassUtil.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/extractSuperclass/ExtractSuperClassUtil.java @@ -68,7 +68,7 @@ public static PsiClass extractSuperClass(final Project project, assert subClassExtends != null: subclass; copyPsiReferenceList(subClassExtends, superclass.getExtendsList()); - // create constructors if neccesary + // create constructors if necessary PsiMethod[] constructors = getCalledBaseConstructors(subclass); if (constructors.length > 0) { createConstructorsByPattern(project, superclass, constructors); diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java index bad7d29ee8..151b05f5ad 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/inline/InlineMethodProcessor.java @@ -377,7 +377,7 @@ public static void addInaccessibleMemberConflicts( /** * Given a set of referencedElements, returns a map from containers (in a sense of ConflictsUtil.getContainer) - * to subsets of referencedElemens that are not accessible from that container + * to subsets of referencedElements that are not accessible from that container * * @param referencedElements * @param usages @@ -618,7 +618,7 @@ public void inlineMethodCall(PsiReferenceExpression ref) throws IncorrectOperati if (callSubstitutor != PsiSubstitutor.EMPTY) { substituteMethodTypeParams(blockData.block, callSubstitutor); } - addParmAndThisVarInitializers(blockData, methodCall); + addParamAndThisVarInitializers(blockData, methodCall); PsiElement anchor = RefactoringUtil.getParentStatement(methodCall, true); if (anchor == null) { @@ -633,7 +633,7 @@ public void inlineMethodCall(PsiReferenceExpression ref) throws IncorrectOperati } PsiElement anchorParent = anchor.getParent(); PsiLocalVariable thisVar = null; - PsiLocalVariable[] parmVars = new PsiLocalVariable[blockData.parmVars.length]; + PsiLocalVariable[] paramVars = new PsiLocalVariable[blockData.paramVars.length]; PsiLocalVariable resultVar = null; PsiStatement[] statements = blockData.block.getStatements(); if (statements.length > 0) { @@ -662,9 +662,9 @@ public void inlineMethodCall(PsiReferenceExpression ref) throws IncorrectOperati thisVar = (PsiLocalVariable)statement.getDeclaredElements()[0]; current = statement; } - for (int i = 0; i < parmVars.length; i++) { + for (int i = 0; i < paramVars.length; i++) { PsiDeclarationStatement statement = PsiTreeUtil.getNextSiblingOfType(current, PsiDeclarationStatement.class); - parmVars[i] = (PsiLocalVariable)statement.getDeclaredElements()[0]; + paramVars[i] = (PsiLocalVariable)statement.getDeclaredElements()[0]; current = statement; } if (blockData.resultVar != null) { @@ -689,7 +689,7 @@ public void inlineMethodCall(PsiReferenceExpression ref) throws IncorrectOperati PsiClass thisClass = myMethod.getContainingClass(); PsiExpression thisAccessExpr; if (thisVar != null) { - if (!canInlineParmOrThisVariable(thisVar)) { + if (!canInlineParamOrThisVariable(thisVar)) { thisAccessExpr = myFactory.createExpressionFromText(thisVar.getName(), null); } else { @@ -718,13 +718,13 @@ else if (methodCall.getParent() instanceof PsiExpressionStatement || tailCall == } if (thisVar != null) { - inlineParmOrThisVariable(thisVar, false); + inlineParamOrThisVariable(thisVar, false); } PsiParameter[] parameters = myMethod.getParameterList().getParameters(); - for (int i = 0; i < parmVars.length; i++) { + for (int i = 0; i < paramVars.length; i++) { PsiParameter parameter = parameters[i]; boolean strictlyFinal = parameter.hasModifierProperty(PsiModifier.FINAL) && isStrictlyFinal(parameter); - inlineParmOrThisVariable(parmVars[i], strictlyFinal); + inlineParamOrThisVariable(paramVars[i], strictlyFinal); } if (resultVar != null) { inlineResultVariable(resultVar); @@ -805,19 +805,19 @@ private BlockData prepareBlock( resultVar = (PsiLocalVariable)declaration.getDeclaredElements()[0]; } - PsiParameter[] parms = myMethodCopy.getParameterList().getParameters(); - PsiLocalVariable[] parmVars = new PsiLocalVariable[parms.length]; - for (int i = parms.length - 1; i >= 0; i--) { - PsiParameter parm = parms[i]; - String parmName = parm.getName(); - String name = parmName; + PsiParameter[] params = myMethodCopy.getParameterList().getParameters(); + PsiLocalVariable[] paramVars = new PsiLocalVariable[params.length]; + for (int i = params.length - 1; i >= 0; i--) { + PsiParameter param = params[i]; + String paramName = param.getName(); + String name = paramName; name = myJavaCodeStyle.variableNameToPropertyName(name, VariableKind.PARAMETER); name = myJavaCodeStyle.propertyNameToVariableName(name, VariableKind.LOCAL_VARIABLE); - if (!name.equals(parmName)) { + if (!name.equals(paramName)) { name = myJavaCodeStyle.suggestUniqueVariableName(name, block.getFirstChild(), true); } - RefactoringUtil.renameVariableReferences(parm, name, new LocalSearchScope(myMethodCopy.getBody()), true); - PsiType paramType = parm.getType(); + RefactoringUtil.renameVariableReferences(param, name, new LocalSearchScope(myMethodCopy.getBody()), true); + PsiType paramType = param.getType(); String defaultValue; if (paramType instanceof PsiEllipsisType ellipsisType) { paramType = callSubstitutor.substitute(ellipsisType.toArrayType()); @@ -836,8 +836,8 @@ private BlockData prepareBlock( PsiDeclarationStatement declaration = myFactory.createVariableDeclarationStatement(name, callSubstitutor.substitute(paramType), initializer); declaration = (PsiDeclarationStatement)block.addAfter(declaration, null); - parmVars[i] = (PsiLocalVariable)declaration.getDeclaredElements()[0]; - PsiUtil.setModifierProperty(parmVars[i], PsiModifier.FINAL, parm.hasModifierProperty(PsiModifier.FINAL)); + paramVars[i] = (PsiLocalVariable)declaration.getDeclaredElements()[0]; + PsiUtil.setModifierProperty(paramVars[i], PsiModifier.FINAL, param.hasModifierProperty(PsiModifier.FINAL)); } PsiLocalVariable thisVar = null; @@ -904,7 +904,7 @@ else if (myMethod.isStatic() && containingClass != null) { } } - return new BlockData(block, thisVar, parmVars, resultVar); + return new BlockData(block, thisVar, paramVars, resultVar); } @RequiredWriteAction @@ -937,12 +937,12 @@ private void solveVariableNameConflicts(PsiElement scope, PsiElement placeToInse } @RequiredWriteAction - private void addParmAndThisVarInitializers(BlockData blockData, PsiMethodCallExpression methodCall) throws IncorrectOperationException { + private void addParamAndThisVarInitializers(BlockData blockData, PsiMethodCallExpression methodCall) throws IncorrectOperationException { PsiExpression[] args = methodCall.getArgumentList().getExpressions(); - if (blockData.parmVars.length > 0) { + if (blockData.paramVars.length > 0) { for (int i = 0; i < args.length; i++) { - int j = Math.min(i, blockData.parmVars.length - 1); - PsiExpression initializer = blockData.parmVars[j].getInitializer(); + int j = Math.min(i, blockData.paramVars.length - 1); + PsiExpression initializer = blockData.paramVars[j].getInitializer(); LOG.assertTrue(initializer != null); if (initializer instanceof PsiNewExpression newExpr && newExpr.getArrayInitializer() != null) { //varargs initializer @@ -1010,7 +1010,7 @@ else if (qualifier instanceof PsiSuperExpression) { } @RequiredReadAction - private boolean canInlineParmOrThisVariable(PsiLocalVariable variable) { + private boolean canInlineParamOrThisVariable(PsiLocalVariable variable) { boolean isAccessedForWriting = false; for (PsiReference ref : ReferencesSearch.search(variable)) { if (ref.getElement() instanceof PsiExpression expression && PsiUtil.isAccessedForWriting(expression)) { @@ -1020,7 +1020,7 @@ private boolean canInlineParmOrThisVariable(PsiLocalVariable variable) { PsiExpression initializer = variable.getInitializer(); boolean shouldBeFinal = variable.hasModifierProperty(PsiModifier.FINAL) && false; - return canInlineParmOrThisVariable( + return canInlineParamOrThisVariable( initializer, shouldBeFinal, false, @@ -1030,7 +1030,7 @@ private boolean canInlineParmOrThisVariable(PsiLocalVariable variable) { } @RequiredWriteAction - private void inlineParmOrThisVariable(PsiLocalVariable variable, boolean strictlyFinal) throws IncorrectOperationException { + private void inlineParamOrThisVariable(PsiLocalVariable variable, boolean strictlyFinal) throws IncorrectOperationException { PsiReference firstRef = ReferencesSearch.search(variable).findFirst(); if (firstRef == null) { @@ -1049,7 +1049,7 @@ private void inlineParmOrThisVariable(PsiLocalVariable variable, boolean strictl PsiExpression initializer = variable.getInitializer(); boolean shouldBeFinal = variable.hasModifierProperty(PsiModifier.FINAL) && strictlyFinal; - if (canInlineParmOrThisVariable(initializer, shouldBeFinal, strictlyFinal, refs.size(), isAccessedForWriting)) { + if (canInlineParamOrThisVariable(initializer, shouldBeFinal, strictlyFinal, refs.size(), isAccessedForWriting)) { if (shouldBeFinal) { declareUsedLocalsFinal(initializer, strictlyFinal); } @@ -1088,7 +1088,7 @@ private void inlineParmOrThisVariable(PsiLocalVariable variable, boolean strictl } @RequiredReadAction - private boolean canInlineParmOrThisVariable( + private boolean canInlineParamOrThisVariable( PsiExpression initializer, boolean shouldBeFinal, boolean strictlyFinal, @@ -1144,7 +1144,7 @@ public void visitElement(PsiElement element) { //TODO: other cases return false; */ - return true; //TODO: "suspicous" places to review by user! + return true; //TODO: "suspicious" places to review by user! } else { if (isAccessedForWriting) { @@ -1171,7 +1171,7 @@ else if (initializer instanceof PsiCallExpression) { PsiArrayInitializerExpression arrayInitializer = newExpr.getArrayInitializer(); if (arrayInitializer != null) { for (PsiExpression expression : arrayInitializer.getInitializers()) { - if (!canInlineParmOrThisVariable(expression, shouldBeFinal, strictlyFinal, accessCount, false)) { + if (!canInlineParamOrThisVariable(expression, shouldBeFinal, strictlyFinal, accessCount, false)) { return false; } } @@ -1184,11 +1184,11 @@ else if (initializer instanceof PsiCallExpression) { } PsiExpression[] expressions = argumentList.getExpressions(); for (PsiExpression expression : expressions) { - if (!canInlineParmOrThisVariable(expression, shouldBeFinal, strictlyFinal, accessCount, false)) { + if (!canInlineParamOrThisVariable(expression, shouldBeFinal, strictlyFinal, accessCount, false)) { return false; } } - return true; //TODO: "suspicous" places to review by user! + return true; //TODO: "suspicious" places to review by user! } else if (initializer instanceof PsiLiteralExpression) { return true; @@ -1196,20 +1196,20 @@ else if (initializer instanceof PsiLiteralExpression) { else if (initializer instanceof PsiArrayAccessExpression arrayAccess) { PsiExpression arrayExpression = arrayAccess.getArrayExpression(); PsiExpression indexExpression = arrayAccess.getIndexExpression(); - return canInlineParmOrThisVariable(arrayExpression, shouldBeFinal, strictlyFinal, accessCount, false) - && canInlineParmOrThisVariable(indexExpression, shouldBeFinal, strictlyFinal, accessCount, false); + return canInlineParamOrThisVariable(arrayExpression, shouldBeFinal, strictlyFinal, accessCount, false) + && canInlineParamOrThisVariable(indexExpression, shouldBeFinal, strictlyFinal, accessCount, false); } else if (initializer instanceof PsiParenthesizedExpression parenthesized) { PsiExpression expr = parenthesized.getExpression(); - return expr == null || canInlineParmOrThisVariable(expr, shouldBeFinal, strictlyFinal, accessCount, false); + return expr == null || canInlineParamOrThisVariable(expr, shouldBeFinal, strictlyFinal, accessCount, false); } else if (initializer instanceof PsiTypeCastExpression typeCast) { PsiExpression operand = typeCast.getOperand(); - return operand != null && canInlineParmOrThisVariable(operand, shouldBeFinal, strictlyFinal, accessCount, false); + return operand != null && canInlineParamOrThisVariable(operand, shouldBeFinal, strictlyFinal, accessCount, false); } else if (initializer instanceof PsiPolyadicExpression binExpr) { for (PsiExpression op : binExpr.getOperands()) { - if (!canInlineParmOrThisVariable(op, shouldBeFinal, strictlyFinal, accessCount, false)) { + if (!canInlineParamOrThisVariable(op, shouldBeFinal, strictlyFinal, accessCount, false)) { return false; } } @@ -1630,7 +1630,7 @@ else if (instruction instanceof ThrowToInstruction throwToInsn) { } else if (instruction instanceof ConditionalThrowToInstruction) { // In case of "conditional throw to", control flow will not be altered - // If exception handler is in method, we will inline it to ivokation site + // If exception handler is in method, we will inline it to invocation site // If exception handler is at invocation site, execution will continue to get there offset++; } @@ -1646,13 +1646,13 @@ else if (instruction instanceof ConditionalThrowToInstruction) { private static class BlockData { final PsiCodeBlock block; final PsiLocalVariable thisVar; - final PsiLocalVariable[] parmVars; + final PsiLocalVariable[] paramVars; final PsiLocalVariable resultVar; - public BlockData(PsiCodeBlock block, PsiLocalVariable thisVar, PsiLocalVariable[] parmVars, PsiLocalVariable resultVar) { + public BlockData(PsiCodeBlock block, PsiLocalVariable thisVar, PsiLocalVariable[] paramVars, PsiLocalVariable resultVar) { this.block = block; this.thisVar = thisVar; - this.parmVars = parmVars; + this.paramVars = paramVars; this.resultVar = resultVar; } } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceParameter/IntroduceParameterDialog.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceParameter/IntroduceParameterDialog.java index 37565acb11..6ca1238d2e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceParameter/IntroduceParameterDialog.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/introduceParameter/IntroduceParameterDialog.java @@ -13,15 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * Created by IntelliJ IDEA. - * User: dsl - * Date: 06.05.2002 - * Time: 16:54:19 - * To change template for new class use - * Code Style | Class Templates options (Tools | IDE Options). - */ package com.intellij.java.impl.refactoring.introduceParameter; import com.intellij.java.impl.refactoring.HelpID; @@ -49,13 +40,17 @@ import java.awt.*; import java.util.List; +/** + * @author dsl + * @since 2002-05-06 + */ public class IntroduceParameterDialog extends RefactoringDialog { private TypeSelector myTypeSelector; private NameSuggestionsManager myNameSuggestionsManager; private final Project myProject; private final List myClassMembersList; - private final int myOccurenceNumber; + private final int myOccurrenceNumber; private final PsiMethod myMethodToSearchFor; private final PsiMethod myMethodToReplaceIn; private final boolean myMustBeFinal; @@ -77,7 +72,7 @@ public class IntroduceParameterDialog extends RefactoringDialog { IntroduceParameterDialog(@Nonnull Project project, @Nonnull List classMembersList, - PsiExpression[] occurences, + PsiExpression[] occurrences, PsiLocalVariable onLocalVariable, PsiExpression onExpression, @Nonnull NameSuggestionsGenerator generator, @@ -90,9 +85,9 @@ public class IntroduceParameterDialog extends RefactoringDialog { myPanel = new IntroduceParameterSettingsPanel(onLocalVariable, onExpression, methodToReplaceIn, parametersToRemove); myProject = project; myClassMembersList = classMembersList; - myOccurenceNumber = occurences.length; - for (PsiExpression occurence : occurences) { - if (PsiUtil.isAccessedForWriting(occurence)) { + myOccurrenceNumber = occurrences.length; + for (PsiExpression occurrence : occurrences) { + if (PsiUtil.isAccessedForWriting(occurrence)) { myHasWriteAccess = true; break; } @@ -199,9 +194,9 @@ public void dataChanged() { gbConstraints.gridx = 0; gbConstraints.insets = new Insets(4, 0, 4, 8); gbConstraints.gridwidth = 2; - if (myOccurenceNumber > 1 && !myPanel.myIsInvokedOnDeclaration) { + if (myOccurrenceNumber > 1 && !myPanel.myIsInvokedOnDeclaration) { gbConstraints.gridy++; - myPanel.createOccurrencesCb(gbConstraints, panel, myOccurenceNumber); + myPanel.createOccurrencesCb(gbConstraints, panel, myOccurrenceNumber); } if(myPanel.myCbReplaceAllOccurences != null) { gbConstraints.insets = new Insets(0, 16, 4, 8); diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/removemiddleman/usageInfo/InlineDelegatingCall.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/removemiddleman/usageInfo/InlineDelegatingCall.java index 21c2fedfad..5d7376abe7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/removemiddleman/usageInfo/InlineDelegatingCall.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/removemiddleman/usageInfo/InlineDelegatingCall.java @@ -28,15 +28,15 @@ public class InlineDelegatingCall extends FixableUsageInfo { private final PsiMethodCallExpression expression; private final String myAccess; private final String delegatingName; - private final int[] paramaterPermutation; + private final int[] parameterPermutation; public InlineDelegatingCall(PsiMethodCallExpression expression, - int[] paramaterPermutation, + int[] parameterPermutation, String access, String delegatingName) { super(expression); this.expression = expression; - this.paramaterPermutation = paramaterPermutation; + this.parameterPermutation = parameterPermutation; myAccess = access; this.delegatingName = delegatingName; } @@ -55,7 +55,7 @@ public void fixUsage() throws IncorrectOperationException { assert argumentList != null; final PsiExpression[] args = argumentList.getExpressions(); boolean first = true; - for (int i : paramaterPermutation) { + for (int i : parameterPermutation) { if (!first) { replacementText.append(", "); } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/RenameJavaMemberProcessor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/RenameJavaMemberProcessor.java index 0ca7fc00d6..65250a77d5 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/RenameJavaMemberProcessor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/rename/RenameJavaMemberProcessor.java @@ -40,24 +40,24 @@ public abstract class RenameJavaMemberProcessor extends RenamePsiElementProcessor { private static final Logger LOG = Logger.getInstance(RenameJavaMemberProcessor.class); - public static void qualifyMember(PsiMember member, PsiElement occurence, String newName) throws IncorrectOperationException { - qualifyMember(occurence, newName, member.getContainingClass(), member.hasModifierProperty(PsiModifier.STATIC)); + public static void qualifyMember(PsiMember member, PsiElement occurrence, String newName) throws IncorrectOperationException { + qualifyMember(occurrence, newName, member.getContainingClass(), member.hasModifierProperty(PsiModifier.STATIC)); } - protected static void qualifyMember(final PsiElement occurence, final String newName, final PsiClass containingClass, final boolean isStatic) + protected static void qualifyMember(final PsiElement occurrence, final String newName, final PsiClass containingClass, final boolean isStatic) throws IncorrectOperationException { - PsiManager psiManager = occurence.getManager(); + PsiManager psiManager = occurrence.getManager(); PsiElementFactory factory = JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory(); if (isStatic) { PsiReferenceExpression qualified = (PsiReferenceExpression)factory.createExpressionFromText("a." + newName, null); qualified = (PsiReferenceExpression)CodeStyleManager.getInstance(psiManager.getProject()).reformat(qualified); qualified.getQualifierExpression().replace(factory.createReferenceExpression(containingClass)); - occurence.replace(qualified); + occurrence.replace(qualified); } else { - PsiReferenceExpression qualified = createQualifiedMemberReference(occurence, newName, containingClass, isStatic); + PsiReferenceExpression qualified = createQualifiedMemberReference(occurrence, newName, containingClass, isStatic); qualified = (PsiReferenceExpression)CodeStyleManager.getInstance(psiManager.getProject()).reformat(qualified); - occurence.replace(qualified); + occurrence.replace(qualified); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/safeDelete/usageInfo/SafeDeletePrivatizeMethod.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/safeDelete/usageInfo/SafeDeletePrivatizeMethod.java index 83ab9824d8..389e432dac 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/safeDelete/usageInfo/SafeDeletePrivatizeMethod.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/safeDelete/usageInfo/SafeDeletePrivatizeMethod.java @@ -29,8 +29,8 @@ * @author dsl */ public class SafeDeletePrivatizeMethod extends SafeDeleteUsageInfo implements SafeDeleteCustomUsageInfo { - public SafeDeletePrivatizeMethod(PsiMethod method, PsiMethod overridenMethod) { - super(method, overridenMethod); + public SafeDeletePrivatizeMethod(PsiMethod method, PsiMethod overriddenMethod) { + super(method, overriddenMethod); } public PsiMethod getMethod() { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassInstanceScanner.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassInstanceScanner.java index 6c2b29836a..8cea80d4ad 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassInstanceScanner.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassInstanceScanner.java @@ -49,26 +49,26 @@ public ClassInstanceScanner(PsiClass aClass, ClassReferenceVisitor delegate, myVisitor = visitor; } - @Override public void visitLocalVariableDeclaration(PsiLocalVariable variable, TypeOccurence occurence) { - visitVariable(variable, occurence); + @Override public void visitLocalVariableDeclaration(PsiLocalVariable variable, TypeOccurence occurrence) { + visitVariable(variable, occurrence); } - @Override public void visitFieldDeclaration(PsiField field, TypeOccurence occurence) { - visitVariable(field, occurence); + @Override public void visitFieldDeclaration(PsiField field, TypeOccurence occurrence) { + visitVariable(field, occurrence); } - @Override public void visitParameterDeclaration(PsiParameter parameter, TypeOccurence occurence) { - visitVariable(parameter, occurence); + @Override public void visitParameterDeclaration(PsiParameter parameter, TypeOccurence occurrence) { + visitVariable(parameter, occurrence); } - private void visitVariable(PsiVariable variable, TypeOccurence occurence) { + private void visitVariable(PsiVariable variable, TypeOccurence occurrence) { GlobalSearchScope projectScope = GlobalSearchScope.projectScope(myClass.getProject()); for (PsiReference reference : ReferencesSearch.search(variable, projectScope, false)) { PsiElement element = reference.getElement(); // todo: handle arrays if (element instanceof PsiExpression) { - processExpression((PsiExpression)element, occurence, variable); + processExpression((PsiExpression)element, occurrence, variable); } else { // todo: java doc processing? @@ -77,7 +77,7 @@ private void visitVariable(PsiVariable variable, TypeOccurence occurence) { } } - @Override public void visitMethodReturnType(PsiMethod method, TypeOccurence occurence) { + @Override public void visitMethodReturnType(PsiMethod method, TypeOccurence occurrence) { GlobalSearchScope projectScope = GlobalSearchScope.projectScope(myClass.getProject()); for (PsiReference ref : ReferencesSearch.search(method, projectScope, false)) { @@ -85,26 +85,26 @@ private void visitVariable(PsiVariable variable, TypeOccurence occurence) { if (element instanceof PsiReferenceExpression) { PsiElement parent = element.getParent(); if (parent instanceof PsiMethodCallExpression) { - processExpression((PsiMethodCallExpression)parent, occurence, method); + processExpression((PsiMethodCallExpression)parent, occurrence, method); } } } } - @Override public void visitTypeCastExpression(PsiTypeCastExpression typeCastExpression, TypeOccurence occurence) { - processExpression(typeCastExpression, occurence, null); + @Override public void visitTypeCastExpression(PsiTypeCastExpression typeCastExpression, TypeOccurence occurrence) { + processExpression(typeCastExpression, occurrence, null); } - @Override public void visitNewExpression(PsiNewExpression newExpression, TypeOccurence occurence) { - processExpression(newExpression, occurence, null); + @Override public void visitNewExpression(PsiNewExpression newExpression, TypeOccurence occurrence) { + processExpression(newExpression, occurrence, null); } - private void processExpression(PsiExpression expression, TypeOccurence occurence, PsiElement referencedElement) { - if(occurence.outermostType == null || !(occurence.outermostType instanceof PsiArrayType)) { + private void processExpression(PsiExpression expression, TypeOccurence occurrence, PsiElement referencedElement) { + if(occurrence.outermostType == null || !(occurrence.outermostType instanceof PsiArrayType)) { processNonArrayExpression(myVisitor, expression, referencedElement); } else { - PsiType type = occurence.outermostType; + PsiType type = occurrence.outermostType; PsiExpression result = RefactoringUtil.outermostParenthesizedExpression(expression); while(type instanceof PsiArrayType && result.getParent() instanceof PsiArrayAccessExpression) { type = ((PsiArrayType) type).getComponentType(); diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassReferenceVisitor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassReferenceVisitor.java index b82cd332a1..96e0157a35 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassReferenceVisitor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassReferenceVisitor.java @@ -31,13 +31,13 @@ public TypeOccurence(PsiElement element, PsiType outermostType) { void visitReferenceExpression(PsiReferenceExpression referenceExpression); - void visitLocalVariableDeclaration(PsiLocalVariable variable, TypeOccurence occurence); - void visitFieldDeclaration(PsiField field, TypeOccurence occurence); - void visitParameterDeclaration(PsiParameter parameter, TypeOccurence occurence); - void visitMethodReturnType(PsiMethod method, TypeOccurence occurence); - void visitTypeCastExpression(PsiTypeCastExpression typeCastExpression, TypeOccurence occurence); + void visitLocalVariableDeclaration(PsiLocalVariable variable, TypeOccurence occurrence); + void visitFieldDeclaration(PsiField field, TypeOccurence occurrence); + void visitParameterDeclaration(PsiParameter parameter, TypeOccurence occurrence); + void visitMethodReturnType(PsiMethod method, TypeOccurence occurrence); + void visitTypeCastExpression(PsiTypeCastExpression typeCastExpression, TypeOccurence occurrence); - void visitNewExpression(PsiNewExpression newExpression, TypeOccurence occurence); + void visitNewExpression(PsiNewExpression newExpression, TypeOccurence occurrence); void visitOther(PsiElement ref); } diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassReferenceVisitorAdapter.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassReferenceVisitorAdapter.java index bda4505d2d..e3b89f56ca 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassReferenceVisitorAdapter.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/ClassReferenceVisitorAdapter.java @@ -28,22 +28,22 @@ public class ClassReferenceVisitorAdapter implements ClassReferenceVisitor { public void visitReferenceExpression(PsiReferenceExpression referenceExpression) { } - public void visitLocalVariableDeclaration(PsiLocalVariable variable, ClassReferenceVisitor.TypeOccurence occurence) { + public void visitLocalVariableDeclaration(PsiLocalVariable variable, ClassReferenceVisitor.TypeOccurence occurrence) { } - public void visitFieldDeclaration(PsiField field, ClassReferenceVisitor.TypeOccurence occurence) { + public void visitFieldDeclaration(PsiField field, ClassReferenceVisitor.TypeOccurence occurrence) { } - public void visitParameterDeclaration(PsiParameter parameter, ClassReferenceVisitor.TypeOccurence occurence) { + public void visitParameterDeclaration(PsiParameter parameter, ClassReferenceVisitor.TypeOccurence occurrence) { } - public void visitMethodReturnType(PsiMethod method, ClassReferenceVisitor.TypeOccurence occurence) { + public void visitMethodReturnType(PsiMethod method, ClassReferenceVisitor.TypeOccurence occurrence) { } - public void visitTypeCastExpression(PsiTypeCastExpression typeCastExpression, ClassReferenceVisitor.TypeOccurence occurence) { + public void visitTypeCastExpression(PsiTypeCastExpression typeCastExpression, ClassReferenceVisitor.TypeOccurence occurrence) { } - public void visitNewExpression(PsiNewExpression newExpression, ClassReferenceVisitor.TypeOccurence occurence) { + public void visitNewExpression(PsiNewExpression newExpression, ClassReferenceVisitor.TypeOccurence occurrence) { } public void visitOther(PsiElement ref) { diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/DelegatingClassReferenceVisitor.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/DelegatingClassReferenceVisitor.java index c6f69787e0..5974007ecf 100644 --- a/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/DelegatingClassReferenceVisitor.java +++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/util/classRefs/DelegatingClassReferenceVisitor.java @@ -33,28 +33,28 @@ public void visitReferenceExpression(PsiReferenceExpression referenceExpression) myDelegate.visitReferenceExpression(referenceExpression); } - public void visitLocalVariableDeclaration(PsiLocalVariable variable, ClassReferenceVisitor.TypeOccurence occurence) { - myDelegate.visitLocalVariableDeclaration(variable, occurence); + public void visitLocalVariableDeclaration(PsiLocalVariable variable, ClassReferenceVisitor.TypeOccurence occurrence) { + myDelegate.visitLocalVariableDeclaration(variable, occurrence); } - public void visitFieldDeclaration(PsiField field, ClassReferenceVisitor.TypeOccurence occurence) { - myDelegate.visitFieldDeclaration(field, occurence); + public void visitFieldDeclaration(PsiField field, ClassReferenceVisitor.TypeOccurence occurrence) { + myDelegate.visitFieldDeclaration(field, occurrence); } - public void visitParameterDeclaration(PsiParameter parameter, ClassReferenceVisitor.TypeOccurence occurence) { - myDelegate.visitParameterDeclaration(parameter, occurence); + public void visitParameterDeclaration(PsiParameter parameter, ClassReferenceVisitor.TypeOccurence occurrence) { + myDelegate.visitParameterDeclaration(parameter, occurrence); } - public void visitMethodReturnType(PsiMethod method, ClassReferenceVisitor.TypeOccurence occurence) { - myDelegate.visitMethodReturnType(method, occurence); + public void visitMethodReturnType(PsiMethod method, ClassReferenceVisitor.TypeOccurence occurrence) { + myDelegate.visitMethodReturnType(method, occurrence); } - public void visitTypeCastExpression(PsiTypeCastExpression typeCastExpression, ClassReferenceVisitor.TypeOccurence occurence) { - myDelegate.visitTypeCastExpression(typeCastExpression, occurence); + public void visitTypeCastExpression(PsiTypeCastExpression typeCastExpression, ClassReferenceVisitor.TypeOccurence occurrence) { + myDelegate.visitTypeCastExpression(typeCastExpression, occurrence); } - public void visitNewExpression(PsiNewExpression newExpression, ClassReferenceVisitor.TypeOccurence occurence) { - myDelegate.visitNewExpression(newExpression, occurence); + public void visitNewExpression(PsiNewExpression newExpression, ClassReferenceVisitor.TypeOccurence occurrence) { + myDelegate.visitNewExpression(newExpression, occurrence); } public void visitOther(PsiElement ref) { diff --git a/plugin/src/main/java/com/intellij/java/impl/slicer/CanItBeNullAction.java b/plugin/src/main/java/com/intellij/java/impl/slicer/CanItBeNullAction.java index 66b9847f4e..aaa34f53b7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/slicer/CanItBeNullAction.java +++ b/plugin/src/main/java/com/intellij/java/impl/slicer/CanItBeNullAction.java @@ -28,7 +28,7 @@ */ public class CanItBeNullAction extends AnAction { private final SliceTreeBuilder myTreeBuilder; - private static final String TEXT = "Group by leaf expression nullness"; + private static final String TEXT = "Group by leaf expression nullity"; public CanItBeNullAction(SliceTreeBuilder treeBuilder) { super(TEXT, "Determine whether null can flow into this expression", ExecutionDebugIconGroup.breakpointBreakpointdisabled()); diff --git a/plugin/src/main/java/consulo/java/impl/ide/JavaIconDescriptorUpdater.java b/plugin/src/main/java/consulo/java/impl/ide/JavaIconDescriptorUpdater.java index 8cf8c57862..10b42282d3 100644 --- a/plugin/src/main/java/consulo/java/impl/ide/JavaIconDescriptorUpdater.java +++ b/plugin/src/main/java/consulo/java/impl/ide/JavaIconDescriptorUpdater.java @@ -74,8 +74,8 @@ public void updateIcon(@Nonnull IconDescriptor iconDescriptor, @Nonnull PsiEleme if (!DumbService.getInstance(element.getProject()).isDumb()) { final PsiManager manager = psiClass.getManager(); - final PsiClass javaLangTrowable = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_THROWABLE, psiClass.getResolveScope()); - final boolean isException = javaLangTrowable != null && InheritanceUtil.isInheritorOrSelf(psiClass, javaLangTrowable, true); + final PsiClass javaLangThrowable = JavaPsiFacade.getInstance(manager.getProject()).findClass(CommonClassNames.JAVA_LANG_THROWABLE, psiClass.getResolveScope()); + final boolean isException = javaLangThrowable != null && InheritanceUtil.isInheritorOrSelf(psiClass, javaLangThrowable, true); if (isException) { iconDescriptor.setMainIcon(abst ? AllIcons.Nodes.AbstractException : AllIcons.Nodes.ExceptionClass); }