You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by dk...@apache.org on 2010/07/15 02:58:44 UTC
svn commit: r964271 - in /servicemix/utils/trunk/src:
main/java/org/apache/servicemix/components/util/
main/java/org/apache/servicemix/expression/
main/java/org/apache/servicemix/jbi/helper/
main/java/org/apache/servicemix/jbi/jaxp/ test/java/org/apach...
Author: dkulp
Date: Thu Jul 15 00:58:43 2010
New Revision: 964271
URL: http://svn.apache.org/viewvc?rev=964271&view=rev
Log:
Fix eclipse warngings
Modified:
servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/StringUtils.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/VariableFixedLengthColumnExtractor.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenVariableContext.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/helper/MessageUtil.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DefaultNamespaceContext.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/SimpleNamespaceContext.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamWriter.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CNamespaceContext.java
servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/XMLStreamHelper.java
servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/SimpleFlatFileMarshalerTest.java
servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/WsRfRpTest.java
servicemix/utils/trunk/src/test/java/org/apache/servicemix/locks/impl/SimpleLockTest.java
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java Thu Jul 15 00:58:43 2010
@@ -17,6 +17,7 @@
package org.apache.servicemix.components.util;
import java.io.ByteArrayInputStream;
+import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -141,7 +142,7 @@ public class SimpleFlatFileMarshaler ext
}
private static class CustomEndOfLineIterator
- implements Iterator {
+ implements Iterator, Closeable {
private InputStreamReader inr;
private String lineSeparator;
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/StringUtils.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/StringUtils.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/StringUtils.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/StringUtils.java Thu Jul 15 00:58:43 2010
@@ -84,7 +84,7 @@ final class StringUtils {
if (len == 0) {
return EMPTY_STRING_ARRAY;
}
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
int sizePlus1 = 1;
int i = 0;
int start = 0;
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/VariableFixedLengthColumnExtractor.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/VariableFixedLengthColumnExtractor.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/VariableFixedLengthColumnExtractor.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/VariableFixedLengthColumnExtractor.java Thu Jul 15 00:58:43 2010
@@ -122,6 +122,7 @@ public class VariableFixedLengthColumnEx
this.variableColumnLengths = variableColumnLengths;
}
+ @SuppressWarnings("unchecked")
public final void setStringEncodedVariableColumnLengths(String columnLengths) {
this.variableColumnLengths = null;
String[] entries = StringUtils.splitWorker(columnLengths, ";", -1, false);
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenVariableContext.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenVariableContext.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenVariableContext.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenVariableContext.java Thu Jul 15 00:58:43 2010
@@ -44,7 +44,7 @@ public class JaxenVariableContext implem
private NormalizedMessage message;
- private Map variables;
+ private Map<String, Object> variables;
public MessageExchange getExchange() {
return exchange;
@@ -62,7 +62,7 @@ public class JaxenVariableContext implem
this.message = message;
}
- public Map getVariables() {
+ public Map<String, Object> getVariables() {
return variables;
}
@@ -71,7 +71,7 @@ public class JaxenVariableContext implem
*
* @param variables
*/
- public void setVariables(Map variables) {
+ public void setVariables(Map<String, Object> variables) {
this.variables = variables;
}
@@ -103,7 +103,7 @@ public class JaxenVariableContext implem
*/
public void setVariableValue(String localPart, Object value) {
if (variables == null) {
- variables = new HashMap();
+ variables = new HashMap<String, Object>();
}
variables.put(localPart, value);
}
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/helper/MessageUtil.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/helper/MessageUtil.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/helper/MessageUtil.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/helper/MessageUtil.java Thu Jul 15 00:58:43 2010
@@ -165,8 +165,8 @@ public final class MessageUtil {
private Subject subject;
private Source content;
- private Map properties = new HashMap();
- private Map attachments = new HashMap();
+ private Map<String, Object> properties = new HashMap<String, Object>();
+ private Map<String, DataHandler> attachments = new HashMap<String, DataHandler>();
public NormalizedMessageImpl() {
}
@@ -211,7 +211,7 @@ public final class MessageUtil {
}
public DataHandler getAttachment(String id) {
- return (DataHandler) this.attachments.get(id);
+ return this.attachments.get(id);
}
public Set getAttachmentNames() {
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DOMStreamReader.java Thu Jul 15 00:58:43 2010
@@ -31,6 +31,9 @@ import javax.xml.stream.XMLStreamConstan
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Node;
+
/**
* Abstract logic for creating XMLStreamReader from DOM documents. Its works
* using adapters for Element, Node and Attribute (
@@ -60,7 +63,7 @@ public abstract class DOMStreamReader im
int currentElement = -1;
List<String> uris;
List<String> prefixes;
- List attributes;
+ List<Attr> attributes;
final ElementFrame parent;
public ElementFrame(Object element, ElementFrame parent) {
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DefaultNamespaceContext.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DefaultNamespaceContext.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DefaultNamespaceContext.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/DefaultNamespaceContext.java Thu Jul 15 00:58:43 2010
@@ -33,16 +33,16 @@ import javax.xml.xpath.XPathFactory;
*/
public class DefaultNamespaceContext implements NamespaceContext {
- private final Map map;
+ private final Map<String, String> map;
private final NamespaceContext parent;
public DefaultNamespaceContext() {
- this.map = new HashMap();
+ this.map = new HashMap<String, String>();
XPathFactory factory = XPathFactory.newInstance();
this.parent = factory.newXPath().getNamespaceContext();
}
- public DefaultNamespaceContext(NamespaceContext parent, Map map) {
+ public DefaultNamespaceContext(NamespaceContext parent, Map<String, String> map) {
this.parent = parent;
this.map = map;
}
@@ -77,9 +77,8 @@ public class DefaultNamespaceContext imp
}
public Iterator getPrefixes(String namespaceURI) {
- Set set = new HashSet();
- for (Iterator iter = map.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
+ Set<String> set = new HashSet<String>();
+ for (Map.Entry<String, String> entry : map.entrySet()) {
if (namespaceURI.equals(entry.getValue())) {
set.add(entry.getKey());
}
@@ -87,7 +86,7 @@ public class DefaultNamespaceContext imp
if (parent != null) {
Iterator iter = parent.getPrefixes(namespaceURI);
while (iter.hasNext()) {
- set.add(iter.next());
+ set.add((String)iter.next());
}
}
return set.iterator();
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java Thu Jul 15 00:58:43 2010
@@ -64,8 +64,8 @@ public class ExtendedXMLStreamReader ext
return next;
}
- private Map getNamespaces() {
- Map ns = new HashMap();
+ private Map<String, String> getNamespaces() {
+ Map<String, String> ns = new HashMap<String, String>();
for (int i = 0; i < getNamespaceCount(); i++) {
ns.put(getNamespacePrefix(i), getNamespaceURI(i));
}
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReader.java Thu Jul 15 00:58:43 2010
@@ -37,7 +37,7 @@ public class FragmentStreamReader extend
private int depth;
private int state = STATE_START_DOC;
private int event = START_DOCUMENT;
- private List rootPrefixes;
+ private List<String> rootPrefixes;
public FragmentStreamReader(XMLStreamReader parent) {
super(parent);
@@ -47,7 +47,7 @@ public class FragmentStreamReader extend
NamespaceContext ctx = getParent().getNamespaceContext();
if (ctx instanceof ExtendedNamespaceContext) {
- rootPrefixes = new ArrayList();
+ rootPrefixes = new ArrayList<String>();
Iterator it = ((ExtendedNamespaceContext) ctx).getPrefixes();
while (it.hasNext()) {
String prefix = (String) it.next();
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/SimpleNamespaceContext.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/SimpleNamespaceContext.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/SimpleNamespaceContext.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/SimpleNamespaceContext.java Thu Jul 15 00:58:43 2010
@@ -41,6 +41,7 @@ public class SimpleNamespaceContext impl
return parent;
}
+ @SuppressWarnings("unchecked")
public Iterator getPrefixes() {
Set prefixes = new HashSet();
for (SimpleNamespaceContext context = this; context != null; context = context.parent) {
@@ -70,18 +71,19 @@ public class SimpleNamespaceContext impl
}
public Iterator getPrefixes(String namespaceURI) {
- Set prefixes = new HashSet();
+ Set<String> prefixes = new HashSet<String>();
for (SimpleNamespaceContext context = this; context != null; context = context.parent) {
for (Iterator it = context.namespaces.keySet().iterator(); it.hasNext();) {
Map.Entry entry = (Map.Entry) it.next();
if (entry.getValue().equals(namespaceURI)) {
- prefixes.add(entry.getKey());
+ prefixes.add((String)entry.getKey());
}
}
}
return prefixes.iterator();
}
+ @SuppressWarnings("unchecked")
public void add(String prefix, String uri) {
namespaces.put(prefix, uri);
}
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReader.java Thu Jul 15 00:58:43 2010
@@ -106,7 +106,7 @@ public class W3CDOMStreamReader extends
frame.uris.add(value);
frame.prefixes.add(prefix);
} else {
- frame.attributes.add(node);
+ frame.attributes.add((Attr)node);
}
}
}
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamWriter.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamWriter.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamWriter.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamWriter.java Thu Jul 15 00:58:43 2010
@@ -38,7 +38,7 @@ import org.w3c.dom.Element;
public class W3CDOMStreamWriter extends DOMStreamWriter {
static final String XML_NS = "http://www.w3.org/2000/xmlns/";
- private Stack stack = new Stack();
+ private Stack<Element> stack = new Stack<Element>();
private Document document;
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CNamespaceContext.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CNamespaceContext.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CNamespaceContext.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/W3CNamespaceContext.java Thu Jul 15 00:58:43 2010
@@ -88,7 +88,7 @@ public class W3CNamespaceContext impleme
}
public Iterator getPrefixes(String uri) {
- List prefixes = new ArrayList();
+ List<String> prefixes = new ArrayList<String>();
String prefix = getPrefix(uri);
if (prefix != null) {
prefixes.add(prefix);
Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/XMLStreamHelper.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/XMLStreamHelper.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/XMLStreamHelper.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jbi/jaxp/XMLStreamHelper.java Thu Jul 15 00:58:43 2010
@@ -97,18 +97,14 @@ public final class XMLStreamHelper imple
}
// Write out the element name
- if (uri != null) {
- if (prefix.length() == 0) {
+ if (prefix.length() == 0) {
- writer.writeStartElement(local);
- writer.setDefaultNamespace(uri);
+ writer.writeStartElement(local);
+ writer.setDefaultNamespace(uri);
- } else {
- writer.writeStartElement(prefix, local, uri);
- writer.setPrefix(prefix, uri);
- }
} else {
- writer.writeStartElement(local);
+ writer.writeStartElement(prefix, local, uri);
+ writer.setPrefix(prefix, uri);
}
// Write out the namespaces
@@ -181,18 +177,14 @@ public final class XMLStreamHelper imple
}
// Write out the element name
- if (uri != null) {
- if (prefix.length() == 0) {
+ if (prefix.length() == 0) {
- writer.writeStartElement(local);
- writer.setDefaultNamespace(uri);
+ writer.writeStartElement(local);
+ writer.setDefaultNamespace(uri);
- } else {
- writer.writeStartElement(prefix, local, uri);
- writer.setPrefix(prefix, uri);
- }
} else {
- writer.writeStartElement(local);
+ writer.writeStartElement(prefix, local, uri);
+ writer.setPrefix(prefix, uri);
}
// Check if the namespace still needs to be written.
Modified: servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/SimpleFlatFileMarshalerTest.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/SimpleFlatFileMarshalerTest.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/SimpleFlatFileMarshalerTest.java (original)
+++ servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/SimpleFlatFileMarshalerTest.java Thu Jul 15 00:58:43 2010
@@ -77,7 +77,7 @@ public class SimpleFlatFileMarshalerTest
marshaler.setColumnLengths(new String[] {"2", "3", "5", "8" });
marshaler.setColumnNames(new String[] {"Number", "Text1", "Text2", "Date" });
- List columnConverters = new ArrayList();
+ List<ContentConverter> columnConverters = new ArrayList<ContentConverter>();
columnConverters.add(new NumberConverter());
columnConverters.add(null);
columnConverters.add(null);
Modified: servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/WsRfRpTest.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/WsRfRpTest.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/WsRfRpTest.java (original)
+++ servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/WsRfRpTest.java Thu Jul 15 00:58:43 2010
@@ -36,6 +36,7 @@ public class WsRfRpTest extends TestCase
reader.nextTag();
source = new StaxSource(new FragmentStreamReader(reader));
+ @SuppressWarnings("unchecked")
JAXBElement<QName> e = (JAXBElement<QName>) context.createUnmarshaller().unmarshal(source);
assertNotNull(e.getValue());
System.out.println(e.getValue());
Modified: servicemix/utils/trunk/src/test/java/org/apache/servicemix/locks/impl/SimpleLockTest.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/test/java/org/apache/servicemix/locks/impl/SimpleLockTest.java?rev=964271&r1=964270&r2=964271&view=diff
==============================================================================
--- servicemix/utils/trunk/src/test/java/org/apache/servicemix/locks/impl/SimpleLockTest.java (original)
+++ servicemix/utils/trunk/src/test/java/org/apache/servicemix/locks/impl/SimpleLockTest.java Thu Jul 15 00:58:43 2010
@@ -23,6 +23,7 @@ import junit.framework.TestCase;
public class SimpleLockTest extends TestCase {
public void testSimple() {
+ @SuppressWarnings("deprecation")
Lock l = new SimpleLock();
assertTrue(l.tryLock());