svn commit: r818369 - in /incubator/shindig/trunk/java: common/conf/ gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/ gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/

[lindner]

Author: lindner
Date: Thu Sep 24 04:52:22 2009
New Revision: 818369

URL: http://svn.apache.org/viewvc?rev=818369&view=rev
Log:
SHINDIG-1160 | Patch from chirag shah | Make the flash min version configurable

Modified:
    incubator/shindig/trunk/java/common/conf/shindig.properties
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
    
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java

Modified: incubator/shindig/trunk/java/common/conf/shindig.properties
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/conf/shindig.properties?rev=818369&r1=818368&r2=818369&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/conf/shindig.properties (original)
+++ incubator/shindig/trunk/java/common/conf/shindig.properties Thu Sep 24 
04:52:22 2009
@@ -64,6 +64,9 @@
 shindig.image-rewrite.jpeg-compression = 0.75
 shindig.image-rewrite.min-threshold-bytes = 200
 
+# Configuration for the os:Flash tag
+shindig.flash.min-version = 9.0.115
+
 # Configuration for template rewriter
 
shindig.template-rewrite.extension-tag-namespace=http://ns.opensocial.org/2009/extensions
 

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java?rev=818369&r1=818368&r2=818369&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java
 Thu Sep 24 04:52:22 2009
@@ -53,12 +53,12 @@
  */
 public class FlashTagHandler extends AbstractTagHandler {
 
-  static final String FLASH_MIN_VER = "9.0.115";
   static final String SWFOBJECT = "swfobject";
   static final String TAG_NAME = "Flash";
 
   private final BeanJsonConverter beanConverter;
   private final GadgetFeatureRegistry featureRegistry;
+  private final String flashMinVersion;
 
   /**
    * Used to generate id's for generated tags and functions
@@ -68,10 +68,12 @@
 
   @Inject
   public FlashTagHandler(BeanJsonConverter beanConverter, 
GadgetFeatureRegistry featureRegistry,
-      @Named("shindig.template-rewrite.extension-tag-namespace") String 
namespace) {
+      @Named("shindig.template-rewrite.extension-tag-namespace") String 
namespace,
+      @Named("shindig.flash.min-version") String flashMinVersion) {
     super(namespace, TAG_NAME);
     this.beanConverter = beanConverter;
     this.featureRegistry = featureRegistry;
+    this.flashMinVersion = flashMinVersion;
   }
 
   public void process(Node result, Element tag, TemplateProcessor processor) {
@@ -154,7 +156,7 @@
       JsonSerializer.appendString(builder, config.width);
       builder.append(",");
       JsonSerializer.appendString(builder, config.height);
-      builder.append(",\"" + FLASH_MIN_VER + "\",");
+      builder.append(",\"" + flashMinVersion + "\",");
       builder.append("null,null,");
       JsonSerializer.appendMap(builder, config.getParams());
       builder.append(",");

Modified: 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java?rev=818369&r1=818368&r2=818369&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java
 Thu Sep 24 04:52:22 2009
@@ -81,7 +81,7 @@
     parser = injector.getInstance(SocialMarkupHtmlParser.class);
     featureRegistry = mock(GadgetFeatureRegistry.class);
     handler = new FlashTagHandler(new BeanJsonConverter(injector), 
featureRegistry,
-        "http://example.org/ns";);
+        "http://example.org/ns";, "9.0.115");
     result = parser.parseDom("");
 
     EasyMock.expect(gadget.getContext()).andReturn(gadgetContext).anyTimes();