cvs commit: xml-cocoon2/src/java/org/apache/cocoon/xml/xlink ExtendedXLinkPipe.java

[vgritsenko]

vgritsenko    2002/08/14 20:13:46

  Modified:    src/java/org/apache/cocoon/xml/xlink ExtendedXLinkPipe.java
  Log:
  In addition to attributes in same namespace with elements,
  link serializer reacts on non-namespaced attributes too. This allows
  processing of (strict) XHTML.
  
  Revision  Changes    Path
  1.5       +32 -9     
xml-cocoon2/src/java/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java
  
  Index: ExtendedXLinkPipe.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExtendedXLinkPipe.java    22 Feb 2002 07:03:59 -0000      1.4
  +++ ExtendedXLinkPipe.java    15 Aug 2002 03:13:46 -0000      1.5
  @@ -74,26 +74,50 @@
   public abstract class ExtendedXLinkPipe extends XLinkPipe {
   
       public void startElement(String uri, String name, String raw, Attributes attr) 
throws SAXException {
  -        if (uri == null) {
  +        if (uri != null) {
  +            // Get namespaced attributes
  +
  +            String href = attr.getValue(uri, "href");
  +            if (href != null) {
  +                simpleLink(href, null, null, null, null, null, uri, name, raw, 
attr);
  +                return;
  +            }
  +
  +            String src = attr.getValue(uri, "src");
  +            if (src != null) {
  +                simpleLink(src, null, null, null, null, null, uri, name, raw, attr);
  +                return;
  +            }
  +
  +            String background = attr.getValue(uri, "background");
  +            if (background != null) {
  +                simpleLink(background, null, null, null, null, null, uri, name, 
raw, attr);
  +                return;
  +            }
  +        } else {
               uri = "";
           }
  -        String href = attr.getValue(uri, "href");
  +
  +        // Get attributes without namespace too
  +
  +        String href = attr.getValue("", "href");
           if (href != null) {
  -            simpleLink(href, null, null, null, null, null, uri, name, raw, attr);
  +            simpleLink(href, null, null, null, null, null, "", name, raw, attr);
               return;
           }
   
  -        String src = attr.getValue(uri, "src");
  +        String src = attr.getValue("", "src");
           if (src != null) {
  -            simpleLink(src, null, null, null, null, null, uri, name, raw, attr);
  +            simpleLink(src, null, null, null, null, null, "", name, raw, attr);
               return;
           }
   
  -        String background = attr.getValue(uri, "background");
  +        String background = attr.getValue("", "background");
           if (background != null) {
  -            simpleLink(background, null, null, null, null, null, uri, name, raw, 
attr);
  +            simpleLink(background, null, null, null, null, null, "", name, raw, 
attr);
               return;
           }
  +
           super.startElement(uri, name, raw, attr);
       }
   
  @@ -108,4 +132,3 @@
           super.startElement(uri, name, raw, newattr);
       }
   }
  -
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]