Author: vsiveton
Date: Thu Mar 5 13:22:39 2009
New Revision: 750453
URL: http://svn.apache.org/viewvc?rev=750453&view=rev
Log:
o javadoc typo
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/HtmlTagHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java?rev=750453&r1=750452&r2=750453&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
Thu Mar 5 13:22:39 2009
@@ -45,8 +45,8 @@
/**
* This ContentRewriter uses a TemplateProcessor to replace os-template
* tag contents of a gadget spec with their rendered equivalents.
- *
- * Only templates without the @name and @tag attributes are processed
+ *
+ * Only templates without the @name and @tag attributes are processed
* automatically.
*/
public class TemplateRewriter implements ContentRewriter {
@@ -55,18 +55,18 @@
/** A temporary parameter while server-side templating is in development */
static final String SERVER_TEMPLATING_PARAM = "process-on-server";
-
+
/**
* Provider of the processor. TemplateRewriters are stateless and
multithreaded,
* processors are not.
*/
private final Provider<TemplateProcessor> processor;
-
+
@Inject
public TemplateRewriter(Provider<TemplateProcessor> processor) {
this.processor = processor;
}
-
+
public RewriterResults rewrite(HttpRequest request, HttpResponse original,
MutableContent content) {
return null;
@@ -76,14 +76,16 @@
Feature f = gadget.getSpec().getModulePrefs().getFeatures()
.get("opensocial-templates");
if (f != null && isServerTemplatingEnabled(f)) {
- return rewriteImpl(gadget, content);
+ return rewriteImpl(gadget, content);
}
return null;
}
/**
* For now, only enable server-side templating when the feature contains:
- * <Param name="process-on-server">true</Param>
+ * <pre>
+ * <Param name="process-on-server">true</Param>
+ * </pre>
*/
private boolean isServerTemplatingEnabled(Feature f) {
return
("true".equalsIgnoreCase(f.getParams().get(SERVER_TEMPLATING_PARAM)));
@@ -105,19 +107,19 @@
// that require data that isn't available on the server can't
// be processed either
return "text/os-template".equals(type)
- && "".equals(name)
+ && "".equals(name)
&& "".equals(tag)
&& checkRequiredData(require, pipelinedData.keySet());
}
}));
-
+
if (templates.isEmpty()) {
return null;
}
-
+
TemplateContext templateContext = new TemplateContext(pipelinedData);
GadgetELResolver globalGadgetVars = new
GadgetELResolver(gadget.getContext());
-
+
for (Element template : templates) {
DocumentFragment result = processor.get().processTemplate(
template, templateContext, globalGadgetVars);
@@ -127,7 +129,7 @@
// e.g. paging through friend lists, will still need the template
template.getParentNode().removeChild(template);
}
-
+
// TODO: Deactivate the "os-templates" feature if all templates have
// been rendered.
// Note: This may not always be correct behavior since client may want
@@ -135,7 +137,7 @@
MutableContent.notifyEdit(content.getDocument());
return RewriterResults.cacheableIndefinitely();
}
-
+
/**
* Checks that all the required data is available at rewriting time.
* @param requiredData A string of comma-separated data set names
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java?rev=750453&r1=750452&r2=750453&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
Thu Mar 5 13:22:39 2009
@@ -29,7 +29,7 @@
import java.util.Map;
/**
- * Wraps an <OAuth> element from the gadget spec.
+ * Wraps an <OAuth> element from the gadget spec.
*
* Instances are immutable.
*/
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java?rev=750453&r1=750452&r2=750453&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/PipelinedData.java
Thu Mar 5 13:22:39 2009
@@ -49,7 +49,7 @@
import com.google.common.collect.Maps;
/**
- * Parsing code for <os:*> elements.
+ * Parsing code for <os:*> elements.
*/
public class PipelinedData {
private final Map<String, SocialData> socialPreloads;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/HtmlTagHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/HtmlTagHandler.java?rev=750453&r1=750452&r2=750453&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/HtmlTagHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/HtmlTagHandler.java
Thu Mar 5 13:22:39 2009
@@ -29,16 +29,16 @@
import com.google.inject.Inject;
/**
- * A TagHandler for the <os:Html code="..."/> tag.
+ * A TagHandler for the <os:Html code="..."/> tag.
* The value of the @code attribute will be treated as HTML markup.
*/
public class HtmlTagHandler extends AbstractTagHandler {
-
+
static final String TAG_NAME = "Html";
static final String ATTR_CODE = "code";
-
+
private final GadgetHtmlParser parser;
-
+
@Inject
public HtmlTagHandler(GadgetHtmlParser parser) {
super(TagHandler.OPENSOCIAL_NAMESPACE, TAG_NAME);
@@ -50,12 +50,12 @@
if ((code == null) || "".equals(code)) {
return;
}
-
+
try {
parser.parseFragment(code, result);
} catch (GadgetException ge) {
try {
- StringBuilder sb = new StringBuilder("Error: ");
+ StringBuilder sb = new StringBuilder("Error: ");
NekoSerializer.printEscapedText(ge.getMessage(), sb);
Node comment = result.getOwnerDocument().createComment(sb.toString());
result.appendChild(comment);
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java?rev=750453&r1=750452&r2=750453&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NameTagHandler.java
Thu Mar 5 13:22:39 2009
@@ -26,20 +26,20 @@
import com.google.inject.Inject;
/**
- * TagHandler for the <os:Name person="..."/> tag.
+ * TagHandler for the <os:Name person="..."/> tag.
*/
public class NameTagHandler extends AbstractTagHandler {
static final String TAG_NAME = "Name";
- static final String PERSON_ATTR = "person";
-
+ static final String PERSON_ATTR = "person";
+
@Inject
public NameTagHandler() {
super(TagHandler.OPENSOCIAL_NAMESPACE, TAG_NAME);
}
-
+
public void process(Node result, Element tag, TemplateProcessor processor) {
-
+
JSONObject person = getValueFromTag(tag, PERSON_ATTR, processor,
JSONObject.class);
if (person == null) {
return;
@@ -52,7 +52,7 @@
if (formatted.length() == 0) {
formatted = name.optString("givenName") + " " +
name.optString("familyName");
}
-
+
Document doc = result.getOwnerDocument();
Element root = doc.createElement("b");
