Merge branch 'imagej-forum-3176'

This fixes a problem with backwards compatibility in ImageJ,
where scripts ending in underscore previously retained a
trailing space, but no longer did so in recent versions.

See:
http://forum.imagej.net/t/trouble-with-commands-being-recognized-in-macro/3176/15

Author: ctrueden

src/main/java/org/scijava/MenuPath.java

@@ -74,10 +74,20 @@ public MenuPath(final String path) {
 	 * the specified separator.
 	 */
 	public MenuPath(final String path, final String separator) {
+		this(path, separator, true);
+	}
+
+	/**
+	 * Creates a menu path with entries parsed from the given string, splitting on
+	 * the specified separator, and trimming whitespace if indicated.
+	 */
+	public MenuPath(final String path, final String separator,
+		final boolean trim)
+	{
 		if (path != null && !path.isEmpty()) {
 			final String[] tokens = path.split(separator);
 			for (final String token : tokens) {
-				add(new MenuEntry(token.trim()));
+				add(new MenuEntry(trim ? token.trim() : token));
 			}
 		}
 	}

src/main/java/org/scijava/script/ScriptFinder.java

@@ -172,7 +172,7 @@ private int createInfos(final List<ScriptInfo> scripts, final Set<URL> urls,
 			final String friendlyPath = basePath.replace('_', ' ');
 
 			final MenuPath menuPath = new MenuPath(menuPrefix);
-			menuPath.addAll(new MenuPath(friendlyPath, "/"));
+			menuPath.addAll(new MenuPath(friendlyPath, "/", false));
 
 			// E.g.:
 			// path = "File/Import/Movie_File....groovy"