Author: cziegeler Date: Tue Dec 21 02:19:24 2004 New Revision: 122957 URL: http://svn.apache.org/viewcvs?view=rev&rev=122957 Log: Use temporary attributes Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java?view=diff&rev=122957&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java&r1=122956&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java&r2=122957 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java Tue Dec 21 02:19:24 2004 @@ -50,8 +50,7 @@ throws SAXException { try { super.streamContent(coplet, uri, contentHandler); - } - catch (SAXException se) { + } catch (SAXException se) { getLogger().error( "ApplicationCopletAdapter: Exception while getting coplet resource", se); @@ -77,15 +76,13 @@ if ("createNewCopletInstance".equals(link)) { try { createNewInstance(coplet); - } - catch (ProcessingException ex) { + } catch (ProcessingException ex) { getLogger().error("Could not create new coplet instance", ex); } - } - else { + } else { // this is a normal link event, so save the url in the instance data // for ProxyTransformer - coplet.setAttribute(ProxyTransformer.LINK, event.getLink()); + coplet.setTemporaryAttribute(ProxyTransformer.LINK, event.getLink()); } } } @@ -132,11 +129,9 @@ throw new ProcessingException( "Unable to lookup profile manager.", ce); - } - catch (Exception e) { + } catch (Exception e) { throw new ProcessingException(e); - } - finally { + } finally { this.manager.release(profileManager); } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java?view=diff&rev=122957&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java&r1=122956&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java&r2=122957 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java Tue Dec 21 02:19:24 2004 @@ -28,8 +28,7 @@ import org.xml.sax.SAXException; /** - * This transformer extends transforms html actions - * into events. + * This transformer transforms html actions into events. * The transformer listens for the element a and form. Links * that only contain an anchor are ignored. * In addition if a link has the attribute "external" with the value Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java?view=diff&rev=122957&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java&r1=122956&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java&r2=122957 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Tue Dec 21 02:19:24 2004 @@ -176,7 +176,7 @@ final String startURI = (String)copletData.getAttribute(START_URI); - this.link = (String) this.copletInstanceData.getAttribute(LINK); + this.link = (String) this.copletInstanceData.getTemporaryAttribute(LINK); this.documentBase = (String) this.copletInstanceData.getAttribute(DOCUMENT_BASE);
