abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r441280 - in /incubator/abdera/java/trunk: core/src/main/java/org/apache/abdera/util/AbstractXPath.java core/src/main/java/org/apache/abdera/xpath/XPath.java parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java
Date Thu, 07 Sep 2006 22:43:19 GMT
Author: jmsnell
Date: Thu Sep  7 15:43:19 2006
New Revision: 441280

URL: http://svn.apache.org/viewvc?view=rev&rev=441280
Log:
Rollback a change that breaks some compilers

Modified:
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractXPath.java
    incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/xpath/XPath.java
    incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractXPath.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractXPath.java?view=diff&rev=441280&r1=441279&r2=441280
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractXPath.java
(original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/util/AbstractXPath.java
Thu Sep  7 15:43:19 2006
@@ -72,7 +72,7 @@
     return isTrue(path, base, getDefaultNamespaces());
   }
 
-  public <T extends Number>T numericValueOf(String path, Base base) throws XPathException
{
+  public Number numericValueOf(String path, Base base) throws XPathException {
     return numericValueOf(path, base, getDefaultNamespaces());
   }
 

Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/xpath/XPath.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/xpath/XPath.java?view=diff&rev=441280&r1=441279&r2=441280
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/xpath/XPath.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/xpath/XPath.java Thu
Sep  7 15:43:19 2006
@@ -49,7 +49,7 @@
     String path, 
     Base base) throws XPathException; 
   
-  <T extends Number>T numericValueOf(
+  Number numericValueOf(
     String path, 
     Base base) 
       throws XPathException;
@@ -79,7 +79,7 @@
     Base base, 
     Map<String,String> namespaces) throws XPathException; 
   
-  <T extends Number>T numericValueOf(
+  Number numericValueOf(
     String path, 
     Base base, 
     Map<String, String> namespaces) 

Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java?view=diff&rev=441280&r1=441279&r2=441280
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java
(original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMXPath.java
Thu Sep  7 15:43:19 2006
@@ -62,26 +62,26 @@
   }
   
   @SuppressWarnings("unchecked")
-  public <T>T selectSingleNode(
+  public Object selectSingleNode(
     String path, 
     Base base, 
     Map<String,String> namespaces) throws XPathException {
     try {
       XPath xpath = getXPath(path, namespaces);
-      return (T)xpath.selectSingleNode(base);
+      return xpath.selectSingleNode(base);
     } catch (JaxenException e) {
       throw new XPathException(e);
     }
   }
   
   @SuppressWarnings("unchecked")
-  public <T>T evaluate(
+  public Object evaluate(
     String path, 
     Base base, 
     Map<String,String> namespaces) throws XPathException {
     try {
       XPath xpath = getXPath(path, namespaces);
-      return (T)xpath.evaluate(base);
+      return xpath.evaluate(base);
     } catch (JaxenException e) {
       throw new XPathException(e);
     }
@@ -114,14 +114,14 @@
   }
 
   @SuppressWarnings("unchecked")
-  public <T extends Number>T numericValueOf(
+  public Number numericValueOf(
     String path, 
     Base base, 
     Map<String,String>namespaces) 
       throws XPathException {
     try {
       XPath xpath = getXPath(path, namespaces);
-      return (T)xpath.numberValueOf(base);
+      return xpath.numberValueOf(base);
     } catch (JaxenException e) {
       throw new XPathException(e);
     }



Mime
View raw message