You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2004/03/06 01:44:18 UTC
cvs commit: jakarta-commons-sandbox/xo/src/java/org/apache/commons/xo Mapper.java
scolebourne 2004/03/05 16:44:18
Modified: xo/src/java/org/apache/commons/xo Mapper.java
Log:
Fix xo for Gump
patch from Antoine L�vy-Lambert
Revision Changes Path
1.6 +8 -8 jakarta-commons-sandbox/xo/src/java/org/apache/commons/xo/Mapper.java
Index: Mapper.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/xo/src/java/org/apache/commons/xo/Mapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Mapper.java 28 Feb 2004 03:35:56 -0000 1.5
+++ Mapper.java 6 Mar 2004 00:44:18 -0000 1.6
@@ -33,7 +33,7 @@
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.MethodUtils;
-import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
@@ -182,7 +182,7 @@
throws Exception
{
// Get the base directory
- basePath = FileUtils.dirname(xmlInput.getAbsolutePath());
+ basePath = FilenameUtils.getPath(xmlInput.getAbsolutePath());
return map(new FileInputStream(xmlInput), beanClass);
}
@@ -217,7 +217,7 @@
InputStream xmlStream = findXmlStream(xmlInput);
// Get the base directory
- basePath = FileUtils.dirname(xmlInput);
+ basePath = FilenameUtils.getPath(xmlInput);
return map(xmlStream, beanClass);
}
@@ -271,7 +271,7 @@
* <code>className</code> attribute of the first <code>Node</code>
* in the XML document.
* @return The modified instance of <code>bean</code>.
- * @exception DocumentException If the buildprocess fails.
+ * @exception org.dom4j.DocumentException If the buildprocess fails.
*/
public Object map(InputStream xmlInput, Object bean)
throws Exception
@@ -290,7 +290,7 @@
* <code>className</code> attribute of the first <code>Node</code>
* in the XML document.
* @return The fleshed-out instance of <code>beanClass</code>.
- * @exception DocumentException If the build process fails.
+ * @exception org.dom4j.DocumentException If the build process fails.
*/
public Object map(InputStream xmlInput, String beanClass)
throws Exception
@@ -309,7 +309,7 @@
* and populate.
* @return The modified <code>bean</code> instance or the fleshed-out
* instance of <code>beanClass</code>
- * @exception DocumentException If the build process fails.
+ * @exception org.dom4j.DocumentException If the build process fails.
*/
protected Object map(InputStream xmlInput, Object bean, String beanClass)
throws Exception
@@ -761,7 +761,7 @@
* <p>
* FIXME: This cannot be easily I18N'd
*
- * @param String name to test for plurality
+ * @param name to test for plurality
* @return boolean
*/
private boolean isPlural(String name)
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org