From c2dcbfb0d679d30b00f1099282aba883e9989867 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Thu, 5 Feb 2009 18:18:56 +0300 Subject: [PATCH] fix for Redundant Import false positive --- .../src/com/siyeh/ig/imports/RedundantImportInspection.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/RedundantImportInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/RedundantImportInspection.java index 845dc4d4a4..8172937240 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/RedundantImportInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/RedundantImportInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2008 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2009 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,22 +30,26 @@ import java.util.Set; public class RedundantImportInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "redundant.import.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "redundant.import.problem.descriptor"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new DeleteImportFix(); } + @Override public BaseInspectionVisitor buildVisitor() { return new RedundantImportVisitor(); } @@ -150,6 +154,8 @@ public class RedundantImportInspection extends BaseInspection { } if (onDemandImports.contains(contextName) && !ImportUtils.hasOnDemandImportConflict(qualifiedName, + javaFile) && + !ImportUtils.hasDefaultImportConflict(qualifiedName, javaFile)) { registerError(importStatement); } -- 2.11.4.GIT