Index: src/demo/org/apache/lucene/demo/html/Entities.java
===================================================================
--- src/demo/org/apache/lucene/demo/html/Entities.java	(revision 834161)
+++ src/demo/org/apache/lucene/demo/html/Entities.java	(working copy)
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 public class Entities {
-  static final Map decoder = new HashMap(300);
+  static final Map<String,String> decoder = new HashMap<String,String>(300);
   static final String[]  encoder = new String[0x100];
 
   static final String decode(String entity) {
Index: src/demo/org/apache/lucene/demo/html/Tags.java
===================================================================
--- src/demo/org/apache/lucene/demo/html/Tags.java	(revision 834161)
+++ src/demo/org/apache/lucene/demo/html/Tags.java	(working copy)
@@ -27,7 +27,7 @@
   /**
    * contains all tags for which whitespaces have to be inserted for proper tokenization
    */
-  public static final Set WS_ELEMS = Collections.synchronizedSet(new HashSet());
+  public static final Set<String> WS_ELEMS = Collections.synchronizedSet(new HashSet<String>());
 
   static{
     WS_ELEMS.add("<hr");