searchbar: layout updates

Author: frauzufall

src/main/java/org/scijava/search/SearchResult.java

@@ -42,6 +42,7 @@
 public interface SearchResult {
 
 	String name();
+	String identifier();
 	String iconPath();
 	Map<String, String> properties();
 }

src/main/java/org/scijava/search/module/ModuleSearchResult.java

@@ -57,7 +57,7 @@ public ModuleSearchResult(final ModuleInfo info, final String baseDir) {
 		this.baseDir = baseDir;
 
 		props = new LinkedHashMap<>();
-		props.put("Title", info.getTitle());
+//		props.put("Title", info.getTitle());
 		final MenuPath menuPath = info.getMenuPath();
 		if (menuPath != null) {
 			props.put("Menu path", menuPath.getMenuString(false));
@@ -79,12 +79,21 @@ public ModuleSearchResult(final ModuleInfo info, final String baseDir) {
 	public String name() {
 		return info.getTitle();
 	}
+	
+	@Override
+	public String identifier() {
+		String menuPath = info.getMenuPath().getMenuString().replace(">", "›");
+		return menuPath.isEmpty() ? info.getTitle() : menuPath;
+	}
 
 	@Override
 	public String iconPath() {
 		final String iconPath = info.getIconPath();
-		return iconPath != null ? iconPath : //
-			info.getMenuPath().getLeaf().getIconPath();
+		if(iconPath != null) return iconPath;
+		if(info.getMenuPath() != null && info.getMenuPath().getLeaf() != null){
+			return info.getMenuPath().getLeaf().getIconPath();
+		}
+		return null;
 	}
 
 	@Override

src/main/java/org/scijava/search/snippet/SnippetSearchResult.java

@@ -74,6 +74,11 @@ public String snippet() {
 	public String name() {
 		return language.getLanguageName() + ": " + snippet;
 	}
+	
+	@Override
+	public String identifier() {
+		return name();
+	}
 
 	@Override
 	public String iconPath() {

src/main/java/org/scijava/search/web/ImageJForumSearcher.java

@@ -81,10 +81,10 @@ public List<SearchResult> search(final String text, final boolean fuzzy) {
 				final String forumPostUrl = "http://forum.imagej.net/t/" + metaInfo.get(
 					"slug") + "/" + metaInfo.get("id") + "/";
 
-				final String details = "Url: " + forumPostUrl + "\n" + "Tags: " +
-					metaInfo.get("tags") + "\n" + "Created: " + metaInfo.get(
-						"created_at") + "\n" + "Last posted: " + metaInfo.get(
-							"last_posted_at") + "\n";
+				final String details = "Tags: " +
+					metaInfo.get("tags") + "<br />" + "Created: " + metaInfo.get(
+						"created_at") + "<br />" + "Last posted: " + metaInfo.get(
+							"last_posted_at");
 
 				addResult(metaInfo.get("title"), "", forumPostUrl, details);
 			}
@@ -102,6 +102,7 @@ HashMap<String, String> parseForumSearchResult(String content) {
 		String currentValue = "";
 		boolean readString = false;
 		boolean readKey = true;
+		boolean tagParentheses = false;
 		String currentChar = " ";
 		String previousChar = " ";
 		for (int i = 0; i < content.length(); i++) {
@@ -119,7 +120,7 @@ HashMap<String, String> parseForumSearchResult(String content) {
 					readKey = false;
 					continue;
 				}
-				if (currentChar.equals(",")) {
+				if (currentChar.equals(",") && !tagParentheses) {
 					readKey = true;
 					map.put(currentKey, currentValue);
 					currentKey = "";
@@ -134,6 +135,12 @@ HashMap<String, String> parseForumSearchResult(String content) {
 					continue;
 				}
 			}
+			if(currentChar.equals("[")){
+				tagParentheses = true;
+			}
+			if(currentChar.equals("]") && tagParentheses){
+				tagParentheses = false;
+			}
 			currentValue = currentValue + currentChar;
 
 		}

src/main/java/org/scijava/search/web/WebSearchResult.java

@@ -61,19 +61,28 @@ public WebSearchResult(final String name, final String iconPath,
 	public String name() {
 		return name;
 	}
+	
+	@Override
+	public String identifier() {
+		return name();
+	}
 
 	@Override
 	public String iconPath() {
 		return iconPath;
 	}
+	
+	public String details() {
+		return details;
+	}
 
 	@Override
 	public Map<String, String> properties() {
 		final HashMap<String, String> properties = new HashMap<>();
-		properties.put("name", name);
+//		properties.put("name", name);
 //		properties.put("iconpath", iconPath);
 		properties.put("url", url);
-		properties.put(null, "<body style='font-size: 11pt; font-family: Arial; background-color: #f4f4f7; padding: 10px 5px;'>.. " + details + " ..</body>");
+		properties.put(null, details);
 		return properties;
 	}
 }