Raw types eliminated

This commit is contained in:
Tagir Valeev
2017-09-27 10:08:14 +07:00
parent c20bbf70d2
commit 21efef3417
9 changed files with 21 additions and 16 deletions
@@ -112,7 +112,7 @@ public class TypeMayBeWeakenedInspection extends BaseInspection {
@NotNull
protected InspectionGadgetsFix[] buildFixes(Object... infos) {
final Iterable<PsiClass> weakerClasses = (Iterable<PsiClass>)infos[1];
final Collection<InspectionGadgetsFix> fixes = new ArrayList();
final Collection<InspectionGadgetsFix> 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<PsiTypeParameter, PsiType> typeParameterMap = new HashMap();
final Map<PsiTypeParameter, PsiType> typeParameterMap = new HashMap<>();
for (int i = 0; i < typeParameters.length; i++) {
final PsiTypeParameter typeParameter = typeParameters[i];
final PsiType parameterType = parameterTypes[i];
@@ -128,7 +128,7 @@ public class CaughtExceptionImmediatelyRethrownInspection extends BaseInspection
index++;
}
final PsiType type = parameter.getType();
final Set<PsiClass> parameterClasses = new THashSet();
final Set<PsiClass> 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<Boolean> superClassExceptionType = new Ref(Boolean.FALSE);
final Ref<Boolean> superClassExceptionType = new Ref<>(Boolean.FALSE);
for (int i = index; i < catchSections.length; i++) {
final PsiCatchSection nextCatchSection = catchSections[i];
final PsiParameter nextParameter = nextCatchSection.getParameter();
@@ -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<String> annotationNames = new ArrayList();
protected final List<String> 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() {
@@ -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<String, String> gridbagConstants = new HashMap();
private static final Map<String, String> 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<String, String> borderLayoutConstants = new HashMap();
private static final Map<String, String> 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<String, String> flowLayoutConstants = new HashMap();
private static final Map<String, String> flowLayoutConstants = new HashMap<>();
static {
flowLayoutConstants.put("LEFT", "LEADING");
flowLayoutConstants.put("RIGHT", "TRAILING");
}
private static final Map<String, String> scrollPaneConstants = new HashMap();
private static final Map<String, String> 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<String, String> boxLayoutConstants = new HashMap();
private static final Map<String, String> boxLayoutConstants = new HashMap<>();
static {
boxLayoutConstants.put("X_AXIS", "LINE_AXIS");
boxLayoutConstants.put("Y_AXIS", "PAGE_AXIS");
@@ -30,7 +30,7 @@ import java.util.ArrayList;
import java.util.List;
public class ClassWithoutLoggerInspectionBase extends BaseInspection {
protected final List<String> loggerNames = new ArrayList();
protected final List<String> loggerNames = new ArrayList<>();
/**
* @noinspection PublicField
*/
@@ -41,7 +41,7 @@ public class NonBooleanMethodNameMayNotStartWithQuestionInspectionBase extends B
@SuppressWarnings("PublicField")
public boolean onlyWarnOnBaseMethods = true;
List<String> questionList = new ArrayList(32);
List<String> questionList = new ArrayList<>(32);
public NonBooleanMethodNameMayNotStartWithQuestionInspectionBase() {
parseString(questionString, questionList);
@@ -84,7 +84,7 @@ public class QuestionableNameInspectionBase extends BaseInspection {
private class QuestionableNameVisitor extends BaseInspectionVisitor {
private final Set<String> nameSet = new HashSet(nameList);
private final Set<String> nameSet = new HashSet<>(nameList);
@Override
public void visitVariable(@NotNull PsiVariable variable) {
@@ -89,7 +89,7 @@ public class ReuseOfLocalVariableInspection
ReferencesSearch.search(variable, scope, false);
final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
final PsiElementFactory factory = psiFacade.getElementFactory();
List<PsiReferenceExpression> collectedReferences = new ArrayList();
List<PsiReferenceExpression> collectedReferences = new ArrayList<>();
for (PsiReference reference : query) {
final PsiElement referenceElement = reference.getElement();
if (referenceElement == null) {
@@ -241,7 +241,7 @@ public class EnumerationCanBeIterationInspection extends EnumerationCanBeIterati
final PsiElementFactory factory = facade.getElementFactory();
final Query<PsiReference> query = ReferencesSearch.search(
enumerationVariable);
final List<PsiElement> referenceElements = new ArrayList();
final List<PsiElement> referenceElements = new ArrayList<>();
for (PsiReference reference : query) {
final PsiElement referenceElement = reference.getElement();
referenceElements.add(referenceElement);