clean warnings in xml tools module

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755323 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/ElementTextListClosure.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/ElementTextListClosure.java
index 9d4c0e4f3f76209175d7babc16954954518905d1..d3b8a40998a12a5f1d997bfd39b33f2b79707380 100644 (file)
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/ElementTextListClosure.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/ElementTextListClosure.java
@@ -33,7 +33,7 @@ import java.util.List;
 public class ElementTextListClosure
     implements Closure
 {
-    private List list = new ArrayList();
+    private List<String> list = new ArrayList<String>();
 
     public void execute( Object input )
     {
@@ -44,7 +44,7 @@ public class ElementTextListClosure
         }
     }
 
-    public List getList()
+    public List<String> getList()
     {
         return list;
     }

diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/LatinEntities.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/LatinEntities.java
index d4013f1612eac9ea7aab58725f90c322bd4ecfaa..b14ee41731b07fea1d8a62b4ebdc7298f601ba07 100644 (file)
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/LatinEntities.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/LatinEntities.java
@@ -29,11 +29,11 @@ import java.util.Map;
  */
 public class LatinEntities
 {
-    private static final Map defaultEntityMap;
+    private static final Map<String, String> defaultEntityMap;
 
     static
     {
-        defaultEntityMap = new HashMap();
+        defaultEntityMap = new HashMap<String, String>();
 
         defaultEntityMap.put( "nbsp", "\u00a0" );
         defaultEntityMap.put( "iexcl", "\u00a1" );

diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java
index 759519e13507d4dd38e91d24c84d46d190b85ae3..4e230e92de3604b62ec90137175e079bd39438f1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java
@@ -204,6 +204,7 @@ public class XMLReader
     /**
      * Remove namespaces from element recursively.
      */
+    @SuppressWarnings("unchecked")
     public void removeNamespaces( Element elem )
     {
         elem.setQName( QName.get( elem.getName(), Namespace.NO_NAMESPACE, elem.getQualifiedName() ) );
@@ -275,6 +276,7 @@ public class XMLReader
         }
     }
 
+    @SuppressWarnings("unchecked")
     public List<Element> getElementList( String xpathExpr )
         throws XMLException
     {

diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
index 719352f2dd579f88e1d7c219054cee2a3592fc84..1fb12fba85b9a9ef35daa728f7bc703098945cbe 100644 (file)
--- a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
+++ b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
@@ -19,13 +19,12 @@ package org.apache.maven.archiva.xml;
  * under the License.
  */
 
-import org.dom4j.Element;
-
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
+import org.dom4j.Element;
+
 /**
  * XMLReaderTest 
  *
@@ -34,14 +33,13 @@ import java.util.List;
 public class XMLReaderTest
     extends AbstractArchivaXmlTestCase
 {
-    private void assertElementTexts( List elementList, String[] expectedTexts )
+    private void assertElementTexts( List<Element> elementList, String[] expectedTexts )
     {
         assertEquals( "Element List Size", expectedTexts.length, elementList.size() );
 
-        List texts = new ArrayList();
-        for ( Iterator iter = elementList.iterator(); iter.hasNext(); )
+        List<String> texts = new ArrayList<String>();
+        for ( Element element : elementList )
         {
-            Element element = (Element) iter.next();
             texts.add( element.getTextTrim() );
         }
 
@@ -58,7 +56,7 @@ public class XMLReaderTest
         File xmlFile = getExampleXml( "no-prolog-basic.xml" );
         XMLReader reader = new XMLReader( "basic", xmlFile );
 
-        List fruits = reader.getElementList( "//basic/fruits/fruit" );
+        List<Element> fruits = reader.getElementList( "//basic/fruits/fruit" );
         assertElementTexts( fruits, new String[] { "apple", "cherry", "pear", "peach" } );
     }
 
@@ -68,7 +66,7 @@ public class XMLReaderTest
         File xmlFile = getExampleXml( "no-prolog-with-entities.xml" );
         XMLReader reader = new XMLReader( "basic", xmlFile );
 
-        List names = reader.getElementList( "//basic/names/name" );
+        List<Element> names = reader.getElementList( "//basic/names/name" );
         assertElementTexts( names, new String[] { TRYGVIS, INFINITE_ARCHIVA } );
     }
 
@@ -78,7 +76,7 @@ public class XMLReaderTest
         File xmlFile = getExampleXml( "no-prolog-with-utf8.xml" );
         XMLReader reader = new XMLReader( "basic", xmlFile );
 
-        List names = reader.getElementList( "//basic/names/name" );
+        List<Element> names = reader.getElementList( "//basic/names/name" );
         assertElementTexts( names, new String[] { TRYGVIS, INFINITE_ARCHIVA } );
     }
 
@@ -88,7 +86,7 @@ public class XMLReaderTest
         File xmlFile = getExampleXml( "prolog-with-utf8.xml" );
         XMLReader reader = new XMLReader( "basic", xmlFile );
 
-        List names = reader.getElementList( "//basic/names/name" );
+        List<Element> names = reader.getElementList( "//basic/names/name" );
         assertElementTexts( names, new String[] { TRYGVIS, INFINITE_ARCHIVA } );
     }