You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/05/15 05:42:29 UTC
svn commit: r406519 - /cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java

Author: antonio
Date: Sun May 14 20:42:29 2006
New Revision: 406519

URL: http://svn.apache.org/viewcvs?rev=406519&view=rev
Log:
Format code.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java?rev=406519&r1=406518&r2=406519&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java Sun May 14 20:42:29 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.cocoon.components.language.markup.xsp;
 
+import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
 import org.apache.cocoon.components.language.markup.LogicsheetFilter;
 import org.apache.cocoon.xml.AbstractXMLPipe;
 import org.apache.cocoon.xml.AttributesImpl;
@@ -175,8 +176,8 @@
      * Remove interpolation attributes and return cleaned attribute list.
      */
     private Attributes pushInterpolationStack(Attributes attribs) {
-        String valueAttr = attribs.getValue(markupURI, XSPMarkupLanguage.ATTR_INTERPOLATION);
-        String valueText = attribs.getValue(markupURI, XSPMarkupLanguage.TEXT_INTERPOLATION);
+        String valueAttr = attribs.getValue(markupURI, AbstractMarkupLanguage.ATTR_INTERPOLATION);
+        String valueText = attribs.getValue(markupURI, AbstractMarkupLanguage.TEXT_INTERPOLATION);
 
         // Neither interpolation flag in attribute list: push tail to stack.
         if (valueAttr == null && valueText == null ) {
@@ -194,12 +195,12 @@
 
         if (valueAttr != null) {
             attrInterpolation = Boolean.valueOf(valueAttr).booleanValue();
-            cleanedAttribs.removeAttribute(cleanedAttribs.getIndex(markupURI, XSPMarkupLanguage.ATTR_INTERPOLATION));
+            cleanedAttribs.removeAttribute(cleanedAttribs.getIndex(markupURI, AbstractMarkupLanguage.ATTR_INTERPOLATION));
         }
 
         if (valueText != null) {
             textInterpolation = Boolean.valueOf(valueText).booleanValue();
-            cleanedAttribs.removeAttribute(cleanedAttribs.getIndex(markupURI, XSPMarkupLanguage.TEXT_INTERPOLATION));
+            cleanedAttribs.removeAttribute(cleanedAttribs.getIndex(markupURI, AbstractMarkupLanguage.TEXT_INTERPOLATION));
         }
 
         interpolationStack.addLast(new InterpolationSettings(attrInterpolation,