svn commit: r687860 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse: GadgetCssParser.java GadgetHtmlParser.java caja/CajaCssParser.java caja/CajaHtmlParser.java

[jo...@apache.org]

Author: johnh
Date: Thu Aug 21 13:57:47 2008
New Revision: 687860

URL: http://svn.apache.org/viewvc?rev=687860&view=rev
Log:
Adding default implementation annotations to html parsers.


Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetCssParser.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetCssParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetCssParser.java?rev=687860&r1=687859&r2=687860&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetCssParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetCssParser.java Thu Aug 21 13:57:47 2008
@@ -17,7 +17,10 @@
  */
 package org.apache.shindig.gadgets.parse;
 
+import com.google.inject.ImplementedBy;
+
 import org.apache.shindig.gadgets.GadgetException;
+import org.apache.shindig.gadgets.parse.caja.CajaCssParser;
 
 import java.util.List;
 
@@ -28,6 +31,7 @@
  * {@see ParsedCssRule} and {@see ParsedCssDeclaration} for additional
  * parsing requirements and semantics.
  */
+@ImplementedBy(CajaCssParser.class)
 public interface GadgetCssParser {
   public List<ParsedCssRule> parse(String css) throws GadgetException;
   public List<ParsedCssDeclaration> parseInline(String style) throws GadgetException;

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java?rev=687860&r1=687859&r2=687860&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java Thu Aug 21 13:57:47 2008
@@ -17,7 +17,10 @@
  */
 package org.apache.shindig.gadgets.parse;
 
+import com.google.inject.ImplementedBy;
+
 import org.apache.shindig.gadgets.GadgetException;
+import org.apache.shindig.gadgets.parse.caja.CajaHtmlParser;
 
 import java.util.List;
 
@@ -29,6 +32,7 @@
  * 
  * {@see ParsedHtmlNode} for parsing details
  */
+@ImplementedBy(CajaHtmlParser.class)
 public interface GadgetHtmlParser {
   public List<ParsedHtmlNode> parse(String source) throws GadgetException;
 }

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java?rev=687860&r1=687859&r2=687860&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java Thu Aug 21 13:57:47 2008
@@ -30,6 +30,7 @@
 import com.google.caja.reporting.MessageContext;
 import com.google.caja.reporting.RenderContext;
 import com.google.caja.util.Criterion;
+import com.google.inject.Singleton;
 
 import org.apache.shindig.gadgets.GadgetException;
 import org.apache.shindig.gadgets.parse.GadgetCssParser;
@@ -42,6 +43,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class CajaCssParser implements GadgetCssParser {
 
   public List<ParsedCssRule> parse(String css) throws GadgetException {

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java?rev=687860&r1=687859&r2=687860&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java Thu Aug 21 13:57:47 2008
@@ -27,6 +27,7 @@
 import com.google.caja.parser.html.DomTree;
 import com.google.caja.reporting.MessageQueue;
 import com.google.caja.reporting.SimpleMessageQueue;
+import com.google.inject.Singleton;
 
 import org.apache.shindig.gadgets.GadgetException;
 import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
@@ -42,6 +43,7 @@
 /**
  * Caja-based implementation of a {@code GadgetHtmlParser}.
  */
+@Singleton
 public class CajaHtmlParser implements GadgetHtmlParser {
 
   /** {@inheritDoc */