DefaultJava3DService: check for all related JARs

ctrueden · ctrueden · commit d5eae7214513 · 2015-10-07T14:38:33.000-05:00
This checks for all known variants of the Java 3D JAR files,
as well as the JOGL and Gluegen dependencies.

And it checks for both versioned and unversioned filenames.
diff --git a/src/main/java/org/scijava/java3d/DefaultJava3DService.java b/src/main/java/org/scijava/java3d/DefaultJava3DService.java
@@ -96,13 +96,13 @@ private void checkLibExtDirectory(final ArrayList<File> files,
 		final File dirFile = new File(dirPath.isEmpty() ? "." : dirPath);
 		if (!dirFile.exists()) return;
 
-		checkFile(files, new File(dirFile, "j3dcore.jar"));
-		checkFile(files, new File(dirFile, "vecmath.jar"));
-		checkFile(files, new File(dirFile, "j3dutils.jar"));
-		checkFilePattern(files, dirFile, "j3d-core.*");
-		checkFilePattern(files, dirFile, "vecmath.*");
-		checkFilePattern(files, dirFile, "jogl.*");
-		// Maybe libJ3DUtils.jnilib libJ3DAudio.jnilib
+		checkFilePattern(files, dirFile, "gluegen-rt(-[0-9].*)?\\.jar");
+		checkFilePattern(files, dirFile, "j3d-core(-[0-9].*)?\\.jar");
+		checkFilePattern(files, dirFile, "j3d-core-utils(-[0-9].*)?\\.jar");
+		checkFilePattern(files, dirFile, "j3dcore(-[0-9].*)?\\.jar");
+		checkFilePattern(files, dirFile, "j3dutils(-[0-9].*)?\\.jar");
+		checkFilePattern(files, dirFile, "jogl(-[0-9].*)?\\.jar");
+		checkFilePattern(files, dirFile, "vecmath(-[0-9].*)?\\.jar");
 	}
 
 	private void checkFilePattern(final ArrayList<File> files,
@@ -120,8 +120,4 @@ public boolean accept(final File dir, final String name) {
 		}
 	}
 
-	private void checkFile(ArrayList<File> files, File file) {
-		if (file.exists()) files.add(file);
-	}
-
 }
