DefaultJava3DService: just pass the regex directly

ctrueden · ctrueden · commit 3428035c4ac1 · 2015-10-07T14:35:16.000-05:00
diff --git a/src/main/java/org/scijava/java3d/DefaultJava3DService.java b/src/main/java/org/scijava/java3d/DefaultJava3DService.java
@@ -96,25 +96,23 @@ private void checkLibExtDirectory(final ArrayList<File> files,
 		checkFile(files, new File(dir, "j3dcore.jar"));
 		checkFile(files, new File(dir, "vecmath.jar"));
 		checkFile(files, new File(dir, "j3dutils.jar"));
-		checkFilePattern(files, dir, "j3d-core*");
-		checkFilePattern(files, dir, "vecmath*");
-		checkFilePattern(files, dir, "jogl*");
+		checkFilePattern(files, dir, "j3d-core.*");
+		checkFilePattern(files, dir, "vecmath.*");
+		checkFilePattern(files, dir, "jogl.*");
 		// Maybe libJ3DUtils.jnilib libJ3DAudio.jnilib
 	}
 
 	private void checkFilePattern(final ArrayList<File> files,
-		final String dirPath, final String argPattern)
+		final String dirPath, final String regex)
 	{
-		final String pattern = argPattern.replace(".", "\\.").replace("*", ".*");
-
 		final File dirFile = new File(dirPath.isEmpty() ? "." : dirPath);
 		if (!dirFile.exists()) return;
 
 		final FilenameFilter filter = new FilenameFilter() {
 
 			@Override
 			public boolean accept(final File dir, final String name) {
-				return name.matches(pattern);
+				return name.matches(regex);
 			}
 		};
 		for (final File f : dirFile.listFiles(filter)) {
