svn commit: r156551 - cocoon/whiteboard/forms/java/org/apache/cocoon/forms/util/DomHelper.java

[ti...@apache.org]

Author: tim
Date: Tue Mar  8 09:36:32 2005
New Revision: 156551

URL: http://svn.apache.org/viewcvs?view=rev&rev=156551
Log:
Merge change from trunk: Fix problems with JDK 5.0 on windows

Modified:
    cocoon/whiteboard/forms/java/org/apache/cocoon/forms/util/DomHelper.java

Modified: cocoon/whiteboard/forms/java/org/apache/cocoon/forms/util/DomHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/java/org/apache/cocoon/forms/util/DomHelper.java?view=diff&r1=156550&r2=156551
==============================================================================
--- cocoon/whiteboard/forms/java/org/apache/cocoon/forms/util/DomHelper.java (original)
+++ cocoon/whiteboard/forms/java/org/apache/cocoon/forms/util/DomHelper.java Tue Mar  8 09:36:32 2005
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import org.apache.excalibur.xml.EntityResolver;
 import org.apache.excalibur.xml.sax.XMLizable;
 import org.apache.xerces.dom.NodeImpl;
+import org.apache.xerces.dom3.UserDataHandler;
 import org.apache.xerces.parsers.DOMParser;
 import org.apache.xerces.xni.Augmentations;
 import org.apache.xerces.xni.NamespaceContext;
@@ -395,7 +396,7 @@
             if (node != null) {
                 String location = locator.getLiteralSystemId() + ":" +
                     locator.getLineNumber() + ":" + locator.getColumnNumber();
-                node.setUserData("location", location, null);
+                node.setUserData("location", location, (UserDataHandler)null);
             }
         }
     }