fixing generics

LinkedInAttic · Apr 19, 2010 · 3571b7a · 3571b7a
1 parent 74d0002
commit 3571b7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/bobo-browse/src/com/browseengine/bobo/facets/data/FacetDataCache.java b/bobo-browse/src/com/browseengine/bobo/facets/data/FacetDataCache.java
@@ -157,7 +157,7 @@ public void load(String fieldName,IndexReader reader,TermListFactory<T> listFact
     this.maxIDs = maxIDList.toIntArray();
   }
 
-	public static int[] convert(FacetDataCache dataCache,String[] vals)
+	private static int[] convertString(FacetDataCache dataCache,String[] vals)
 	{
 	    IntList list = new IntArrayList(vals.length);
 	    for (int i=0;i<vals.length;++i)
@@ -182,6 +182,7 @@ public static int[] convert(FacetDataCache dataCache,String[] vals)
    */
   public static <T> int[] convert(FacetDataCache<T> dataCache,T[] vals)
   {
+    if (vals!=null && (vals instanceof String[])) return convertString(dataCache, (String[])vals);
     IntList list = new IntArrayList(vals.length);
     for (int i=0;i<vals.length;++i)
     {

diff --git a/bobo-browse/src/com/browseengine/bobo/facets/data/MultiValueFacetDataCache.java b/bobo-browse/src/com/browseengine/bobo/facets/data/MultiValueFacetDataCache.java
@@ -30,7 +30,7 @@
  * @author ymatsuda
  *
  */
-public class MultiValueFacetDataCache extends FacetDataCache
+public class MultiValueFacetDataCache<T> extends FacetDataCache<T>
 {
   private static final long serialVersionUID = 1L;
   private static Logger logger = Logger.getLogger(MultiValueFacetDataCache.class);
@@ -52,7 +52,7 @@ public void setMaxItems(int maxItems)
   }
 
   @Override
-  public void load(String fieldName, IndexReader reader, TermListFactory listFactory) throws IOException
+  public void load(String fieldName, IndexReader reader, TermListFactory<T> listFactory) throws IOException
   {
     this.load(fieldName, reader, listFactory, new WorkArea());
   }
@@ -65,14 +65,14 @@ public void load(String fieldName, IndexReader reader, TermListFactory listFacto
    * @param workArea
    * @throws IOException
    */
-  public void load(String fieldName, IndexReader reader, TermListFactory listFactory, WorkArea workArea) throws IOException
+  public void load(String fieldName, IndexReader reader, TermListFactory<T> listFactory, WorkArea workArea) throws IOException
   {
     int maxdoc = reader.maxDoc();
     BufferedLoader loader = getBufferedLoader(maxdoc, workArea);
 
     TermEnum tenum = null;
     TermDocs tdoc = null;
-    TermValueList list = (listFactory == null ? new TermStringList() : listFactory.createTermList());
+    TermValueList<T> list = (listFactory == null ? (TermValueList<T>)new TermStringList() : listFactory.createTermList());
     IntArrayList minIDList = new IntArrayList();
     IntArrayList maxIDList = new IntArrayList();
     IntArrayList freqList = new IntArrayList();
@@ -180,7 +180,7 @@ public void load(String fieldName, IndexReader reader, TermListFactory listFacto
    * @param listFactory
    * @throws IOException
    */
-  public void load(String fieldName, IndexReader reader, TermListFactory listFactory, Term sizeTerm) throws IOException
+  public void load(String fieldName, IndexReader reader, TermListFactory<T> listFactory, Term sizeTerm) throws IOException
   {
     int maxdoc = reader.maxDoc();
     Loader loader = new AllocOnlyLoader(_maxItems, sizeTerm, reader);
@@ -200,7 +200,7 @@ public void load(String fieldName, IndexReader reader, TermListFactory listFacto
 
     TermEnum tenum = null;
     TermDocs tdoc = null;
-    TermValueList list = (listFactory == null ? new TermStringList() : listFactory.createTermList());
+    TermValueList<T> list = (listFactory == null ? (TermValueList<T>)new TermStringList() : listFactory.createTermList());
     IntArrayList minIDList = new IntArrayList();
     IntArrayList maxIDList = new IntArrayList();
     IntArrayList freqList = new IntArrayList();