ModuleSearcher: expose iconPath & location helpers

These will be useful for the OpSearcher of imagej-ops.

Author: ctrueden

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-search</artifactId>
-	<version>0.2.1-SNAPSHOT</version>
+	<version>0.3.0-SNAPSHOT</version>
 
 	<name>SciJava Search</name>
 	<description>Search framework for SciJava applications.</description>

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

@@ -46,12 +46,10 @@
 public class ModuleSearchResult implements SearchResult {
 
 	private final ModuleInfo info;
-	private final String baseDir;
 	private final Map<String, String> props;
 
 	public ModuleSearchResult(final ModuleInfo info, final String baseDir) {
 		this.info = info;
-		this.baseDir = baseDir;
 
 		props = new LinkedHashMap<>();
 		final MenuPath menuPath = info.getMenuPath();
@@ -66,7 +64,7 @@ public ModuleSearchResult(final ModuleInfo info, final String baseDir) {
 			}
 		}
 		props.put("Identifier", info.getIdentifier());
-		props.put("Location", getLocation());
+		props.put("Location", ModuleSearcher.location(info, baseDir));
 	}
 
 	public ModuleInfo info() {
@@ -86,12 +84,7 @@ public String identifier() {
 
 	@Override
 	public String iconPath() {
-		final String iconPath = info.getIconPath();
-		if (iconPath != null) return iconPath;
-		if (info.getMenuPath() != null && info.getMenuPath().getLeaf() != null) {
-			return info.getMenuPath().getLeaf().getIconPath();
-		}
-		return null;
+		return ModuleSearcher.iconPath(info);
 	}
 
 	@Override
@@ -101,17 +94,6 @@ public Map<String, String> properties() {
 
 	// -- Helper methods --
 
-	private String getLocation() {
-		String path = info.getLocation();
-		if (path == null) return null;
-		if (path.startsWith("file:/")) path = path.replaceFirst("file:/+", "/");
-		if (baseDir != null && path.startsWith(baseDir)) {
-			if (path.length() == baseDir.length()) return "";
-			path = path.substring(baseDir.length() + 1);
-		}
-		return path;
-	}
-
 	private String getMenuPath(boolean includeLeaf) {
 		final MenuPath menuPath = info.getMenuPath();
 		if (menuPath == null) return "";

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

@@ -128,6 +128,27 @@ public static String title(final ModuleInfo info) {
 		return null;
 	}
 
+	/** Gets the icon path associated with the given module. */
+	public static String iconPath(final ModuleInfo info) {
+		final String iconPath = info.getIconPath();
+		if (iconPath != null) return iconPath;
+		final MenuPath menuPath = info.getMenuPath();
+		return menuPath == null || menuPath.getLeaf() == null ? //
+			null : menuPath.getLeaf().getIconPath();
+	}
+
+	/** Gets an abbreviated location for the given module. */
+	public static String location(final ModuleInfo info, final String baseDir) {
+		String path = info.getLocation();
+		if (path == null) return null;
+		if (path.startsWith("file:/")) path = path.replaceFirst("file:/+", "/");
+		if (baseDir != null && path.startsWith(baseDir)) {
+			if (path.length() == baseDir.length()) return "";
+			path = path.substring(baseDir.length() + 1);
+		}
+		return path;
+	}
+
 	// -- Helper methods --
 
 	private boolean isGoodModule(final ModuleInfo info) {