diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java index ec2778f79c5b..aaedda31b7a6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java @@ -112,7 +112,7 @@ public class TypeMayBeWeakenedInspection extends BaseInspection { @NotNull protected InspectionGadgetsFix[] buildFixes(Object... infos) { final Iterable weakerClasses = (Iterable)infos[1]; - final Collection fixes = new ArrayList(); + final Collection fixes = new ArrayList<>(); for (PsiClass weakestClass : weakerClasses) { final String className = getClassName(weakestClass); if (className == null) { @@ -183,7 +183,7 @@ public class TypeMayBeWeakenedInspection extends BaseInspection { if (aClass != null) { final PsiTypeParameter[] typeParameters = aClass.getTypeParameters(); if (typeParameters.length != 0 && typeParameters.length == parameterTypes.length) { - final Map typeParameterMap = new HashMap(); + final Map typeParameterMap = new HashMap<>(); for (int i = 0; i < typeParameters.length; i++) { final PsiTypeParameter typeParameter = typeParameters[i]; final PsiType parameterType = parameterTypes[i]; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java index 6efba31fbf8b..446500bfe588 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java @@ -128,7 +128,7 @@ public class CaughtExceptionImmediatelyRethrownInspection extends BaseInspection index++; } final PsiType type = parameter.getType(); - final Set parameterClasses = new THashSet(); + final Set parameterClasses = new THashSet<>(); processExceptionClasses(type, aClass -> { parameterClasses.add(aClass); return true; @@ -136,7 +136,7 @@ public class CaughtExceptionImmediatelyRethrownInspection extends BaseInspection if (parameterClasses.isEmpty()) { return false; } - final Ref superClassExceptionType = new Ref(Boolean.FALSE); + final Ref superClassExceptionType = new Ref<>(Boolean.FALSE); for (int i = index; i < catchSections.length; i++) { final PsiCatchSection nextCatchSection = catchSections[i]; final PsiParameter nextParameter = nextCatchSection.getParameter(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/InstanceVariableUninitializedUseInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/InstanceVariableUninitializedUseInspectionBase.java index 3b72bd5f87f1..d65fb5fdbbaa 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/InstanceVariableUninitializedUseInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/InstanceVariableUninitializedUseInspectionBase.java @@ -28,6 +28,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.AddToIgnoreIfAnnotatedByListQuickFix; import com.siyeh.ig.psiutils.ClassUtils; import com.siyeh.ig.psiutils.UninitializedReadCollector; +import org.intellij.lang.annotations.Pattern; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -36,7 +37,7 @@ import java.util.ArrayList; import java.util.List; public class InstanceVariableUninitializedUseInspectionBase extends BaseInspection { - protected final List annotationNames = new ArrayList(); + protected final List annotationNames = new ArrayList<>(); /** * @noinspection PublicField */ @@ -51,6 +52,7 @@ public class InstanceVariableUninitializedUseInspectionBase extends BaseInspecti parseString(annotationNamesString, annotationNames); } + @Pattern(VALID_ID_PATTERN) @Override @NotNull public String getID() { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java index 662ae31b29a7..572e3f1f5d4a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/AbsoluteAlignmentInUserInterfaceInspection.java @@ -17,7 +17,10 @@ package com.siyeh.ig.internationalization; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; -import com.intellij.psi.*; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiReferenceExpression; import com.intellij.psi.util.InheritanceUtil; import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; @@ -33,33 +36,33 @@ import java.util.Map; public class AbsoluteAlignmentInUserInterfaceInspection extends BaseInspection { - private static final Map gridbagConstants = new HashMap(); + private static final Map gridbagConstants = new HashMap<>(); static { gridbagConstants.put("NORTHWEST", "FIRST_LINE_START"); gridbagConstants.put("NORTHEAST", "FIRST_LINE_END"); gridbagConstants.put("SOUTHWEST", "LAST_LINE_START"); gridbagConstants.put("SOUTHEAST", "LAST_LINE_END"); } - private static final Map borderLayoutConstants = new HashMap(); + private static final Map borderLayoutConstants = new HashMap<>(); static { borderLayoutConstants.put("NORTH", "PAGE_START"); borderLayoutConstants.put("SOUTH", "PAGE_END"); borderLayoutConstants.put("EAST", "LINE_END"); borderLayoutConstants.put("WEST", "LINE_START"); } - private static final Map flowLayoutConstants = new HashMap(); + private static final Map flowLayoutConstants = new HashMap<>(); static { flowLayoutConstants.put("LEFT", "LEADING"); flowLayoutConstants.put("RIGHT", "TRAILING"); } - private static final Map scrollPaneConstants = new HashMap(); + private static final Map scrollPaneConstants = new HashMap<>(); static { scrollPaneConstants.put("LOWER_LEFT_CORNER", "LOWER_LEADING_CORNER"); scrollPaneConstants.put("LOWER_RIGHT_CORNER", "LOWER_TRAILING_CORNER"); scrollPaneConstants.put("UPPER_LEFT_CORNER", "UPPER_LEADING_CORNER"); scrollPaneConstants.put("UPPER_RIGHT_CORNER", "UPPER_TRAILING_CORNER"); } - private static final Map boxLayoutConstants = new HashMap(); + private static final Map boxLayoutConstants = new HashMap<>(); static { boxLayoutConstants.put("X_AXIS", "LINE_AXIS"); boxLayoutConstants.put("Y_AXIS", "PAGE_AXIS"); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/ClassWithoutLoggerInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/ClassWithoutLoggerInspectionBase.java index b1dad3eaadac..4f3a1ed492e1 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/ClassWithoutLoggerInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/logging/ClassWithoutLoggerInspectionBase.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; public class ClassWithoutLoggerInspectionBase extends BaseInspection { - protected final List loggerNames = new ArrayList(); + protected final List loggerNames = new ArrayList<>(); /** * @noinspection PublicField */ diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspectionBase.java index 2f6d12bba381..56c9e6ea65a3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspectionBase.java @@ -41,7 +41,7 @@ public class NonBooleanMethodNameMayNotStartWithQuestionInspectionBase extends B @SuppressWarnings("PublicField") public boolean onlyWarnOnBaseMethods = true; - List questionList = new ArrayList(32); + List questionList = new ArrayList<>(32); public NonBooleanMethodNameMayNotStartWithQuestionInspectionBase() { parseString(questionString, questionList); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/QuestionableNameInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/QuestionableNameInspectionBase.java index 41697bd72a0d..67512fe18acd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/QuestionableNameInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/QuestionableNameInspectionBase.java @@ -84,7 +84,7 @@ public class QuestionableNameInspectionBase extends BaseInspection { private class QuestionableNameVisitor extends BaseInspectionVisitor { - private final Set nameSet = new HashSet(nameList); + private final Set nameSet = new HashSet<>(nameList); @Override public void visitVariable(@NotNull PsiVariable variable) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java index fca27bf22a5b..7f5a5d49f257 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java @@ -89,7 +89,7 @@ public class ReuseOfLocalVariableInspection ReferencesSearch.search(variable, scope, false); final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); final PsiElementFactory factory = psiFacade.getElementFactory(); - List collectedReferences = new ArrayList(); + List collectedReferences = new ArrayList<>(); for (PsiReference reference : query) { final PsiElement referenceElement = reference.getElement(); if (referenceElement == null) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java index e50c4d036818..1858fb3679b1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java @@ -241,7 +241,7 @@ public class EnumerationCanBeIterationInspection extends EnumerationCanBeIterati final PsiElementFactory factory = facade.getElementFactory(); final Query query = ReferencesSearch.search( enumerationVariable); - final List referenceElements = new ArrayList(); + final List referenceElements = new ArrayList<>(); for (PsiReference reference : query) { final PsiElement referenceElement = reference.getElement(); referenceElements.add(referenceElement);