[PATCH] SuppressWarnings
Ahmed Ashour
asashour at yahoo.com
Fri Sep 11 11:05:26 UTC 2015
Hi all,
Please find the below patch, which covers:
- Unneeded @SuppressWarnings
- Generics Eclipse warnings
- Spacing before and after comma.
- 'everytime' to be 'every time'
Thanks,
Ahmed
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
Fri Sep 11 11:49:39 2015 +0200
@@ -111,7 +111,7 @@
private final TypeBasedGuardingDynamicLinker[] linkers;
private final List<TypeBasedGuardingDynamicLinker>[]
singletonLinkers;
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings("unchecked")
ClassToLinker(final TypeBasedGuardingDynamicLinker[] linkers) {
this.linkers = linkers;
singletonLinkers = new List[linkers.length];
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Lower.java
Fri Sep 11 11:49:39 2015 +0200
@@ -219,7 +219,7 @@
// If expression is a primitive literal that is not an array index
and does return its string value. Else return null.
private static String getConstantPropertyName(final Expression
expression) {
if (expression instanceof LiteralNode.PrimitiveLiteralNode) {
- final Object value = ((LiteralNode) expression).getValue();
+ final Object value = ((LiteralNode<?>) expression).getValue();
if (value instanceof String &&
SAFE_PROPERTY_NAME.matcher((String) value).matches()) {
return (String) value;
}
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/debug/NashornTextifier.java
Fri Sep 11 11:49:39 2015 +0200
@@ -679,7 +679,7 @@
}
@Override
- public void visitLocalVariable(final String name, final String
desc,final String signature, final Label start, final Label end, final
int index) {
+ public void visitLocalVariable(final String name, final String
desc, final String signature, final Label start, final Label end, final
int index) {
final StringBuilder sb = new StringBuilder();
if (!localVarsStarted) {
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeMath.java
Fri Sep 11 11:49:39 2015 +0200
@@ -238,7 +238,7 @@
*/
@SpecializedFunction
public static double atan2(final Object self, final double y,
final double x) {
- return Math.atan2(y,x);
+ return Math.atan2(y, x);
}
/**
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/DateParser.java
Fri Sep 11 11:49:39 2015 +0200
@@ -78,7 +78,7 @@
private int yearSign = 0;
private boolean namedMonth = false;
- private final static HashMap<String,Name> names = new HashMap<>();
+ private final static HashMap<String, Name> names = new HashMap<>();
static {
addName("monday", Name.DAY_OF_WEEK, 0);
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/AccessorProperty.java
Fri Sep 11 11:49:39 2015 +0200
@@ -649,7 +649,7 @@
final MethodHandle widerSetter =
newProperty.getSetter(type, newMap);
final Class<?> ct = getLocalType();
- mh = MH.filterArguments(widerSetter, 0,
MH.insertArguments(debugReplace(ct, type, currentMap, newMap) , 1, newMap));
+ mh = MH.filterArguments(widerSetter, 0,
MH.insertArguments(debugReplace(ct, type, currentMap, newMap), 1, newMap));
if (ct != null && ct.isPrimitive() && !type.isPrimitive()) {
mh =
ObjectClassGenerator.createGuardBoxedPrimitiveSetter(ct,
generateSetter(ct, ct), mh);
}
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java
Fri Sep 11 11:49:39 2015 +0200
@@ -234,7 +234,7 @@
@Override
public void storeScript(final String cacheKey, final Source
source, final String mainClassName,
- final Map<String,byte[]> classBytes,
final Map<Integer, FunctionInitializer> initializers,
+ final Map<String, byte[]> classBytes,
final Map<Integer, FunctionInitializer> initializers,
final Object[] constants, final int
compilationId) {
if (context.codeStore != null) {
context.codeStore.store(cacheKey, source,
mainClassName, classBytes, initializers, constants, compilationId);
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java
Fri Sep 11 11:49:39 2015 +0200
@@ -235,7 +235,7 @@
}
// Check for explicit constructor signature use
- // Example: new (java.awt["Color(int, int,int)"])(2, 3, 4);
+ // Example: new (java.awt["Color(int, int, int)"])(2, 3, 4);
final int openBrace = propertyName.indexOf('(');
final int closeBrace = propertyName.lastIndexOf(')');
if (openBrace != -1 || closeBrace != -1) {
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
Fri Sep 11 11:49:39 2015 +0200
@@ -679,7 +679,6 @@
* @return either the existing map, or a loaded map from the
persistent type info cache, or a new empty map if
* neither an existing map or a persistent cached type info is
available.
*/
- @SuppressWarnings("unused")
private static Map<Integer, Type>
getEffectiveInvalidatedProgramPoints(
final Map<Integer, Type> invalidatedProgramPoints, final
Object typeInformationFile) {
if(invalidatedProgramPoints != null) {
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java
Fri Sep 11 11:49:39 2015 +0200
@@ -220,7 +220,6 @@
* @param out output print writer
* @param err error print writer
*/
- @SuppressWarnings("unused")
public ScriptEnvironment(final Options options, final PrintWriter
out, final PrintWriter err) {
this.out = out;
this.err = err;
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/UserAccessorProperty.java
Fri Sep 11 11:49:39 2015 +0200
@@ -298,8 +298,7 @@
// User defined getter and setter are always called by "dyn:call".
Note that the user
// getter/setter may be inherited. If so, proto is bound during
lookup. In either
// inherited or self case, slot is also bound during lookup.
Actual ScriptFunction
- // to be called is retrieved everytime and applied.
- @SuppressWarnings("unused")
+ // to be called is retrieved every time and applied.
private static Object invokeObjectGetter(final Accessors gs, final
MethodHandle invoker, final Object self) throws Throwable {
final Object func = gs.getter;
if (func instanceof ScriptFunction) {
@@ -339,7 +338,6 @@
throw new UnwarrantedOptimismException(UNDEFINED, programPoint);
}
- @SuppressWarnings("unused")
private static void invokeObjectSetter(final Accessors gs, final
MethodHandle invoker, final String name, final Object self, final Object
value) throws Throwable {
final Object func = gs.setter;
if (func instanceof ScriptFunction) {
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
Fri Sep 11 11:49:39 2015 +0200
@@ -69,7 +69,7 @@
final int l = Array.getLength(value);
for (int i = 0; i < l; i++) {
if (undefined.isSet(i)) {
- Array.set(value, i,undefValue);
+ Array.set(value, i, undefValue);
}
}
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
Fri Sep 11 11:49:39 2015 +0200
@@ -109,7 +109,7 @@
// Short circuit the lookup here for non-existent methods
by linking an empty getter. If we just returned
// null instead, BeansLinker would find final methods on
the JavaSuperAdapter instead: getClass() and
// wait().
- return new
GuardedInvocation(MethodHandles.dropArguments(EMPTY_GETTER,
1,type.parameterList().subList(1,
+ return new
GuardedInvocation(MethodHandles.dropArguments(EMPTY_GETTER, 1,
type.parameterList().subList(1,
type.parameterCount())), guard).asType(descriptor);
}
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
Fri Sep 11 11:49:39 2015 +0200
@@ -98,7 +98,7 @@
public static final int FLAGS_MASK = (1 <<
CALLSITE_PROGRAM_POINT_SHIFT) - 1;
private static final
ClassValue<ConcurrentMap<NashornCallSiteDescriptor,
NashornCallSiteDescriptor>> canonicals =
- new
ClassValue<ConcurrentMap<NashornCallSiteDescriptor,NashornCallSiteDescriptor>>()
{
+ new ClassValue<ConcurrentMap<NashornCallSiteDescriptor,
NashornCallSiteDescriptor>>() {
@Override
protected ConcurrentMap<NashornCallSiteDescriptor,
NashornCallSiteDescriptor> computeValue(final Class<?> type) {
return new ConcurrentHashMap<>();
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
Fri Sep 11 11:49:39 2015 +0200
@@ -162,7 +162,7 @@
return TargetInfo.IS_EMPTY_MEM;
case EncloseType.OPTION:
- case EncloseNode.STOP_BACKTRACK:
+ case EncloseType.STOP_BACKTRACK:
info = quantifiersMemoryInfo(en.target);
break;
@@ -907,7 +907,6 @@
int altNum = 1;
ConsAltNode topRoot = null, r = null;
- @SuppressWarnings("unused")
final ObjPtr<Node> prevNode = new ObjPtr<Node>();
StringNode stringNode = null;
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
Fri Sep 11 11:49:39 2015 +0200
@@ -840,7 +840,7 @@
regex.operands[regex.operandLength++] = o;
}
- private void addChars(final char[] chars, final int pp ,final int
length) {
+ private void addChars(final char[] chars, final int pp, final int
length) {
ensure(codeLength + length);
int p = pp;
final int end = p + length;
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
Fri Sep 11 11:49:39 2015 +0200
@@ -32,7 +32,7 @@
protected final int[]repeatStk;
protected final int memStartStk, memEndStk;
- protected StackMachine(final Regex regex, final char[] chars, final
int p , final int end) {
+ protected StackMachine(final Regex regex, final char[] chars, final
int p, final int end) {
super(regex, chars, p, end);
this.stack = regex.stackNeeded ? fetchStack() : null;
@@ -59,14 +59,12 @@
static final ThreadLocal<WeakReference<StackEntry[]>> stacks
= new ThreadLocal<WeakReference<StackEntry[]>>() {
- @SuppressWarnings("unused")
@Override
protected WeakReference<StackEntry[]> initialValue() {
return new WeakReference<StackEntry[]>(allocateStack());
}
};
- @SuppressWarnings("unused")
private static StackEntry[] fetchStack() {
WeakReference<StackEntry[]> ref = stacks.get();
StackEntry[] stack = ref.get();
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
Fri Sep 11 11:49:39 2015 +0200
@@ -110,13 +110,13 @@
if (car.parent != this) {
warnings.warn("broken list car: " +
this.getAddressName() + " -> " + car.getAddressName());
}
- car.verifyTree(set,warnings);
+ car.verifyTree(set, warnings);
}
if (cdr != null) {
if (cdr.parent != this) {
warnings.warn("broken list cdr: " +
this.getAddressName() + " -> " + cdr.getAddressName());
}
- cdr.verifyTree(set,warnings);
+ cdr.verifyTree(set, warnings);
}
}
}
diff -r 882bbbfcaf03
src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
---
a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
Fri Sep 11 11:49:39 2015 +0200
@@ -406,7 +406,7 @@
public final int getLastExpressionStart(final Context context,
final String code) {
final int[] exprStart = { -1 };
- final Parser p = new Parser(context.getEnv(),
sourceFor("<partial_code>", code),new Context.ThrowErrorManager()) {
+ final Parser p = new Parser(context.getEnv(),
sourceFor("<partial_code>", code), new Context.ThrowErrorManager()) {
@Override
protected Expression expression() {
exprStart[0] = this.start;
diff -r 882bbbfcaf03
test/src/jdk/nashorn/api/scripting/JSONCompatibleTest.java
--- a/test/src/jdk/nashorn/api/scripting/JSONCompatibleTest.java Thu Sep
10 19:09:23 2015 +0530
+++ b/test/src/jdk/nashorn/api/scripting/JSONCompatibleTest.java Fri Sep
11 11:49:39 2015 +0200
@@ -101,14 +101,14 @@
private static List<Object> asList(final Object obj) {
assertJSObject(obj);
Assert.assertTrue(obj instanceof List);
- return (List)obj;
+ return (List<Object>)obj;
}
@SuppressWarnings("unchecked")
private static Map<String, Object> asMap(final Object obj) {
assertJSObject(obj);
Assert.assertTrue(obj instanceof Map);
- return (Map)obj;
+ return (Map<String, Object>)obj;
}
private static void assertJSObject(final Object obj) {
diff -r 882bbbfcaf03
test/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java
--- a/test/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java
Thu Sep 10 19:09:23 2015 +0530
+++ b/test/src/jdk/nashorn/api/scripting/test/PluggableJSObjectTest.java
Fri Sep 11 11:49:39 2015 +0200
@@ -233,7 +233,6 @@
}
public static class Factory extends AbstractJSObject {
- @SuppressWarnings("unused")
@Override
public Object newObject(final Object... args) {
return new HashMap<Object, Object>();
diff -r 882bbbfcaf03
test/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java
---
a/test/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java
Thu Sep 10 19:09:23 2015 +0530
+++
b/test/src/jdk/nashorn/api/scripting/test/ScriptObjectMirrorTest.java
Fri Sep 11 11:49:39 2015 +0200
@@ -361,7 +361,7 @@
" return obj instanceof
Packages.jdk.nashorn.api.scripting.ScriptObjectMirror; " +
"}");
@SuppressWarnings("unchecked")
- final Function<Object,Object> func =
invocable.getInterface(Function.class);
+ final Function<Object, Object> func =
invocable.getInterface(Function.class);
assertFalse((boolean)func.apply(engine.eval("({ x: 2 })")));
}
More information about the nashorn-dev
mailing list