You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/01/27 14:19:38 UTC
svn commit: r903631 - in
/incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content:
./ src/main/java/org/apache/clerezza/platform/content/
src/main/java/org/apache/clerezza/platform/content/genericmetadata/
Author: reto
Date: Wed Jan 27 13:19:37 2010
New Revision: 903631
URL: http://svn.apache.org/viewvc?rev=903631&view=rev
Log:
CLEREZZA-70: merged down trunk
Added:
incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/genericmetadata/
- copied from r903625, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/genericmetadata/
incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/genericmetadata/GenericMetaDataGenerator.java
- copied unchanged from r903625, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/genericmetadata/GenericMetaDataGenerator.java
Modified:
incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content/ (props changed)
incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java
Propchange: incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 27 13:19:37 2010
@@ -1,2 +1,3 @@
/incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content:891178-892849
-/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content:890392-891033
+/incubator/clerezza/issues/CLEREZZA-65/org.apache.clerezza.platform.content:897875-897920
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content:897917-903625
Modified: incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java?rev=903631&r1=903630&r2=903631&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java (original)
+++ incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/TitledContentRenderlet.java Wed Jan 27 13:19:37 2010
@@ -62,6 +62,7 @@
public void render(GraphNode res, GraphNode context,
CallbackRenderer callbackRenderer,
URI renderingSpecification,
+ String mode,
MediaType mediaType,
OutputStream os) throws IOException {
PrintWriter writer = new PrintWriter(os);
@@ -70,14 +71,14 @@
writer.flush();
callbackRenderer.render(
containedNodes.get(0),
- context, "naked", os);
+ context, mode, os);
writer.println(getHeaderClose());
writer.print("<div>");
headingLevel.set(headingLevel.get()+1);
writer.flush();
callbackRenderer.render(
containedNodes.get(1),
- context, "naked", os);
+ context, mode, os);
headingLevel.set(headingLevel.get()-1);
writer.println("</div>");
writer.flush();