Author: tchemit Date: 2011-08-29 13:54:58 +0200 (Mon, 29 Aug 2011) New Revision: 323 Url: http://chorem.org/repositories/revision/bow/323 Log: fix build :( Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchSuggestionAction.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchSuggestionAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchSuggestionAction.java 2011-08-22 11:23:47 UTC (rev 322) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/opensearch/OpenSearchSuggestionAction.java 2011-08-29 11:54:58 UTC (rev 323) @@ -24,25 +24,28 @@ package org.chorem.bow.action.opensearch; import com.opensymphony.xwork2.ActionContext; -import java.io.InputStream; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; import org.apache.commons.io.input.ReaderInputStream; import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.bow.BookmarkUtils; - import org.chorem.bow.BowBookmark; +import org.chorem.bow.BowConfig; import org.chorem.bow.BowUser; import org.chorem.bow.BowUtils; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Search; +import java.io.InputStream; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + /** * Retourne les suggestions pour l'opensearch en fonction de ce qui a ete deja * saisi @@ -50,6 +53,11 @@ * @author poussin */ public class OpenSearchSuggestionAction extends OpenSearchBaseAction { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(OpenSearchSuggestionAction.class); + private static final long serialVersionUID = 1L; static public OpenSearchSuggestionAction getAction() { @@ -57,7 +65,7 @@ return (OpenSearchSuggestionAction) action; } - protected InputStream inputStream; + protected transient InputStream inputStream; public InputStream getInputStream() { return inputStream; @@ -72,7 +80,7 @@ // preparation de la reponse. Un toString sur une liste retourne // la bonne syntaxe pour une reponse json :) si on triche un peu // en ajoutant des '' pour les chaines - List json = new ArrayList(); + List<Object> json = new ArrayList<Object>(); List<String> completions = new ArrayList<String>(); List<String> descriptions = new ArrayList<String>(); List<String> queryUrls = new ArrayList<String>(); @@ -130,7 +138,8 @@ if (completion.startsWith(lastTag)) { String description = _("%s results",t.getCount()); String tags = query + StringUtils.removeStart(completion, lastTag); - String queryUrl = getConfig().getBowUrl() + BowUtils.redirectTo(tags, null); + getConfig(); + String queryUrl = BowConfig.getBowUrl() + BowUtils.redirectTo(tags, null); completions.add("'" + completion + "'"); descriptions.add("'" + description + "'"); @@ -170,7 +179,7 @@ // preparation de la reponse. Un toString sur une liste retourne // la bonne syntaxe pour une reponse json :) si on triche un peu // en ajoutant des '' pour les chaines - List json = new ArrayList(); + List<Object> json = new ArrayList<Object>(); List<String> completions = new ArrayList<String>(); List<String> descriptions = new ArrayList<String>(); List<String> queryUrls = new ArrayList<String>(); @@ -216,7 +225,6 @@ /** * On ne renvoie aucune suggestion * - * @param prefix * @param query * @return */