searchbar: layout updates, imagej forum result improvements

Author: frauzufall

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

@@ -0,0 +1,42 @@
+
+package org.scijava.search.web;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Deborah Schmidt
+ */
+public class ImageJForumSearchResult extends WebSearchResult {
+
+	final HashMap<String, String> metaInfo;
+
+	public ImageJForumSearchResult(final String name, final String iconPath,
+		final String url, HashMap< String, String > metaInfo, final String details)
+	{
+		super(name, iconPath, url, details);
+		this.metaInfo = metaInfo;
+	}
+
+	@Override
+	public Map<String, String> properties() {
+		final HashMap<String, String> properties = new HashMap<>();
+//		properties.put("name", name);
+//		properties.put("iconpath", iconPath);
+		properties.put("url", url);
+		properties.put("tags", metaInfo.get("tags"));
+		properties.put("created / last posted", formatDate(metaInfo.get("created_at")) + " / " + formatDate(metaInfo.get("last_posted_at")));
+		return properties;
+	}
+	
+	public String formatDate(String datestr) {
+		 Instant instant = Instant.parse(datestr);
+		 LocalDateTime result = LocalDateTime.ofInstant(instant, ZoneId.of(ZoneOffset.UTC.getId()));
+		return result.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+	}
+}

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

@@ -86,14 +86,30 @@ public List<SearchResult> search(final String text, final boolean fuzzy) {
 						"created_at") + "<br />" + "Last posted: " + metaInfo.get(
 							"last_posted_at");
 
-				addResult(metaInfo.get("title"), "", forumPostUrl, details);
+				addResult(metaInfo.get("title"), "", forumPostUrl, metaInfo, details);
 			}
 		}
 		catch (final IOException e) {
 			log.debug(e);
 		}
 		return getSearchResults();
 	}
+	
+	/**
+	 * @param name Resulting website title / name
+	 * @param iconPath path to an image representing the results
+	 * @param url URL of the found website
+	 * @param metaInfo 
+	 * @param details some text from the website representing its content
+	 */
+	protected void addResult(final String name, final String iconPath,
+		final String url, HashMap< String, String > metaInfo, final String details)
+	{
+		getSearchResults().add(new ImageJForumSearchResult(name, //
+			iconPath == null || iconPath.isEmpty() ? "/icons/world_link.png"
+				: iconPath, url, metaInfo, details));
+	}
+
 
 	HashMap<String, String> parseForumSearchResult(String content) {
 		content = content + ",";

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

@@ -43,7 +43,7 @@
  */
 public class WebSearchResult implements SearchResult {
 
-	private final String details;
+	protected final String details;
 	String name;
 	String iconPath;
 	String url;

src/main/java/org/scijava/ui/swing/search/SwingSearchBar.java

@@ -42,6 +42,11 @@
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.net.URL;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -349,11 +354,17 @@ public SwingSearchPanel() {
 			final JPanel detailsPane = new JPanel();
 			final JLabel detailsTitle = new JLabel();
 			final JPanel detailsProps = new JPanel();
+			final JScrollPane detailsScrollPane = new JScrollPane(detailsProps);
 			final JPanel detailsButtons = new JPanel();
 
-			detailsProps.setLayout(new MigLayout("fill, wrap 1, ins 0, wmin 10"));
-			detailsButtons.setLayout(new MigLayout("fill, ins " + PAD + " 0 " + PAD + " 0"));
-			detailsPane.setLayout(new MigLayout("wrap, ins 0 " + PAD + " " + PAD + " " + PAD + ", fill, wmin 100, hmin 100","[grow]", "[fill][fill]push[fill]"));
+			detailsScrollPane.setHorizontalScrollBarPolicy(
+					ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+			detailsScrollPane.setBorder(null);
+			
+			detailsProps.setLayout(new MigLayout("wrap 1, ins 0, wmin 0, hmin 0", "[grow]", ""));
+			detailsButtons.setLayout(new MigLayout("fill, ins " + PAD + " 0 0 0"));
+			detailsPane.setLayout(new MigLayout("wrap, ins 0 " + PAD + " " + PAD + " " + PAD + ", fill, wmin 0, hmin 0, hmax 100%, wmax 100%",
+					"[grow]", "[fill][fill,grow][fill]"));
 
 			resultsList.addListSelectionListener(lse -> {
 				if (lse.getValueIsAdjusting()) return;
@@ -373,7 +384,6 @@ public SwingSearchPanel() {
 				else {
 					// populate details pane
 					detailsTitle.setText("<html><h2>" + highlightSearchUnderline(escapeHtml(result.name()), searchTerm) + "</h2>");
-					detailsTitle.repaint();
 					detailsProps.removeAll();
 					result.properties().forEach((k, v) -> {
 						if(v != "") {
@@ -422,10 +432,7 @@ public SwingSearchPanel() {
 						});
 						button.addKeyListener(new SearchBarKeyAdapter());
 						if(first){
-							JPanel mainBtnPane = new JPanel();
-							mainBtnPane.setLayout(new MigLayout("insets 0", "[fill,grow]", "[fill,grow]"));
-							mainBtnPane.add(button, "growx");
-							detailsButtons.add(mainBtnPane, "south");
+							detailsButtons.add(button, "grow, spanx");
 							JRootPane rootPane = this.getRootPane();
 							if(rootPane != null){
 								rootPane.setDefaultButton(button);
@@ -440,7 +447,7 @@ public SwingSearchPanel() {
 
 			detailsPane.add(exitBtn, "pos n 0 100% n");
 			detailsPane.add(detailsTitle,"growx, pad 0 0 0 -20");
-			detailsPane.add(detailsProps, "growx");
+			detailsPane.add(detailsScrollPane, "growx, hmin 0, wmin 0");
 			detailsPane.add(detailsButtons, "growx");
 
 			resultsList.addKeyListener(new SearchBarKeyAdapter());
@@ -460,7 +467,7 @@ public SwingSearchPanel() {
 		public void search(final String text) {
 			assertDispatchThread();
 			searchTerm = text;
-			operation.search(text);
+			operation.search(text.toLowerCase());
 		}
 
 		// -- Helper methods --
@@ -655,6 +662,7 @@ public String escapeHtml(String s) {
 			}
 			return out.toString();
 		}
+
 	}
 
 	private class SearchBarKeyAdapter extends KeyAdapter {