more consistent Java inspection names

GitOrigin-RevId: 5c958dfd8b5f55e9e5bede82be5015c3299dd16e
2026-09-27 10:03:11 +07:00 · 2021-12-20 10:55:14 +00:00
parent 6fecec667a
commit ed2c73e98c
44 changed files with 142 additions and 141 deletions
@@ -265,7 +265,7 @@ inspection.implicit.subclass.make.class.extendable=Make class ''{0}'' {1,choice,
 inspection.infinite.loop.option=Ignore when placed in Thread.run
 inspection.java.module.naming.terminal.digits=Module name component ''{0}'' should avoid terminal digits
 inspection.java.module.naming=Java module name contradicts the convention
-inspection.local.can.be.final.display.name=Local variable or parameter can be final
+inspection.local.can.be.final.display.name=Local variable or parameter can be 'final'
 inspection.local.can.be.final.option1=Report method parameters
 inspection.local.can.be.final.option2=Report catch parameters
 inspection.local.can.be.final.option3=Report foreach parameters
@@ -293,7 +293,7 @@ inspection.nullable.problems.at.wildcard=Nullability annotation is not applicabl
 inspection.nullable.problems.at.local.variable=Nullability annotation is not applicable to local variables
 inspection.nullable.problems.at.type.parameter=Nullability annotation is not applicable to type parameters
 inspection.nullable.problems.at.reference.list=Nullability annotation is not applicable to extends/implements clause
-inspection.objects.equals.can.be.simplified.display.name=Objects.equals() can be replaced with equals()
+inspection.objects.equals.can.be.simplified.display.name='Objects.equals()' can be replaced with 'equals()'
 inspection.redundant.cast.problem.descriptor=Casting {0} to {1} is redundant
 inspection.redundant.cast.remove.quickfix=Remove redundant cast(s)
 inspection.redundant.field.initialization.option=Only warn on initialization to null
@@ -325,10 +325,10 @@ inspection.same.return.value.problem.descriptor1=Method and all its derivables a
 inspection.same.return.value.problem.descriptor2=All implementations of this method always return {0}
 inspection.same.return.value.problem.descriptor=Method always returns {0}
 inspection.surround.requirenonnull.quickfix=Replace with ''Objects.requireNonNull({0})''
-inspection.suspicious.array.method.call.display.name=Suspicious 'Arrays' method calls
+inspection.suspicious.array.method.call.display.name=Suspicious 'Arrays' method call
 inspection.suspicious.array.method.call.problem.arrays=Array types are incompatible: arrays are always different
 inspection.suspicious.array.method.call.problem.element=Element type is not compatible with array type
-inspection.suspicious.collections.method.calls.display.name=Suspicious collections method calls
+inspection.suspicious.collections.method.calls.display.name=Suspicious collection method call
 inspection.suspicious.collections.method.calls.problem.descriptor1=Suspicious call to ''{0}''
 inspection.suspicious.collections.method.calls.problem.descriptor=''{0}'' may not contain {2} of type ''{1}''
 inspection.suspicious.getter.setter.field.option=Only warn when field matching getter/setter name is present
@@ -405,7 +405,7 @@ var.can.be.replaced.with.explicit.type='var' can be replaced with explicit type
 vararg.method.call.with.50.poly.arguments=Vararg method call with 50+ poly arguments may cause compilation and analysis slowdown
 inspection.inconsistent.language.level.display.name=Inconsistent language level settings
 inspection.weaker.access.display.name=Declaration access can be weaker
-inspection.can.be.final.display.name=Declaration can have final modifier
+inspection.can.be.final.display.name=Declaration can have 'final' modifier
 inspection.redundant.throws.display.name=Redundant 'throws' clause
 inspection.java.9.redundant.requires.statement.display.name=Redundant 'requires' directive in module-info
 inspection.numeric.overflow.display.name=Numeric overflow
@@ -414,19 +414,19 @@ inspection.deprecated.is.still.used.display.name=Deprecated member is still used
 inspection.deprecated.class.usage.inspection.display.name=Deprecated API usage in XML
 inspection.field.access.not.guarded.display.name=Unguarded field access or method call
 inspection.instance.guarded.by.static.display.name=Instance member guarded by static field
-inspection.non.final.field.in.immutable.display.name=Non-final field in @Immutable class
-inspection.non.final.guard.display.name=Non-final @GuardedBy field
+inspection.non.final.field.in.immutable.display.name=Non-final field in '@Immutable' class
+inspection.non.final.guard.display.name=Non-final '@GuardedBy' field
 inspection.static.guarded.by.instance.display.name=Static member guarded by instance field or this
-inspection.unknown.guard.display.name=Unknown @GuardedBy field
+inspection.unknown.guard.display.name=Unknown '@GuardedBy' field
 inspection.use.compare.method.display.name='compare()' method can be used to compare numbers
-inspection.convert.2.diamond.display.name=Explicit type can be replaced with <>
+inspection.convert.2.diamond.display.name=Explicit type can be replaced with '<>'
 inspection.convert.2.lambda.display.name=Anonymous type can be replaced with lambda
 inspection.invalid.comparator.method.reference.display.name=Invalid method reference used for 'Comparator'
 inspection.safe.varargs.detector.display.name=Possible heap pollution from parameterized vararg type
 inspection.block.marker.comments.display.name=Block marker comment
-inspection.string.tokenizer.delimiter.display.name=Duplicated delimiters in java.util.StringTokenizer
+inspection.string.tokenizer.delimiter.display.name=Duplicated delimiters in 'StringTokenizer'
 inspection.anonymous.has.lambda.alternative.display.name=Anonymous type has shorter lambda alternative
-inspection.java.8.list.sort.display.name=Collections.sort() can be replaced with List.sort()
+inspection.java.8.list.sort.display.name='Collections.sort()' can be replaced with 'List.sort()'
 inspection.class.has.no.to.string.method.display.name=Class does not override 'toString()' method
 inspection.field.not.used.in.to.string.display.name=Field not used in 'toString()' method
 inspection.contract.checker.clause.syntax=A contract clause must be in form arg1, ..., argN -> return-value
@@ -455,7 +455,7 @@ contract.return.validator.method.return.incompatible.with.method.containing.clas
 contract.return.validator.too.few.parameters=not applicable for method that has {0, choice, 0#no parameters|1#one parameter|2#{0} parameters} 
 contract.return.validator.incompatible.return.parameter.type=return type ''{0}'' must be convertible from parameter type ''{1}''
 contract.return.value.validation.prefix=Contract return value ''{0}'':
-suspicious.invocation.handler.implementation.display.name=Suspicious InvocationHandler implementation
+suspicious.invocation.handler.implementation.display.name=Suspicious 'InvocationHandler' implementation
 suspicious.invocation.handler.implementation.method.unused.message=Method is never used in 'invoke': it's unlikely that 'hashCode', 'equals' and 'toString' are implemented correctly
 suspicious.invocation.handler.implementation.type.mismatch.message=Incompatible type might be returned when proxying method ''{0}()'': required: {1}; got: {2}
 suspicious.invocation.handler.implementation.null.returned.for.toString.message=Null might be returned when proxying method 'toString()': this is discouraged
@@ -1,4 +1,4 @@
-// "Fix all ''equals()' called on 'java.math.BigDecimal'' problems in file" "true"
+// "Fix all ''equals()' called on 'BigDecimal'' problems in file" "true"
 import java.math.BigDecimal;
 import java.util.Objects;

@@ -1,4 +1,4 @@
-// "Fix all ''equals()' called on 'java.math.BigDecimal'' problems in file" "true"
+// "Fix all ''equals()' called on 'BigDecimal'' problems in file" "true"
 import java.math.BigDecimal;
 import java.util.Objects;

@@ -1,4 +1,4 @@
-// "Fix all 'Integer multiplication or shift implicitly cast to long' problems in file" "true"
+// "Fix all 'Integer multiplication or shift implicitly cast to 'long'' problems in file" "true"
 class Test {
  void test(int a, int b) {
    long c = a * 2L;
@@ -1,4 +1,4 @@
-// "Fix all 'Integer multiplication or shift implicitly cast to long' problems in file" "true"
+// "Fix all 'Integer multiplication or shift implicitly cast to 'long'' problems in file" "true"
 class Test {

  void test (int i1, int i2, int i3) {
@@ -1,4 +1,4 @@
-// "Fix all 'Integer multiplication or shift implicitly cast to long' problems in file" "true"
+// "Fix all 'Integer multiplication or shift implicitly cast to 'long'' problems in file" "true"
 class Test {
  void test(int a, int b) {
    long c = a * ((long) a * b);
@@ -1,4 +1,4 @@
-// "Fix all 'Integer multiplication or shift implicitly cast to long' problems in file" "true"
+// "Fix all 'Integer multiplication or shift implicitly cast to 'long'' problems in file" "true"
 class Test {
  void test(int a, int b) {
    long c = <caret>a * 2;
@@ -1,4 +1,4 @@
-// "Fix all 'Integer multiplication or shift implicitly cast to long' problems in file" "true"
+// "Fix all 'Integer multiplication or shift implicitly cast to 'long'' problems in file" "true"
 class Test {

  void test (int i1, int i2, int i3) {
@@ -1,4 +1,4 @@
-// "Fix all 'Integer multiplication or shift implicitly cast to long' problems in file" "true"
+// "Fix all 'Integer multiplication or shift implicitly cast to 'long'' problems in file" "true"
 class Test {
  void test(int a, int b) {
    long c = a * (<caret>a * b);
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 import java.io.ByteArrayOutputStream;

 class Main {
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;

@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 import java.util.Locale;
 public class Main {
  public static void main(String[] args) {
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"

 class Test {
  String foo1(char c) {
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  public static void main(String[] args) {
    StringBuilder sb = new StringBuilder();
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"

 class StringBuilderToString {

@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  void test(String s) {
    String s1 = s.substring(1);
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  void test(String s) {
    String s1 = "";
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  void test(String s) {
    String s1 = s.substring(1);
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"

 class Test {
  String foo1(char c) {
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class X {
  boolean testStrip(String s) {
    return s.isBlank();
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class X {
    void test(String s, int pos, String s2) {
        if (s.startsWith("xyzt", pos)) { }
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  public static void main(String[] args) {
    StringBuilder sb = new StringBuilder();
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  public static void main(String[] args) {
    int i = Integer.parseInt(args[2]);
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 import java.io.ByteArrayOutputStream;

 class Main {
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;

@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 import java.util.Locale;
 public class Main {
  public static void main(String[] args) {
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"

 class Test {
  String foo1(char c) {
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  public static void main(String[] args) {
    StringBuilder sb = new StringBuilder();
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"

 class StringBuilderToString {

@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  void test(String s) {
    String s1 = s.substring(1, s.leng<caret>th());
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  void test(String s) {
    String s1 = s.substring(s.leng<caret>th());
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  void test(String s) {
    String s1 = s.substring(1);
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"

 class Test {
  String foo1(char c) {
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class X {
  boolean testStrip(String s) {
    return s.st<caret>rip().isEmpty();
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class X {
    void test(String s, int pos, String s2) {
        if (s.sub<caret>string(pos, pos + 4).equals("xyzt")) { }
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  public static void main(String[] args) {
    StringBuilder sb = new StringBuilder();
@@ -1,4 +1,4 @@
-// "Fix all 'Redundant String operation' problems in file" "true"
+// "Fix all 'Redundant 'String' operation' problems in file" "true"
 class Foo {
  public static void main(String[] args) {
    int i = Integer.parseInt(args[2]);
@@ -171,7 +171,7 @@ subtraction.in.compareto.display.name=Subtraction in 'compareTo()'
 subtraction.in.compareto.problem.descriptor=Subtraction <code>#ref</code> in 'compareTo()' may result in overflow or precision loss #loc
 text.label.in.switch.statement.display.name=Text label in 'switch' statement
 text.label.in.switch.statement.problem.descriptor=Text label <code>#ref:</code> in ''switch'' {0, choice, 1#statement|2#expression} #loc
-properties.object.as.hashtable.display.name=Use of Properties object as a Hashtable
+properties.object.as.hashtable.display.name=Use of 'Properties' object as a 'Hashtable'
 properties.object.as.hashtable.problem.descriptor=Call to <code>Hashtable.#ref()</code> on properties object #loc
 assignment.replaceable.with.operator.assignment.display.name=Assignment can be replaced with operator assignment
 unnecessary.code.block.display.name=Unnecessary code block
@@ -184,7 +184,7 @@ static.collection.problem.descriptor=Static collection <code>#ref</code> #loc
 static.collection.ignore.option=Ignore weak static collections or maps
 stringbuffer.field.display.name='StringBuilder' field
 stringbuffer.field.problem.descriptor=''{0}'' field <code>#ref</code> #loc
-gc.call.display.name=Calls to 'System.gc()' or 'Runtime.gc()'
+gc.call.display.name=Call to 'System.gc()' or 'Runtime.gc()'
 gc.call.problem.descriptor=<code>#ref</code> should not be called in production code #loc
 array.allocation.zero.length.display.name=Zero-length array allocation
 array.allocation.zero.length.problem.descriptor=Allocation of zero length array #loc
@@ -243,7 +243,7 @@ use.obsolete.collection.type.problem.descriptor=Obsolete collection type <code>#
 use.obsolete.collection.type.ignore.library.arguments.option=Ignore obsolete collection types where they are required
 inspection.suppression.annotation.display.name=Inspection suppression annotation
 inspection.suppression.annotation.problem.descriptor=Inspection suppression annotation <code>#ref</code> #loc
-use.system.out.err.display.name=Use of System.out or System.err
+use.system.out.err.display.name=Use of 'System.out' or 'System.err'
 use.system.out.err.problem.descriptor=Uses of <code>#ref</code> should probably be replaced with more robust logging #loc
 dumpstack.call.display.name=Call to 'Thread.dumpStack()'
 dumpstack.call.problem.descriptor=Call to <code>Thread.#ref()</code> should probably be replaced with more robust logging #loc
@@ -269,7 +269,7 @@ static.variable.used.before.initialization.display.name=Static field used before
 static.variable.used.before.initialization.problem.descriptor=Static field <code>#ref</code> used before initialization #loc
 this.reference.escaped.in.construction.display.name='this' reference escaped in object construction
 this.reference.escaped.in.construction.problem.descriptor=Escape of <code>#ref</code> during object construction #loc
-assignment.to.catch.block.parameter.display.name=Assignment to catch block parameter
+assignment.to.catch.block.parameter.display.name=Assignment to 'catch' block parameter
 extract.parameter.as.local.variable.quickfix=Extract parameter as local variable
 assignment.to.for.loop.parameter.display.name=Assignment to 'for' loop parameter
 assignment.to.for.loop.parameter.check.foreach.option=Check enhanced 'for' loop parameters
@@ -330,7 +330,7 @@ inspection.option.ignore.as.initial.capacity=Ignore initial capacity for StringB
 inspection.option.ignore.in.hashcode=Ignore constants in 'hashCode()' methods
 string.touppercase.tolowercase.without.locale.display.name=Call to 'String.toUpperCase()' or 'toLowerCase()' without locale
 string.touppercase.tolowercase.without.locale.problem.descriptor=<code>String.#ref()</code> called without specifying a Locale using internationalized strings #loc
-use.stringtokenizer.display.name=Use of StringTokenizer
+use.stringtokenizer.display.name=Use of 'StringTokenizer'
 use.stringtokenizer.problem.descriptor=<code>#ref</code> in an internationalized context #loc
 time.tostring.call.display.name=Call to 'Time.toString()'
 time.tostring.call.problem.descriptor=<code>Time.#ref()</code> in an internationalized context #loc
@@ -354,7 +354,7 @@ method.overloads.display.name=Possibly unintended overload of method from superc
 method.overloads.problem.descriptor=Method <code>#ref()</code> overloads a compatible method of a superclass, when overriding might have been intended #loc
 method.overloads.report.incompatible.option=Report even if parameter types are not compatible
 method.overrides.private.display.name.problem.descriptor=Method <code>#ref()</code> overrides a 'private' method of a superclass #loc
-method.overrides.static.display.name=Method tries to override static method of superclass
+method.overrides.static.display.name=Method tries to override 'static' method of superclass
 method.overrides.static.problem.descriptor=Method <code>#ref()</code> tries to override a static method of a superclass #loc
 parameter.hides.member.variable.display.name=Parameter hides field
 parameter.hides.member.variable.problem.descriptor=Parameter <code>#ref</code> hides field in class ''{0}'' #loc
@@ -371,7 +371,7 @@ anonymous.class.parameter.hides.containing.method.variable.problem.descriptor=An
 anonymous.class.field.hides.containing.method.variable.problem.descriptor=Anonymous class field <code>#ref</code> hides variable in containing method #loc
 anonymous.class.variable.hides.containing.method.variable.problem.descriptor=Anonymous class local variable <code>#ref</code> hides variable in containing method #loc
 channel.opened.not.closed.display.name='Channel' opened but not safely closed
-drivermanager.call.display.name=Use of DriverManager to get JDBC connection
+drivermanager.call.display.name=Use of 'DriverManager' to get JDBC connection
 drivermanager.call.problem.descriptor=Call to <code>DriverManager.#ref()</code> #loc
 hibernate.resource.opened.not.closed.display.name=Hibernate resource opened but not safely closed
 i.o.resource.opened.not.closed.display.name=I/O resource opened but not safely closed
@@ -489,9 +489,9 @@ readobject.initialization.display.name=Instance field may not be initialized by
 readobject.initialization.problem.descriptor=Instance field <code>#ref</code> may not be initialized during 'readObject()' call #loc
 readresolve.writereplace.protected.display.name='readResolve()' or 'writeReplace()' not declared 'protected'
 readresolve.writereplace.protected.problem.descriptor=<code>#ref()</code> not declared 'protected' #loc
-missing.serial.annotation.display.name=@Serial annotation could be used
-missing.serial.annotation.on.field.problem.descriptor=<code>#ref</code> can be annotated with @Serial annotation
-missing.serial.annotation.on.method.problem.descriptor=<code>#ref()</code> can be annotated with @Serial annotation
+missing.serial.annotation.display.name='@Serial' annotation could be used
+missing.serial.annotation.on.field.problem.descriptor=<code>#ref</code> can be annotated with '@Serial' annotation
+missing.serial.annotation.on.method.problem.descriptor=<code>#ref()</code> can be annotated with '@Serial' annotation
 serial.annotation.used.on.wrong.member.display.name='@Serial' annotation used on wrong member
 serial.annotation.used.on.wrong.member.problem.descriptor=Annotated member is not a part of the serialization mechanism
 serializable.record.contains.ignored.members.display.name='record' contains ignored members
@@ -532,7 +532,7 @@ labeled.statement.display.name=Labeled statement
 notify.called.on.condition.display.name='notify()' or 'notifyAll()' called on 'java.util.concurrent.locks.Condition' object
 loop.statements.that.dont.loop.display.name=Loop statement that does not loop
 ignore.enhanced.for.loop.statements=Ignore enhanced for loops
-non.synchronized.method.overrides.synchronized.method.display.name=Unsynchronized method overrides synchronized method
+non.synchronized.method.overrides.synchronized.method.display.name=Unsynchronized method overrides 'synchronized' method
 synchronize.on.this.display.name=Synchronization on 'this'
 switch.statement.with.too.many.branches.display.name=Maximum 'switch' branches
 utility.class.without.private.constructor.display.name=Utility class without 'private' constructor
@@ -545,14 +545,14 @@ serializable.with.unconstructable.ancestor.display.name=Serializable class with
 missorted.modifiers.display.name=Missorted modifiers
 sleep.while.holding.lock.display.name=Call to 'Thread.sleep()' while synchronized
 singleton.display.name=Singleton
-thread.death.rethrown.display.name='java.lang.ThreadDeath' not rethrown
+thread.death.rethrown.display.name='ThreadDeath' not rethrown
 if.statement.with.too.many.branches.display.name='if' statement with too many branches
 redundant.implements.display.name=Redundant interface declaration
 nesting.depth.display.name=Overly nested method
 return.this.display.name=Return of 'this'
 busy.wait.display.name=Busy wait
 utility.class.display.name=Utility class
-instantiating.object.to.get.class.object.display.name=Instantiating object to get Class object
+instantiating.object.to.get.class.object.display.name=Instantiating object to get 'Class' object
 abstract.class.extends.concrete.class.display.name=Abstract class extends concrete class
 parameter.naming.convention.display.name=Method parameter naming convention
 parameter.naming.convention.element.description=Parameter
@@ -568,12 +568,12 @@ class.initializer.display.name=Non-'static' initializer
 enumerated.class.naming.convention.element.description=Enumeration
 non.thread.safe.lazy.initialization.display.name=Unsafe lazy initialization of 'static' field
 call.to.simple.setter.in.class.display.name=Call to simple setter from within class
-comparison.to.nan.display.name=Comparison to Double.NaN or Float.NaN
+comparison.to.nan.display.name=Comparison to 'Double.NaN' or 'Float.NaN'
 new.method.naming.convention.display.name=Method naming convention
 instance.method.naming.convention.element.description=Instance
 unnecessary.semicolon.display.name=Unnecessary semicolon
 fallthru.in.switch.statement.display.name=Fallthrough in 'switch' statement
-call.to.native.method.while.locked.display.name=Call to a native method while locked
+call.to.native.method.while.locked.display.name=Call to a 'native' method while locked
 switch.statement.display.name='switch' statement
 custom.classloader.display.name=Custom 'ClassLoader' is declared
 nested.conditional.expression.display.name=Nested conditional expression
@@ -595,7 +595,7 @@ inner.class.on.interface.display.name=Inner class of interface
 unused.label.display.name=Unused label
 overly.complex.boolean.expression.display.name=Overly complex boolean expression
 continue.statement.with.label.display.name='continue' statement with label
-class.loader.instantiation.display.name=ClassLoader instantiation
+class.loader.instantiation.display.name='ClassLoader' instantiation
 return.from.finally.block.display.name='return' inside 'finally' block
 unnecessary.boxing.display.name=Unnecessary boxing
 annotation.naming.convention.element.description=Annotation
@@ -608,20 +608,20 @@ long.literals.ending.with.lowercase.l.display.name='long' literal ending with 'l
 overly.complex.arithmetic.expression.display.name=Overly complex arithmetic expression
 junit.abstract.test.class.naming.convention.element.description=Abstract test
 unnecessary.parentheses.display.name=Unnecessary parentheses
-test.case.in.product.code.display.name=JUnit TestCase in product source
+test.case.in.product.code.display.name=JUnit 'TestCase' in product source
 test.method.in.product.code.display.name=JUnit test method in product source
 serializable.class.in.secure.context.display.name=Serializable class in secure context
 static.variable.naming.convention.element.description='static' field
 nested.method.call.display.name=Nested method call
 throw.from.finally.block.display.name='throw' inside 'finally' block
-field.accessed.synchronized.and.unsynchronized.display.name=Field accessed in both synchronized and unsynchronized contexts
+field.accessed.synchronized.and.unsynchronized.display.name=Field accessed in both 'synchronized' and unsynchronized contexts
 abstract.method.overrides.abstract.method.display.name=Abstract method overrides abstract method
 static.non.final.field.display.name='static', non-'final' field
 static.non.final.field.option=Only report 'public' fields
 class.without.no.arg.constructor.display.name=Class without no-arg constructor
 unnecessary.return.display.name=Unnecessary 'return' statement
 final.static.method.display.name='static' method declared 'final'
-constant.declared.in.abstract.class.display.name=Constant declared in abstract class
+constant.declared.in.abstract.class.display.name=Constant declared in 'abstract' class
 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
@@ -632,14 +632,14 @@ unsecure.random.number.generation.display.name=Insecure random number generation
 parameters.per.method.display.name=Method with too many parameters
 parameters.per.constructor.display.name=Constructor with too many parameters
 unnecessary.unboxing.display.name=Unnecessary unboxing
-extends.thread.display.name=Class directly extends 'java.lang.Thread'
+extends.thread.display.name=Class directly extends 'Thread'
 test.case.with.constructor.display.name=JUnit TestCase with non-trivial constructors
 parameter.name.differs.from.overridden.parameter.display.name=Parameter name differs from parameter in overridden method
 final.private.method.display.name='private' method declared 'final'
 enum.switch.statement.which.misses.cases.display.name=Enum 'switch' statement that misses case
 enum.switch.statement.which.misses.cases.option=Ignore switch statements with a default branch
-unconstructable.test.case.display.name=Unconstructable JUnit TestCase
-string.buffer.must.have.initial.capacity.display.name=StringBuilder without initial capacity
+unconstructable.test.case.display.name=Unconstructable JUnit 'TestCase'
+string.buffer.must.have.initial.capacity.display.name='StringBuilder' without initial capacity
 method.may.be.static.display.name=Method can be made 'static'
 class.initializer.may.be.static.display.name=Class initializer may be 'static'
 class.initializer.option=Only warn when the class has one or more constructors
@@ -656,7 +656,7 @@ unnecessary.label.on.continue.statement.display.name=Unnecessary label on 'conti
 jdbc.prepare.statement.with.non.constant.string.display.name=Call to 'Connection.prepare*()' with non-constant string
 synchronize.on.non.final.field.display.name=Synchronization on a non-final field
 noop.method.in.abstract.class.display.name=No-op method in 'abstract' class
-non.final.field.of.exception.display.name=Non-final field of exception class
+non.final.field.of.exception.display.name=Non-final field of 'Exception' class
 nested.try.statement.display.name=Nested 'try' statement
 condition.signal.display.name=Call to 'signal()' instead of 'signalAll()'
 jdbc.execute.with.non.constant.string.display.name=Call to 'Statement.execute()' with non-constant string
@@ -667,7 +667,7 @@ trivial.if.display.name=Redundant 'if' statement
 trivial.if.fix.family.name=Simplify 'if else'
 trivial.if.option.ignore.chained=Ignore chained 'if' statements
 trivial.if.option.ignore.assert.statements=Ignore 'assert' statements
-thread.with.default.run.method.display.name=Instantiating a Thread with default 'run()' method
+thread.with.default.run.method.display.name=Instantiating a 'Thread' with default 'run()' method
 while.loop.spins.on.field.display.name='while' loop spins on field
 while.loop.spins.on.field.fix.family.name=Fix spin loop
 while.loop.spins.on.field.fix.volatile=Make ''{0}'' volatile
@@ -695,7 +695,7 @@ questionable.name.display.name=Questionable name
 empty.finally.block.display.name=Empty 'finally' block
 abstract.method.overrides.concrete.method.display.name=Abstract method overrides concrete method
 thread.stop.suspend.resume.display.name=Call to 'Thread.stop()', 'suspend()' or 'resume()'
-constant.math.call.display.name=Constant call to 'java.lang.Math'
+constant.math.call.display.name=Constant call to 'Math'
 volatile.array.field.display.name=Volatile array field
 literal.as.arg.to.string.equals.display.name=String literal may be 'equals()' qualifier
 inner.class.may.be.static.display.name=Inner class may be 'static'
@@ -704,7 +704,7 @@ redundant.field.initialization.display.name=Redundant field initialization
 string.buffer.to.string.in.concatenation.display.name='StringBuilder.toString()' in concatenation
 utility.class.with.public.constructor.display.name=Utility class with 'public' constructor
 for.loop.replaceable.by.while.display.name='for' loop may be replaced by 'while' loop
-missing.deprecated.annotation.display.name=Missing @Deprecated annotation
+missing.deprecated.annotation.display.name=Missing '@Deprecated' annotation
 cloneable.class.in.secure.context.display.name=Cloneable class in secure context
 static.inheritance.display.name=Static inheritance
 class.name.prefixed.with.package.name.display.name=Class name prefixed with package name
@@ -714,21 +714,21 @@ protected.member.in.final.class.display.name='protected' member in 'final' class
 load.library.with.non.constant.string.display.name=Call to 'System.loadLibrary()' with non-constant string
 instanceof.catch.parameter.display.name='instanceof' on 'catch' parameter
 implicit.numeric.conversion.display.name=Implicit numeric conversion
-unnecessary.interface.modifier.display.name=Unnecessary interface modifier
+unnecessary.interface.modifier.display.name=Unnecessary 'interface' modifier
 confusing.main.method.display.name=Confusing 'main()' method
 octal.literal.display.name=Octal integer
 misordered.assert.equals.arguments.display.name=Misordered 'assertEquals()' arguments
 unnecessary.constructor.display.name=Redundant no-arg constructor
 method.name.same.as.parent.name.display.name=Method name same as parent class name
 while.can.be.foreach.display.name='while' loop can be replaced with enhanced 'for' loop
-big.decimal.equals.display.name='equals()' called on 'java.math.BigDecimal'
+big.decimal.equals.display.name='equals()' called on 'BigDecimal'
 implicit.call.to.super.display.name=Implicit call to 'super()'
 unqualified.static.usage.display.name=Unqualified static access
 simplifiable.junit.assertion.display.name=Simplifiable assertion
 object.notify.display.name=Call to 'notify()' instead of 'notifyAll()'
 thread.start.in.construction.display.name=Call to 'Thread.start()' during object construction
 non.final.clone.display.name=Non-final 'clone()' in secure context
-unnecessary.temporary.on.conversion.from.string.display.name=Unnecessary temporary object in conversion from String
+unnecessary.temporary.on.conversion.from.string.display.name=Unnecessary temporary object in conversion from 'String'
 unnecessary.this.display.name=Unnecessary 'this' qualifier
 unnecessary.this.ignore.assignments.option=Ignore field assignments
 runtime.exec.with.non.constant.string.display.name=Call to 'Runtime.exec()' with non-constant string
@@ -736,13 +736,13 @@ system.properties.display.name=Access of system properties
 chained.method.call.display.name=Chained method calls
 safe.lock.display.name=Lock acquired but not safely unlocked
 system.run.finalizers.on.exit.display.name=Call to 'System.runFinalizersOnExit()'
-for.can.be.foreach.display.name='for' loop can be replaced with enhanced 'for' loop
-type.parameter.extends.object.display.name=Type parameter explicitly extends 'java.lang.Object'
+for.can.be.foreach.display.name='for' loop can be replaced with enhanced for loop
+type.parameter.extends.object.display.name=Type parameter explicitly extends 'Object'
 type.parameter.extends.object.ignore.annotated=Ignore when java.lang.Object is annotated
 marker.interface.display.name=Marker interface
 limited.scope.inner.class.display.name=Local class
 switch.statements.without.default.display.name='switch' statement without 'default' branch
-unchecked.exception.class.display.name=Unchecked exception class
+unchecked.exception.class.display.name=Unchecked 'Exception' class
 for.loop.with.missing.component.display.name='for' loop with missing components
 for.loop.with.missing.component.collection.loop.option=Ignore collection iterations
 double.checked.locking.display.name=Double-checked locking
@@ -750,7 +750,7 @@ double.checked.locking.problem.descriptor=Double-checked locking #loc
 string.buffer.replaceable.by.string.display.name='StringBuilder' can be replaced with 'String'
 boolean.method.name.must.start.with.question.display.name=Boolean method name must start with question word
 class.name.same.as.ancestor.name.display.name=Class name same as ancestor name
-error.rethrown.display.name='java.lang.Error' not rethrown
+error.rethrown.display.name='Error' not rethrown
 serializable.has.serialization.methods.display.name=Serializable class without 'readObject()' and 'writeObject()'
 serializable.has.serialization.methods.ignore.option=Ignore classes that do not define instance fields
 missing.override.annotation.display.name=Missing '@Override' annotation
@@ -762,12 +762,12 @@ unnecessary.default.display.name=Unnecessary 'default' for enum 'switch' stateme
 simplifiable.conditional.expression.display.name=Simplifiable conditional expression
 unnecessary.super.constructor.display.name=Unnecessary call to 'super()'
 unnecessarily.qualified.static.usage.display.name=Unnecessarily qualified static access
-bad.exception.caught.display.name=Prohibited exception caught
+bad.exception.caught.display.name=Prohibited 'Exception' caught
 custom.security.manager.display.name=Custom 'SecurityManager'
 string.concatenation.in.loops.display.name=String concatenation in loop
 boolean.constructor.display.name=Boolean constructor call
 continue.statement.display.name='continue' statement
-extends.object.display.name=Class explicitly extends 'java.lang.Object'
+extends.object.display.name=Class explicitly extends 'Object'
 serializable.inner.class.has.serial.version.uid.field.display.name=Serializable non-static inner class without 'serialVersionUID'
 static.method.naming.convention.element.description='static'
 empty.try.block.display.name=Empty 'try' block
@@ -777,30 +777,30 @@ conditional.expression.display.name=Conditional expression
 unnecessary.enum.modifier.display.name=Unnecessary 'enum' modifier
 unnecessary.record.modifier.display.name=Unnecessary 'record' modifier
 string.equals.empty.string.display.name='String.equals()' can be replaced with 'String.isEmpty()'
-synchronize.on.lock.display.name=Synchronization on a Lock object
+synchronize.on.lock.display.name=Synchronization on a 'Lock' object
 synchronized.on.literal.object.name=Synchronization on an object initialized with a literal
 field.may.be.static.display.name=Field can be made 'static'
-class.may.be.interface.display.name=Abstract class may be interface
-abstract.class.without.abstract.methods.display.name=Abstract class without abstract methods
+class.may.be.interface.display.name=Abstract 'class' may be 'interface'
+abstract.class.without.abstract.methods.display.name=Abstract class without 'abstract' methods
 divide.by.zero.display.name=Division by zero
 default.not.last.case.in.switch.display.name='default' not last case in 'switch'
 nested.synchronized.statement.display.name=Nested 'synchronized' statement
 constant.conditional.expression.display.name=Constant conditional expression
 redundant.else.display.name=Redundant 'else'
-public.field.accessed.in.synchronized.context.display.name=Non-private field accessed in synchronized context
-string.replaceable.by.string.buffer.display.name=Non-constant String can be replaced with StringBuilder
+public.field.accessed.in.synchronized.context.display.name=Non-private field accessed in 'synchronized' context
+string.replaceable.by.string.buffer.display.name=Non-constant 'String' can be replaced with 'StringBuilder'
 junit.test.class.naming.convention.element.description=Test
 junit.test.suite.naming.convention.element.description=Test suite
 method.coupling.display.name=Overly coupled method
 collections.must.have.initial.capacity.display.name=Collection without initial capacity
 anonymous.inner.class.display.name=Anonymous inner class can be replaced with inner class
 negated.conditional.display.name=Conditional expression with negated condition
-non.reproducible.math.call.display.name=Non-reproducible call to 'java.lang.Math'
+non.reproducible.math.call.display.name=Non-reproducible call to 'Math'
 multiple.top.level.classes.in.file.display.name=Multiple top level classes in single file
 set.replaceable.by.enum.set.display.name='Set' can be replaced with 'EnumSet'
 tail.recursion.display.name=Tail recursion
 finally.block.cannot.complete.normally.display.name='finally' block which can not complete normally
-non.atomic.operation.on.volatile.field.display.name=Non-atomic operation on volatile field
+non.atomic.operation.on.volatile.field.display.name=Non-atomic operation on 'volatile' 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
@@ -1414,7 +1414,7 @@ wait.without.corresponding.notify.display.name='wait()' without corresponding 'n
 wait.without.corresponding.notify.problem.descriptor=Call to <code>#ref()</code> without corresponding <code>notify()</code> or <code>notifyAll()</code> #loc
 notify.without.corresponding.wait.display.name='notify()' without corresponding 'wait()'
 notify.without.corresponding.wait.problem.descriptor=Call to <code>#ref()</code> without corresponding <code>wait()</code> #loc
-integer.multiplication.implicit.cast.to.long.display.name=Integer multiplication or shift implicitly cast to long
+integer.multiplication.implicit.cast.to.long.display.name=Integer multiplication or shift implicitly cast to 'long'
 integer.multiplication.implicit.cast.to.long.problem.descriptor=#ref: integer multiplication implicitly cast to long #loc
 integer.multiplication.implicit.cast.to.long.quickfix=Cast to long
 integer.shift.implicit.cast.to.long.problem.descriptor=#ref: integer shift implicitly cast to long #loc
@@ -1474,25 +1474,25 @@ package.naming.convention.display.name=Package naming convention
 package.naming.convention.problem.descriptor.short=Package name <code>{0}</code> is too short
 package.naming.convention.problem.descriptor.long=Package name <code>{0}</code> is too long
 package.naming.convention.problem.descriptor.regex.mismatch=Package name <code>{0}</code> doesn''t match regex ''{1}''
-before.or.after.is.public.void.no.arg.display.name=Malformed @Before or @After method
+before.or.after.is.public.void.no.arg.display.name=Malformed '@Before' or '@After' method
 before.or.after.is.public.void.no.arg.problem.descriptor=<code>#ref()</code> has incorrect signature for a @Before or @After method #loc
-before.class.or.after.class.is.public.static.void.no.arg.display.name=Malformed @BeforeClass/@BeforeAll or @AfterClass/@AfterAll method
+before.class.or.after.class.is.public.static.void.no.arg.display.name=Malformed '@BeforeClass'/'@BeforeAll' or '@AfterClass'/'@AfterAll' method
 before.class.or.after.class.is.public.static.void.no.arg.problem.descriptor=<code>#ref()</code> has incorrect signature for a @{0} method #loc
 design.for.extension.display.name=Design for extension
 design.for.extension.problem.descriptor=Method <code>#ref()</code> may be overridden and its functionality ignored #loc
 bad.oddness.display.name=Suspicious oddness check
 bad.oddness.problem.descriptor=Oddness check will fail on negative values #loc
-comparator.not.serializable.display.name=Comparator class not declared Serializable
+comparator.not.serializable.display.name='Comparator' class not declared 'Serializable'
 comparator.not.serializable.problem.descriptor=Comparator class <code>#ref</code> is not declared as Serializable #loc
-non.serializable.field.in.serializable.class.display.name=Non-serializable field in a Serializable class
+non.serializable.field.in.serializable.class.display.name=Non-serializable field in a 'Serializable' class
 non.serializable.field.in.serializable.class.problem.descriptor=Non-serializable field '#ref' in a Serializable class #loc
-non.serializable.object.passed.to.object.stream.display.name=Non-serializable object passed to ObjectOutputStream
+non.serializable.object.passed.to.object.stream.display.name=Non-serializable object passed to 'ObjectOutputStream'
 non.serializable.object.passed.to.object.stream.problem.descriptor=Non-serializable object passed to ObjectOutputStream #loc
-non.serializable.object.bound.to.http.session.display.name=Non-serializable object bound to HttpSession
+non.serializable.object.bound.to.http.session.display.name=Non-serializable object bound to 'HttpSession'
 non.serializable.object.bound.to.http.session.problem.descriptor=Non-serializable object bound to HttpSession #loc
 reflection.for.unavailable.annotation.display.name=Reflective access to a source-only annotation
 reflection.for.unavailable.annotation.problem.descriptor=Annotation '#ref' is not retained for reflective access #loc
-access.to.static.field.locked.on.instance.display.name=Access to static field locked on instance data
+access.to.static.field.locked.on.instance.display.name=Access to 'static' field locked on instance data
 access.to.static.field.locked.on.instance.problem.descriptor=Access to static field <code>#ref</code> locked on instance data #loc
 access.to.static.field.locked.on.instance.fix.name=Ignore static fields with type ''{0}''
 make.method.ctr.quickfix=Make method constructor
@@ -1504,7 +1504,7 @@ class.extends.utility.class.problem.descriptor=Class <code>#ref</code> extends u
 class.extends.utility.class.ignore.utility.class.option=Ignore if overriding class is a utility class
 public.constructor.in.non.public.class.quickfix=Make constructor private
 assignment.to.method.parameter.ignore.transformation.option=<html>Ignore if assignment is a transformation of the original parameter</html>
-type.parameter.extends.final.class.display.name=Type parameter extends final class
+type.parameter.extends.final.class.display.name=Type parameter extends 'final' class
 type.parameter.extends.final.class.type.parameter.problem.descriptor=Type parameter <code>#ref</code> extends ''final'' class ''{0}'' #loc
 type.parameter.extends.enum.type.parameter.problem.descriptor=Type parameter <code>#ref</code> extends implicitly final enum ''{0}'' #loc
 type.parameter.extends.final.class.wildcard.problem.descriptor=Wildcard type argument <code>#ref</code> extends ''final'' class ''{0}'' #loc
@@ -1515,7 +1515,7 @@ double.negation.problem.descriptor=Double negation in <code>#ref</code> #loc
 double.negation.quickfix=Remove double negation
 exception.from.catch.which.doesntwrap.ignore.option=Ignore if result of exception method call is used
 exception.from.catch.which.doesntwrap.ignore.cant.wrap.option=Ignore if thrown exception cannot wrap an exception
-comparable.implemented.but.equals.not.overridden.display.name=Comparable implemented but 'equals()' not overridden
+comparable.implemented.but.equals.not.overridden.display.name='Comparable' implemented but 'equals()' not overridden
 comparable.implemented.but.equals.not.overridden.problem.descriptor=Class <code>#ref</code> implements 'java.lang.Comparable' but does not override 'equals()' #loc
 comparable.implemented.but.equals.not.overridden.fix.add.note.name=Add 'ordering inconsistent with equals' JavaDoc note
 comparable.implemented.but.equals.not.overridden.fix.generate.equals.name=Generate 'equals()' method
@@ -1526,7 +1526,7 @@ unqualified.method.access.problem.descriptor=Instance method call <code>#ref()</
 add.this.qualifier.quickfix=Add 'this' qualifier
 while.loop.spins.on.field.ignore.non.empty.loops.option=Only warn if the loop is empty
 method.may.be.synchronized.problem.descriptor=Method <code>#ref()</code> with synchronized block could be synchronized method #loc
-method.may.be.synchronized.display.name=Method with single synchronized block can be replaced with synchronized method
+method.may.be.synchronized.display.name=Method with single 'synchronized' block can be replaced with 'synchronized' method
 method.may.be.synchronized.quickfix=Make method synchronized and remove synchronized block
 fallthru.in.switch.statement.quickfix=Add ''{0}''
 law.of.demeter.display.name=Method call violates Law of Demeter
@@ -1541,7 +1541,7 @@ masked.assertion.problem.description=''{0}'' cannot fail as it''s masked via ''c
 enumeration.can.be.iteration.display.name=Enumeration can be iteration
 enumeration.can.be.iteration.problem.descriptor=<code>#ref()</code> can be replaced with ''{0}'' construct #loc
 enumeration.can.be.iteration.quickfix=Replace with 'Iterator' construct
-equals.hashcode.called.on.url.display.name='equals()' or 'hashCode()' called on 'java.net.URL' object
+equals.hashcode.called.on.url.display.name='equals()' or 'hashCode()' called on 'URL' object
 equals.hashcode.called.on.url.problem.descriptor=Call to <code>#ref()</code> on URL object #loc
 collection.contains.url.problem.decriptor={0} <code>#ref</code> may contain URL objects #loc
 collection.contains.url.display.name='Map' or 'Set' may contain 'URL' objects
@@ -1552,7 +1552,7 @@ implicit.array.to.string.display.name=Call to 'toString()' on array
 implicit.array.to.string.quickfix=Wrap with ''{0}'' expression
 suspicious.indent.after.control.statement.problem.descriptor=Suspicious indentation after ''{0}'' statement #loc
 suspicious.indent.after.control.statement.display.name=Suspicious indentation after control statement without braces
-unpredictable.big.decimal.constructor.call.display.name=Unpredictable BigDecimal constructor call
+unpredictable.big.decimal.constructor.call.display.name=Unpredictable 'BigDecimal' constructor call
 unpredictable.big.decimal.constructor.call.problem.descriptor=Unpredictable <code>new #ref()</code> call #loc
 unpredictable.big.decimal.constructor.call.ignore.references.option=Ignore constructor calls with variable or method call arguments
 unpredictable.big.decimal.constructor.call.ignore.complex.literals.option=Ignore constructor calls with multiple literals (e.g. 0.1 + 0.2)
@@ -1564,7 +1564,7 @@ make.field.final.quickfix=Make ''{0}'' ''final''
 increment.decrement.used.as.expression.quickfix=Extract ''{0}'' to separate statement
 ignore.classes.in.hierarchy.column.name=Ignore subclasses of:
 overly.strong.type.cast.ignore.in.matching.instanceof.option=Ignore casts with a matching instanceof expression
-access.to.non.thread.safe.static.field.from.instance.display.name=Non-thread-safe static field access
+access.to.non.thread.safe.static.field.from.instance.display.name=Non-thread-safe 'static' field access
 access.to.non.thread.safe.static.field.from.instance.field.problem.descriptor=Access to non-thread-safe static field <code>#ref</code> of type ''{0}'' #loc
 access.to.non.thread.safe.static.field.from.instance.option.title=Non-thread-safe classes:
 access.to.non.thread.safe.static.field.from.instance.class.chooser.title=Choose Non-Thread-Safe Class
@@ -1611,10 +1611,10 @@ synchronization.on.method.parameter.problem.descriptor=Synchronization on method
 too.broad.catch.quickfix=Add ''catch'' clause for ''{0}''
 replace.with.catch.clause.for.runtime.exception.quickfix=Replace with 'catch' clause for 'RuntimeException'
 too.broad.catch.option=&Only warn on RuntimeException, Exception, Error or Throwable
-unnecessary.conversion.to.string.display.name=Unnecessary conversion to String
+unnecessary.conversion.to.string.display.name=Unnecessary conversion to 'String'
 unnecessary.tostring.call.display.name=Unnecessary call to 'toString()'
 unnecessary.tostring.call.problem.descriptor=Unnecessary <code>#ref()</code> call #loc
-throwable.not.thrown.display.name=Throwable not thrown
+throwable.not.thrown.display.name='Throwable' not thrown
 throwable.result.of.method.call.ignored.problem.descriptor=Result of <code>#ref()</code> not thrown #loc
 char.used.in.arithmetic.context.display.name='char' expression used in arithmetic context
 char.used.in.arithmetic.context.problem.descriptor='char' used in arithmetic context #loc
@@ -1692,7 +1692,7 @@ assert.with.side.effects.problem.descriptor=<code>#ref</code> has side effects:
 method.count.ignore.getters.setters.option=&Ignore simple getter and setter methods
 class.new.instance.display.name=Unsafe call to 'Class.newInstance()'
 class.new.instance.problem.descriptor=Call to <code>#ref()</code> may throw undeclared checked exceptions #loc
-dynamic.regex.replaceable.by.compiled.pattern.display.name=Dynamic regular expression could be replaced by compiled Pattern
+dynamic.regex.replaceable.by.compiled.pattern.display.name=Dynamic regular expression could be replaced by compiled 'Pattern'
 dynamic.regex.replaceable.by.compiled.pattern.problem.descriptor=<code>#ref()</code> could be replaced with compiled 'java.util.regex.Pattern' construct #loc
 dynamic.regex.replaceable.by.compiled.pattern.quickfix=Replace with call to method of compiled 'Pattern' constant
 ignore.serializable.option=Ignore 'java.io.Serializable'
@@ -1700,7 +1700,7 @@ ignore.cloneable.option=Ignore 'java.lang.Cloneable'
 listener.may.use.adapter.display.name=Class may extend adapter instead of implementing listener
 listener.may.use.adapter.problem.descriptor=Class ''{0}'' may extend ''{1}'' instead of implementing <code>#ref</code> #loc
 listener.may.use.adapter.emtpy.methods.option=&Only warn when empty implementing methods are found
-unnecessary.inherit.doc.display.name=Unnecessary {@inheritDoc} Javadoc comment
+unnecessary.inherit.doc.display.name=Unnecessary '{@inheritDoc}' Javadoc comment
 unnecessary.inherit.doc.problem.descriptor=Javadoc comment containing only <code>#ref</code> is unnecessary #loc
 unnecessary.inherit.doc.field.invalid.problem.descriptor=<code>#ref</code> is not valid on fields #loc
 unnecessary.inherit.doc.constructor.invalid.problem.descriptor=<code>#ref</code> is not valid on constructors #loc
@@ -1715,7 +1715,7 @@ unnecessary.javadoc.link.super.method.problem.descriptor=<code>#ref</code> point
 unnecessary.javadoc.link.this.method.problem.descriptor=<code>#ref</code> pointing to this method is unnecessary #loc
 unnecessary.javadoc.link.this.class.problem.descriptor=<code>#ref</code> pointing to containing class is unnecessary #loc
 unnecessary.javadoc.link.quickfix=Remove unnecessary ''{0}''
-thread.local.not.static.final.display.name=ThreadLocal field not declared static final
+thread.local.not.static.final.display.name='ThreadLocal' field not declared 'static final'
 thread.local.not.static.final.problem.descriptor=ThreadLocal <code>#ref</code> is not declared 'static final' #loc
 remove.try.finally.block.quickfix=Remove 'try-finally' block
 remove.finally.block.quickfix=Remove 'finally' block
@@ -1825,7 +1825,7 @@ unnecessarily.qualified.inner.class.access.option=Ignore references for which an
 unqualified.inner.class.access.option=Ignore references to local inner classes
 try.with.identical.catches.quickfix=Collapse 'catch' blocks
 confusing.else.option=Report when there are no more statements after the 'if' statement
-html.tag.can.be.javadoc.tag.display.name=<code>...</code> can be replaced with {@code ...}
+html.tag.can.be.javadoc.tag.display.name='<code>...</code>' can be replaced with '{@code ...}'
 html.tag.can.be.javadoc.tag.problem.descriptor=<code>#ref...\\&lt;/code\\&gt;</code> can be replaced with '{@code ...}' #loc
 try.finally.can.be.try.with.resources.display.name='try finally' can be replaced with 'try' with resources
 try.finally.can.be.try.with.resources.problem.descriptor=<code>#ref</code> can use automatic resource management #loc
@@ -1914,7 +1914,7 @@ add.0.to.ignore.if.annotated.by.list.quickfix=Add ''{0}'' to ''Ignore if annotat
 non.final.field.in.enum.display.name=Non-final field in 'enum'
 non.final.field.in.enum.problem.descriptor=Non-final field <code>#ref</code> in enum ''{0}'' #loc
 non.final.field.in.enum.quickfix.option=Ignore field if quick-fix is not available
-externalizable.without.public.no.arg.constructor.display.name=Externalizable class without 'public' no-arg constructor
+externalizable.without.public.no.arg.constructor.display.name='Externalizable' class without 'public' no-arg constructor
 externalizable.without.public.no.arg.constructor.problem.descriptor=Externalizable class <code>#ref</code> has no 'public' no-arg constructor #loc
 make.constructor.public=Make constructor 'public'
 string.concatenation.missing.whitespace.display.name=Whitespace may be missing in string concatenation
@@ -1953,7 +1953,7 @@ placeholder.count.matches.argument.count.more.problem.descriptor=More arguments
 placeholder.count.matches.argument.count.fewer.problem.descriptor=Fewer arguments provided ({0}) than placeholders specified ({1}) #loc
 assignment.to.superclass.field.display.name=Constructor assigns value to field defined in superclass
 assignment.to.superclass.field.problem.descriptor=Assignment to field ''{0}'' defined in superclass ''{1}'' #loc
-junit.datapoint.display.name=Malformed @DataPoint field
+junit.datapoint.display.name=Malformed '@DataPoint' field
 junit.datapoint.problem.descriptor={1}s annotated with @DataPoint should be {0}
 inner.class.referenced.via.subclass.display.name=Inner class referenced via subclass
 inner.class.referenced.via.subclass.problem.descriptor=Inner class <code>#ref</code> declared in class ''{0}'' but referenced via subclass ''{1}'' #loc
@@ -2074,7 +2074,7 @@ equals.replaceable.by.objects.check.not.null.option=Highlight expressions like '
 array.objects.equals.display.name=Use of shallow or 'Objects' methods with arrays
 array.equals.problem.descriptor=Arrays comparison should probably be done using ''{0}''
 array.hashcode.problem.descriptor=Array hash code calculation should probably be done using ''{0}''
-extends.throwable.display.name=Class directly extends 'java.lang.Throwable'
+extends.throwable.display.name=Class directly extends 'Throwable'
 anonymous.extends.throwable.problem.descriptor=Anonymous class directly extends 'java.lang.Throwable' #loc
 extends.throwable.problem.descriptor=Class <code>#ref</code> directly extends 'java.lang.Throwable' #loc
 lambda.parameter.naming.convention.display.name=Lambda parameter naming convention
@@ -2096,9 +2096,9 @@ unnecessary.initcause.display.name=Unnecessary call to 'Throwable.initCause()'
 unnecessary.initcause.problem.descriptor=Unnecessary <code>Throwable.#ref()</code> call
 unnecessary.initcause.quickfix=Remove 'Throwable.initCause()' call
 consider.static.final.fields.constant.option=Consider 'static final' fields constant
-atomic.field.updater.not.static.final.display.name=AtomicFieldUpdater field not declared 'static final'
+atomic.field.updater.not.static.final.display.name='AtomicFieldUpdater' field not declared 'static final'
 atomic.field.updater.not.static.final.problem.descriptor={0} field <code>#ref</code> is not declared ''static final'' #loc
-atomic.field.updater.issues.display.name=Inconsistent AtomicFieldUpdater declaration
+atomic.field.updater.issues.display.name=Inconsistent 'AtomicFieldUpdater' declaration
 field.not.found.in.class.problem.descriptor=No field named ''{0}'' found in class ''{1}''
 field.incorrect.type.problem.descriptor=Field ''{0}'' does not have type ''{1}''
 field.missing.volatile.modifier.problem.descriptor=Field ''{0}'' does not have ''volatile'' modifier
@@ -2106,7 +2106,7 @@ field.has.static.modifier.problem.descriptor=Field ''{0}'' has ''static'' modifi
 private.field.not.accessible.problem.descriptor=''private'' field ''{0}'' is not accessible from here
 package.local.field.not.accessible=Package-private field ''{0}'' is not accessible from here
 protected.field.not.accessible.problem.descriptor=''protected'' field ''{0}'' is not accessible from here
-interface.clashes.with.object.class.display.name=Interface method clashes with method in 'java.lang.Object'
+interface.clashes.with.object.class.display.name=Interface method clashes with method in 'Object'
 interface.clashes.with.object.class.problem.descriptor=<code>#ref()</code> clashes with method in 'java.lang.Object'
 optional.used.as.field.or.parameter.type.display.name='Optional' used as field or parameter type
 optional.used.as.field.type.problem.descriptor=<code>#ref</code> used as type for field ''{0}''
@@ -2159,7 +2159,7 @@ overly.long.lambda.display.name=Overly long lambda expression
 overly.long.lambda.problem.descriptor=Lambda expression is too long (# Non-comment source statements = {0}) #loc
 wait.notify.not.in.synchronized.context.display.name='wait()' or 'notify()' is not in synchronized context
 wait.notify.while.not.synchronized.on.problem.descriptor=Call to <code>#ref</code> while not synchronized on ''{0}'' #loc
-call.to.suspicious.string.method.display.name=Call to suspicious String method
+call.to.suspicious.string.method.display.name=Call to suspicious 'String' method
 call.to.suspicious.string.method.problem.descriptor=<code>String.#ref()</code> called in internationalized context #loc
 unnecessary.string.escape.display.name=Unnecessarily escaped character
 unnecessary.string.escape.problem.descriptor=<code>#ref</code> is unnecessarily escaped
@@ -2191,7 +2191,7 @@ assignment.of.field.with.mutable.type.problem.descriptor=Assignment to {0} field
 return.of.field.with.mutable.type.problem.descriptor=Return of {0} field <code>{1}</code> #loc
 ignore.private.methods.option=Ignore assignments in and returns from private methods

-inspection.redundant.string.operation.display.name=Redundant String operation
+inspection.redundant.string.operation.display.name=Redundant 'String' operation
 inspection.redundant.string.remove.fix.name=Remove redundant ''{0}()'' call
 inspection.redundant.string.fix.family.name=Remove redundant call
 inspection.redundant.string.call.message=Call to <code>#ref()</code> is redundant #loc
@@ -2241,7 +2241,7 @@ inspection.catch.ignores.exception.empty.message=Empty <code>#ref</code> block #
 inspection.catch.ignores.exception.unused.message=Unused 'catch' parameter <code>#ref</code> #loc
 inspection.catch.ignores.exception.vm.ignored.message=Unexpected VM exception like ''{0}'' might be ignored in a <code>#ref</code> block #loc

-inspection.redundant.collection.operation.display.name=Redundant Collection operation
+inspection.redundant.collection.operation.display.name=Redundant 'Collection' operation
 inspection.redundant.collection.operation.fix.family.name=Simplify collection operation
 inspection.redundant.collection.operation.problem.arraycopy=Unnecessary collection created to copy an array
 inspection.redundant.collection.removal.by.index.problem=Removal by index can be replaced with removal by object
@@ -2,13 +2,13 @@ import java.io.*;

 class Test implements Externalizable {

-  private static final long <warning descr="'serialVersionUID' can be annotated with @Serial annotation">serialVersionUID</warning> = 7874493593505141603L;
+  private static final long <warning descr="'serialVersionUID' can be annotated with '@Serial' annotation">serialVersionUID</warning> = 7874493593505141603L;

-  public Object <warning descr="'writeReplace()' can be annotated with @Serial annotation">writeReplace</warning>() throws ObjectStreamException {
+  public Object <warning descr="'writeReplace()' can be annotated with '@Serial' annotation">writeReplace</warning>() throws ObjectStreamException {
    return 1;
  }

-  protected Object <warning descr="'readResolve()' can be annotated with @Serial annotation">readResolve</warning>() throws ObjectStreamException {
+  protected Object <warning descr="'readResolve()' can be annotated with '@Serial' annotation">readResolve</warning>() throws ObjectStreamException {
    return 1;
  }

@@ -22,13 +22,13 @@ class Test implements Externalizable {
 }

 record R() implements Externalizable {
-  private static final long <warning descr="'serialVersionUID' can be annotated with @Serial annotation">serialVersionUID</warning> = 7874493593505141603L;
+  private static final long <warning descr="'serialVersionUID' can be annotated with '@Serial' annotation">serialVersionUID</warning> = 7874493593505141603L;

-  public Object <warning descr="'writeReplace()' can be annotated with @Serial annotation">writeReplace</warning>() throws ObjectStreamException {
+  public Object <warning descr="'writeReplace()' can be annotated with '@Serial' annotation">writeReplace</warning>() throws ObjectStreamException {
    return 1;
  }

-  protected Object <warning descr="'readResolve()' can be annotated with @Serial annotation">readResolve</warning>() throws ObjectStreamException {
+  protected Object <warning descr="'readResolve()' can be annotated with '@Serial' annotation">readResolve</warning>() throws ObjectStreamException {
    return 1;
  }

@@ -2,36 +2,36 @@ import java.io.*;

 class Test implements Serializable {

-  private static final long <warning descr="'serialVersionUID' can be annotated with @Serial annotation">serialVersionUID</warning> = 7874493593505141603L;
-  private static final ObjectStreamField[] <warning descr="'serialPersistentFields' can be annotated with @Serial annotation">serialPersistentFields</warning> = new ObjectStreamField[0];
+  private static final long <warning descr="'serialVersionUID' can be annotated with '@Serial' annotation">serialVersionUID</warning> = 7874493593505141603L;
+  private static final ObjectStreamField[] <warning descr="'serialPersistentFields' can be annotated with '@Serial' annotation">serialPersistentFields</warning> = new ObjectStreamField[0];

-  private void <warning descr="'writeObject()' can be annotated with @Serial annotation">writeObject</warning>(ObjectOutputStream out) throws IOException {
+  private void <warning descr="'writeObject()' can be annotated with '@Serial' annotation">writeObject</warning>(ObjectOutputStream out) throws IOException {
  }

-  private void <warning descr="'readObject()' can be annotated with @Serial annotation">readObject</warning>(ObjectInputStream in) throws IOException, ClassNotFoundException {
+  private void <warning descr="'readObject()' can be annotated with '@Serial' annotation">readObject</warning>(ObjectInputStream in) throws IOException, ClassNotFoundException {
  }

-  private void <warning descr="'readObjectNoData()' can be annotated with @Serial annotation">readObjectNoData</warning>() throws ObjectStreamException {
+  private void <warning descr="'readObjectNoData()' can be annotated with '@Serial' annotation">readObjectNoData</warning>() throws ObjectStreamException {
  }

-  public Object <warning descr="'writeReplace()' can be annotated with @Serial annotation">writeReplace</warning>() throws ObjectStreamException {
+  public Object <warning descr="'writeReplace()' can be annotated with '@Serial' annotation">writeReplace</warning>() throws ObjectStreamException {
    return 1;
  }

-  protected Object <warning descr="'readResolve()' can be annotated with @Serial annotation">readResolve</warning>() throws ObjectStreamException {
+  protected Object <warning descr="'readResolve()' can be annotated with '@Serial' annotation">readResolve</warning>() throws ObjectStreamException {
    return 1;
  }
 }

 record R() implements Serializable {
-  private static final long <warning descr="'serialVersionUID' can be annotated with @Serial annotation">serialVersionUID</warning> = 7874493593505141603L;
+  private static final long <warning descr="'serialVersionUID' can be annotated with '@Serial' annotation">serialVersionUID</warning> = 7874493593505141603L;
  private static final ObjectStreamField[] serialPersistentFields = new ObjectStreamField[0];

-  public Object <warning descr="'writeReplace()' can be annotated with @Serial annotation">writeReplace</warning>() throws ObjectStreamException {
+  public Object <warning descr="'writeReplace()' can be annotated with '@Serial' annotation">writeReplace</warning>() throws ObjectStreamException {
    return 1;
  }

-  protected Object <warning descr="'readResolve()' can be annotated with @Serial annotation">readResolve</warning>() throws ObjectStreamException {
+  protected Object <warning descr="'readResolve()' can be annotated with '@Serial' annotation">readResolve</warning>() throws ObjectStreamException {
    return 1;
  }

@@ -1,4 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.siyeh.ig.fixes.serialization;

 import com.intellij.codeInspection.InspectionProfileEntry;
@@ -22,7 +22,7 @@ public class AddSerialAnnotationFixTest extends LightJavaInspectionTestCase {
  public void testAdditionToField() {
    doTest("import java.io.*;\n" +
           "class Test implements Serializable {\n" +
-           "  private static final long /*'serialVersionUID' can be annotated with @Serial annotation*//*_*/serialVersionUID/**/ = 7874493593505141603L;\n" +
+           "  private static final long /*'serialVersionUID' can be annotated with '@Serial' annotation*//*_*/serialVersionUID/**/ = 7874493593505141603L;\n" +
           "}");
    checkQuickFix("Annotate field 'serialVersionUID' as @Serial", "import java.io.*;\n" +
                                    "class Test implements Serializable {\n" +
@@ -34,7 +34,7 @@ public class AddSerialAnnotationFixTest extends LightJavaInspectionTestCase {
  public void testAdditionToMethod() {
    doTest("import java.io.*;\n" +
           "class Test implements Serializable {\n" +
-           "  protected Object /*'readResolve()' can be annotated with @Serial annotation*//*_*/readResolve/**/() throws ObjectStreamException {\n" +
+           "  protected Object /*'readResolve()' can be annotated with '@Serial' annotation*//*_*/readResolve/**/() throws ObjectStreamException {\n" +
           "    return 1;\n" +
           "  }\n" +
           "}");
@@ -1,3 +1,4 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.siyeh.ig.fixes.style;

 import com.siyeh.ig.IGQuickFixesTestCase;
@@ -10,7 +11,7 @@ public class UnnecessaryCallToStringValueOfFixTest extends IGQuickFixesTestCase
    super.setUp();
    myFixture.enableInspections(new UnnecessaryCallToStringValueOfInspection());
    myRelativePath = "style/unnecessary_valueof";
-    myDefaultHint = "Fix all 'Unnecessary conversion to String' problems in file";
+    myDefaultHint = "Fix all 'Unnecessary conversion to 'String'' problems in file";
  }

  public void testUnnecessaryCall() { doTest(); }