minor changes according to JLint

[mir.git] / source / mircoders / search / ImagesSearchTerm.java

diff --git a/source/mircoders/search/ImagesSearchTerm.java b/source/mircoders/search/ImagesSearchTerm.java
index 723eb70..0a411d7 100755 (executable)
--- a/source/mircoders/search/ImagesSearchTerm.java
+++ b/source/mircoders/search/ImagesSearchTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,20 +18,22 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License, 
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
+ * (or with modified versions of the above that use the same license as the above), 
+ * and distribute linked combinations including the two.  You must obey the 
+ * GNU General Public License in all respects for all of the code used other than 
+ * the above mentioned libraries.  If you modify this file, you may extend this 
+ * exception to your version of the file, but you are not obligated to do so.  
+ * If you do not wish to do so, delete this exception statement from your version.
  */
 
 package mircoders.search;
 
+import java.util.List;
+import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -44,29 +46,26 @@ import mircoders.storage.DatabaseContentToMedia;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
-import freemarker.template.SimpleHash;
-import freemarker.template.SimpleList;
-import freemarker.template.SimpleScalar;
-
 
 public class ImagesSearchTerm extends SearchTerm{
-  
-  
-  public static String matchField       = "hasImages"; 
-  public static String paramName        = "search_hasImages"; 
-  public static String dataField        = "images"; 
-  public static String templateVariable = "images";
 
+  static {
+    matchField       = "hasImages";
+    paramName        = "search_hasImages";
+    dataField        = "images";
+    templateVariable = "images";
+  }
+  
   public void index(Document doc, Entity entity) throws StorageObjectFailure{
     EntityList images = DatabaseContentToMedia.getInstance().getImages((EntityContent) entity);
     if (images != null && images.size()>0){
       doc.add(Field.Keyword(matchField,"y"));
       String imageURLString = "";
       for(int k=0;k<images.size();k++){
-       if (k != 0){
-         imageURLString = imageURLString + ":";
-       }
-       imageURLString = imageURLString + (images.elementAt(k)).getValue("icon_path");
+        if (k != 0){
+          imageURLString = imageURLString + ":";
+        }
+        imageURLString = imageURLString + (images.elementAt(k)).getValue("icon_path");
       }
       doc.add(Field.UnIndexed("images",imageURLString));
     }
@@ -83,20 +82,20 @@ public class ImagesSearchTerm extends SearchTerm{
       return null;
     }
   }
- 
-  public void returnMeta(SimpleHash result,Document doc){
+
+  public void returnMeta(Map result,Document doc){
     String imageURLString=doc.get(dataField);
     if (imageURLString != null){
-      SimpleList theImages = new SimpleList();
+      List theImages = new Vector();
       StringTokenizer st = new StringTokenizer(imageURLString,":");
       while (st.hasMoreTokens()) {
-       String imageURL=st.nextToken();
-       theImages.add(new SimpleScalar(imageURL));
+        String imageURL=st.nextToken();
+        theImages.add(imageURL);
       }
       result.put(templateVariable,theImages);
     }
   }
-  
+
 
 }