Author: etnu
Date: Wed Apr 2 23:28:43 2008
New Revision: 644183
URL: http://svn.apache.org/viewvc?rev=644183&view=rev
Log:
Updated metadata request to use HttpUtil.getView to ensure that the most
appropriate view is always selected.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java?rev=644183&r1=644182&r2=644183&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/UrlGenerator.java
Wed Apr 2 23:28:43 2008
@@ -24,6 +24,7 @@
import org.apache.shindig.gadgets.GadgetFeatureFactory;
import org.apache.shindig.gadgets.GadgetFeatureRegistry;
import org.apache.shindig.gadgets.JsLibrary;
+import org.apache.shindig.gadgets.SyndicatorConfig;
import org.apache.shindig.gadgets.UserPrefs;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.UserPref;
@@ -47,6 +48,7 @@
private final String jsPrefix;
private final String iframePrefix;
private final String jsChecksum;
+ private final SyndicatorConfig syndicatorConfig;
private final static Pattern ALLOWED_FEATURE_NAME
= Pattern.compile("[0-9a-zA-Z\\.\\-]+");
@@ -98,11 +100,17 @@
GadgetSpec spec = gadget.getSpec();
try {
String url = context.getUrl().toString();
- View.ContentType type = spec.getView(context.getView()).getType();
+ View view = HttpUtil.getView(gadget, syndicatorConfig);
+ View.ContentType type;
+ if (view == null) {
+ type = View.ContentType.HTML;
+ } else {
+ type = null;
+ }
switch (type) {
case URL:
// type = url
- buf.append(url);
+ buf.append(view.getHref());
if (url.indexOf('?') == -1) {
buf.append('?');
} else {
@@ -149,9 +157,11 @@
@Inject
public UrlGenerator(@Named("urls.iframe.prefix") String iframePrefix,
@Named("urls.js.prefix") String jsPrefix,
- GadgetFeatureRegistry registry) {
+ GadgetFeatureRegistry registry,
+ SyndicatorConfig syndicatorConfig) {
this.iframePrefix = iframePrefix;
this.jsPrefix = jsPrefix;
+ this.syndicatorConfig = syndicatorConfig;
StringBuilder jsBuf = new StringBuilder();
for (Map.Entry<String, GadgetFeatureRegistry.Entry> entry :
