/*
 * Copyright 2003-2006 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.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.siyeh.ig.security;

import com.intellij.codeInsight.daemon.GroupNames;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiModifier;
import com.intellij.psi.PsiType;
import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.FieldInspection;
import com.siyeh.ig.psiutils.CollectionUtils;
import com.siyeh.InspectionGadgetsBundle;
import org.jetbrains.annotations.NotNull;

public class PublicStaticCollectionFieldInspection extends FieldInspection {

    public String getGroupDisplayName() {
        return GroupNames.SECURITY_GROUP_NAME;
    }

    @NotNull
    protected String buildErrorString(Object... infos) {
        return InspectionGadgetsBundle.message(
                "public.static.collection.field.problem.descriptor");
    }

    public BaseInspectionVisitor buildVisitor() {
        return new PublicStaticArrayFieldVisitor();
    }

    private static class PublicStaticArrayFieldVisitor
            extends BaseInspectionVisitor {
        
        public void visitField(@NotNull PsiField field) {
            super.visitField(field);
            if (!field.hasModifierProperty(PsiModifier.PUBLIC)
                && !field.hasModifierProperty(PsiModifier.STATIC)) {
                return;
            }
            final PsiType type = field.getType();
            if (!CollectionUtils.isCollectionClass(type)) {
                return;
            }
            registerFieldError(field);
        }
    }
}
@@ -1084,16 +1084,172 @@
 tion %7B%0A%0A
+    public String getDisplayName() %7B%0A        return InspectionGadgetsBundle.message(%0A                %22public.static.collection.field.display.name%22);%0A    %7D%0A%0A
     publ
@@ -1604,37 +1604,42 @@
 new PublicStatic
-Array
+Collection
 FieldVisitor();%0A
@@ -1686,13 +1686,18 @@
 atic
-Array
+Collection
 Fiel
@@ -1915,16 +1915,19 @@
 .PUBLIC)
+) %7B
 %0A       
@@ -1939,11 +1939,46 @@
     
-&& 
+return;%0A            %7D%0A            if (
 !fie

Fix for false positive in "Public static collection field" inspection