From 672f9ed2c913e1ceb7ac5d65e13fd62e402bb50c Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Fri, 5 Sep 2008 18:02:15 +0400
Subject: [PATCH] wording

---
 .../com/siyeh/InspectionGadgetsBundle.properties   | 34 +++++++++++-----------
 ...tectedConstructorInAbstractClassInspection.java |  9 +++++-
 .../NonProtectedConstructorInAbstractClass.html    |  3 +-
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
index 208e7f39a4..f6b4c0d3b1 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
+++ b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
@@ -32,8 +32,8 @@ overly.strong.type.cast.display.name=Overly-strong type cast
 overly.strong.type.cast.weaken.quickfix=Weaken overly-strong cast
 concrete.class.method.parameter.display.name=Method parameter of concrete class
 concrete.class.method.parameter.problem.descriptor=Parameter ''{0}'' of concrete class <code>#ref</code> #loc
-public.method.not.in.interface.display.name=Public method not exposed in interface
-public.method.not.in.interface.problem.descriptor=Public method <code>#ref()</code> is not exposed via an interface #loc
+public.method.not.in.interface.display.name='public' method not exposed in interface
+public.method.not.in.interface.problem.descriptor='public' method <code>#ref()</code> is not exposed via an interface #loc
 static.variable.of.concrete.class.display.name=Static variable of concrete class
 static.variable.of.concrete.class.problem.descriptor=Static variable ''{0}'' of concrete class <code>#ref</code> #loc
 incompatible.mask.operation.display.name=Incompatible bitwise mask operation
@@ -199,8 +199,8 @@ no.logger.display.name=Class without logger
 no.logger.problem.descriptor=Class <code>#ref</code> does not declare a logger #loc
 non.constant.logger.display.name=Non-constant logger
 non.constant.logger.problem.descriptor=Non-constant logger field <code>#ref</code> #loc
-public.method.without.logging.display.name=Public method without logging
-public.method.without.logging.problem.descriptor=Public method without logging <code>#ref</code> #loc
+public.method.without.logging.display.name='public' method without logging
+public.method.without.logging.problem.descriptor='public' method without logging <code>#ref</code> #loc
 action.reset.telemetry.description=Reset telemetry data
 
 telemetry.table.column.inspection.name=Inspection Name
@@ -313,12 +313,12 @@ protected.field.display.name=Protected field
 protected.field.problem.descriptor=Protected field <code>#ref</code> #loc
 protected.inner.class.display.name=Protected inner class
 protected.inner.class.problem.descriptor=Protected inner class <code>#ref</code> #loc
-public.field.display.name=Public field
-public.field.problem.descriptor=Public field <code>#ref</code> #loc
-public.field.ignore.enum.type.fields.option=Ignore public fields of an enum type
-public.inner.class.display.name=Public inner class
-public.inner.class.problem.descriptor=Public inner class <code>#ref</code> #loc
-public.inner.class.ignore.enum.option=Ignore public inner enums
+public.field.display.name='public' field
+public.field.problem.descriptor='public' field <code>#ref</code> #loc
+public.field.ignore.enum.type.fields.option=Ignore 'public' fields of an enum type
+public.inner.class.display.name='public' inner class
+public.inner.class.problem.descriptor='public' inner class <code>#ref</code> #loc
+public.inner.class.ignore.enum.option=Ignore 'public' inner enums
 return.of.collection.array.field.display.name=Return of Collection or array field
 return.of.collection.array.field.problem.descriptor.array='return' of array field <code>#ref</code> #loc
 return.of.collection.array.field.problem.descriptor.collection='return' of Collection field <code>#ref</code> #loc
@@ -515,7 +515,7 @@ serializable.class.without.serialversionuid.problem.descriptor=<code>#ref</code>
 serializable.class.without.serialversionuid.ignore.option=Ignore classes serializable due to inheritance
 
 #dynamic
-non.protected.constructor.in.abstract.class.display.name=Constructor not 'protected' in 'abstract' class
+non.protected.constructor.in.abstract.class.display.name='public' constructor 'abstract' class
 unnecessary.qualifier.for.this.display.name=Unnecessary qualifier for 'this'
 multiple.declaration.display.name=Multiple variables in one declaration
 thread.priority.display.name=Call to 'Thread.setPriority()'
@@ -639,7 +639,7 @@ constant.declared.in.abstract.class.display.name=Constant declared in abstract c
 too.broad.catch.display.name=Overly broad 'catch' block
 floating.point.equality.display.name=Floating point equality comparison
 thrown.exceptions.per.method.display.name=Method with too many exceptions declared
-public.static.array.field.display.name=Public static array field
+public.static.array.field.display.name='public static' array field
 await.not.in.loop.display.name='await()' not in loop
 method.names.differ.only.by.case.display.name=Method names differing only by case
 unsecure.random.number.generation.display.name=Insecure random number generation
@@ -699,7 +699,7 @@ inner.class.may.be.static.display.name=Inner class may be 'static'
 static.suite.display.name='suite()' method not declared 'static'
 redundant.field.initialization.display.name=Redundant field initialization
 string.buffer.to.string.in.concatenation.display.name='StringBuffer.toString()' in concatenation
-utility.class.with.public.constructor.display.name=Utility class with public constructor
+utility.class.with.public.constructor.display.name=Utility class with 'public' constructor
 for.loop.replaceable.by.while.display.name='for' loop may be replaced with 'while' loop
 missing.deprecated.annotation.display.name=Missing @Deprecated annotation
 cloneable.class.in.secure.context.display.name=Cloneable class in secure context
@@ -807,7 +807,7 @@ non.static.inner.class.in.secure.context.display.name=Non-static inner class in
 tail.recursion.display.name=Tail recursion
 finally.block.cannot.complete.normally.display.name='finally' block which can not complete normally
 arithmetic.on.volatile.field.display.name=Arithmetic operation on volatile field
-public.static.collection.field.display.name=Public static collection field
+public.static.collection.field.display.name='public static' collection field
 non.exception.name.ends.with.exception.display.name=Non-exception class name ends with 'Exception'
 synchronized.method.display.name='synchronized' method
 enumerated.constant.naming.convention.display.name=Enumerated constant naming convention
@@ -894,7 +894,7 @@ class.without.constructor.problem.descriptor=<code>#ref</code> has no constructo
 abstract.class.without.abstract.methods.problem.descriptor=Class <code>#ref</code> is declared 'abstract', and has no 'abstract' methods #loc
 final.method.in.final.class.problem.descriptor=Method declared <code>#ref</code> in 'final' class #loc
 protected.member.in.final.class.problem.descriptor=Class member declared <code>#ref</code> in 'final' class #loc
-utility.class.with.public.constructor.problem.descriptor=Class <code>#ref</code> has only static members, and a public constructor #loc
+utility.class.with.public.constructor.problem.descriptor=Class <code>#ref</code> has only 'static' members, and a 'public' constructor #loc
 utility.class.without.private.constructor.problem.descriptor=Class <code>#ref</code> has only 'static' members, and lacks a 'private' constructor #loc
 abstract.method.overrides.concrete.method.problem.descriptor=Abstract method <code>#ref()</code> overrides concrete method #loc
 abstract.method.with.missing.implementations.problem.descriptor=Abstract method <code>#ref()</code> is not implemented in every subclass #loc
@@ -1069,8 +1069,8 @@ custom.classloader.problem.descriptor=Custom ClassLoader class <code>#ref</code>
 custom.security.manager.problem.descriptor=Custom SecurityManager class <code>#ref</code> #loc
 system.set.problem.descriptor=Call to <code>System.#ref()</code> may pose security concerns #loc
 class.loader.instantiation.problem.descriptor=Instantiation of <code>#ref</code> may pose security concerns #loc
-public.static.array.field.problem.descriptor=Public static array field <code>#ref</code>, compromising security #loc
-public.static.collection.field.problem.descriptor=Public static collection field <code>#ref</code>, compromising security #loc
+public.static.array.field.problem.descriptor='public static' array field <code>#ref</code>, compromising security #loc
+public.static.collection.field.problem.descriptor='public static' collection field <code>#ref</code>, compromising security #loc
 abstract.class.with.only.one.direct.inheritor.problem.descriptor=Abstract class <code>#ref</code> has only one direct inheritor #loc
 
 #other
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/NonProtectedConstructorInAbstractClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/NonProtectedConstructorInAbstractClassInspection.java
index f92e37d102..cb542164ed 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/NonProtectedConstructorInAbstractClassInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/NonProtectedConstructorInAbstractClassInspection.java
@@ -36,23 +36,27 @@ public class NonProtectedConstructorInAbstractClassInspection
      */
     public boolean m_ignoreNonPublicClasses = false;
 
+    @Override
     @NotNull
     public String getDisplayName() {
         return InspectionGadgetsBundle.message(
                 "non.protected.constructor.in.abstract.class.display.name");
     }
 
+    @Override
     @NotNull
     public String getID() {
         return "ConstructorNotProtectedInAbstractClass";
     }
 
+    @Override
     @NotNull
     protected String buildErrorString(Object... infos) {
         return InspectionGadgetsBundle.message(
                 "non.protected.constructor.in.abstract.class.problem.descriptor");
     }
 
+    @Override
     public JComponent createOptionsPanel() {
         return new SingleCheckboxOptionsPanel(
                 InspectionGadgetsBundle.message(
@@ -60,10 +64,12 @@ public class NonProtectedConstructorInAbstractClassInspection
                 this, "m_ignoreNonPublicClasses");
     }
 
+    @Override
     public BaseInspectionVisitor buildVisitor() {
         return new NonProtectedConstructorInAbstractClassVisitor();
     }
 
+    @Override
     public InspectionGadgetsFix buildFix(Object... infos) {
         return new ChangeModifierFix(PsiModifier.PROTECTED);
     }
@@ -77,7 +83,8 @@ public class NonProtectedConstructorInAbstractClassInspection
                 return;
             }
             if (method.hasModifierProperty(PsiModifier.PROTECTED)
-                || method.hasModifierProperty(PsiModifier.PRIVATE)) {
+                || method.hasModifierProperty(PsiModifier.PRIVATE)
+                    || method.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) {
                 return;
             }
             final PsiClass containingClass = method.getContainingClass();
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/NonProtectedConstructorInAbstractClass.html b/plugins/InspectionGadgets/src/inspectionDescriptions/NonProtectedConstructorInAbstractClass.html
index f73444167a..bb2671de8c 100644
--- a/plugins/InspectionGadgets/src/inspectionDescriptions/NonProtectedConstructorInAbstractClass.html
+++ b/plugins/InspectionGadgets/src/inspectionDescriptions/NonProtectedConstructorInAbstractClass.html
@@ -2,6 +2,7 @@
 <body><table> <tr> <td valign="top" height="150">
 <font face="verdana" size="-1">
 This inspection reports all instances of constructors in abstract classes that are not
-declared <b><font color="#000080">protected</font></b> or <b><font color="#000080">private</font></b>.
+declared <b><font color="#000080">protected</font></b>, package-protected or
+<b><font color="#000080">private</font></b>.
 </font></td> </tr> <tr> <td height="20"> <font face="verdana" size="-2">Powered by InspectionGadgets </font> </td> </tr> </table> </body>
 </html>
\ No newline at end of file
-- 
2.11.4.GIT