You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/12/11 10:44:14 UTC
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation CopletTransformer.java
cziegeler 2003/12/11 01:44:14
Modified: src/blocks/portal/java/org/apache/cocoon/portal/transformation
CopletTransformer.java
Log:
You don't need the coplet id for a layout
Revision Changes Path
1.8 +3 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
Index: CopletTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CopletTransformer.java 11 Dec 2003 09:41:35 -0000 1.7
+++ CopletTransformer.java 11 Dec 2003 09:44:14 -0000 1.8
@@ -143,11 +143,11 @@
PortalService portalService = null;
try {
- final CopletInstanceData cid = this.getCopletInstanceData();
portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
final LinkService linkService = portalService.getComponentManager().getLinkService();
if ( attr.getValue("href") != null ) {
+ final CopletInstanceData cid = this.getCopletInstanceData();
ChangeCopletInstanceAspectDataEvent event = new ChangeCopletInstanceAspectDataEvent(cid, null, null);
String value = linkService.getLinkURI(event);
@@ -167,6 +167,7 @@
Object layout = portalService.getComponentManager().getProfileManager().getPortalLayout(null, layoutId);
event = new JXPathEvent(layout, path, value);
} else {
+ final CopletInstanceData cid = this.getCopletInstanceData();
event = new CopletJXPathEvent(cid, path, value);
}
newAttrs.addCDATAAttribute("href", linkService.getLinkURI(event));