Author: brett
Date: Tue Mar 17 17:03:45 2009
New Revision: 755323
URL: http://svn.apache.org/viewvc?rev=755323&view=rev
Log:
clean warnings in xml tools module
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/ElementTextListClosure.java
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/LatinEntities.java
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/ElementTextListClosure.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/ElementTextListClosure.java?rev=755323&r1=755322&r2=755323&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/ElementTextListClosure.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/ElementTextListClosure.java
Tue Mar 17 17:03:45 2009
@@ -33,7 +33,7 @@
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 List getList()
+ public List<String> getList()
{
return list;
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/LatinEntities.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/LatinEntities.java?rev=755323&r1=755322&r2=755323&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/LatinEntities.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/LatinEntities.java
Tue Mar 17 17:03:45 2009
@@ -29,11 +29,11 @@
*/
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" );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java?rev=755323&r1=755322&r2=755323&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLReader.java
Tue Mar 17 17:03:45 2009
@@ -204,6 +204,7 @@
/**
* 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 @@
}
}
+ @SuppressWarnings("unchecked")
public List<Element> getElementList( String xpathExpr )
throws XMLException
{
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java?rev=755323&r1=755322&r2=755323&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
Tue Mar 17 17:03:45 2009
@@ -19,13 +19,12 @@
* 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 @@
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 @@
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 @@
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 @@
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 @@
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 }
);
}
