diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactBySourceFileFinderImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactBySourceFileFinderImpl.java index c9b3d85e4896..d4e2a59f8261 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactBySourceFileFinderImpl.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactBySourceFileFinderImpl.java @@ -60,7 +60,7 @@ public class ArtifactBySourceFileFinderImpl extends ArtifactBySourceFileFinder { for (ComplexPackagingElementType type : PackagingElementFactory.getInstance().getComplexElementTypes()) { ContainerUtil.addIfNotNull(trackers, type.getAllSubstitutionsModificationTracker(myProject)); } - return CachedValueProvider.Result.create(result, trackers.toArray(new ModificationTracker[trackers.size()])); + return CachedValueProvider.Result.create(result, trackers); }, false); } return myFile2Artifacts; diff --git a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java index 6cf46f7d6c11..897bba0b6d88 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java +++ b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java @@ -108,7 +108,7 @@ public abstract class ParameterTablePanel extends AbstractParameterTablePanel ((PsiType)o).getPresentableText()); diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodTest.java index 5dc35bdd9cc7..d255951e0919 100644 --- a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodTest.java @@ -36,6 +36,7 @@ import com.intellij.refactoring.extractMethod.PrepareFailedException; import com.intellij.refactoring.introduceVariable.IntroduceVariableBase; import com.intellij.refactoring.util.duplicates.Match; import com.intellij.testFramework.LightCodeInsightTestCase; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -1210,7 +1211,7 @@ public class ExtractMethodTest extends LightCodeInsightTestCase { public static boolean performExtractMethod(boolean doRefactor, boolean replaceAllDuplicates, Editor editor, PsiFile file, Project project, final boolean extractChainedConstructor) throws PrepareFailedException, IncorrectOperationException { - return performExtractMethod(doRefactor, replaceAllDuplicates, editor, file, project, extractChainedConstructor, null); + return performExtractMethod(doRefactor, replaceAllDuplicates, editor, file, project, extractChainedConstructor, ArrayUtil.EMPTY_INT_ARRAY); } public static boolean performExtractMethod(boolean doRefactor, diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java index 46a59795d3d6..8ab1d94efe4e 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java @@ -148,7 +148,7 @@ public class PackageSetChooserCombo extends ComponentWithBrowseButton editorList = new ArrayList<>(editors.length); List providerList = new ArrayList<>(providers.length); for (int i = 0; i < editors.length; i++) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java index 5081b18e7b39..c074f929b056 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RecentProjectPanel.java @@ -349,11 +349,11 @@ public class RecentProjectPanel extends JPanel { return title; } - private class MyList extends JBList { + private class MyList extends JBList { private final Dimension mySize; private Point myMousePoint; - private MyList(Dimension size, @NotNull Object ... listData) { + private MyList(Dimension size, @NotNull AnAction[] listData) { super(listData); mySize = size; setEmptyText(" No Project Open Yet "); diff --git a/platform/platform-tests/testSrc/com/intellij/util/MatrixTest.java b/platform/platform-tests/testSrc/com/intellij/util/MatrixTest.java index 0144e2c8ce38..5b028369bc3c 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/MatrixTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/MatrixTest.java @@ -49,7 +49,7 @@ public class MatrixTest extends TestCase { public void testCreateNull() { try { - fail("Created " + Matrix.create(0, null)); + fail("Created " + Matrix.create(0, (double[])null)); } catch (Exception ignored) { } diff --git a/platform/platform-tests/testSrc/com/intellij/util/VectorTest.java b/platform/platform-tests/testSrc/com/intellij/util/VectorTest.java index 8bc712b327ed..f463363ac81e 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/VectorTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/VectorTest.java @@ -40,7 +40,7 @@ public class VectorTest extends TestCase { public void testCreateNull() { try { - fail("Created " + Vector.create(null)); + fail("Created " + Vector.create((double[])null)); } catch (Exception ignored) { } diff --git a/platform/testFramework/src/com/intellij/TestAll.java b/platform/testFramework/src/com/intellij/TestAll.java index 967817a6b288..056d534d4d90 100644 --- a/platform/testFramework/src/com/intellij/TestAll.java +++ b/platform/testFramework/src/com/intellij/TestAll.java @@ -443,7 +443,7 @@ public class TestAll implements Test { Method suiteMethod = safeFindMethod(testCaseClass, "suite"); if (suiteMethod != null && !isPerformanceTestsRun()) { - return (Test)suiteMethod.invoke(null, ArrayUtil.EMPTY_CLASS_ARRAY); + return (Test)suiteMethod.invoke(null, ArrayUtil.EMPTY_OBJECT_ARRAY); } if (TestRunnerUtil.isJUnit4TestClass(testCaseClass)) { diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/EditorFixture.java b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/EditorFixture.java index 50a2c5adeefa..37db4cc1c857 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/EditorFixture.java +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/EditorFixture.java @@ -967,7 +967,7 @@ public class EditorFixture { for (HighlightInfo info : getCurrentFileFixture().getHighlightInfos(severity)) { infos.add(info.getDescription()); } - assertThat(infos).containsOnly(highlights); + assertThat(infos).containsOnly((Object[])highlights); return this; } diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/LibraryFixture.java b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/LibraryFixture.java index 327c23a9ea8c..ead72b1e4041 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/LibraryFixture.java +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/LibraryFixture.java @@ -31,7 +31,7 @@ public class LibraryFixture { @NotNull public LibraryFixture requireJavadocUrls(@NotNull String... urls) { String[] actualUrls = myLibrary.getUrls(JavadocOrderRootType.getInstance()); - assertThat(actualUrls).as("Javadoc URLs").containsOnly(urls); + assertThat(actualUrls).as("Javadoc URLs").containsOnly((Object[])urls); return this; } } diff --git a/platform/util/src/com/intellij/util/ImageLoader.java b/platform/util/src/com/intellij/util/ImageLoader.java index bbf0a868efb8..cd93f76c74cd 100644 --- a/platform/util/src/com/intellij/util/ImageLoader.java +++ b/platform/util/src/com/intellij/util/ImageLoader.java @@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; +import java.awt.image.BufferedImageOp; import java.awt.image.ImageFilter; import java.io.IOException; import java.io.InputStream; @@ -338,7 +339,7 @@ public class ImageLoader implements Serializable { // Using "QUALITY" instead of "ULTRA_QUALITY" results in images that are less blurry // because ultra quality performs a few more passes when scaling, which introduces blurriness // when the scaling factor is relatively small (i.e. <= 3.0f) -- which is the case here. - return Scalr.resize(ImageUtil.toBufferedImage(image), Scalr.Method.QUALITY, Scalr.Mode.FIT_EXACT, width, height, null); + return Scalr.resize(ImageUtil.toBufferedImage(image), Scalr.Method.QUALITY, Scalr.Mode.FIT_EXACT, width, height, (BufferedImageOp[])null); } @Nullable diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java index 3dda51a4d157..078ac9570b56 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java @@ -18,6 +18,7 @@ package com.siyeh.ig.j2me; import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiMethodCallExpression; +import com.intellij.psi.PsiType; import com.intellij.util.xmlb.XmlSerializer; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.psiutils.MethodCallUtils; @@ -45,7 +46,7 @@ public class ConnectionResourceInspection extends ResourceInspection { return false; } final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; - return MethodCallUtils.isCallToMethod(methodCallExpression, "javax.microedition.io.Connector", null, "open", null); + return MethodCallUtils.isCallToMethod(methodCallExpression, "javax.microedition.io.Connector", null, "open", (PsiType[])null); } @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java index d5db8085edfd..625ea025147b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java @@ -18,6 +18,7 @@ package com.siyeh.ig.j2me; import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiMethodCallExpression; +import com.intellij.psi.PsiType; import com.intellij.psi.PsiVariable; import com.intellij.util.xmlb.XmlSerializer; import com.siyeh.InspectionGadgetsBundle; @@ -47,7 +48,7 @@ public class RecordStoreResourceInspection extends ResourceInspection { return false; } final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; - return MethodCallUtils.isCallToMethod(methodCallExpression, "javax.microedition.rms.RecordStore", null, "openRecordStore", null); + return MethodCallUtils.isCallToMethod(methodCallExpression, "javax.microedition.rms.RecordStore", null, "openRecordStore", (PsiType[])null); } @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java index 4d7db8d67b50..ab9ffafdedf5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java @@ -158,8 +158,8 @@ public class HardcodedFileSeparatorsInspection extends BaseInspection { if (grandParent instanceof PsiMethodCallExpression) { final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent; if (MethodCallUtils.isCallToRegexMethod(methodCallExpression) || - MethodCallUtils.isCallToMethod(methodCallExpression, "java.lang.Class", null, "getResource", null) || - MethodCallUtils.isCallToMethod(methodCallExpression, "java.lang.Class", null, "getResourceAsStream", null)) { + MethodCallUtils.isCallToMethod(methodCallExpression, "java.lang.Class", null, "getResource", (PsiType[])null) || + MethodCallUtils.isCallToMethod(methodCallExpression, "java.lang.Class", null, "getResourceAsStream", (PsiType[])null)) { return; } } diff --git a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/vararg/WrapVarargArgumentsWithExplicitArrayIntentionTest.java b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/vararg/WrapVarargArgumentsWithExplicitArrayIntentionTest.java index 1718ab2c8635..0287dcab94cc 100644 --- a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/vararg/WrapVarargArgumentsWithExplicitArrayIntentionTest.java +++ b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/vararg/WrapVarargArgumentsWithExplicitArrayIntentionTest.java @@ -22,6 +22,7 @@ import com.siyeh.ipp.IPPTestCase; */ public class WrapVarargArgumentsWithExplicitArrayIntentionTest extends IPPTestCase { + @SuppressWarnings("ConfusingArgumentToVarargsMethod") public void testNullArgument() { doTestIntentionNotAvailable("class X {" + " void a(String... ss) {}" + @@ -31,6 +32,7 @@ public class WrapVarargArgumentsWithExplicitArrayIntentionTest extends IPPTestCa "}"); } + @SuppressWarnings("RedundantArrayCreation") public void testEnumConstants() { doTest("enum X {" + " A(/*_Wrap vararg arguments with explicit array creation*/1), B(1,2), C(1,2,3);" + @@ -43,6 +45,7 @@ public class WrapVarargArgumentsWithExplicitArrayIntentionTest extends IPPTestCa "}"); } + @SuppressWarnings("RedundantArrayCreation") public void testConstructorCall() { doTest("class A {" + " A(int... is) {}" + diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java index e5ad7bb60e13..f5dda213243d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java @@ -17,8 +17,8 @@ package org.jetbrains.plugins.groovy.refactoring.convertToJava; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.NullUtils; import com.intellij.psi.*; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement; @@ -62,7 +62,7 @@ class ArgumentListGenerator { } final PsiSubstitutor substitutor = signature == null ? PsiSubstitutor.EMPTY : signature.getSubstitutor(); - if (argInfos == null || NullUtils.hasNull(argInfos)) { + if (argInfos == null || ArrayUtil.contains(null, argInfos)) { generateSimple(exprs, namedArgs, clArgs, context, substitutor); return; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java index 69b47365a254..715987c2d30a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java @@ -230,7 +230,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { myRepositoriesLabel = new JLabel(myRepositoriesLabelText); top.add(myRepositoriesLabel); - top.add(createToolbar(true, null)); + top.add(createToolbar(true, (AnAction[])null)); parentPanel.add(top, BorderLayout.NORTH); JComponent panel = createBrowserComponent(false); diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java index 49bfd1d60928..394cf1cdc51d 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java @@ -132,7 +132,7 @@ public class UndeclaredTestInspection extends AbstractBaseJavaLocalInspectionToo LOG.assertTrue(psiFile instanceof XmlFile); final XmlFile testngXML = (XmlFile)psiFile; new WriteCommandAction(project, getName(), testngXML) { - protected void run(@NotNull final Result result) throws Throwable { + protected void run(@NotNull final Result result) { patchTestngXml(testngXML, psiClass); } }.execute(); @@ -182,8 +182,8 @@ public class UndeclaredTestInspection extends AbstractBaseJavaLocalInspectionToo final PsiManager psiManager = PsiManager.getInstance(project); final PsiDirectory directory = psiManager.findDirectory(file); LOG.assertTrue(directory != null); - new WriteCommandAction(project, getName(), null) { - protected void run(@NotNull final Result result) throws Throwable { + new WriteCommandAction(project, getName(), PsiFile.EMPTY_ARRAY) { + protected void run(@NotNull final Result result) { XmlFile testngXml = (XmlFile)PsiFileFactory.getInstance(psiManager.getProject()) .createFileFromText("testng.xml", "\n"); try { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/IntRegexEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/IntRegexEditor.java index 446dd064d84b..f42d09e25dff 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/IntRegexEditor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/IntRegexEditor.java @@ -73,6 +73,6 @@ public class IntRegexEditor extends AbstractTextFieldEditor { params [i] = value; } - return myValueClass.getConstructor(paramTypes).newInstance(params); + return myValueClass.getConstructor(paramTypes).newInstance((Object[])params); } } diff --git a/xml/dom-impl/src/com/intellij/util/xml/ModelMergerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/ModelMergerImpl.java index 2f4880e0fdb1..ec61d35f7d87 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/ModelMergerImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/ModelMergerImpl.java @@ -232,7 +232,7 @@ public class ModelMergerImpl implements ModelMerger { private T _mergeModels(final Class aClass, final MergingInvocationHandler handler, final T... implementations) { - final Set commonClasses = getCommonClasses(new THashSet<>(), implementations); + final Set commonClasses = getCommonClasses(new THashSet<>(), (Object[])implementations); commonClasses.add(MERGED_OBJECT_CLASS); commonClasses.add(aClass); final T t = AdvancedProxy.createProxy(handler, null, commonClasses.toArray(new Class[commonClasses.size()]));