cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/transformation TagTransformer.java
Date Thu, 24 Jun 2004 13:45:29 GMT
cziegeler    2004/06/24 06:45:29

  Modified:    src/blocks/taglib/java/org/apache/cocoon/transformation
                        TagTransformer.java
  Log:
  Hopefully fix tag transformer again
  
  Revision  Changes    Path
  1.7       +6 -5      cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java
  
  Index: TagTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TagTransformer.java	5 Mar 2004 13:02:25 -0000	1.6
  +++ TagTransformer.java	24 Jun 2004 13:45:29 -0000	1.7
  @@ -28,6 +28,7 @@
   import org.apache.commons.collections.map.StaticBucketMap;
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.component.ComponentSelector;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -194,7 +195,7 @@
   
           Tag tag = (Tag) tagStack.pop();
           if (tag != null) {
  -            ServiceSelector tagSelector = (ServiceSelector)tagSelectorStack.pop();
  +            ComponentSelector tagSelector = (ComponentSelector)tagSelectorStack.pop();
               try {
                   if (saxFragment != null) {
                       //start Iteration
  @@ -315,7 +316,7 @@
               Tag tag = (Tag) tagStack.pop();
               if (tag == null)
                   continue;
  -            ServiceSelector tagSelector = (ServiceSelector)tagSelectorStack.pop();
  +            ComponentSelector tagSelector = (ComponentSelector)tagSelectorStack.pop();
               tagSelector.release(tag);
   
               tagNamespaceSelector.release(tagSelector);
  @@ -424,10 +425,10 @@
   
           Tag tag = null;
           if (namespaceURI != null && namespaceURI.length() > 0) {
  -            ServiceSelector tagSelector = null;
  +            ComponentSelector tagSelector = null;
               Transformer tagTransformer = null;
               try {
  -                tagSelector = (ServiceSelector) tagNamespaceSelector.select(namespaceURI);
  +                tagSelector = (ComponentSelector) tagNamespaceSelector.select(namespaceURI);
                   tagSelectorStack.push(tagSelector);
   
                   // namespace matches tag library, lookup tag now.
  
  
  

Mime
View raw message