diff --git a/config/identical-files.json b/config/identical-files.json
index 76a0de4ca4da..b63690c5f1ef 100644
--- a/config/identical-files.json
+++ b/config/identical-files.json
@@ -374,50 +374,50 @@
"javascript/ql/src/semmle/javascript/XML.qll",
"python/ql/src/semmle/python/xml/XML.qll"
],
- "DuplicationProblems.qhelp": [
- "cpp/ql/src/Metrics/Files/DuplicationProblems.qhelp",
- "csharp/ql/src/Metrics/Files/DuplicationProblems.qhelp",
- "javascript/ql/src/Metrics/DuplicationProblems.qhelp",
- "python/ql/src/Metrics/DuplicationProblems.qhelp"
- ],
- "CommentedOutCodeQuery.qhelp": [
- "cpp/ql/src/Documentation/CommentedOutCodeQuery.qhelp",
- "python/ql/src/Lexical/CommentedOutCodeQuery.qhelp",
- "csharp/ql/src/Bad Practices/Comments/CommentedOutCodeQuery.qhelp",
- "java/ql/src/Violations of Best Practice/Comments/CommentedOutCodeQuery.qhelp",
- "javascript/ql/src/Comments/CommentedOutCodeQuery.qhelp"
- ],
- "FLinesOfCodeReferences.qhelp": [
- "java/ql/src/Metrics/Files/FLinesOfCodeReferences.qhelp",
- "javascript/ql/src/Metrics/FLinesOfCodeReferences.qhelp"
- ],
- "FCommentRatioCommon.qhelp": [
- "java/ql/src/Metrics/Files/FCommentRatioCommon.qhelp",
- "javascript/ql/src/Metrics/FCommentRatioCommon.qhelp"
- ],
- "FLinesOfCodeOverview.qhelp": [
- "java/ql/src/Metrics/Files/FLinesOfCodeOverview.qhelp",
- "javascript/ql/src/Metrics/FLinesOfCodeOverview.qhelp"
- ],
- "CommentedOutCodeMetricOverview.qhelp": [
- "cpp/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.qhelp",
- "csharp/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.qhelp",
- "java/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.qhelp",
- "javascript/ql/src/Comments/CommentedOutCodeMetricOverview.qhelp",
- "python/ql/src/Lexical/CommentedOutCodeMetricOverview.qhelp"
- ],
- "FLinesOfDuplicatedCodeCommon.qhelp": [
- "cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.qhelp",
- "java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.qhelp",
- "javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.qhelp",
- "python/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.qhelp"
- ],
- "CommentedOutCodeReferences.qhelp": [
- "cpp/ql/src/Metrics/Files/CommentedOutCodeReferences.qhelp",
- "csharp/ql/src/Metrics/Files/CommentedOutCodeReferences.qhelp",
- "java/ql/src/Metrics/Files/CommentedOutCodeReferences.qhelp",
- "javascript/ql/src/Comments/CommentedOutCodeReferences.qhelp",
- "python/ql/src/Lexical/CommentedOutCodeReferences.qhelp"
+ "DuplicationProblems.inc.qhelp": [
+ "cpp/ql/src/Metrics/Files/DuplicationProblems.inc.qhelp",
+ "csharp/ql/src/Metrics/Files/DuplicationProblems.inc.qhelp",
+ "javascript/ql/src/Metrics/DuplicationProblems.inc.qhelp",
+ "python/ql/src/Metrics/DuplicationProblems.inc.qhelp"
+ ],
+ "CommentedOutCodeQuery.inc.qhelp": [
+ "cpp/ql/src/Documentation/CommentedOutCodeQuery.inc.qhelp",
+ "python/ql/src/Lexical/CommentedOutCodeQuery.inc.qhelp",
+ "csharp/ql/src/Bad Practices/Comments/CommentedOutCodeQuery.inc.qhelp",
+ "java/ql/src/Violations of Best Practice/Comments/CommentedOutCodeQuery.inc.qhelp",
+ "javascript/ql/src/Comments/CommentedOutCodeQuery.inc.qhelp"
+ ],
+ "FLinesOfCodeReferences.inc.qhelp": [
+ "java/ql/src/Metrics/Files/FLinesOfCodeReferences.inc.qhelp",
+ "javascript/ql/src/Metrics/FLinesOfCodeReferences.inc.qhelp"
+ ],
+ "FCommentRatioCommon.inc.qhelp": [
+ "java/ql/src/Metrics/Files/FCommentRatioCommon.inc.qhelp",
+ "javascript/ql/src/Metrics/FCommentRatioCommon.inc.qhelp"
+ ],
+ "FLinesOfCodeOverview.inc.qhelp": [
+ "java/ql/src/Metrics/Files/FLinesOfCodeOverview.inc.qhelp",
+ "javascript/ql/src/Metrics/FLinesOfCodeOverview.inc.qhelp"
+ ],
+ "CommentedOutCodeMetricOverview.inc.qhelp": [
+ "cpp/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.inc.qhelp",
+ "csharp/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.inc.qhelp",
+ "java/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.inc.qhelp",
+ "javascript/ql/src/Comments/CommentedOutCodeMetricOverview.inc.qhelp",
+ "python/ql/src/Lexical/CommentedOutCodeMetricOverview.inc.qhelp"
+ ],
+ "FLinesOfDuplicatedCodeCommon.inc.qhelp": [
+ "cpp/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp",
+ "java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp",
+ "javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp",
+ "python/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.inc.qhelp"
+ ],
+ "CommentedOutCodeReferences.inc.qhelp": [
+ "cpp/ql/src/Metrics/Files/CommentedOutCodeReferences.inc.qhelp",
+ "csharp/ql/src/Metrics/Files/CommentedOutCodeReferences.inc.qhelp",
+ "java/ql/src/Metrics/Files/CommentedOutCodeReferences.inc.qhelp",
+ "javascript/ql/src/Comments/CommentedOutCodeReferences.inc.qhelp",
+ "python/ql/src/Lexical/CommentedOutCodeReferences.inc.qhelp"
],
"IDE Contextual Queries": [
"cpp/ql/src/IDEContextual.qll",
diff --git a/cpp/ql/src/Documentation/CommentedOutCode.qhelp b/cpp/ql/src/Documentation/CommentedOutCode.qhelp
index ba056ab73f77..5750b5be871d 100644
--- a/cpp/ql/src/Documentation/CommentedOutCode.qhelp
+++ b/cpp/ql/src/Documentation/CommentedOutCode.qhelp
@@ -2,6 +2,6 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
@Override.
Galaxy.
Addison-Wesley, 2008.
MIN_WIDTH.
getBackground.
com.sun.eng<
Java Language Specification:
- 6.1. Declarations.
+ 6.1. Declarations.
Java SE Documentation:
- 9 - Naming Conventions.
+ 9 - Naming Conventions.
diff --git a/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.qhelp b/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.qhelp
index ccfa2171932e..d32b5ce31a5d 100644
--- a/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.qhelp
+++ b/java/ql/src/Advisory/Naming/NamingConventionsRefTypes.qhelp
@@ -28,11 +28,11 @@ the class name. For example, HotelBooking.
Java Language Specification:
- 6.1. Declarations.
+ 6.1. Declarations.
Java SE Documentation:
- 9 - Naming Conventions.
+ 9 - Naming Conventions.
diff --git a/java/ql/src/Advisory/Naming/NamingConventionsVariables.qhelp b/java/ql/src/Advisory/Naming/NamingConventionsVariables.qhelp
index c5b255e4f770..816f5a4757b2 100644
--- a/java/ql/src/Advisory/Naming/NamingConventionsVariables.qhelp
+++ b/java/ql/src/Advisory/Naming/NamingConventionsVariables.qhelp
@@ -29,11 +29,11 @@ the variable name. For example, numberOfGuests.
Java Language Specification:
- 6.1. Declarations.
+ 6.1. Declarations.
Java SE Documentation:
- 9 - Naming Conventions.
+ 9 - Naming Conventions.
diff --git a/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.qhelp b/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.qhelp
index 847c24db682a..61e77e748f06 100644
--- a/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.qhelp
+++ b/java/ql/src/Advisory/Statements/MissingDefaultInSwitch.qhelp
@@ -39,7 +39,7 @@ has made. However, if the user does not choose 1, 2, or 3, execution falls throu
Java SE Documentation:
- 7.8 switch Statements.
+ 7.8 switch Statements.
diff --git a/java/ql/src/Advisory/Statements/OneStatementPerLine.qhelp b/java/ql/src/Advisory/Statements/OneStatementPerLine.qhelp
index 49f7dec654b1..b6af0ae7559f 100644
--- a/java/ql/src/Advisory/Statements/OneStatementPerLine.qhelp
+++ b/java/ql/src/Advisory/Statements/OneStatementPerLine.qhelp
@@ -20,7 +20,7 @@
Java SE Documentation:
- 7.1 Simple Statements.
+ 7.1 Simple Statements.
diff --git a/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.qhelp b/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.qhelp
index a50e1736cba9..d95d9e77b021 100644
--- a/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.qhelp
+++ b/java/ql/src/Advisory/Statements/TerminateIfElseIfWithElse.qhelp
@@ -40,7 +40,7 @@ test score. However, if the score is less than 60, execution falls through silen
Java SE Documentation:
- 7.4 if, if-else, if else-if else Statements.
+ 7.4 if, if-else, if else-if else Statements.
diff --git a/java/ql/src/Advisory/Types/GenericsConstructor.qhelp b/java/ql/src/Advisory/Types/GenericsConstructor.qhelp
index 301395a9df9c..34a9b6586a61 100644
--- a/java/ql/src/Advisory/Types/GenericsConstructor.qhelp
+++ b/java/ql/src/Advisory/Types/GenericsConstructor.qhelp
@@ -4,6 +4,6 @@
-
+
diff --git a/java/ql/src/Advisory/Types/GenericsReturnType.qhelp b/java/ql/src/Advisory/Types/GenericsReturnType.qhelp
index 301395a9df9c..34a9b6586a61 100644
--- a/java/ql/src/Advisory/Types/GenericsReturnType.qhelp
+++ b/java/ql/src/Advisory/Types/GenericsReturnType.qhelp
@@ -4,6 +4,6 @@
-
+
diff --git a/java/ql/src/Advisory/Types/GenericsVariable.qhelp b/java/ql/src/Advisory/Types/GenericsVariable.qhelp
index 301395a9df9c..34a9b6586a61 100644
--- a/java/ql/src/Advisory/Types/GenericsVariable.qhelp
+++ b/java/ql/src/Advisory/Types/GenericsVariable.qhelp
@@ -4,6 +4,6 @@
-
+
diff --git a/java/ql/src/Advisory/Types/Generics_Common.qhelp b/java/ql/src/Advisory/Types/Generics_Common.inc.qhelp
similarity index 74%
rename from java/ql/src/Advisory/Types/Generics_Common.qhelp
rename to java/ql/src/Advisory/Types/Generics_Common.inc.qhelp
index 617e493e7a5f..5be1467b6db3 100644
--- a/java/ql/src/Advisory/Types/Generics_Common.qhelp
+++ b/java/ql/src/Advisory/Types/Generics_Common.inc.qhelp
@@ -43,12 +43,12 @@ more error prone because the compiler is less able to perform type checks.
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
The Java Tutorials:
- Generics,
- Converting Legacy Code to Use Generics.
+ Generics,
+ Converting Legacy Code to Use Generics.
diff --git a/java/ql/src/Architecture/Dependencies/UnusedMavenDependency.qhelp b/java/ql/src/Architecture/Dependencies/UnusedMavenDependency.inc.qhelp
similarity index 100%
rename from java/ql/src/Architecture/Dependencies/UnusedMavenDependency.qhelp
rename to java/ql/src/Architecture/Dependencies/UnusedMavenDependency.inc.qhelp
diff --git a/java/ql/src/Architecture/Dependencies/UnusedMavenDependencyBinary.qhelp b/java/ql/src/Architecture/Dependencies/UnusedMavenDependencyBinary.qhelp
index 17c21c500db9..f803c44c2cf1 100644
--- a/java/ql/src/Architecture/Dependencies/UnusedMavenDependencyBinary.qhelp
+++ b/java/ql/src/Architecture/Dependencies/UnusedMavenDependencyBinary.qhelp
@@ -2,5 +2,5 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
-
+
diff --git a/java/ql/src/Architecture/Dependencies/UnusedMavenDependencySource.qhelp b/java/ql/src/Architecture/Dependencies/UnusedMavenDependencySource.qhelp
index 17c21c500db9..f803c44c2cf1 100644
--- a/java/ql/src/Architecture/Dependencies/UnusedMavenDependencySource.qhelp
+++ b/java/ql/src/Architecture/Dependencies/UnusedMavenDependencySource.qhelp
@@ -2,5 +2,5 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
-
+
diff --git a/java/ql/src/Compatibility/JDK9/JdkInternalAccess.qhelp b/java/ql/src/Compatibility/JDK9/JdkInternalAccess.qhelp
index 425e5f646907..cd8bbeffa0ec 100644
--- a/java/ql/src/Compatibility/JDK9/JdkInternalAccess.qhelp
+++ b/java/ql/src/Compatibility/JDK9/JdkInternalAccess.qhelp
@@ -27,8 +27,8 @@ Oracle JDK Documentation:
OpenJDK Documentation:
Java Dependency Analysis Tool,
-JEP 260: Encapsulate Most Internal APIs,
-JEP 261: Module System.
+JEP 260: Encapsulate Most Internal APIs,
+JEP 261: Module System.
diff --git a/java/ql/src/Compatibility/JDK9/JdkInternals.qll b/java/ql/src/Compatibility/JDK9/JdkInternals.qll
index 5e65a42ed828..4cdda13a6a7c 100644
--- a/java/ql/src/Compatibility/JDK9/JdkInternals.qll
+++ b/java/ql/src/Compatibility/JDK9/JdkInternals.qll
@@ -5,7 +5,7 @@
/**
* Provides a QL encoding of the list of unsupported JDK-internal APIs at:
*
- * http://hg.openjdk.java.net/jdk9/jdk9/langtools/file/6ba2130e87bd/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt
+ * https://hg.openjdk.java.net/jdk9/jdk9/langtools/file/6ba2130e87bd/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdk8_internals.txt
*/
predicate jdkInternalApi(string p) {
p = "apple.applescript" or
diff --git a/java/ql/src/Compatibility/JDK9/JdkInternalsReplacement.qll b/java/ql/src/Compatibility/JDK9/JdkInternalsReplacement.qll
index fa7eb3cc12d6..f836b0c1452b 100644
--- a/java/ql/src/Compatibility/JDK9/JdkInternalsReplacement.qll
+++ b/java/ql/src/Compatibility/JDK9/JdkInternalsReplacement.qll
@@ -5,7 +5,7 @@
/**
* Provides a QL encoding of the suggested replacements for unsupported JDK-internal APIs listed at:
*
- * http://hg.openjdk.java.net/jdk9/jdk9/langtools/file/6ba2130e87bd/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
+ * https://hg.openjdk.java.net/jdk9/jdk9/langtools/file/6ba2130e87bd/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
*/
predicate jdkInternalReplacement(string old, string new) {
exists(string r, int eqIdx | jdkInternalReplacement(r) and eqIdx = r.indexOf("=") |
@@ -33,10 +33,10 @@ private predicate jdkInternalReplacement(string r) {
r = "sun.awt.CausedFocusEvent=Use java.awt.event.FocusEvent::getCause @since 9" or
r = "sun.font.FontUtilities=See java.awt.Font.textRequiresLayout @since 9" or
r = "sun.reflect.Reflection=Use java.lang.StackWalker @since 9" or
- r = "sun.reflect.ReflectionFactory=See http://openjdk.java.net/jeps/260" or
- r = "sun.misc.Unsafe=See http://openjdk.java.net/jeps/260" or
- r = "sun.misc.Signal=See http://openjdk.java.net/jeps/260" or
- r = "sun.misc.SignalHandler=See http://openjdk.java.net/jeps/260" or
+ r = "sun.reflect.ReflectionFactory=See https://openjdk.java.net/jeps/260" or
+ r = "sun.misc.Unsafe=See https://openjdk.java.net/jeps/260" or
+ r = "sun.misc.Signal=See https://openjdk.java.net/jeps/260" or
+ r = "sun.misc.SignalHandler=See https://openjdk.java.net/jeps/260" or
r = "sun.security.action=Use java.security.PrivilegedAction @since 1.1" or
r = "sun.security.krb5=Use com.sun.security.jgss" or
r =
@@ -58,6 +58,6 @@ private predicate jdkInternalReplacement(string r) {
r =
"sun.misc.Cleaner=Use java.lang.ref.PhantomReference @since 1.2 or java.lang.ref.Cleaner @since 9" or
r = "sun.misc.Service=Use java.util.ServiceLoader @since 1.6" or
- r = "sun.misc=Removed. See http://openjdk.java.net/jeps/260" or
- r = "sun.reflect=Removed. See http://openjdk.java.net/jeps/260"
+ r = "sun.misc=Removed. See https://openjdk.java.net/jeps/260" or
+ r = "sun.reflect=Removed. See https://openjdk.java.net/jeps/260"
}
diff --git a/java/ql/src/DeadCode/DeadClass.qhelp b/java/ql/src/DeadCode/DeadClass.qhelp
index 518acef8eafa..f6cb55aa723e 100644
--- a/java/ql/src/DeadCode/DeadClass.qhelp
+++ b/java/ql/src/DeadCode/DeadClass.qhelp
@@ -7,7 +7,7 @@
Classes that are never used at runtime are redundant and should be removed.
-
+
Classes are considered dead if at runtime:
@@ -26,7 +26,7 @@ fields, methods and nested classes - it is never instantiated, has no public con
instance methods. If a class is considered to be a namespace class, then it is live if at least one
of the static members of that class is live - including static nested classes.
-
+
@@ -48,7 +48,7 @@ if there are some live nested classes within the dead class, the class can be re
converting all live nested classes to static members, and removing all instance methods and fields,
and all dead static members (see Example 2).
-
+
@@ -95,5 +95,5 @@ Taking the second approach, this is the final result.
-
+
diff --git a/java/ql/src/DeadCode/DeadCodeDetails.qhelp b/java/ql/src/DeadCode/DeadCodeDetails.inc.qhelp
similarity index 100%
rename from java/ql/src/DeadCode/DeadCodeDetails.qhelp
rename to java/ql/src/DeadCode/DeadCodeDetails.inc.qhelp
diff --git a/java/ql/src/DeadCode/DeadCodeExtraEntryPoints.qhelp b/java/ql/src/DeadCode/DeadCodeExtraEntryPoints.inc.qhelp
similarity index 100%
rename from java/ql/src/DeadCode/DeadCodeExtraEntryPoints.qhelp
rename to java/ql/src/DeadCode/DeadCodeExtraEntryPoints.inc.qhelp
diff --git a/java/ql/src/DeadCode/DeadCodeReferences.qhelp b/java/ql/src/DeadCode/DeadCodeReferences.inc.qhelp
similarity index 100%
rename from java/ql/src/DeadCode/DeadCodeReferences.qhelp
rename to java/ql/src/DeadCode/DeadCodeReferences.inc.qhelp
diff --git a/java/ql/src/DeadCode/DeadCodeSummary.qhelp b/java/ql/src/DeadCode/DeadCodeSummary.inc.qhelp
similarity index 100%
rename from java/ql/src/DeadCode/DeadCodeSummary.qhelp
rename to java/ql/src/DeadCode/DeadCodeSummary.inc.qhelp
diff --git a/java/ql/src/DeadCode/DeadEnumConstant.qhelp b/java/ql/src/DeadCode/DeadEnumConstant.qhelp
index 82ba9d363625..d5f9285e6eda 100644
--- a/java/ql/src/DeadCode/DeadEnumConstant.qhelp
+++ b/java/ql/src/DeadCode/DeadEnumConstant.qhelp
@@ -7,7 +7,7 @@
Enum constants that are never used at runtime are redundant and should be removed.
-
+
An enum constant is considered dead if at runtime it is never used, or only used in comparisons. Any
enum constant which is not dead is considered to be "live".
@@ -17,7 +17,7 @@ An enum constant that is only used in a comparison is considered dead because th
always produce the same result. This is because no variable holds the value of the enum constant,
so the comparison of any variable against the constant will always return the same result.
-
+
@@ -32,7 +32,7 @@ After confirming that the enum constant is not required, remove the enum constan
need to remove any references to this enum constant, which may, in turn, require removing other dead
code.
-
+
@@ -51,5 +51,5 @@ stored or returned anywhere in the program. Therefore, ERROR is dea
along with the comparison check, and the exit(1);.
-
+
diff --git a/java/ql/src/DeadCode/DeadField.qhelp b/java/ql/src/DeadCode/DeadField.qhelp
index f3027a7a9c31..d71f207d6960 100644
--- a/java/ql/src/DeadCode/DeadField.qhelp
+++ b/java/ql/src/DeadCode/DeadField.qhelp
@@ -7,7 +7,7 @@
Fields that are never read at runtime are unnecessary and should be removed.
-
+
Fields are considered dead if at runtime they are never read directly or indirectly, for example
through a framework or a use of reflection. Any field which is not dead is considered to be "live".
@@ -15,7 +15,7 @@ through a framework or a use of reflection. Any field which is not dead is consi
Fields are considered to be dead if they are only written to, and never read.
-
+
@@ -30,7 +30,7 @@ After confirming that the field is not required, remove the field. You will also
references to this field, which may, in turn, require removing other unused classes, methods
and fields.
-
+
@@ -64,5 +64,5 @@ the contents of the object in an XML file, or to construct an instance of the ob
file. The field is therefore considered to be read at runtime, which makes the field live.
-
+
diff --git a/java/ql/src/DeadCode/DeadMethod.qhelp b/java/ql/src/DeadCode/DeadMethod.qhelp
index e3368b54a47a..ffb3552a4f29 100644
--- a/java/ql/src/DeadCode/DeadMethod.qhelp
+++ b/java/ql/src/DeadCode/DeadMethod.qhelp
@@ -7,7 +7,7 @@
Methods that are never called at runtime are redundant and should be removed.
-
+
Methods are considered dead if at runtime they are never called, either directly, by a method call,
or indirectly, through a framework or use of reflection. Any method which is not dead is considered
@@ -18,7 +18,7 @@ The results can include methods, constructors and initializers. Initializers com
instance initializers and static initializers. For each class there will be at most one dead
initializer of each type, representing all the initialization of that type in the class.
-
+
@@ -47,7 +47,7 @@ and initializers on instance fields are dead. In addition, the lack of instance
implies that the class is never constructed, which means that all instance methods and fields are
also dead and can be removed. These methods and fields will also be reported separately.
-
+
@@ -77,5 +77,5 @@ framework when running the tests. testCustomer and setUp
-
+
diff --git a/java/ql/src/DeadCode/FLinesOfDeadCode.qhelp b/java/ql/src/DeadCode/FLinesOfDeadCode.qhelp
index 215733ed510d..8a6ed7b2fe6d 100644
--- a/java/ql/src/DeadCode/FLinesOfDeadCode.qhelp
+++ b/java/ql/src/DeadCode/FLinesOfDeadCode.qhelp
@@ -3,8 +3,8 @@
"qhelp.dtd">
-
-
+
+
@@ -13,5 +13,5 @@ can see which classes, methods and fields contribute to this metric using the ru
analysis.
-
+
diff --git a/java/ql/src/DeadCode/UselessParameter.qhelp b/java/ql/src/DeadCode/UselessParameter.qhelp
index fd05dd62371a..755e9787af1e 100644
--- a/java/ql/src/DeadCode/UselessParameter.qhelp
+++ b/java/ql/src/DeadCode/UselessParameter.qhelp
@@ -35,5 +35,5 @@ parameter name is not used within the body of the method. The param
as useless, and can be removed from the program.
-
+
diff --git a/java/ql/src/Frameworks/Spring/Violations of Best Practice/AvoidAutowiring.qhelp b/java/ql/src/Frameworks/Spring/Violations of Best Practice/AvoidAutowiring.qhelp
index 7c124ade08cc..5bb589fb5c96 100644
--- a/java/ql/src/Frameworks/Spring/Violations of Best Practice/AvoidAutowiring.qhelp
+++ b/java/ql/src/Frameworks/Spring/Violations of Best Practice/AvoidAutowiring.qhelp
@@ -66,7 +66,7 @@ explicit wiring.
Spring Framework Reference Documentation 3.0:
-3.4.5.1 Limitations and disadvantages of autowiring.
+3.4.5.1 Limitations and disadvantages of autowiring.
ONJava:
diff --git a/java/ql/src/Frameworks/Spring/Violations of Best Practice/DontUseConstructorArgIndex.qhelp b/java/ql/src/Frameworks/Spring/Violations of Best Practice/DontUseConstructorArgIndex.qhelp
index a782e1069d05..5c3d6ae5b491 100644
--- a/java/ql/src/Frameworks/Spring/Violations of Best Practice/DontUseConstructorArgIndex.qhelp
+++ b/java/ql/src/Frameworks/Spring/Violations of Best Practice/DontUseConstructorArgIndex.qhelp
@@ -32,7 +32,7 @@ whose constructor-arg elements use type matching.
Spring Framework Reference Documentation 3.0:
-3.4.1.1 Constructor-based dependency injection.
+3.4.1.1 Constructor-based dependency injection.
ONJava:
diff --git a/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseSetterInjection.qhelp b/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseSetterInjection.qhelp
index 0f209b4571a4..03d51131489c 100644
--- a/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseSetterInjection.qhelp
+++ b/java/ql/src/Frameworks/Spring/Violations of Best Practice/UseSetterInjection.qhelp
@@ -47,7 +47,7 @@ the bean configuration is followed by the class definition.
Martin Fowler:
-Inversion of Control Containers and the Dependency Injection pattern.
+Inversion of Control Containers and the Dependency Injection pattern.
ONJava:
@@ -55,12 +55,12 @@ ONJava:
Spring Framework Reference Documentation 3.0:
-3.4.1.1 Constructor-based dependency injection,
-3.4.1.2 Setter-based dependency injection.
+3.4.1.1 Constructor-based dependency injection,
+3.4.1.2 Setter-based dependency injection.
SpringSource:
-Setter injection versus constructor injection and the use of @Required.
+Setter injection versus constructor injection and the use of @Required.
diff --git a/java/ql/src/Language Abuse/EmptyStatement.qhelp b/java/ql/src/Language Abuse/EmptyStatement.qhelp
index 4a5a32f3fea7..700bd488dfce 100644
--- a/java/ql/src/Language Abuse/EmptyStatement.qhelp
+++ b/java/ql/src/Language Abuse/EmptyStatement.qhelp
@@ -31,7 +31,7 @@ an explanatory comment for the body instead.
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
diff --git a/java/ql/src/Language Abuse/EnumIdentifier.qhelp b/java/ql/src/Language Abuse/EnumIdentifier.qhelp
index 37eaa77c5ced..588df0222b96 100644
--- a/java/ql/src/Language Abuse/EnumIdentifier.qhelp
+++ b/java/ql/src/Language Abuse/EnumIdentifier.qhelp
@@ -32,7 +32,7 @@ constraint, the variable should be renamed.
Java Language Specification:
-8.9 Enums.
+8.9 Enum Types.
diff --git a/java/ql/src/Language Abuse/ImplementsAnnotation.qhelp b/java/ql/src/Language Abuse/ImplementsAnnotation.qhelp
index a60fd9a67b63..d424668d4728 100644
--- a/java/ql/src/Language Abuse/ImplementsAnnotation.qhelp
+++ b/java/ql/src/Language Abuse/ImplementsAnnotation.qhelp
@@ -35,16 +35,16 @@ extended or implemented by the class.
- The Java Language Specification:
- Annotation Types.
+ Java Language Specification:
+ Annotation Types.
The Java Tutorials:
- Annotations.
+ Annotations.
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
diff --git a/java/ql/src/Language Abuse/IterableIterator.qhelp b/java/ql/src/Language Abuse/IterableIterator.qhelp
index 1958cc9ef933..8f9c1c4c8fe5 100644
--- a/java/ql/src/Language Abuse/IterableIterator.qhelp
+++ b/java/ql/src/Language Abuse/IterableIterator.qhelp
@@ -3,7 +3,7 @@
"qhelp.dtd">
-
+
@@ -53,14 +53,14 @@ refactoring above, but nevertheless an improvement over the original.
-The Java Language Specification:
-The enhanced for statement.
+Java Language Specification:
+The enhanced for statement.
-The Java API Specification:
-Interface Iterable<T>,
-Interface Iterator<T>,
-Interface DirectoryStream<T>.
+Java API Specification:
+Interface Iterable<T>,
+Interface Iterator<T>,
+Interface DirectoryStream<T>.
diff --git a/java/ql/src/Language Abuse/IterableOverview.qhelp b/java/ql/src/Language Abuse/IterableOverview.inc.qhelp
similarity index 100%
rename from java/ql/src/Language Abuse/IterableOverview.qhelp
rename to java/ql/src/Language Abuse/IterableOverview.inc.qhelp
diff --git a/java/ql/src/Language Abuse/OverridePackagePrivate.qhelp b/java/ql/src/Language Abuse/OverridePackagePrivate.qhelp
index c1b5a774d878..16d0f8aa22bd 100644
--- a/java/ql/src/Language Abuse/OverridePackagePrivate.qhelp
+++ b/java/ql/src/Language Abuse/OverridePackagePrivate.qhelp
@@ -52,11 +52,11 @@ example, PhotoResizerWidget.width would be better named
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
Java Language Specification:
-8.4.8.1 Overriding (by Instance Methods).
+8.4.8.1 Overriding (by Instance Methods).
diff --git a/java/ql/src/Language Abuse/TypeVarExtendsFinalType.qhelp b/java/ql/src/Language Abuse/TypeVarExtendsFinalType.qhelp
index 810f46280ea3..462f4e6a0bee 100644
--- a/java/ql/src/Language Abuse/TypeVarExtendsFinalType.qhelp
+++ b/java/ql/src/Language Abuse/TypeVarExtendsFinalType.qhelp
@@ -35,12 +35,12 @@ subclasses. Therefore, it is clearer to replace ? extends String
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
Java Language Specification:
-4.5.1 Type Arguments and Wildcards,
-8.1.1.2 final Classes.
+4.5.1 Type Arguments of Parameterized Types ,
+8.1.1.2 final Classes.
diff --git a/java/ql/src/Language Abuse/TypeVariableHidesType.qhelp b/java/ql/src/Language Abuse/TypeVariableHidesType.qhelp
index ff135efda012..eab667038f7f 100644
--- a/java/ql/src/Language Abuse/TypeVariableHidesType.qhelp
+++ b/java/ql/src/Language Abuse/TypeVariableHidesType.qhelp
@@ -36,11 +36,11 @@ interface. The type variable therefore shadows Map.Entry.
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
Java Language Specification:
-6.4 Shadowing and Obscuring.
+6.4 Shadowing and Obscuring.
diff --git a/java/ql/src/Language Abuse/UselessNullCheck.qhelp b/java/ql/src/Language Abuse/UselessNullCheck.qhelp
index 1f21ee33b8e6..91cbc692b479 100644
--- a/java/ql/src/Language Abuse/UselessNullCheck.qhelp
+++ b/java/ql/src/Language Abuse/UselessNullCheck.qhelp
@@ -33,8 +33,8 @@ returned by new can never be null, so this check is superfluous.
Java Language Specification:
-Creation of New Class Instances,
-Execution of try-catch.
+Creation of New Class Instances,
+Execution of try-catch.
diff --git a/java/ql/src/Language Abuse/WrappedIterator.qhelp b/java/ql/src/Language Abuse/WrappedIterator.qhelp
index 9c8b0817c552..47ce92ec5d9a 100644
--- a/java/ql/src/Language Abuse/WrappedIterator.qhelp
+++ b/java/ql/src/Language Abuse/WrappedIterator.qhelp
@@ -3,7 +3,7 @@
"qhelp.dtd">
-
+
@@ -45,14 +45,14 @@ beginning.
-The Java Language Specification:
-The enhanced for statement.
+Java Language Specification:
+The enhanced for statement.
-The Java API Specification:
-Interface Iterable<T>,
-Interface Iterator<T>,
-Interface DirectoryStream<T>.
+Java API Specification:
+Interface Iterable<T>,
+Interface Iterator<T>,
+Interface DirectoryStream<T>.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/BadAbsOfRandom.qhelp b/java/ql/src/Likely Bugs/Arithmetic/BadAbsOfRandom.qhelp
index 27a1ac60834d..a12adaba2c86 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/BadAbsOfRandom.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/BadAbsOfRandom.qhelp
@@ -36,14 +36,14 @@ The example shows how using the two solutions described above means that p
-Java API Documentation:
-Math.abs(int),
-Math.abs(long),
-Random.
+Java API Specification:
+Math.abs(int),
+Math.abs(long),
+Random.
-Java Language Specification, 3rd ed:
-4.2.1 Integral Types and Values.
+Java Language Specification:
+4.2.1 Integral Types and Values.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/BadCheckOdd.qhelp b/java/ql/src/Likely Bugs/Arithmetic/BadCheckOdd.qhelp
index eb839ea1aed2..25f7045a8731 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/BadCheckOdd.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/BadCheckOdd.qhelp
@@ -36,8 +36,8 @@ Consider using x % 2 != 0 to check for odd and x % 2 == 0Java Puzzlers: Traps, Pitfalls, and Corner Cases, Puzzle 1. Addison-Wesley, 2005.
- The Java Language Specification:
- Remainder Operator %.
+ Java Language Specification:
+ Remainder Operator %.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/CondExprTypes.qhelp b/java/ql/src/Likely Bugs/Arithmetic/CondExprTypes.qhelp
index d19bc5fb32f7..fb4a6578810b 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/CondExprTypes.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/CondExprTypes.qhelp
@@ -40,8 +40,8 @@ This avoids potentially unexpected results caused by binary numeric promotion.
J. Bloch and N. Gafter, Java Puzzlers: Traps, Pitfalls, and Corner Cases, Puzzle 8. Addison-Wesley, 2005.
- The Java Language Specification:
- Conditional Operator ?.
+ Java Language Specification:
+ Conditional Operator ? :.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.qhelp b/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.qhelp
index 824476b1f1c0..446ce9dfd4ad 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/ConstantExpAppearsNonConstant.qhelp
@@ -53,8 +53,8 @@ an integer. The correct check is x % 2 == 0.
- The Java Language Specification:
- Multiplication operator *, Remainder operator %, Bitwise AND operator &, Conditional-and operator && and Conditional-or operator ||.
+ Java Language Specification:
+ Multiplication Operator *, Remainder Operator %, Integer Bitwise Operators &, ^, and |, Conditional-And Operator && and Conditional-Or Operator ||.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.qhelp b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.qhelp
index d7ba87f4340a..1f280852b52f 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/InformationLoss.qhelp
@@ -39,12 +39,12 @@ the left-hand side of the assignment: short, possibly leading to in
J. Bloch and N. Gafter, Java Puzzlers: Traps, Pitfalls, and Corner Cases, Puzzle 9. Addison-Wesley, 2005.
- The Java Language Specification:
- Compound Assignment Operators,
- Narrowing Primitive Conversion.
+ Java Language Specification:
+ Compound Assignment Operators,
+ Narrowing Primitive Conversion.
-The CERT Oracle Secure Coding Standard for Java:
- NUM00-J. Detect or prevent integer overflow.
+SEI CERT Oracle Coding Standard for Java:
+ NUM00-J. Detect or prevent integer overflow.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.qhelp b/java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.qhelp
index 9a3da8bd1cab..e574eddec48d 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/IntMultToLong.qhelp
@@ -40,11 +40,11 @@ one of the operands to type long.
J. Bloch and N. Gafter, Java Puzzlers: Traps, Pitfalls, and Corner Cases, Puzzle 3. Addison-Wesley, 2005.
- The Java Language Specification:
- Multiplication Operator.
+ Java Language Specification:
+ Multiplication Operator.
-The CERT Oracle Secure Coding Standard for Java:
- NUM00-J. Detect or prevent integer overflow.
+SEI CERT Oracle Coding Standard for Java:
+ NUM00-J. Detect or prevent integer overflow.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.qhelp b/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.qhelp
index e541753db74e..710a6ccef7db 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/LShiftLargerThanTypeWidth.qhelp
@@ -39,8 +39,8 @@ be cast to long before the shift is applied. Then the left-shift of
- The Java Language Specification:
- Shift Operators.
+ Java Language Specification:
+ Shift Operators.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/MultiplyRemainder.qhelp b/java/ql/src/Likely Bugs/Arithmetic/MultiplyRemainder.qhelp
index 334c2af2ab70..f6c5d7da28d7 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/MultiplyRemainder.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/MultiplyRemainder.qhelp
@@ -35,7 +35,7 @@ Instead, the expression should be t % (60 * 1000).
J. Bloch and N. Gafter, Java Puzzlers: Traps, Pitfalls, and Corner Cases, Puzzle 35. Addison-Wesley, 2005.
- The Java Tutorials: Operators.
+ The Java Tutorials: Operators.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/OctalLiteral.qhelp b/java/ql/src/Likely Bugs/Arithmetic/OctalLiteral.qhelp
index e5c164a2eaf0..e0d858f3d8a4 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/OctalLiteral.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/OctalLiteral.qhelp
@@ -36,8 +36,8 @@ octal literal. This can lead to two problems:
J. Bloch and N. Gafter, Java Puzzlers: Traps, Pitfalls, and Corner Cases, Puzzle 59. Addison-Wesley, 2005.
- The Java Language Specification:
- Integer Literals.
+ Java Language Specification:
+ Integer Literals.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/RandomUsedOnce.qhelp b/java/ql/src/Likely Bugs/Arithmetic/RandomUsedOnce.qhelp
index 739ab0828031..53150e0e5949 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/RandomUsedOnce.qhelp
+++ b/java/ql/src/Likely Bugs/Arithmetic/RandomUsedOnce.qhelp
@@ -11,7 +11,7 @@ every time a new pseudo-random number is required (for example, new Random
-According to the Java API specification:
+According to the Java API Specification:
If two instances of Random are created with the same seed, and the same sequence of method calls is made for each, they will generate and return
@@ -48,8 +48,8 @@ the numbers are based on only one Random object.
- Java API Documentation:
- Random.
+ Java API Specification:
+ Random.
diff --git a/java/ql/src/Likely Bugs/Cloning/MissingCallToSuperClone.qhelp b/java/ql/src/Likely Bugs/Cloning/MissingCallToSuperClone.qhelp
index 9f2e83ada123..eb313b41e582 100644
--- a/java/ql/src/Likely Bugs/Cloning/MissingCallToSuperClone.qhelp
+++ b/java/ql/src/Likely Bugs/Cloning/MissingCallToSuperClone.qhelp
@@ -12,7 +12,7 @@ the contract for Cloneable.
-
+
@@ -42,7 +42,7 @@ because super.clone is implemented correctly in its superclass Effective Java (second edition), Item 11. Addison-Wesley, 2008.
- Java 6 API Specification: Object.clone().
+ Java API Specification: Object.clone().
diff --git a/java/ql/src/Likely Bugs/Cloning/MissingCloneDetails.qhelp b/java/ql/src/Likely Bugs/Cloning/MissingCloneDetails.inc.qhelp
similarity index 97%
rename from java/ql/src/Likely Bugs/Cloning/MissingCloneDetails.qhelp
rename to java/ql/src/Likely Bugs/Cloning/MissingCloneDetails.inc.qhelp
index d1a3dc49f9aa..7775bfa13e90 100644
--- a/java/ql/src/Likely Bugs/Cloning/MissingCloneDetails.qhelp
+++ b/java/ql/src/Likely Bugs/Cloning/MissingCloneDetails.inc.qhelp
@@ -4,7 +4,7 @@
-The Java API documentation states that, for an object x, the general intent of the clone method is for it to
+The Java API Specification states that, for an object x, the general intent of the clone method is for it to
satisfy the following three properties:
diff --git a/java/ql/src/Likely Bugs/Cloning/MissingMethodClone.qhelp b/java/ql/src/Likely Bugs/Cloning/MissingMethodClone.qhelp
index 9c60c63766b5..b15b4a5ba331 100644
--- a/java/ql/src/Likely Bugs/Cloning/MissingMethodClone.qhelp
+++ b/java/ql/src/Likely Bugs/Cloning/MissingMethodClone.qhelp
@@ -12,7 +12,7 @@ that does not have a clone method indicates that the class is break
-
+
@@ -53,7 +53,7 @@ operations on the rs1clone stack do not affect the rs1
J. Bloch, Effective Java (second edition), Item 11. Addison-Wesley, 2008.
- Java 6 API Specification: Object.clone().
+ Java API Specification: Object.clone().
diff --git a/java/ql/src/Likely Bugs/Collections/ArrayIndexOutOfBounds.qhelp b/java/ql/src/Likely Bugs/Collections/ArrayIndexOutOfBounds.qhelp
index 11477633224c..f9e70db46bf1 100644
--- a/java/ql/src/Likely Bugs/Collections/ArrayIndexOutOfBounds.qhelp
+++ b/java/ql/src/Likely Bugs/Collections/ArrayIndexOutOfBounds.qhelp
@@ -33,8 +33,8 @@ The condition should be changed as follows to correctly guard the array access.
-The Java API Specification:
-ArrayIndexOutOfBoundsException.
+Java API Specification:
+ArrayIndexOutOfBoundsException.
diff --git a/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.qhelp b/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.qhelp
index 8f5c2ef1a1b2..cfc3e07f0ed0 100644
--- a/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.qhelp
+++ b/java/ql/src/Likely Bugs/Collections/ContainsTypeMismatch.qhelp
@@ -50,8 +50,8 @@ returns true because you can compare Short(1) and
- Java API Documentation:
- Collection.contains.
+ Java API Specification:
+ Collection.contains.
diff --git a/java/ql/src/Likely Bugs/Collections/ReadOnlyContainer.qhelp b/java/ql/src/Likely Bugs/Collections/ReadOnlyContainer.qhelp
index 2e8aa2d25395..a293e3615690 100644
--- a/java/ql/src/Likely Bugs/Collections/ReadOnlyContainer.qhelp
+++ b/java/ql/src/Likely Bugs/Collections/ReadOnlyContainer.qhelp
@@ -46,9 +46,9 @@ body to ensure that seen is correctly maintained.
- Java API Documentation:
- Collection,
- Map.
+ Java API Specification:
+ Collection,
+ Map.
diff --git a/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.qhelp b/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.qhelp
index c9965746ff3e..6ee5ef92ae56 100644
--- a/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.qhelp
+++ b/java/ql/src/Likely Bugs/Collections/RemoveTypeMismatch.qhelp
@@ -52,8 +52,8 @@ item to remove.
- Java API Documentation:
- Collection.remove.
+ Java API Specification:
+ Collection.remove.
diff --git a/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.qhelp b/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.qhelp
index 3b39a4f4bed3..c61cc441e728 100644
--- a/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.qhelp
+++ b/java/ql/src/Likely Bugs/Collections/WriteOnlyContainer.qhelp
@@ -43,9 +43,9 @@ to see whether the node has already been considered.
- Java API Documentation:
- Collection,
- Map.
+ Java API Specification:
+ Collection,
+ Map.
diff --git a/java/ql/src/Likely Bugs/Comparison/BitwiseSignCheck.qhelp b/java/ql/src/Likely Bugs/Comparison/BitwiseSignCheck.qhelp
index 6a80a0caaa60..ee10cf0461b5 100644
--- a/java/ql/src/Likely Bugs/Comparison/BitwiseSignCheck.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/BitwiseSignCheck.qhelp
@@ -37,8 +37,8 @@ even though the 31st bit of x is, in fact, set.
- The Java Language Specification:
- Integer Bitwise Operators &, ^, and |.
+ Java Language Specification:
+ Integer Bitwise Operators &, ^, and |.
diff --git a/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.qhelp b/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.qhelp
index efaac8d8dcff..4977b7e3c25f 100644
--- a/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.qhelp
@@ -45,11 +45,11 @@ includes the missing qualifier o in the comparison of id
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
Java Language Specification:
-15.21.1. Numerical Equality Operators.
+15.21.1. Numerical Equality Operators.
diff --git a/java/ql/src/Likely Bugs/Comparison/CovariantCompareTo.qhelp b/java/ql/src/Likely Bugs/Comparison/CovariantCompareTo.qhelp
index fa073be74a09..ab5b15477c85 100644
--- a/java/ql/src/Likely Bugs/Comparison/CovariantCompareTo.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/CovariantCompareTo.qhelp
@@ -35,10 +35,10 @@ to Super.
J. Bloch, Effective Java (second edition), Item 12. Addison-Wesley, 2008.
- The Java Language Specification:
- Overriding (by Instance Methods),
- Overloading.
- The Java Tutorials: Overriding and Hiding Methods.
+ Java Language Specification:
+ Overriding (by Instance Methods),
+ Overloading.
+ The Java Tutorials: Overriding and Hiding Methods.
diff --git a/java/ql/src/Likely Bugs/Comparison/CovariantEquals.qhelp b/java/ql/src/Likely Bugs/Comparison/CovariantEquals.qhelp
index a85890af4189..84fa46cd815f 100644
--- a/java/ql/src/Likely Bugs/Comparison/CovariantEquals.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/CovariantEquals.qhelp
@@ -29,10 +29,10 @@ so that r.equals(s) returns true.
J. Bloch, Effective Java (second edition), Item 8. Addison-Wesley, 2008.
- The Java Language Specification:
- Overriding (by Instance Methods),
- Overloading.
- The Java Tutorials: Overriding and Hiding Methods.
+ Java Language Specification:
+ Overriding (by Instance Methods),
+ Overloading.
+ The Java Tutorials: Overriding and Hiding Methods.
diff --git a/java/ql/src/Likely Bugs/Comparison/DefineEqualsWhenAddingFields.qhelp b/java/ql/src/Likely Bugs/Comparison/DefineEqualsWhenAddingFields.qhelp
index 948f983d619b..09a248ac9fac 100644
--- a/java/ql/src/Likely Bugs/Comparison/DefineEqualsWhenAddingFields.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/DefineEqualsWhenAddingFields.qhelp
@@ -41,8 +41,8 @@ not rectangles. (Note that, in practice, the example should also include an impl
- Java API Documentation:
- Object.equals().
+ Java API Specification:
+ Object.equals().
diff --git a/java/ql/src/Likely Bugs/Comparison/EqualsArray.qhelp b/java/ql/src/Likely Bugs/Comparison/EqualsArray.qhelp
index aee14b2d4865..dbae3e73a8b2 100644
--- a/java/ql/src/Likely Bugs/Comparison/EqualsArray.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/EqualsArray.qhelp
@@ -41,12 +41,13 @@ Because this compares the length and contents of the arrays, Arrays.equals
- Java API Documentation:
- Arrays.equals,
- Arrays.deepEquals,
- Object.equals,
- Arrays.hashCode,
- Arrays.deepHashCode,
- Object.hashCode.
+ Java API Specification:
+ Arrays.equals,
+ Arrays.deepEquals,
+ Objects.deepEquals,
+ Object.equals,
+ Arrays.hashCode,
+ Arrays.deepHashCode,
+ Object.hashCode.
diff --git a/java/ql/src/Likely Bugs/Comparison/EqualsUsesInstanceOf.qhelp b/java/ql/src/Likely Bugs/Comparison/EqualsUsesInstanceOf.qhelp
index fe68c585d858..7485c733b3fe 100644
--- a/java/ql/src/Likely Bugs/Comparison/EqualsUsesInstanceOf.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/EqualsUsesInstanceOf.qhelp
@@ -64,16 +64,16 @@ using getClass rather than instanceof.
J. Bloch, Effective Java (second edition), Items 8 and 16. Addison-Wesley, 2008.
- Java API Documentation:
- Object.equals().
+ Java API Specification:
+ Object.equals().
- The Java Language Specification:
- Type Comparison Operator instanceof.
+ Java Language Specification:
+ Type Comparison Operator instanceof.
Artima Developer:
- How to Write an Equality Method in Java.
+ How to Write an Equality Method in Java.
JavaSolutions, April 2002:
Secrets of equals().
diff --git a/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.qhelp b/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.qhelp
index 42d6fb70969d..d29009e5b3e0 100644
--- a/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.qhelp
@@ -43,12 +43,12 @@ in the equals method. Therefore, the contract of the hashCode
J. Bloch, Effective Java (second edition), Item 9. Addison-Wesley, 2008.
- Java API Documentation:
- Object.equals,
- Object.hashCode.
+ Java API Specification:
+ Object.equals,
+ Object.hashCode.
- IBM developerWorks: Java theory and practice: Hashing it out.
+ IBM developerWorks: Java theory and practice: Hashing it out.
diff --git a/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.qhelp b/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.qhelp
index 6e916f9cddcb..23afb98eb309 100644
--- a/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/IncomparableEquals.qhelp
@@ -30,8 +30,8 @@ mistake, instead of a specific element. Therefore, "Value not found" is returned
- Java API Documentation:
- Object.equals().
+ Java API Specification:
+ Object.equals().
diff --git a/java/ql/src/Likely Bugs/Comparison/InconsistentCompareTo.qhelp b/java/ql/src/Likely Bugs/Comparison/InconsistentCompareTo.qhelp
index 8bdcc5f7eb10..1c5fbfb5122e 100644
--- a/java/ql/src/Likely Bugs/Comparison/InconsistentCompareTo.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/InconsistentCompareTo.qhelp
@@ -42,10 +42,9 @@ If you require a natural ordering that is inconsistent with equals,
J. Bloch, Effective Java (second edition), Item 12. Addison-Wesley, 2008.
- Java API Documentation:
- Comparable.compareTo,
- Comparable,
- Object.equals.
+ Java API Specification:
+ Comparable.compareTo,
+ Object.equals.
diff --git a/java/ql/src/Likely Bugs/Comparison/InconsistentEqualsHashCode.qhelp b/java/ql/src/Likely Bugs/Comparison/InconsistentEqualsHashCode.qhelp
index c6bf422cae6a..ac4b7373c470 100644
--- a/java/ql/src/Likely Bugs/Comparison/InconsistentEqualsHashCode.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/InconsistentEqualsHashCode.qhelp
@@ -39,16 +39,16 @@ retrieving objects of such a class in a hashing data structure.
J. Bloch, Effective Java (second edition), Item 9. Addison-Wesley, 2008.
- Java API Documentation:
- Object.equals,
- Object.hashCode.
+ Java API Specification:
+ Object.equals,
+ Object.hashCode.
- IBM developerWorks: Java theory and practice: Hashing it out.
+ IBM developerWorks: Java theory and practice: Hashing it out.
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
diff --git a/java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.qhelp b/java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.qhelp
index c15382bb6cb6..41be4184b519 100644
--- a/java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.qhelp
@@ -46,12 +46,12 @@ instances of a class and its subclasses, even when no additional state is added
J. Bloch, Effective Java (second edition), Item 8. Addison-Wesley, 2008.
- Java API Documentation:
- Object.equals().
+ Java API Specification:
+ Object.equals().
- The Java Language Specification:
- Type Comparison Operator instanceof.
+ Java Language Specification:
+ Type Comparison Operator instanceof.
diff --git a/java/ql/src/Likely Bugs/Comparison/NoAssignInBooleanExprs.qhelp b/java/ql/src/Likely Bugs/Comparison/NoAssignInBooleanExprs.qhelp
index 0eee72aa790d..bac0695f2e81 100644
--- a/java/ql/src/Likely Bugs/Comparison/NoAssignInBooleanExprs.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/NoAssignInBooleanExprs.qhelp
@@ -34,12 +34,12 @@ condition, possibly splitting the condition into several separate tests.
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
Java Language Specification:
-15.21 Equality Operators,
-15.26 Assignment Operators.
+15.21 Equality Operators,
+15.26 Assignment Operators.
diff --git a/java/ql/src/Likely Bugs/Comparison/NoComparisonOnFloats.qhelp b/java/ql/src/Likely Bugs/Comparison/NoComparisonOnFloats.qhelp
index 614c995f42f5..9813420f13c3 100644
--- a/java/ql/src/Likely Bugs/Comparison/NoComparisonOnFloats.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/NoComparisonOnFloats.qhelp
@@ -46,7 +46,7 @@ J. Bloch, Effective Java (second edition), Item 48. Addison-Wesley, 200
Numerical Computation Guide:
-(What Every Computer Scientist Should Know About Floating-Point Arithmetic).
+What Every Computer Scientist Should Know About Floating-Point Arithmetic.
diff --git a/java/ql/src/Likely Bugs/Comparison/ObjectComparison.qhelp b/java/ql/src/Likely Bugs/Comparison/ObjectComparison.qhelp
index dcd9282dd1a7..ebc8b85c3cf3 100644
--- a/java/ql/src/Likely Bugs/Comparison/ObjectComparison.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/ObjectComparison.qhelp
@@ -24,8 +24,8 @@ equality.
- Java API Documentation:
- Object.equals().
+ Java API Specification:
+ Object.equals().
diff --git a/java/ql/src/Likely Bugs/Comparison/RefEqBoxed.qhelp b/java/ql/src/Likely Bugs/Comparison/RefEqBoxed.qhelp
index 078e4450c4f4..f14a7dd0dac1 100644
--- a/java/ql/src/Likely Bugs/Comparison/RefEqBoxed.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/RefEqBoxed.qhelp
@@ -35,9 +35,9 @@ returns true because the objects contain equal values.
J. Bloch and N. Gafter, Java Puzzlers: Traps, Pitfalls, and Corner Cases, Puzzle 32. Addison-Wesley, 2005.
- Java API Documentation:
- Object.equals(),
- Integer.equals().
+ Java API Specification:
+ Object.equals(),
+ Integer.equals().
diff --git a/java/ql/src/Likely Bugs/Comparison/StringComparison.qhelp b/java/ql/src/Likely Bugs/Comparison/StringComparison.qhelp
index b0ccb5e6e19e..243a5b5ce314 100644
--- a/java/ql/src/Likely Bugs/Comparison/StringComparison.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/StringComparison.qhelp
@@ -42,15 +42,15 @@ the equals method. This version will reliably detect whenever
- Java API Documentation:
- String.equals(),
- String.intern().
+ Java API Specification:
+ String.equals(),
+ String.intern().
- The Java Language Specification:
- 15.21.3,
- 3.10.5,
- 15.28.
+ Java Language Specification:
+ 15.21.3 Reference Equality Operators == and !=,
+ 3.10.5 String Literals ,
+ 15.28 Constant Expressions.
diff --git a/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.qhelp b/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.qhelp
index 624de0a665b0..89f581f074fd 100644
--- a/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.qhelp
@@ -31,7 +31,7 @@ the condition should be removed to make this clear.
Java Language Specification:
-The if Statement.
+The if Statement.
diff --git a/java/ql/src/Likely Bugs/Comparison/WrongNanComparison.qhelp b/java/ql/src/Likely Bugs/Comparison/WrongNanComparison.qhelp
index b6be702344c2..8ba4c703007b 100644
--- a/java/ql/src/Likely Bugs/Comparison/WrongNanComparison.qhelp
+++ b/java/ql/src/Likely Bugs/Comparison/WrongNanComparison.qhelp
@@ -25,7 +25,7 @@ by Double.isNaN(x), which accurately identifies whether x
Java Language Specification:
-Numerical Equality Operators == and !=.
+Numerical Equality Operators == and !=.
diff --git a/java/ql/src/Likely Bugs/Concurrency/BusyWait.qhelp b/java/ql/src/Likely Bugs/Concurrency/BusyWait.qhelp
index 65d21bcb265f..af98cdf05ad9 100644
--- a/java/ql/src/Likely Bugs/Concurrency/BusyWait.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/BusyWait.qhelp
@@ -50,12 +50,12 @@ message has been sent. This means that the thread can respond immediately instea
J. Bloch, Effective Java (second edition), Item 72. Addison-Wesley, 2008.
- Java API Documentation:
- Object.wait(),
- Object.notifyAll(),
- java.util.concurrent.
- The Java Tutorials: Guarded Blocks,
- High Level Concurrency Objects.
+ Java API Specification:
+ Object.wait(),
+ Object.notifyAll(),
+ java.util.concurrent.
+ The Java Tutorials: Guarded Blocks,
+ High Level Concurrency Objects.
diff --git a/java/ql/src/Likely Bugs/Concurrency/CallsToConditionWait.qhelp b/java/ql/src/Likely Bugs/Concurrency/CallsToConditionWait.qhelp
index 148d3dda9af0..0a2d518b53d9 100644
--- a/java/ql/src/Likely Bugs/Concurrency/CallsToConditionWait.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/CallsToConditionWait.qhelp
@@ -18,7 +18,7 @@ typing "wait" instead of "await".
- Java API Documentation: java.util.concurrent.Condition.
+ Java API Specification: java.util.concurrent.Condition.
diff --git a/java/ql/src/Likely Bugs/Concurrency/CallsToRunnableRun.qhelp b/java/ql/src/Likely Bugs/Concurrency/CallsToRunnableRun.qhelp
index c959b1f8f653..b6cb3a730876 100644
--- a/java/ql/src/Likely Bugs/Concurrency/CallsToRunnableRun.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/CallsToRunnableRun.qhelp
@@ -47,7 +47,7 @@ continue while the child thread is waiting, so that "Main thread activity" is pr
- The Java Tutorials: Defining and Starting a Thread.
+ The Java Tutorials: Defining and Starting a Thread.
diff --git a/java/ql/src/Likely Bugs/Concurrency/DateFormatThreadUnsafe.qhelp b/java/ql/src/Likely Bugs/Concurrency/DateFormatThreadUnsafe.qhelp
index 997cd846632a..ab697d2ea993 100644
--- a/java/ql/src/Likely Bugs/Concurrency/DateFormatThreadUnsafe.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/DateFormatThreadUnsafe.qhelp
@@ -37,15 +37,9 @@ instance of DateFormattingThread.
- Java API Documentation:
- java.text.DateFormat synchronization.
+ Java API Specification:
+ java.text.DateFormat synchronization.
-
-
-
diff --git a/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLocking.qhelp b/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLocking.qhelp
index 6e1cb6495dce..4b83aa4fa37c 100644
--- a/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLocking.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLocking.qhelp
@@ -3,6 +3,6 @@
"qhelp.dtd">
-
+
diff --git a/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingShared.qhelp b/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingShared.inc.qhelp
similarity index 94%
rename from java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingShared.qhelp
rename to java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingShared.inc.qhelp
index 4ae0866dacf8..274eb6b16089 100644
--- a/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingShared.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingShared.inc.qhelp
@@ -91,11 +91,11 @@ necessary for correctness.
-The "Double-Checked Locking is Broken" Declaration.
+The "Double-Checked Locking is Broken" Declaration.
Java Language Specification:
-17.4. Memory Model.
+17.4. Memory Model.
Wikipedia: Double-checked locking.
diff --git a/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingWithInitRace.qhelp b/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingWithInitRace.qhelp
index 6e1cb6495dce..4b83aa4fa37c 100644
--- a/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingWithInitRace.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingWithInitRace.qhelp
@@ -3,6 +3,6 @@
"qhelp.dtd">
-
+
diff --git a/java/ql/src/Likely Bugs/Concurrency/EmptyRunMethodInThread.qhelp b/java/ql/src/Likely Bugs/Concurrency/EmptyRunMethodInThread.qhelp
index 13656d73efa4..cfa4065397f8 100644
--- a/java/ql/src/Likely Bugs/Concurrency/EmptyRunMethodInThread.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/EmptyRunMethodInThread.qhelp
@@ -44,12 +44,12 @@ constructor of the Thread class.
- Java API Documentation:
- Thread.
+ Java API Specification:
+ Thread.
The Java Tutorials:
- Defining and Starting a Thread.
+ Defining and Starting a Thread.
diff --git a/java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.qhelp b/java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.qhelp
index 6de0a40237f5..8ed7b4363437 100644
--- a/java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.qhelp
@@ -37,13 +37,13 @@ object.
- The Java Language Specification:
- The synchronized Statement,
- synchronized Methods.
+ Java Language Specification:
+ The synchronized Statement,
+ synchronized Methods.
The Java Tutorials:
- Lock Objects.
+ Lock Objects.
diff --git a/java/ql/src/Likely Bugs/Concurrency/InconsistentAccess.qhelp b/java/ql/src/Likely Bugs/Concurrency/InconsistentAccess.qhelp
index 44ea36292590..4ffb1dc3f151 100644
--- a/java/ql/src/Likely Bugs/Concurrency/InconsistentAccess.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/InconsistentAccess.qhelp
@@ -33,8 +33,8 @@ are performed by the other threads.
- The Java Language Specification:
- Synchronization.
+ Java Language Specification:
+ Synchronization.
diff --git a/java/ql/src/Likely Bugs/Concurrency/NonSynchronizedOverride.qhelp b/java/ql/src/Likely Bugs/Concurrency/NonSynchronizedOverride.qhelp
index 5e1cf9362d3e..5d7c435cecc8 100644
--- a/java/ql/src/Likely Bugs/Concurrency/NonSynchronizedOverride.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/NonSynchronizedOverride.qhelp
@@ -23,12 +23,12 @@ method is synchronized, if necessary.
- The Java Language Specification:
- Synchronization.
+ Java Language Specification:
+ Synchronization.
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
diff --git a/java/ql/src/Likely Bugs/Concurrency/NotifyNotNotifyAll.qhelp b/java/ql/src/Likely Bugs/Concurrency/NotifyNotNotifyAll.qhelp
index 76270d861c72..9036d58cb002 100644
--- a/java/ql/src/Likely Bugs/Concurrency/NotifyNotNotifyAll.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/NotifyNotNotifyAll.qhelp
@@ -44,9 +44,9 @@ and if there are any threads that could proceed, we can be sure that at least on
Addison-Wesley, 2008.
- Java API Documentation:
- notify(),
- notifyAll().
+ Java API Specification:
+ Object.notify(),
+ Object.notifyAll().
diff --git a/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.qhelp b/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.qhelp
index ee83e53b000e..13299f3f7272 100644
--- a/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.qhelp
@@ -42,11 +42,11 @@
Addison-Wesley, 2008.
- Java API Documentation:
- notify(),
- notifyAll(),
- wait(),
- wait(long).
+ Java API Specification:
+ Object.notify(),
+ Object.notifyAll(),
+ Object.wait(),
+ Object.wait(long).
diff --git a/java/ql/src/Likely Bugs/Concurrency/SleepWithLock.qhelp b/java/ql/src/Likely Bugs/Concurrency/SleepWithLock.qhelp
index 0868f2148694..448c5991df17 100644
--- a/java/ql/src/Likely Bugs/Concurrency/SleepWithLock.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/SleepWithLock.qhelp
@@ -37,10 +37,10 @@ the synchronized block instead, so that counter is unl
- Java API Documentation: Thread.sleep(),
- Object.wait(),
- Object.notifyAll(),
- java.util.concurrent.
+ Java API Specification: Thread.sleep(),
+ Object.wait(),
+ Object.notifyAll(),
+ java.util.concurrent.
diff --git a/java/ql/src/Likely Bugs/Concurrency/SynchOnBoxedType.qhelp b/java/ql/src/Likely Bugs/Concurrency/SynchOnBoxedType.qhelp
index 542c1f83e526..2ef57d93adfc 100644
--- a/java/ql/src/Likely Bugs/Concurrency/SynchOnBoxedType.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/SynchOnBoxedType.qhelp
@@ -51,8 +51,8 @@ lock object is created for each thread allowing them to execute concurrently.
- The CERT Oracle Secure Coding Standard for Java:
- LCK01-J. Do not synchronize on objects that may be reused,
+ SEI CERT Oracle Coding Standard for Java:
+ LCK01-J. Do not synchronize on objects that may be reused,
diff --git a/java/ql/src/Likely Bugs/Concurrency/SynchSetUnsynchGet.qhelp b/java/ql/src/Likely Bugs/Concurrency/SynchSetUnsynchGet.qhelp
index d63b49dfb442..f848867370db 100644
--- a/java/ql/src/Likely Bugs/Concurrency/SynchSetUnsynchGet.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/SynchSetUnsynchGet.qhelp
@@ -23,8 +23,8 @@ Synchronize read operations as well as write operations. You should usually sync
- The Java Language Specification:
- Synchronization.
+ Java Language Specification:
+ Synchronization.
diff --git a/java/ql/src/Likely Bugs/Concurrency/SynchWriteObject.qhelp b/java/ql/src/Likely Bugs/Concurrency/SynchWriteObject.qhelp
index 719a1c5e69e7..3ed5dd02f892 100644
--- a/java/ql/src/Likely Bugs/Concurrency/SynchWriteObject.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/SynchWriteObject.qhelp
@@ -25,8 +25,8 @@ should usually be synchronized as well.
- The Java Language Specification:
- Synchronization.
+ Java Language Specification:
+ Synchronization.
diff --git a/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.qhelp b/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.qhelp
index b2e1ced85364..eb8dd211083c 100644
--- a/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/UnreleasedLock.qhelp
@@ -40,9 +40,9 @@ the method might not unlock, so this should be avoided.
-Java API Documentation:
-java.util.concurrent.locks.Lock,
-java.util.concurrent.locks.ReentrantLock.
+Java API Specification:
+java.util.concurrent.locks.Lock,
+java.util.concurrent.locks.ReentrantLock.
diff --git a/java/ql/src/Likely Bugs/Concurrency/WaitOutsideLoop.qhelp b/java/ql/src/Likely Bugs/Concurrency/WaitOutsideLoop.qhelp
index 682cc09f38d5..89abe809f09c 100644
--- a/java/ql/src/Likely Bugs/Concurrency/WaitOutsideLoop.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/WaitOutsideLoop.qhelp
@@ -31,8 +31,8 @@ the loop:
J. Bloch, Effective Java (second edition), p. 276. Addison-Wesley, 2008.
- Java API Documentation: Object.wait().
- The Java Tutorials: Guarded Blocks.
+ Java API Specification: Object.wait().
+ The Java Tutorials: Guarded Blocks.
diff --git a/java/ql/src/Likely Bugs/Concurrency/WaitWithTwoLocks.qhelp b/java/ql/src/Likely Bugs/Concurrency/WaitWithTwoLocks.qhelp
index ee84d36578a5..170cf26dbd51 100644
--- a/java/ql/src/Likely Bugs/Concurrency/WaitWithTwoLocks.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/WaitWithTwoLocks.qhelp
@@ -37,7 +37,7 @@ can proceed.
- Java API Documentation: Object.wait().
+ Java API Specification: Object.wait().
diff --git a/java/ql/src/Likely Bugs/Concurrency/YieldCalls.qhelp b/java/ql/src/Likely Bugs/Concurrency/YieldCalls.qhelp
index a26e715e10af..78ea12dcc07e 100644
--- a/java/ql/src/Likely Bugs/Concurrency/YieldCalls.qhelp
+++ b/java/ql/src/Likely Bugs/Concurrency/YieldCalls.qhelp
@@ -29,12 +29,12 @@ In some cases, calls to Thread.sleep may be appropriate to temporar
J. Bloch, Effective Java (second edition), Item 72. Addison-Wesley, 2008.
- Java API Documentation:
- Thread.yield(),
- Object.wait(),
- Object.notifyAll(),
- java.util.concurrent,
- Thread.sleep().
+ Java API Specification:
+ Thread.yield(),
+ Object.wait(),
+ Object.notifyAll(),
+ java.util.concurrent,
+ Thread.sleep().
diff --git a/java/ql/src/Likely Bugs/Finalization/NullifiedSuperFinalize.qhelp b/java/ql/src/Likely Bugs/Finalization/NullifiedSuperFinalize.qhelp
index 35b39977b463..c5b9071f5e97 100644
--- a/java/ql/src/Likely Bugs/Finalization/NullifiedSuperFinalize.qhelp
+++ b/java/ql/src/Likely Bugs/Finalization/NullifiedSuperFinalize.qhelp
@@ -46,8 +46,8 @@ which means that native resources are not disposed of. However, RightCache
- Java 7 API Documentation:
- Object.finalize().
+ Java API Specification:
+ Object.finalize().
J. Bloch, Effective Java (second edition), Item 7. Addison-Wesley, 2008.
diff --git a/java/ql/src/Likely Bugs/Frameworks/Swing/BadlyOverriddenAdapter.qhelp b/java/ql/src/Likely Bugs/Frameworks/Swing/BadlyOverriddenAdapter.qhelp
index 7329123073a2..4ddae013f067 100644
--- a/java/ql/src/Likely Bugs/Frameworks/Swing/BadlyOverriddenAdapter.qhelp
+++ b/java/ql/src/Likely Bugs/Frameworks/Swing/BadlyOverriddenAdapter.qhelp
@@ -84,12 +84,12 @@ not a function of the same name to be overridden.
D. Flanagan, Java Foundation Classes in a Nutshell, Chapter 26. O'Reilly, 1999.
-Java Platform, Standard Edition 7, API Specification:
-Annotation Type Override.
+Java API Specification:
+Annotation Type Override.
The Java Tutorials:
-Event Adapters.
+Event Adapters.
diff --git a/java/ql/src/Likely Bugs/Frameworks/Swing/ThreadSafety.qhelp b/java/ql/src/Likely Bugs/Frameworks/Swing/ThreadSafety.qhelp
index 3da88fbcb4fa..af79f45d59ca 100644
--- a/java/ql/src/Likely Bugs/Frameworks/Swing/ThreadSafety.qhelp
+++ b/java/ql/src/Likely Bugs/Frameworks/Swing/ThreadSafety.qhelp
@@ -98,11 +98,11 @@ Java Developer's Journal:
The Java Tutorials:
-Concurrency in Swing.
+Concurrency in Swing.
The Swing Connection:
-Threads and Swing.
+Threads and Swing.
diff --git a/java/ql/src/Likely Bugs/I18N/MissingLocaleArgument.qhelp b/java/ql/src/Likely Bugs/I18N/MissingLocaleArgument.qhelp
index 68ef88f814b2..2f120713d31a 100644
--- a/java/ql/src/Likely Bugs/I18N/MissingLocaleArgument.qhelp
+++ b/java/ql/src/Likely Bugs/I18N/MissingLocaleArgument.qhelp
@@ -26,8 +26,7 @@ across all locales. For example:
for different locales. For example, if the default locale is ENGLISH, the function toLowerCase()
converts a capital I to i; if the default locale is TURKISH, the function
toLowerCase() converts a capital I to the Unicode Character "Latin small
-letter dotless i" (U+0131) (Turkish HTML
-Codes, Unicode Hexadecimal & HTML Names).
+letter dotless i" (U+0131).
To ensure that an English string is returned, regardless of the default locale, the example shows
@@ -42,8 +41,8 @@ assumes that the text is English. If the text is Turkish, you should pass
-Java API Documentation:
-String.toUpperCase().
+Java API Specification:
+String.toUpperCase().
diff --git a/java/ql/src/Likely Bugs/Inheritance/NoNonFinalInConstructor.qhelp b/java/ql/src/Likely Bugs/Inheritance/NoNonFinalInConstructor.qhelp
index cca1d2f7d315..c671a59facf7 100644
--- a/java/ql/src/Likely Bugs/Inheritance/NoNonFinalInConstructor.qhelp
+++ b/java/ql/src/Likely Bugs/Inheritance/NoNonFinalInConstructor.qhelp
@@ -49,7 +49,7 @@ To avoid this problem:
The Java Tutorials:
- Writing Final Classes and Methods.
+ Writing Final Classes and Methods.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/ConstructorTypo.qhelp b/java/ql/src/Likely Bugs/Likely Typos/ConstructorTypo.qhelp
index 2d0aa9af1b24..15af15c93323 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/ConstructorTypo.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/ConstructorTypo.qhelp
@@ -42,12 +42,12 @@ E. Gamma, R. Helm, R. Johnson, J. Vlissides,
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
Java Language Specification:
-8.4 Method Declarations,
-8.8 Constructor Declarations.
+8.4 Method Declarations,
+8.8 Constructor Declarations.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/ContainerSizeCmpZero.qhelp b/java/ql/src/Likely Bugs/Likely Typos/ContainerSizeCmpZero.qhelp
index 712b94cbaebe..46613f3f550b 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/ContainerSizeCmpZero.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/ContainerSizeCmpZero.qhelp
@@ -29,15 +29,15 @@
-Java 2 Platform, Standard Edition 6.0, API Specification:
+Java API Specification:
-
+
Collection.isEmpty(),
-
+
Map.isEmpty(),
-
+
String.isEmpty().
diff --git a/java/ql/src/Likely Bugs/Likely Typos/ContradictoryTypeChecks.qhelp b/java/ql/src/Likely Bugs/Likely Typos/ContradictoryTypeChecks.qhelp
index bf89dca5870d..2e9588d786a9 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/ContradictoryTypeChecks.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/ContradictoryTypeChecks.qhelp
@@ -48,7 +48,7 @@ the two conditions should be swapped:
-Java Language Specification: Type Comparison Operator instanceof.
+Java Language Specification: Type Comparison Operator instanceof.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/DangerousNonCircuitLogic.qhelp b/java/ql/src/Likely Bugs/Likely Typos/DangerousNonCircuitLogic.qhelp
index 48d4d37c5ab6..3328aa3f6445 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/DangerousNonCircuitLogic.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/DangerousNonCircuitLogic.qhelp
@@ -56,9 +56,9 @@ operator are always evaluated, so if surname is
Java Language Specification:
-15.22.2 Boolean Logical Operators &, ^, and |,
-15.23 Conditional-And Operator &&,
-15.24 Conditional-Or Operator ||.
+15.22.2 Boolean Logical Operators &, ^, and |,
+15.23 Conditional-And Operator &&,
+15.24 Conditional-Or Operator ||.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/EqualsTypo.qhelp b/java/ql/src/Likely Bugs/Likely Typos/EqualsTypo.qhelp
index 8d410cc883e9..eb37ab641566 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/EqualsTypo.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/EqualsTypo.qhelp
@@ -26,8 +26,8 @@ rename it to avoid confusion with the inherited method Object.equals
-Java 2 Platform, Standard Edition 5.0, API Specification:
-
+Java API Specification:
+
equals.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/FormatStringsOverview.qhelp b/java/ql/src/Likely Bugs/Likely Typos/FormatStringsOverview.inc.qhelp
similarity index 100%
rename from java/ql/src/Likely Bugs/Likely Typos/FormatStringsOverview.qhelp
rename to java/ql/src/Likely Bugs/Likely Typos/FormatStringsOverview.inc.qhelp
diff --git a/java/ql/src/Likely Bugs/Likely Typos/FormatStringsRefs.inc.qhelp b/java/ql/src/Likely Bugs/Likely Typos/FormatStringsRefs.inc.qhelp
new file mode 100644
index 000000000000..2380c12d24ec
--- /dev/null
+++ b/java/ql/src/Likely Bugs/Likely Typos/FormatStringsRefs.inc.qhelp
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+Java API Specification:
+Format string syntax,
+Class String,
+Class Formatter,
+Class Console,
+Class PrintWriter,
+Class PrintStream.
+
+SLF4J library:
+org.slf4j.Logger.
+
+
+
+
+
diff --git a/java/ql/src/Likely Bugs/Likely Typos/FormatStringsRefs.qhelp b/java/ql/src/Likely Bugs/Likely Typos/FormatStringsRefs.qhelp
deleted file mode 100644
index 99224f670e2e..000000000000
--- a/java/ql/src/Likely Bugs/Likely Typos/FormatStringsRefs.qhelp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-The Java API Specification:
-Format string syntax,
-Class String,
-Class Formatter,
-Class Console,
-Class PrintWriter,
-Class PrintStream.
-
-
-org.slf4j.Logger.
-
-
-
-
-
diff --git a/java/ql/src/Likely Bugs/Likely Typos/HashCodeTypo.qhelp b/java/ql/src/Likely Bugs/Likely Typos/HashCodeTypo.qhelp
index d5fa0d0e74b5..72ed6c479c22 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/HashCodeTypo.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/HashCodeTypo.qhelp
@@ -26,9 +26,9 @@ rename it to avoid confusion with the inherited method Object.hashCode
-Java 2 Platform, Standard Edition 5.0, API Specification:
-
-hashCode.
+Java API Specification:
+
+Object.hashCode.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/MissingFormatArg.qhelp b/java/ql/src/Likely Bugs/Likely Typos/MissingFormatArg.qhelp
index 07d6a89f0198..0836cb82678e 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/MissingFormatArg.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/MissingFormatArg.qhelp
@@ -3,7 +3,7 @@
"qhelp.dtd">
-
+
@@ -22,6 +22,6 @@ format string refers to two arguments, so this will throw an
-
+
diff --git a/java/ql/src/Likely Bugs/Likely Typos/MissingSpaceTypo.qhelp b/java/ql/src/Likely Bugs/Likely Typos/MissingSpaceTypo.qhelp
index da899e8e4ace..92bb95eb047c 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/MissingSpaceTypo.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/MissingSpaceTypo.qhelp
@@ -32,7 +32,7 @@ omits a space character between the two words at the line break.
Java Language Specification:
-String Literals.
+String Literals.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/NestedLoopsSameVariable.qhelp b/java/ql/src/Likely Bugs/Likely Typos/NestedLoopsSameVariable.qhelp
index 485e8d7973a1..4932dd62f72f 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/NestedLoopsSameVariable.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/NestedLoopsSameVariable.qhelp
@@ -21,8 +21,8 @@ This is probably a typographical error.
- The Java Language Specification:
- The basic for Statement.
+ Java Language Specification:
+ The basic for Statement.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.qhelp b/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.qhelp
index 43444bb32ec7..7e260183e760 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/SelfAssignment.qhelp
@@ -33,7 +33,7 @@ corrected method.
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/StringBufferCharInit.qhelp b/java/ql/src/Likely Bugs/Likely Typos/StringBufferCharInit.qhelp
index ad7bdea703f2..48004a1f1186 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/StringBufferCharInit.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/StringBufferCharInit.qhelp
@@ -44,12 +44,12 @@ Addison-Wesley, 2005.
NetBeans IDE: Java Hints
-PMD: Rule StringBufferInstantiationWithChar
+PMD: Rule StringBufferInstantiationWithChar
Java API:
-java.lang.StringBuffer,
-java.lang.StringBuilder.
+StringBuffer,
+java.lang.StringBuilder.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/SuspiciousDateFormat.qhelp b/java/ql/src/Likely Bugs/Likely Typos/SuspiciousDateFormat.qhelp
index 7f8a743b7d42..ca1abbc6ed58 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/SuspiciousDateFormat.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/SuspiciousDateFormat.qhelp
@@ -34,8 +34,8 @@
- Java Platform, Standard Edition 7, API Specification:
- SimpleDateFormat.
+ Java API Specification:
+ SimpleDateFormat.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/ToStringTypo.qhelp b/java/ql/src/Likely Bugs/Likely Typos/ToStringTypo.qhelp
index eb879232dfb0..9e37ea0559da 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/ToStringTypo.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/ToStringTypo.qhelp
@@ -26,9 +26,9 @@ rename it to avoid confusion with the inherited method Object.toString
-Java 2 Platform, Standard Edition 5.0, API Specification:
-
-toString.
+Java API Specification:
+
+Object.toString.
diff --git a/java/ql/src/Likely Bugs/Likely Typos/UnusedFormatArg.qhelp b/java/ql/src/Likely Bugs/Likely Typos/UnusedFormatArg.qhelp
index 944e9d86a485..641a2d89b362 100644
--- a/java/ql/src/Likely Bugs/Likely Typos/UnusedFormatArg.qhelp
+++ b/java/ql/src/Likely Bugs/Likely Typos/UnusedFormatArg.qhelp
@@ -3,7 +3,7 @@
"qhelp.dtd">
-
+
@@ -21,6 +21,6 @@ third argument.
-
+
diff --git a/java/ql/src/Likely Bugs/Nullness/NullAlways.qhelp b/java/ql/src/Likely Bugs/Nullness/NullAlways.qhelp
index c5cee6b4e891..802e1f7659ec 100644
--- a/java/ql/src/Likely Bugs/Nullness/NullAlways.qhelp
+++ b/java/ql/src/Likely Bugs/Nullness/NullAlways.qhelp
@@ -36,12 +36,12 @@ the expression correctly by using && instead of
-Java Tutorial:
+The Java Tutorials:
Autoboxing and Unboxing.
-Java Specification:
-Conditional Operator ? :.
+Java Language Specification:
+Conditional Operator ? :.
diff --git a/java/ql/src/Likely Bugs/Nullness/NullExprDeref.qhelp b/java/ql/src/Likely Bugs/Nullness/NullExprDeref.qhelp
index 6ec57262ebf8..69852e8f136e 100644
--- a/java/ql/src/Likely Bugs/Nullness/NullExprDeref.qhelp
+++ b/java/ql/src/Likely Bugs/Nullness/NullExprDeref.qhelp
@@ -31,7 +31,7 @@ If the method is intended to return null, the return type should be
-Java Tutorial:
+The Java Tutorials:
Autoboxing and Unboxing.
diff --git a/java/ql/src/Likely Bugs/Nullness/NullMaybe.qhelp b/java/ql/src/Likely Bugs/Nullness/NullMaybe.qhelp
index f03e62ecb5b8..832e6f4579cd 100644
--- a/java/ql/src/Likely Bugs/Nullness/NullMaybe.qhelp
+++ b/java/ql/src/Likely Bugs/Nullness/NullMaybe.qhelp
@@ -41,12 +41,12 @@ that both branches of the conditional operator have the same type.
-Java Tutorial:
+The Java Tutorials:
Autoboxing and Unboxing.
-Java Specification:
-Conditional Operator ? :.
+Java Language Specification:
+Conditional Operator ? :.
diff --git a/java/ql/src/Likely Bugs/Reflection/AnnotationPresentCheck.qhelp b/java/ql/src/Likely Bugs/Reflection/AnnotationPresentCheck.qhelp
index 4c67123614fd..b3bf27905488 100644
--- a/java/ql/src/Likely Bugs/Reflection/AnnotationPresentCheck.qhelp
+++ b/java/ql/src/Likely Bugs/Reflection/AnnotationPresentCheck.qhelp
@@ -35,10 +35,10 @@ because the annotation cannot be observed using reflection.
- Java API Documentation:
- Annotation Type Retention,
- RetentionPolicy.RUNTIME,
- AnnotatedElement.isAnnotationPresent().
+ Java API Specification:
+ Annotation Type Retention,
+ RetentionPolicy.RUNTIME,
+ AnnotatedElement.isAnnotationPresent().
diff --git a/java/ql/src/Likely Bugs/Resource Leaks/CloseReader.qhelp b/java/ql/src/Likely Bugs/Resource Leaks/CloseReader.qhelp
index 3de3880c0f15..4d06bef040e3 100644
--- a/java/ql/src/Likely Bugs/Resource Leaks/CloseReader.qhelp
+++ b/java/ql/src/Likely Bugs/Resource Leaks/CloseReader.qhelp
@@ -51,10 +51,10 @@ In this case, the inner expression needs to be assigned to a local variable and
- IBM developerWorks: Java theory and practice: Good housekeeping practices.
+ IBM developerWorks: Java theory and practice: Good housekeeping practices.
- The Java Tutorials: The try-with-resources Statement.
+ The Java Tutorials: The try-with-resources Statement.
diff --git a/java/ql/src/Likely Bugs/Resource Leaks/CloseSql.qhelp b/java/ql/src/Likely Bugs/Resource Leaks/CloseSql.qhelp
index 10c72e58efaf..8f89d16ef1d2 100644
--- a/java/ql/src/Likely Bugs/Resource Leaks/CloseSql.qhelp
+++ b/java/ql/src/Likely Bugs/Resource Leaks/CloseSql.qhelp
@@ -40,10 +40,10 @@ by the code that created it or by a server shutdown procedure, as appropriate.
- IBM developerWorks: Java theory and practice: Good housekeeping practices.
+ IBM developerWorks: Java theory and practice: Good housekeeping practices.
- The Java Tutorials: The try-with-resources Statement.
+ The Java Tutorials: The try-with-resources Statement.
diff --git a/java/ql/src/Likely Bugs/Resource Leaks/CloseWriter.qhelp b/java/ql/src/Likely Bugs/Resource Leaks/CloseWriter.qhelp
index 1e768567f483..36e834ecefda 100644
--- a/java/ql/src/Likely Bugs/Resource Leaks/CloseWriter.qhelp
+++ b/java/ql/src/Likely Bugs/Resource Leaks/CloseWriter.qhelp
@@ -50,10 +50,10 @@ In this case, the inner expression needs to be assigned to a local variable and
- IBM developerWorks: Java theory and practice: Good housekeeping practices.
+ IBM developerWorks: Java theory and practice: Good housekeeping practices.
- The Java Tutorials: The try-with-resources Statement.
+ The Java Tutorials: The try-with-resources Statement.
diff --git a/java/ql/src/Likely Bugs/Serialization/IncorrectSerialVersionUID.qhelp b/java/ql/src/Likely Bugs/Serialization/IncorrectSerialVersionUID.qhelp
index c80be5f5f18e..d00d097d8f3e 100644
--- a/java/ql/src/Likely Bugs/Serialization/IncorrectSerialVersionUID.qhelp
+++ b/java/ql/src/Likely Bugs/Serialization/IncorrectSerialVersionUID.qhelp
@@ -30,11 +30,11 @@ so that it is used by the framework.
- Java API Documentation:
- Serializable.
+ Java API Specification:
+ Serializable.
- JavaWorld: Ensure proper version control for serialized objects.
+ JavaWorld: Ensure proper version control for serialized objects.
diff --git a/java/ql/src/Likely Bugs/Serialization/IncorrectSerializableMethods.qhelp b/java/ql/src/Likely Bugs/Serialization/IncorrectSerializableMethods.qhelp
index fbb1f0541050..8fe190866713 100644
--- a/java/ql/src/Likely Bugs/Serialization/IncorrectSerializableMethods.qhelp
+++ b/java/ql/src/Likely Bugs/Serialization/IncorrectSerializableMethods.qhelp
@@ -34,12 +34,12 @@ correctly.
- Java API Documentation:
- Serializable.
+ Java API Specification:
+ Serializable.
Oracle Technology Network:
- Discover the secrets of the Java Serialization API.
+ Discover the secrets of the Java Serialization API.
diff --git a/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorOnExternalizable.qhelp b/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorOnExternalizable.qhelp
index 8dbfbcb97b1e..27522672a1ea 100644
--- a/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorOnExternalizable.qhelp
+++ b/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorOnExternalizable.qhelp
@@ -40,8 +40,8 @@ object is deserialized successfully.
- Java API Documentation:
- Externalizable.
+ Java API Specification:
+ Externalizable.
diff --git a/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorsOnSerializable.qhelp b/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorsOnSerializable.qhelp
index 72fabede0da1..b4de17c88763 100644
--- a/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorsOnSerializable.qhelp
+++ b/java/ql/src/Likely Bugs/Serialization/MissingVoidConstructorsOnSerializable.qhelp
@@ -38,8 +38,8 @@ superclass WrongItem does not declare a no-argument constructor. Ho
-Java API Documentation:
-Serializable.
+Java API Specification:
+Serializable.
J. Bloch, Effective Java (second edition), Item 74.
diff --git a/java/ql/src/Likely Bugs/Serialization/NonSerializableComparator.qhelp b/java/ql/src/Likely Bugs/Serialization/NonSerializableComparator.qhelp
index eeb13572f561..e976251bfb02 100644
--- a/java/ql/src/Likely Bugs/Serialization/NonSerializableComparator.qhelp
+++ b/java/ql/src/Likely Bugs/Serialization/NonSerializableComparator.qhelp
@@ -46,10 +46,10 @@ it does implement Serializable.
-Java API Documentation:
-Comparator,
-ObjectOutputStream,
-Serializable.
+Java API Specification:
+Comparator,
+ObjectOutputStream,
+Serializable.
diff --git a/java/ql/src/Likely Bugs/Serialization/NonSerializableField.qhelp b/java/ql/src/Likely Bugs/Serialization/NonSerializableField.qhelp
index 81d490f1c443..7cbef18f3f31 100644
--- a/java/ql/src/Likely Bugs/Serialization/NonSerializableField.qhelp
+++ b/java/ql/src/Likely Bugs/Serialization/NonSerializableField.qhelp
@@ -66,9 +66,9 @@ interface.
- Java API Documentation:
- Serializable,
- ObjectOutputStream.
+ Java API Specification:
+ Serializable,
+ ObjectOutputStream.
diff --git a/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.qhelp b/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.qhelp
index 0084fcf10eb7..3eebba897043 100644
--- a/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.qhelp
+++ b/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.qhelp
@@ -55,9 +55,9 @@ However, the class Session can be serialized because it is declared
- Java 6 Object Serialization Specification:
- 1.10 The Serializable Interface,
- 2.1 The ObjectOutputStream Class.
+ Java Object Serialization Specification:
+ 1.10 The Serializable Interface,
+ 2.1 The ObjectOutputStream Class.
diff --git a/java/ql/src/Likely Bugs/Serialization/ReadResolveObject.qhelp b/java/ql/src/Likely Bugs/Serialization/ReadResolveObject.qhelp
index 96f8b3b3f30a..7b8e4f2280d5 100644
--- a/java/ql/src/Likely Bugs/Serialization/ReadResolveObject.qhelp
+++ b/java/ql/src/Likely Bugs/Serialization/ReadResolveObject.qhelp
@@ -46,13 +46,13 @@ the singleton.
-Java API Documentation:
-Serializable.
+Java API Specification:
+Serializable.
-Java 6 Object Serialization Specification:
-3.7 The readResolve Method,
-1.12 Serialization of Enum Constants.
+Java Object Serialization Specification:
+3.7 The readResolve Method,
+1.12 Serialization of Enum Constants.
J. Bloch, Effective Java (second edition),
diff --git a/java/ql/src/Likely Bugs/Serialization/TransientNotSerializable.qhelp b/java/ql/src/Likely Bugs/Serialization/TransientNotSerializable.qhelp
index 395336b95c14..6939e0577af6 100644
--- a/java/ql/src/Likely Bugs/Serialization/TransientNotSerializable.qhelp
+++ b/java/ql/src/Likely Bugs/Serialization/TransientNotSerializable.qhelp
@@ -35,12 +35,12 @@ in the class that implements Serializable.
- Java Language Specification, 3rd Ed:
- 8.3.1.3 transient Fields.
+ Java Language Specification:
+ 8.3.1.3 transient Fields.
- Java 6 Object Serialization Specification:
- 1.5 Defining Serializable Fields for a Class.
+ Java Object Serialization Specification:
+ 1.5 Defining Serializable Fields for a Class.
diff --git a/java/ql/src/Likely Bugs/Statements/ContinueInFalseLoop.qhelp b/java/ql/src/Likely Bugs/Statements/ContinueInFalseLoop.qhelp
index 73e5381be333..bf8e9b6b93a6 100644
--- a/java/ql/src/Likely Bugs/Statements/ContinueInFalseLoop.qhelp
+++ b/java/ql/src/Likely Bugs/Statements/ContinueInFalseLoop.qhelp
@@ -19,7 +19,7 @@
Java Language Specification:
-14.13 The do Statement.
+14.13 The do Statement.
diff --git a/java/ql/src/Likely Bugs/Statements/EmptyBlock.qhelp b/java/ql/src/Likely Bugs/Statements/EmptyBlock.qhelp
index 29d0b910e734..31d87cdf2a1a 100644
--- a/java/ql/src/Likely Bugs/Statements/EmptyBlock.qhelp
+++ b/java/ql/src/Likely Bugs/Statements/EmptyBlock.qhelp
@@ -35,16 +35,16 @@ Therefore it is a good practice to add a comment to an empty block explaining wh
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
Java Language Specification:
-14.2 Blocks,
-14.6 The Empty Statement,
-14.9 The if Statement,
-14.12 The while Statement,
-14.13 The do Statement,
-14.14 The for Statement.
+14.2 Blocks,
+14.6 The Empty Statement,
+14.9 The if Statement,
+14.12 The while Statement,
+14.13 The do Statement,
+14.14 The for Statement.
diff --git a/java/ql/src/Likely Bugs/Statements/EmptySynchronizedBlock.qhelp b/java/ql/src/Likely Bugs/Statements/EmptySynchronizedBlock.qhelp
index fcf83b44fddc..d778a38351d5 100644
--- a/java/ql/src/Likely Bugs/Statements/EmptySynchronizedBlock.qhelp
+++ b/java/ql/src/Likely Bugs/Statements/EmptySynchronizedBlock.qhelp
@@ -23,12 +23,12 @@ within the synchronized block.
- The Java Language Specification:
- The synchronized Statement.
+ Java Language Specification:
+ The synchronized Statement.
The Java Tutorials:
- Synchronization.
+ Synchronization.
diff --git a/java/ql/src/Likely Bugs/Statements/ImpossibleCast.qhelp b/java/ql/src/Likely Bugs/Statements/ImpossibleCast.qhelp
index 8f6d4140cad8..a2bac11eea7a 100644
--- a/java/ql/src/Likely Bugs/Statements/ImpossibleCast.qhelp
+++ b/java/ql/src/Likely Bugs/Statements/ImpossibleCast.qhelp
@@ -32,10 +32,9 @@ even if all the elements of a can be cast to B.
- The Java Language Specification:
- Checked Casts at Run Time,
- Reference Type Casting,
- Subtyping among Array Types.
+ Java Language Specification:
+ Narrowing Reference Conversion,
+ Subtyping among Array Types.
diff --git a/java/ql/src/Likely Bugs/Statements/MissingEnumInSwitch.qhelp b/java/ql/src/Likely Bugs/Statements/MissingEnumInSwitch.qhelp
index bcdd36377f15..9071a5511929 100644
--- a/java/ql/src/Likely Bugs/Statements/MissingEnumInSwitch.qhelp
+++ b/java/ql/src/Likely Bugs/Statements/MissingEnumInSwitch.qhelp
@@ -34,12 +34,12 @@ exception (rather than just having no cases for those constants).
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
Java Language Specification:
-8.9 Enums,
-14.11 The switch Statement.
+8.9 Enum Types,
+14.11 The switch Statement.
diff --git a/java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.qhelp b/java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.qhelp
index 56c81672a21a..b6dc313ec584 100644
--- a/java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.qhelp
+++ b/java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.qhelp
@@ -60,13 +60,13 @@ reachable.
- The Java Language Specification:
- Execution of try-catch,
- Unreachable Statements.
+ Java Language Specification:
+ Execution of try-catch,
+ Unreachable Statements.
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
diff --git a/java/ql/src/Likely Bugs/Statements/StaticFieldWrittenByInstance.qhelp b/java/ql/src/Likely Bugs/Statements/StaticFieldWrittenByInstance.qhelp
index 2f3ebc48d038..c41a6afb4c01 100644
--- a/java/ql/src/Likely Bugs/Statements/StaticFieldWrittenByInstance.qhelp
+++ b/java/ql/src/Likely Bugs/Statements/StaticFieldWrittenByInstance.qhelp
@@ -47,7 +47,7 @@ it will happen exactly once.
Java Language Specification:
- 8.3.1.1 static Fields.
+ 8.3.1.1 static Fields.
diff --git a/java/ql/src/Likely Bugs/Statements/UseBraces.qhelp b/java/ql/src/Likely Bugs/Statements/UseBraces.qhelp
index 16112a4fad27..cdfb1bd318a7 100644
--- a/java/ql/src/Likely Bugs/Statements/UseBraces.qhelp
+++ b/java/ql/src/Likely Bugs/Statements/UseBraces.qhelp
@@ -56,11 +56,11 @@ tab width settings cannot be taken into account.
Java SE Documentation:
- Compound Statements.
+ Compound Statements.
Wikipedia:
- Indent style.
+ Indentation style.
diff --git a/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.qhelp b/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.qhelp
index 20009f99688f..2ef3a9014f12 100644
--- a/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.qhelp
+++ b/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.qhelp
@@ -40,7 +40,7 @@ The solution is to rewrite the code as follows using an if-statemen
Java Language Specification:
-Blocks and Statements.
+Blocks and Statements.
diff --git a/java/ql/src/Likely Bugs/Termination/SpinOnField.qhelp b/java/ql/src/Likely Bugs/Termination/SpinOnField.qhelp
index 3ac646c69107..969205c469fa 100644
--- a/java/ql/src/Likely Bugs/Termination/SpinOnField.qhelp
+++ b/java/ql/src/Likely Bugs/Termination/SpinOnField.qhelp
@@ -37,8 +37,8 @@ library to communicate between threads.
- The Java Language Specification:
- Threads and Locks.
+ Java Language Specification:
+ Threads and Locks.
diff --git a/java/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.qhelp b/java/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.inc.qhelp
similarity index 100%
rename from java/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.qhelp
rename to java/ql/src/Metrics/Files/CommentedOutCodeMetricOverview.inc.qhelp
diff --git a/java/ql/src/Metrics/Files/CommentedOutCodeReferences.qhelp b/java/ql/src/Metrics/Files/CommentedOutCodeReferences.inc.qhelp
similarity index 100%
rename from java/ql/src/Metrics/Files/CommentedOutCodeReferences.qhelp
rename to java/ql/src/Metrics/Files/CommentedOutCodeReferences.inc.qhelp
diff --git a/java/ql/src/Metrics/Files/DuplicationProblems.qhelp b/java/ql/src/Metrics/Files/DuplicationProblems.inc.qhelp
similarity index 100%
rename from java/ql/src/Metrics/Files/DuplicationProblems.qhelp
rename to java/ql/src/Metrics/Files/DuplicationProblems.inc.qhelp
diff --git a/java/ql/src/Metrics/Files/FCommentRatio.qhelp b/java/ql/src/Metrics/Files/FCommentRatio.qhelp
index 8c24e275296c..f2108d6fb54d 100644
--- a/java/ql/src/Metrics/Files/FCommentRatio.qhelp
+++ b/java/ql/src/Metrics/Files/FCommentRatio.qhelp
@@ -2,5 +2,5 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
-
+
diff --git a/java/ql/src/Metrics/Files/FCommentRatioCommon.qhelp b/java/ql/src/Metrics/Files/FCommentRatioCommon.inc.qhelp
similarity index 100%
rename from java/ql/src/Metrics/Files/FCommentRatioCommon.qhelp
rename to java/ql/src/Metrics/Files/FCommentRatioCommon.inc.qhelp
diff --git a/java/ql/src/Metrics/Files/FLinesOfCode.qhelp b/java/ql/src/Metrics/Files/FLinesOfCode.qhelp
index 79fa708599ab..08565f0e4671 100644
--- a/java/ql/src/Metrics/Files/FLinesOfCode.qhelp
+++ b/java/ql/src/Metrics/Files/FLinesOfCode.qhelp
@@ -3,7 +3,7 @@
"qhelp.dtd">
-
+
@@ -36,5 +36,5 @@ will not be maintained by a programmer.
-
+
diff --git a/java/ql/src/Metrics/Files/FLinesOfCodeOverview.qhelp b/java/ql/src/Metrics/Files/FLinesOfCodeOverview.inc.qhelp
similarity index 100%
rename from java/ql/src/Metrics/Files/FLinesOfCodeOverview.qhelp
rename to java/ql/src/Metrics/Files/FLinesOfCodeOverview.inc.qhelp
diff --git a/java/ql/src/Metrics/Files/FLinesOfCodeReferences.qhelp b/java/ql/src/Metrics/Files/FLinesOfCodeReferences.inc.qhelp
similarity index 100%
rename from java/ql/src/Metrics/Files/FLinesOfCodeReferences.qhelp
rename to java/ql/src/Metrics/Files/FLinesOfCodeReferences.inc.qhelp
diff --git a/java/ql/src/Metrics/Files/FLinesOfCommentedCode.qhelp b/java/ql/src/Metrics/Files/FLinesOfCommentedCode.qhelp
index d435289b652c..ff045244d7bb 100644
--- a/java/ql/src/Metrics/Files/FLinesOfCommentedCode.qhelp
+++ b/java/ql/src/Metrics/Files/FLinesOfCommentedCode.qhelp
@@ -2,6 +2,6 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
-
-
+
+
diff --git a/java/ql/src/Metrics/Files/FLinesOfDuplicatedCode.qhelp b/java/ql/src/Metrics/Files/FLinesOfDuplicatedCode.qhelp
index 30a98df0ceeb..80dd9f98e637 100644
--- a/java/ql/src/Metrics/Files/FLinesOfDuplicatedCode.qhelp
+++ b/java/ql/src/Metrics/Files/FLinesOfDuplicatedCode.qhelp
@@ -2,5 +2,5 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
-
+
\ No newline at end of file
diff --git a/javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.qhelp b/java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp
similarity index 94%
rename from javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.qhelp
rename to java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp
index 17171fb75871..6fc36156c110 100644
--- a/javascript/ql/src/Metrics/FLinesOfDuplicatedCodeCommon.qhelp
+++ b/java/ql/src/Metrics/Files/FLinesOfDuplicatedCodeCommon.inc.qhelp
@@ -14,7 +14,7 @@ for a number of reasons.
-
+
diff --git a/java/ql/src/Metrics/Files/FLinesOfSimilarCode.qhelp b/java/ql/src/Metrics/Files/FLinesOfSimilarCode.qhelp
index 3efe6ad66814..bddda6b1b37d 100644
--- a/java/ql/src/Metrics/Files/FLinesOfSimilarCode.qhelp
+++ b/java/ql/src/Metrics/Files/FLinesOfSimilarCode.qhelp
@@ -10,7 +10,7 @@ duplicated code.
-
+
diff --git a/java/ql/src/Metrics/Files/FNumberOfInterfaces.qhelp b/java/ql/src/Metrics/Files/FNumberOfInterfaces.qhelp
index cff4481c447d..d5d722d68df9 100644
--- a/java/ql/src/Metrics/Files/FNumberOfInterfaces.qhelp
+++ b/java/ql/src/Metrics/Files/FNumberOfInterfaces.qhelp
@@ -42,7 +42,7 @@ indeed a class) should be given their own file.
-The Java Language Specification. §9: Interfaces.
+Java Language Specification. 9 Interfaces.
diff --git a/java/ql/src/Metrics/Files/FSelfContainedness.qhelp b/java/ql/src/Metrics/Files/FSelfContainedness.qhelp
index c3729aabfbcc..3a254ca64132 100644
--- a/java/ql/src/Metrics/Files/FSelfContainedness.qhelp
+++ b/java/ql/src/Metrics/Files/FSelfContainedness.qhelp
@@ -55,15 +55,14 @@ external libraries.
-Wikipedia. Software portability. Published online.
+Wikipedia: Software portability
- Java SE 6 Compatibility,
- Oracle Technology Network.
+ Oracle Technology Network: Java SE 6 Compatibility
- The Java Language Specification
- Chapter 13
+ Java Language Specification:
+ Binary Compatibility
diff --git a/java/ql/src/Metrics/RefTypes/TSelfContainedness.qhelp b/java/ql/src/Metrics/RefTypes/TSelfContainedness.qhelp
index 3a4d2bc930e0..cafeb813b27c 100644
--- a/java/ql/src/Metrics/RefTypes/TSelfContainedness.qhelp
+++ b/java/ql/src/Metrics/RefTypes/TSelfContainedness.qhelp
@@ -58,12 +58,11 @@ external libraries.
Wikipedia. Software portability. Published online.
- Java SE 6 Compatibility,
- Oracle Technology Network.
+ Oracle Technology Network: Java SE 6 Compatibility
- The Java Language Specification
- Chapter 13
+ Java Language Specification:
+ Binary Compatibility
diff --git a/java/ql/src/Performance/ConcatenationInLoops.qhelp b/java/ql/src/Performance/ConcatenationInLoops.qhelp
index cc5f79a3741d..a97279a14329 100644
--- a/java/ql/src/Performance/ConcatenationInLoops.qhelp
+++ b/java/ql/src/Performance/ConcatenationInLoops.qhelp
@@ -47,9 +47,9 @@ orders of magnitude faster.
Addison-Wesley, 2008.
- Java Platform, Standard Edition 6, API Specification:
- StringBuffer,
- StringBuilder.
+ Java API Specification:
+ StringBuffer,
+ StringBuilder.
diff --git a/java/ql/src/Performance/InefficientEmptyStringTest.qhelp b/java/ql/src/Performance/InefficientEmptyStringTest.qhelp
index ccde60c25579..c02f0704bbc0 100644
--- a/java/ql/src/Performance/InefficientEmptyStringTest.qhelp
+++ b/java/ql/src/Performance/InefficientEmptyStringTest.qhelp
@@ -45,9 +45,10 @@ the program.
- Java Platform, Standard Edition 6, API Specification:
- String.length(),
- String.equals().
+ Java API Specification:
+ String.length(),
+ String.isEmpty(),
+ String.equals().
diff --git a/java/ql/src/Performance/InefficientKeySetIterator.qhelp b/java/ql/src/Performance/InefficientKeySetIterator.qhelp
index 798b78fb7884..35697a647f3c 100644
--- a/java/ql/src/Performance/InefficientKeySetIterator.qhelp
+++ b/java/ql/src/Performance/InefficientKeySetIterator.qhelp
@@ -38,8 +38,8 @@ using the entry set because the loop body needs both the key and the value for e
- Java Platform, Standard Edition 6, API Specification:
- Map.entrySet().
+ Java API Specification:
+ Map.entrySet().
diff --git a/java/ql/src/Performance/InefficientOutputStream.qhelp b/java/ql/src/Performance/InefficientOutputStream.qhelp
index 6cee00001060..10fefdbb5400 100644
--- a/java/ql/src/Performance/InefficientOutputStream.qhelp
+++ b/java/ql/src/Performance/InefficientOutputStream.qhelp
@@ -55,9 +55,9 @@
- Java Platform, Standard Edition 8, API Documentation:
- OutputStream.write(byte[] b, int off, int len),
- FilterOutputStream.write(byte[] b, int off, int len).
+ Java API Specification:
+ OutputStream.write(byte[] b, int off, int len),
+ FilterOutputStream.write(byte[] b, int off, int len).
diff --git a/java/ql/src/Performance/InefficientPrimConstructor.qhelp b/java/ql/src/Performance/InefficientPrimConstructor.qhelp
index eda20a82be2f..739522618a7a 100644
--- a/java/ql/src/Performance/InefficientPrimConstructor.qhelp
+++ b/java/ql/src/Performance/InefficientPrimConstructor.qhelp
@@ -47,14 +47,15 @@ an argument of this type.
Addison-Wesley, 2008.
- Java Platform, Standard Edition 6, API Documentation:
- Boolean.valueOf(),
- Byte.valueOf(),
- Short.valueOf(),
- Integer.valueOf(),
- Long.valueOf(),
- Float.valueOf(),
- Double.valueOf().
+ Java API Specification:
+ Boolean.valueOf(),
+ Byte.valueOf(),
+ Short.valueOf(),
+ Character.valueOf(),
+ Integer.valueOf(),
+ Long.valueOf(),
+ Float.valueOf(),
+ Double.valueOf().
diff --git a/java/ql/src/Performance/InnerClassCouldBeStatic.qhelp b/java/ql/src/Performance/InnerClassCouldBeStatic.qhelp
index b029582c193b..74e23a5e1443 100644
--- a/java/ql/src/Performance/InnerClassCouldBeStatic.qhelp
+++ b/java/ql/src/Performance/InnerClassCouldBeStatic.qhelp
@@ -52,11 +52,11 @@ parameterizing the nested class by that type variable.
Java Language Specification:
- 8.1.3. Inner Classes and Enclosing Instances.
+ 8.1.3. Inner Classes and Enclosing Instances.
The Java Tutorials:
- Nested Classes.
+ Nested Classes.
diff --git a/java/ql/src/Performance/NewStringString.qhelp b/java/ql/src/Performance/NewStringString.qhelp
index 4c5be9a83415..5859e9e4f023 100644
--- a/java/ql/src/Performance/NewStringString.qhelp
+++ b/java/ql/src/Performance/NewStringString.qhelp
@@ -38,8 +38,8 @@ memory churn.
Addison-Wesley, 2008.
- Java Platform, Standard Edition 6, API Specification:
- String(String).
+ Java API Specification:
+ String(String).
diff --git a/java/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp b/java/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp
index c813d5c7fd3c..a8b7508763cb 100644
--- a/java/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp
+++ b/java/ql/src/Security/CWE/CWE-078/ExecTainted.qhelp
@@ -35,8 +35,8 @@ without examining it first.
OWASP:
Command Injection.
-The CERT Oracle Secure Coding Standard for Java:
- IDS07-J. Sanitize untrusted data passed to the Runtime.exec() method.
+SEI CERT Oracle Coding Standard for Java:
+ IDS07-J. Sanitize untrusted data passed to the Runtime.exec() method.
diff --git a/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.qhelp b/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.qhelp
index bbae963b7d17..4520828b1be2 100644
--- a/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.qhelp
+++ b/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.qhelp
@@ -36,8 +36,8 @@ an argument.
OWASP:
Command Injection.
-The CERT Oracle Secure Coding Standard for Java:
- IDS07-J. Sanitize untrusted data passed to the Runtime.exec() method.
+SEI CERT Oracle Coding Standard for Java:
+ IDS07-J. Sanitize untrusted data passed to the Runtime.exec() method.
diff --git a/java/ql/src/Security/CWE/CWE-089/HowToAddress.qhelp b/java/ql/src/Security/CWE/CWE-089/HowToAddress.inc.qhelp
similarity index 100%
rename from java/ql/src/Security/CWE/CWE-089/HowToAddress.qhelp
rename to java/ql/src/Security/CWE/CWE-089/HowToAddress.inc.qhelp
diff --git a/java/ql/src/Security/CWE/CWE-089/SqlTainted.qhelp b/java/ql/src/Security/CWE/CWE-089/SqlTainted.qhelp
index f1ba450d4a09..343b7126c9ac 100644
--- a/java/ql/src/Security/CWE/CWE-089/SqlTainted.qhelp
+++ b/java/ql/src/Security/CWE/CWE-089/SqlTainted.qhelp
@@ -11,7 +11,7 @@ SQL and the Java Persistence Query Language.
-
+
@@ -70,9 +70,9 @@ OWASP:
SQL
Injection Prevention Cheat Sheet.
-The CERT Oracle Secure Coding Standard for Java:
- IDS00-J. Prevent SQL injection.
-The Java Tutorials: Using Prepared Statements.
+SEI CERT Oracle Coding Standard for Java:
+ IDS00-J. Prevent SQL injection.
+The Java Tutorials: Using Prepared Statements.
The Java EE Tutorial: The Java Persistence Query Language.
diff --git a/java/ql/src/Security/CWE/CWE-089/SqlUnescaped.qhelp b/java/ql/src/Security/CWE/CWE-089/SqlUnescaped.qhelp
index e469415d683c..f50ba1935e36 100644
--- a/java/ql/src/Security/CWE/CWE-089/SqlUnescaped.qhelp
+++ b/java/ql/src/Security/CWE/CWE-089/SqlUnescaped.qhelp
@@ -13,7 +13,7 @@ it enough to cause the SQL query to fail to run.
-
+
@@ -42,9 +42,9 @@ OWASP:
SQL
Injection Prevention Cheat Sheet.
-The CERT Oracle Secure Coding Standard for Java:
- IDS00-J. Prevent SQL injection.
-The Java Tutorials: Using Prepared Statements.
+SEI CERT Oracle Coding Standard for Java:
+ IDS00-J. Prevent SQL injection.
+The Java Tutorials: Using Prepared Statements.
diff --git a/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstruction.qhelp b/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstruction.qhelp
index 7cfa72612fda..9c71483badc7 100644
--- a/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstruction.qhelp
+++ b/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstruction.qhelp
@@ -32,7 +32,7 @@ access will not throw an ArrayIndexOutOfBoundsException.
-Java API: ArrayIndexOutOfBoundsException.
+Java API Specification: ArrayIndexOutOfBoundsException.
diff --git a/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstructionCodeSpecified.qhelp b/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstructionCodeSpecified.qhelp
index dafc693351c4..d19c3ba39689 100644
--- a/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstructionCodeSpecified.qhelp
+++ b/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayConstructionCodeSpecified.qhelp
@@ -30,7 +30,7 @@ access will not throw an ArrayIndexOutOfBoundsException.
-Java API: ArrayIndexOutOfBoundsException.
+Java API Specification: ArrayIndexOutOfBoundsException.
diff --git a/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndex.qhelp b/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndex.qhelp
index fc41cb72e3ab..2628b2cd0f97 100644
--- a/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndex.qhelp
+++ b/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndex.qhelp
@@ -30,7 +30,7 @@ The index used in the array access should be checked against the bounds of the a
-Java API: ArrayIndexOutOfBoundsException.
+Java API Specification: ArrayIndexOutOfBoundsException.
diff --git a/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndexCodeSpecified.qhelp b/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndexCodeSpecified.qhelp
index 1caeae11a69b..7d7625e4a566 100644
--- a/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndexCodeSpecified.qhelp
+++ b/java/ql/src/Security/CWE/CWE-129/ImproperValidationOfArrayIndexCodeSpecified.qhelp
@@ -42,7 +42,7 @@ In the second case, the array access is protected by a conditional that verifies
-Java API: ArrayIndexOutOfBoundsException.
+Java API Specification: ArrayIndexOutOfBoundsException.
diff --git a/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.qhelp b/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.qhelp
index d6dd3ada7067..a6d2fd664a1b 100644
--- a/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.qhelp
+++ b/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.qhelp
@@ -41,9 +41,9 @@ being evaluated.
-CERT Java Coding Standard: IDS06-J. Exclude unsanitized user input from format strings.
-Java SE Documentation: Formatting Numeric Print Output.
-Java API: Formatter.
+SEI CERT Oracle Coding Standard for Java: IDS06-J. Exclude unsanitized user input from format strings.
+The Java Tutorials: Formatting Numeric Print Output.
+Java API Specification: Formatter.
diff --git a/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.qhelp b/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.qhelp
index 93453d106452..a4a9be399b88 100644
--- a/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.qhelp
+++ b/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.qhelp
@@ -35,8 +35,8 @@ a check before performing a multiplication.
-The CERT Oracle Secure Coding Standard for Java:
- NUM00-J. Detect or prevent integer overflow.
+SEI CERT Oracle Coding Standard for Java:
+ NUM00-J. Detect or prevent integer overflow.
diff --git a/java/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.qhelp b/java/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.qhelp
index 537a32f5dec9..7ed6adcd6b9a 100644
--- a/java/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.qhelp
+++ b/java/ql/src/Security/CWE/CWE-190/ArithmeticUncontrolled.qhelp
@@ -35,8 +35,8 @@ a check before performing a multiplication.
-The CERT Oracle Secure Coding Standard for Java:
- NUM00-J. Detect or prevent integer overflow.
+SEI CERT Oracle Coding Standard for Java:
+ NUM00-J. Detect or prevent integer overflow.
diff --git a/java/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.qhelp b/java/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.qhelp
index e9c18737f4d1..4f4a37878ff2 100644
--- a/java/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.qhelp
+++ b/java/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.qhelp
@@ -24,8 +24,8 @@ is done in the wider type, and so does not overflow.
-The CERT Oracle Secure Coding Standard for Java:
- NUM00-J. Detect or prevent integer overflow.
+SEI CERT Oracle Coding Standard for Java:
+ NUM00-J. Detect or prevent integer overflow.
diff --git a/java/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.qhelp b/java/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.qhelp
index 537b20d4c2c6..0996e79287d6 100644
--- a/java/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.qhelp
+++ b/java/ql/src/Security/CWE/CWE-190/ComparisonWithWiderType.qhelp
@@ -30,8 +30,8 @@ terminates.
-The CERT Oracle Secure Coding Standard for Java:
- NUM00-J. Detect or prevent integer overflow.
+SEI CERT Oracle Coding Standard for Java:
+ NUM00-J. Detect or prevent integer overflow.
diff --git a/java/ql/src/Security/CWE/CWE-312/CleartextStorage.qhelp b/java/ql/src/Security/CWE/CWE-312/CleartextStorage.inc.qhelp
similarity index 85%
rename from java/ql/src/Security/CWE/CWE-312/CleartextStorage.qhelp
rename to java/ql/src/Security/CWE/CWE-312/CleartextStorage.inc.qhelp
index ca631a76c3a8..ca74eed47db9 100644
--- a/java/ql/src/Security/CWE/CWE-312/CleartextStorage.qhelp
+++ b/java/ql/src/Security/CWE/CWE-312/CleartextStorage.inc.qhelp
@@ -29,8 +29,8 @@ storing them.
-The CERT Oracle Secure Coding Standard for Java:
- SER03-J. Do not serialize unencrypted, sensitive data.
+SEI CERT Oracle Coding Standard for Java:
+ SER03-J. Do not serialize unencrypted, sensitive data.
M. Dowd, J. McDonald and J. Schuhm, The Art of Software Security Assessment, 1st Edition, Chapter 2 - 'Common Vulnerabilities of Encryption', p. 43. Addison Wesley, 2006.
M. Howard and D. LeBlanc, Writing Secure Code, 2nd Edition, Chapter 9 - 'Protecting Secret Data', p. 299. Microsoft, 2002.
diff --git a/java/ql/src/Security/CWE/CWE-312/CleartextStorageClass.qhelp b/java/ql/src/Security/CWE/CWE-312/CleartextStorageClass.qhelp
index 884b1dbdd4b4..d715abca84c9 100644
--- a/java/ql/src/Security/CWE/CWE-312/CleartextStorageClass.qhelp
+++ b/java/ql/src/Security/CWE/CWE-312/CleartextStorageClass.qhelp
@@ -2,4 +2,4 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
-
+
diff --git a/java/ql/src/Security/CWE/CWE-312/CleartextStorageCookie.qhelp b/java/ql/src/Security/CWE/CWE-312/CleartextStorageCookie.qhelp
index 884b1dbdd4b4..d715abca84c9 100644
--- a/java/ql/src/Security/CWE/CWE-312/CleartextStorageCookie.qhelp
+++ b/java/ql/src/Security/CWE/CWE-312/CleartextStorageCookie.qhelp
@@ -2,4 +2,4 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
-
+
diff --git a/java/ql/src/Security/CWE/CWE-312/CleartextStorageProperties.qhelp b/java/ql/src/Security/CWE/CWE-312/CleartextStorageProperties.qhelp
index 884b1dbdd4b4..d715abca84c9 100644
--- a/java/ql/src/Security/CWE/CWE-312/CleartextStorageProperties.qhelp
+++ b/java/ql/src/Security/CWE/CWE-312/CleartextStorageProperties.qhelp
@@ -2,4 +2,4 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
-
+
diff --git a/java/ql/src/Security/CWE/CWE-319/HttpsUrls.qhelp b/java/ql/src/Security/CWE/CWE-319/HttpsUrls.qhelp
index 2cfdca624fb8..88852062a470 100644
--- a/java/ql/src/Security/CWE/CWE-319/HttpsUrls.qhelp
+++ b/java/ql/src/Security/CWE/CWE-319/HttpsUrls.qhelp
@@ -30,10 +30,10 @@ connection is a secure SSL connection.
-The CERT Oracle Secure Coding Standard for Java:
- SER03-J. Do not serialize unencrypted, sensitive data.
-Java Platform, Standard Edition 7, API Specification:
-
+SEI CERT Oracle Coding Standard for Java:
+ SER03-J. Do not serialize unencrypted, sensitive data.
+Java API Specification:
+
Class HttpsURLConnection.
OWASP:
diff --git a/java/ql/src/Security/CWE/CWE-319/UseSSL.qhelp b/java/ql/src/Security/CWE/CWE-319/UseSSL.qhelp
index cec4937c8f75..0f381a3edd3a 100644
--- a/java/ql/src/Security/CWE/CWE-319/UseSSL.qhelp
+++ b/java/ql/src/Security/CWE/CWE-319/UseSSL.qhelp
@@ -28,13 +28,13 @@ the connection is a secured SSL connection.
-The CERT Oracle Secure Coding Standard for Java:
- SER03-J. Do not serialize unencrypted, sensitive data.
-Java Platform, Standard Edition 7, API Specification:
-
+SEI CERT Oracle Coding Standard for Java:
+ SER03-J. Do not serialize unencrypted, sensitive data.
+Java API Specification:
+
Class HttpsURLConnection.
-Java Platform, Standard Edition 7, API Specification:
-
+Java API Specification:
+
Class SSLSocket.
OWASP:
diff --git a/java/ql/src/Security/CWE/CWE-319/UseSSLSocketFactories.qhelp b/java/ql/src/Security/CWE/CWE-319/UseSSLSocketFactories.qhelp
index bf0dbc0bcacd..f439ac335ea7 100644
--- a/java/ql/src/Security/CWE/CWE-319/UseSSLSocketFactories.qhelp
+++ b/java/ql/src/Security/CWE/CWE-319/UseSSLSocketFactories.qhelp
@@ -26,10 +26,10 @@ uses explicit SSL factories, which are preferable.
-The CERT Oracle Secure Coding Standard for Java:
- SER03-J. Do not serialize unencrypted, sensitive data.
-Java Platform, Standard Edition 7, API Specification:
-
+SEI CERT Oracle Coding Standard for Java:
+ SER03-J. Do not serialize unencrypted, sensitive data.
+Java API Specification:
+
Class SSLSocketFactory.
OWASP:
diff --git a/java/ql/src/Security/CWE/CWE-614/InsecureCookie.qhelp b/java/ql/src/Security/CWE/CWE-614/InsecureCookie.qhelp
index d49b0905de0d..7afda7d0ce51 100644
--- a/java/ql/src/Security/CWE/CWE-614/InsecureCookie.qhelp
+++ b/java/ql/src/Security/CWE/CWE-614/InsecureCookie.qhelp
@@ -23,10 +23,10 @@ way leaves out the setting of the 'secure' flag; the second way includes the set
-The CERT Oracle Secure Coding Standard for Java:
- SER03-J. Do not serialize unencrypted, sensitive data.
-Java 2 Platform Enterprise Edition, v5.0, API Specifications:
-Class Cookie.
+SEI CERT Oracle Coding Standard for Java:
+ SER03-J. Do not serialize unencrypted, sensitive data.
+Java Platform, Enterprise Edition (Java EE) 7, API Specification:
+Class Cookie.
diff --git a/java/ql/src/Security/CWE/CWE-676/PotentiallyDangerousFunction.qhelp b/java/ql/src/Security/CWE/CWE-676/PotentiallyDangerousFunction.qhelp
index aad17c95b396..10d2d6853b3e 100644
--- a/java/ql/src/Security/CWE/CWE-676/PotentiallyDangerousFunction.qhelp
+++ b/java/ql/src/Security/CWE/CWE-676/PotentiallyDangerousFunction.qhelp
@@ -42,15 +42,14 @@ exit by a particular kind of message being sent on the queue.
-The CERT Oracle Secure Coding Standard for Java:
-THI05-J. Do
+SEI CERT Oracle Coding Standard for Java:
+THI05-J. Do
not use Thread.stop() to terminate threads.
-Java SE
-Documentation: Java
+Java API Specification: Java
Thread Primitive Deprecation.
-Java API:
-Thread.interrupt,
-BlockingQueue.
+Java API Specification:
+Thread.interrupt,
+BlockingQueue.
diff --git a/java/ql/src/Security/CWE/CWE-681/NumericCastTainted.qhelp b/java/ql/src/Security/CWE/CWE-681/NumericCastTainted.qhelp
index 6dd83fab76d8..cb6845e82753 100644
--- a/java/ql/src/Security/CWE/CWE-681/NumericCastTainted.qhelp
+++ b/java/ql/src/Security/CWE/CWE-681/NumericCastTainted.qhelp
@@ -38,8 +38,8 @@ to cast to type int it is rejected as invalid.
-The CERT Oracle Secure Coding Standard for Java:
- NUM12-J. Ensure conversions of numeric types to narrower types do not result in lost or misinterpreted data.
+SEI CERT Oracle Coding Standard for Java:
+ NUM12-J. Ensure conversions of numeric types to narrower types do not result in lost or misinterpreted data.
diff --git a/java/ql/src/Security/CWE/CWE-732/ReadingFromWorldWritableFile.qhelp b/java/ql/src/Security/CWE/CWE-732/ReadingFromWorldWritableFile.qhelp
index 909acdfe889a..5abf572c6980 100644
--- a/java/ql/src/Security/CWE/CWE-732/ReadingFromWorldWritableFile.qhelp
+++ b/java/ql/src/Security/CWE/CWE-732/ReadingFromWorldWritableFile.qhelp
@@ -47,7 +47,7 @@ user. If there may be untrusted users on the system, this is potentially dangero
-The CERT Oracle Secure Coding Standard for Java:
- FIO01-J. Create files with appropriate access permissions.
+SEI CERT Oracle Coding Standard for Java:
+ FIO01-J. Create files with appropriate access permissions.
diff --git a/java/ql/src/Security/CWE/CWE-807/ConditionalBypass.qhelp b/java/ql/src/Security/CWE/CWE-807/ConditionalBypass.qhelp
index 026508134ee4..5bffcbf2a849 100644
--- a/java/ql/src/Security/CWE/CWE-807/ConditionalBypass.qhelp
+++ b/java/ql/src/Security/CWE/CWE-807/ConditionalBypass.qhelp
@@ -35,8 +35,8 @@ secure way shows a decision that is based on looking up the user in a security d
-The CERT Oracle Secure Coding Standard for Java:
- SEC02-J. Do not base security checks on untrusted sources.
+SEI CERT Oracle Coding Standard for Java:
+ SEC02-J. Do not base security checks on untrusted sources.
diff --git a/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.qhelp b/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.qhelp
index aad94ec60414..dd088bcbb974 100644
--- a/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.qhelp
+++ b/java/ql/src/Security/CWE/CWE-807/TaintedPermissionsCheck.qhelp
@@ -37,8 +37,8 @@ not depend on data that is controlled by the user.
-The CERT Oracle Secure Coding Standard for Java:
- SEC02-J. Do not base security checks on untrusted sources.
+SEI CERT Oracle Coding Standard for Java:
+ SEC02-J. Do not base security checks on untrusted sources.
diff --git a/java/ql/src/Security/CWE/CWE-833/LockOrderInconsistency.qhelp b/java/ql/src/Security/CWE/CWE-833/LockOrderInconsistency.qhelp
index 318a9c541dc0..2047da05de9f 100644
--- a/java/ql/src/Security/CWE/CWE-833/LockOrderInconsistency.qhelp
+++ b/java/ql/src/Security/CWE/CWE-833/LockOrderInconsistency.qhelp
@@ -42,14 +42,14 @@ to match the lock order in transferToSecondary.
-The CERT Oracle Secure Coding Standard for Java:
- LCK07-J. Avoid deadlock by requesting and releasing locks in the same order.
+SEI CERT Oracle Coding Standard for Java:
+ LCK07-J. Avoid deadlock by requesting and releasing locks in the same order.
Java Language Specification:
- Synchronization.
+ Synchronization.
- Java API Documentation:
- ReentrantLock.
+ Java API Specification:
+ ReentrantLock.
diff --git a/java/ql/src/Security/CWE/CWE-835/InfiniteLoop.qhelp b/java/ql/src/Security/CWE/CWE-835/InfiniteLoop.qhelp
index 6ee07164bd76..dace20bb7b1e 100644
--- a/java/ql/src/Security/CWE/CWE-835/InfiniteLoop.qhelp
+++ b/java/ql/src/Security/CWE/CWE-835/InfiniteLoop.qhelp
@@ -42,7 +42,7 @@ To fix the loop the condition is corrected to check the right variable.
Java Language Specification:
-Blocks and Statements.
+Blocks and Statements.
diff --git a/java/ql/src/Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.qhelp b/java/ql/src/Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.qhelp
index 949f57ce7a78..f8797e093228 100644
--- a/java/ql/src/Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.qhelp
+++ b/java/ql/src/Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.qhelp
@@ -78,12 +78,12 @@ In any case, care should be taken to ensure correct behavior for
-The Java Language Specification:
-Logical Complement Operator !,
-Boolean Equality Operators == and !=,
-Conditional-And Operator &&,
-Conditional-Or Operator ||,
-Conditional Operator ? :.
+Java Language Specification:
+Logical Complement Operator !,
+Boolean Equality Operators == and !=,
+Conditional-And Operator &&,
+Conditional-Or Operator ||,
+Conditional Operator ? :.
diff --git a/java/ql/src/Violations of Best Practice/Boxed Types/BoxedVariable.qhelp b/java/ql/src/Violations of Best Practice/Boxed Types/BoxedVariable.qhelp
index ff8b11224faa..b9ca80bc49e7 100644
--- a/java/ql/src/Violations of Best Practice/Boxed Types/BoxedVariable.qhelp
+++ b/java/ql/src/Violations of Best Practice/Boxed Types/BoxedVariable.qhelp
@@ -53,9 +53,9 @@ be rewritten in the following way:
-The Java Language Specification:
-Boxing Conversion,
-Unboxing Conversion.
+Java Language Specification:
+Boxing Conversion,
+Unboxing Conversion.
The Java Tutorials:
diff --git a/java/ql/src/Violations of Best Practice/Comments/CommentedCode.qhelp b/java/ql/src/Violations of Best Practice/Comments/CommentedCode.qhelp
index 0997169f4dfc..50e63e8320ee 100644
--- a/java/ql/src/Violations of Best Practice/Comments/CommentedCode.qhelp
+++ b/java/ql/src/Violations of Best Practice/Comments/CommentedCode.qhelp
@@ -2,6 +2,6 @@
"-//Semmle//qhelp//EN"
"qhelp.dtd">
-
-
+
+
diff --git a/java/ql/src/Violations of Best Practice/Comments/CommentedOutCodeQuery.qhelp b/java/ql/src/Violations of Best Practice/Comments/CommentedOutCodeQuery.inc.qhelp
similarity index 100%
rename from java/ql/src/Violations of Best Practice/Comments/CommentedOutCodeQuery.qhelp
rename to java/ql/src/Violations of Best Practice/Comments/CommentedOutCodeQuery.inc.qhelp
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/AssignmentInReturn.qhelp b/java/ql/src/Violations of Best Practice/Dead Code/AssignmentInReturn.qhelp
index bb88ab26d95a..6c1904e6fb1d 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/AssignmentInReturn.qhelp
+++ b/java/ql/src/Violations of Best Practice/Dead Code/AssignmentInReturn.qhelp
@@ -33,9 +33,9 @@ the assignment is redundant. Instead, the last line of the method can be changed
Java Language Specification:
-
+
14.17 The return Statement,
-
+
15.26 Assignment Operators.
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.qhelp b/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.qhelp
index b7e6dc4611ea..e82acd8c1e96 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.qhelp
+++ b/java/ql/src/Violations of Best Practice/Dead Code/CreatesEmptyZip.qhelp
@@ -35,8 +35,8 @@ call to write, an empty ZIP file entry is written to the output str
-Java 2 Platform Standard Edition 5.0, API Specification:
-
+Java API Specification:
+
ZipOutputStream.
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/DeadStoreOfLocalUnread.qhelp b/java/ql/src/Violations of Best Practice/Dead Code/DeadStoreOfLocalUnread.qhelp
index b9bc97d56c91..7ebe551266f2 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/DeadStoreOfLocalUnread.qhelp
+++ b/java/ql/src/Violations of Best Practice/Dead Code/DeadStoreOfLocalUnread.qhelp
@@ -19,5 +19,5 @@ it is important to keep this to preserve the overall behavior.
-
+
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/EmptyFinalize.qhelp b/java/ql/src/Violations of Best Practice/Dead Code/EmptyFinalize.qhelp
index 80c32b87b4e6..c73bb59b7c07 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/EmptyFinalize.qhelp
+++ b/java/ql/src/Violations of Best Practice/Dead Code/EmptyFinalize.qhelp
@@ -30,7 +30,7 @@ that the log file is not closed. To fix this, remove the empty finalize
Java Language Specification:
-12.6 Finalization of Class Instances.
+12.6 Finalization of Class Instances.
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/FinalizerNullsFields.qhelp b/java/ql/src/Violations of Best Practice/Dead Code/FinalizerNullsFields.qhelp
index c0944725c9bf..f85888f651c6 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/FinalizerNullsFields.qhelp
+++ b/java/ql/src/Violations of Best Practice/Dead Code/FinalizerNullsFields.qhelp
@@ -77,11 +77,11 @@ severely affect performance, and you should avoid defining finalize
IBM developerWorks:
- Explicit nulling.
+ Java theory and practice: Explicit nulling.
Oracle Technology Network:
-
+
How to Handle Java Finalization's Memory-Retention Issues
.
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/InterfaceCannotBeImplemented.qhelp b/java/ql/src/Violations of Best Practice/Dead Code/InterfaceCannotBeImplemented.qhelp
index 78e13e2f7073..f6256bcac4be 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/InterfaceCannotBeImplemented.qhelp
+++ b/java/ql/src/Violations of Best Practice/Dead Code/InterfaceCannotBeImplemented.qhelp
@@ -47,11 +47,11 @@ required: java.lang.Object
Help - Eclipse Platform:
-Java Compiler Errors/Warnings Preferences.
+Java Compiler Errors/Warnings Preferences.
-Java Language Specification, Third Edition:
-9.2 Interface Members.
+Java Language Specification:
+9.2 Interface Members.
diff --git a/java/ql/src/Violations of Best Practice/Dead Code/LocalInitialisedButNotUsed.qhelp b/java/ql/src/Violations of Best Practice/Dead Code/LocalInitialisedButNotUsed.qhelp
index f35a9e53a7e4..f801d24eb4b8 100644
--- a/java/ql/src/Violations of Best Practice/Dead Code/LocalInitialisedButNotUsed.qhelp
+++ b/java/ql/src/Violations of Best Practice/Dead Code/LocalInitialisedButNotUsed.qhelp
@@ -19,6 +19,6 @@ it is important to keep this to preserve the overall behavior.
break; at the end of the PING case.
List type on line 5 is imported from.
IOException instead. This is shown in
Addison-Wesley, 2005.
return new HashSet<Item>(items);.
Addison-Wesley, 2008.
getResource on the same class.
toString on a String object.
p
J. Bloch, Effective Java (second edition), Item 10. Addison-Wesley, 2008.
Integer.