svn commit: r889977 - in /webservices/commons/trunk/modules/axiom/modules/axiom-api/src: main/java/org/apache/axiom/injection/ main/java/org/apache/axiom/om/ds/ test/java/org/apache/axiom/util/stax/

[veithen]

Author: veithen
Date: Sat Dec 12 20:56:54 2009
New Revision: 889977

URL: http://svn.apache.org/viewvc?rev=889977&view=rev
Log:
Replaced some method calls specific to Java 1.5 (Officially we still support 
Java 1.4.2).

Modified:
    
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/injection/FactoryInjectionComponent.java
    
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/ds/ParserInputStreamDataSource.java
    
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderComparator.java

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/injection/FactoryInjectionComponent.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/injection/FactoryInjectionComponent.java?rev=889977&r1=889976&r2=889977&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/injection/FactoryInjectionComponent.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/injection/FactoryInjectionComponent.java
 Sat Dec 12 20:56:54 2009
@@ -49,7 +49,7 @@
                            metaFactories = new ArrayList();
                        }
                        // Special case llom - it's the default
-                       if (metafactory.getClass().toString().contains("llom")) 
{
+                       if (metafactory.getClass().toString().indexOf("llom") 
!= -1) {
                                metaFactories.add(0, metafactory);
                        } else {
                                metaFactories.add(metafactory);

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/ds/ParserInputStreamDataSource.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/ds/ParserInputStreamDataSource.java?rev=889977&r1=889976&r2=889977&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/ds/ParserInputStreamDataSource.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/ds/ParserInputStreamDataSource.java
 Sat Dec 12 20:56:54 2009
@@ -382,7 +382,7 @@
             if(log.isDebugEnabled()){
                 String clsName = inputStream == null ? 
                         null : 
-                            inputStream.getClass().getCanonicalName();
+                            inputStream.getClass().getName();
                 log.debug("Enter setInputStream: The kind of InputStream is:" 
+ clsName);
             }
             this.numReads = 0;

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderComparator.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderComparator.java?rev=889977&r1=889976&r2=889977&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderComparator.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderComparator.java
 Sat Dec 12 20:56:54 2009
@@ -221,7 +221,7 @@
             // START_ELEMENT
             for (int i=0; i < (attributeCount == null ? 1 : 
attributeCount.intValue()); i++) {
                 Class[] paramTypes = { Integer.TYPE };
-                Object[] args = { Integer.valueOf(i) };
+                Object[] args = { new Integer(i) };
                 assertSameResult("getAttributeLocalName", paramTypes, args);
                 assertSameResult("getAttributeName", paramTypes, args);
                 namespaceURIs.add(assertSameResult("getAttributeNamespace", 
paramTypes, args));