stephan     2003/03/06 09:20:14

  Modified:    src/blocks/slide/java/org/apache/cocoon/generation
                        SourceDescriptionGenerator.java
  Log:
  Correct the namespaces for the attributes.
  
  Revision  Changes    Path
  1.4       +14 -14    
xml-cocoon2/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java
  
  Index: SourceDescriptionGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SourceDescriptionGenerator.java   6 Mar 2003 09:38:02 -0000       1.3
  +++ SourceDescriptionGenerator.java   6 Mar 2003 17:20:14 -0000       1.4
  @@ -341,22 +341,22 @@
           try {
               AttributesImpl attributes = new AttributesImpl();
   
  -            attributes.addAttribute(SOURCE_NS, URI_ATTR_NAME, URI_ATTR_NAME,
  +            attributes.addAttribute("", URI_ATTR_NAME, URI_ATTR_NAME,
                                       "CDATA", source.getURI());
   
               String name = source.getURI();
   
               if (name.endsWith("://")) {
  -                attributes.addAttribute(SOURCE_NS, NAME_ATTR_NAME,
  +                attributes.addAttribute("", NAME_ATTR_NAME,
                                           NAME_ATTR_NAME, "CDATA", "");
               } else if (name.endsWith("/")) {
                   name = name.substring(1, name.length()-1);
  -                attributes.addAttribute(SOURCE_NS, NAME_ATTR_NAME,
  +                attributes.addAttribute("", NAME_ATTR_NAME,
                                           NAME_ATTR_NAME, "CDATA",
                                           name.substring(name.lastIndexOf("/")+
                                                          1, name.length()));
               } else {
  -                attributes.addAttribute(SOURCE_NS, NAME_ATTR_NAME,
  +                attributes.addAttribute("", NAME_ATTR_NAME,
                                           NAME_ATTR_NAME, "CDATA",
                                           name.substring(name.lastIndexOf("/")+
                                                          1, name.length()));
  @@ -364,19 +364,19 @@
   
               if ((source.getMimeType()!=null) &&
                   (source.getMimeType().length()>0)) {
  -                attributes.addAttribute(SOURCE_NS, MIMETYPE_ATTR_NAME,
  +                attributes.addAttribute("", MIMETYPE_ATTR_NAME,
                                           MIMETYPE_ATTR_NAME, "CDATA",
                                           source.getMimeType());
               }
   
               if (source.getContentLength()>=0) {
  -                attributes.addAttribute(SOURCE_NS, CONTENTLENGTH_ATTR_NAME,
  +                attributes.addAttribute("", CONTENTLENGTH_ATTR_NAME,
                                           CONTENTLENGTH_ATTR_NAME, "CDATA",
                                           String.valueOf(source.getContentLength()));
               }
   
               if (source.getLastModified()>0) {
  -                attributes.addAttribute(SOURCE_NS, LASTMODIFIED_ATTR_NAME,
  +                attributes.addAttribute("", LASTMODIFIED_ATTR_NAME,
                                           LASTMODIFIED_ATTR_NAME, "CDATA",
                                           String.valueOf(source.getLastModified()));
               }
  @@ -387,7 +387,7 @@
                   if (versionablesource.isVersioned()) {
                       if ((versionablesource.getSourceRevision()!=null) &&
                           (versionablesource.getSourceRevision().length()>0)) {
  -                        attributes.addAttribute(SOURCE_NS,
  +                        attributes.addAttribute("",
                                                   REVISION_ATTR_NAME,
                                                   REVISION_ATTR_NAME, "CDATA",
                                                   
versionablesource.getSourceRevision());
  @@ -396,7 +396,7 @@
                       if ((versionablesource.getSourceRevisionBranch()!=null) &&
                           (versionablesource.getSourceRevisionBranch().length()>
                            0)) {
  -                        attributes.addAttribute(SOURCE_NS,
  +                        attributes.addAttribute("",
                                                   REVISIONBRANCH_ATTR_NAME,
                                                   REVISIONBRANCH_ATTR_NAME,
                                                   "CDATA",
  @@ -413,14 +413,14 @@
   
                   isCollection = traversablesource.isSourceCollection();
   
  -                attributes.addAttribute(SOURCE_NS, COLLECTION_ATTR_NAME,
  +                attributes.addAttribute("", COLLECTION_ATTR_NAME,
                                           COLLECTION_ATTR_NAME, "CDATA",
                                           String.valueOf(isCollection));
   
                   String parent = traversablesource.getParentSource();
   
                   if ((parent!=null) && (parent.length()>0)) {
  -                    attributes.addAttribute(SOURCE_NS, PARENT_ATTR_NAME,
  +                    attributes.addAttribute("", PARENT_ATTR_NAME,
                                               PARENT_ATTR_NAME, "CDATA",
                                               parent);
                   }
  @@ -496,7 +496,7 @@
   
           AttributesImpl attributes = new AttributesImpl();
   
  -        attributes.addAttribute(SOURCE_NS, PROPERTY_TYPE_ATTR_NAME,
  +        attributes.addAttribute("", PROPERTY_TYPE_ATTR_NAME,
                                   PROPERTY_TYPE_ATTR_NAME, "CDATA", "live");
           this.contentHandler.startElement(SOURCE_NS, PROPERTIES_NODE_NAME,
                                            PROPERTIES_NODE_QNAME, attributes);
  @@ -526,7 +526,7 @@
         throws SAXException, SourceException {
           AttributesImpl attributes = new AttributesImpl();
   
  -        attributes.addAttribute(SOURCE_NS, PROPERTY_TYPE_ATTR_NAME,
  +        attributes.addAttribute("", PROPERTY_TYPE_ATTR_NAME,
                                   PROPERTY_TYPE_ATTR_NAME, "CDATA", "computed");
           this.contentHandler.startElement(SOURCE_NS, PROPERTIES_NODE_NAME,
                                            PROPERTIES_NODE_QNAME, attributes);
  
  
  

Reply via email to