2008-06-23 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* gnu/xml/xpath/CountFunction.java,
	* gnu/xml/xpath/EqualityExpr.java,
	* gnu/xml/xpath/Expr.java,
	* gnu/xml/xpath/IdFunction.java,
	* gnu/xml/xpath/LocalNameFunction.java,
	* gnu/xml/xpath/NameFunction.java,
	* gnu/xml/xpath/NamespaceUriFunction.java,
	* gnu/xml/xpath/ParenthesizedExpr.java,
	* gnu/xml/xpath/Steps.java,
	* gnu/xml/xpath/SumFunction.java,
	* gnu/xml/xpath/UnionExpr.java,
	* gnu/xml/xpath/XPathParser.java,
	* gnu/xml/xpath/XPathParser.y,
	* java/lang/Enum.java,
	* java/lang/reflect/Constructor.java,
	* java/lang/reflect/Field.java,
	* java/lang/reflect/Method.java:
	Reduce scope of unchecked warning suppression,
	and remove unneeded uses.

1 files changed, 10 insertions, 5 deletions

diff --git a/gnu/xml/xpath/NameFunction.java b/gnu/xml/xpath/NameFunction.java
index 7eefbc25c..239a53453 100644
--- a/gnu/xml/xpath/NameFunction.java
+++ b/gnu/xml/xpath/NameFunction.java
@@ -77,25 +77,30 @@ final class NameFunction
     this.arg = arg;
   }
 
-  @Override @SuppressWarnings("unchecked")
+  @Override 
   public Object evaluate(Node context, int pos, int len)
   {
-    Object val = (arg == null) ? Collections.singleton(context) :
-        arg.evaluate(context, pos, len);
-    return _name(context, (Collection<Node>) val);
+    /* Suppression is safe, as we know context produces Collection<Node> */
+    @SuppressWarnings("unchecked")
+    Collection<Node> val = (arg == null) ? Collections.singleton(context) :
+      (Collection<Node>) arg.evaluate(context, pos, len);
+    return _name(context, val);
   }
 
+  @Override
   public Expr clone(Object context)
   {
     return new NameFunction((arg == null) ? null :
                             arg.clone(context));
   }
-
+  
+  @Override
   public boolean references(QName var)
   {
     return (arg == null) ? false : arg.references(var);
   }
   
+  @Override
   public String toString()
   {
     return (arg == null) ? "name()" : "name(" + arg + ")";