Merge branch 'improve-java3d-detection'

ctrueden · ctrueden · commit cae62a8c9bd8 · 2015-10-07T14:41:48.000-05:00
diff --git a/src/main/java/org/scijava/java3d/DefaultJava3DService.java b/src/main/java/org/scijava/java3d/DefaultJava3DService.java
@@ -91,34 +91,33 @@ protected void onEvent(@SuppressWarnings("unused") final UIShownEvent evt) {
 	// -- Helper methods --
 
 	private void checkLibExtDirectory(final ArrayList<File> files,
-		final String dir)
+		final String dirPath)
 	{
-		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*");
-		// Maybe libJ3DUtils.jnilib libJ3DAudio.jnilib 
-	}
-	
-	private void checkFilePattern(ArrayList<File> files, String dir, String argPattern) {
-		final String pattern = argPattern.replace(".","\\.").replace("*",".*");	    
-	    
-	    if( dir.isEmpty() ) dir = ".";
-	    else if( (new File(dir)).exists() ) {
-		    for( File f : new File( dir ).listFiles( new FilenameFilter(){
-		                       public boolean accept( File dir, String name ) { 
-		                           return name.matches( pattern );
-		                       }
-		                    })){
-		    	files.add(f);
-		    }
-	    }
+		final File dirFile = new File(dirPath.isEmpty() ? "." : dirPath);
+		if (!dirFile.exists()) return;
+
+		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 checkFile(ArrayList<File> files, File file) {
-		if (file.exists()) files.add(file);
+	private void checkFilePattern(final ArrayList<File> files,
+		final File dirFile, final String regex)
+	{
+		final FilenameFilter filter = new FilenameFilter() {
+
+			@Override
+			public boolean accept(final File dir, final String name) {
+				return name.matches(regex);
+			}
+		};
+		for (final File f : dirFile.listFiles(filter)) {
+			files.add(f);
+		}
 	}
 
 }
diff --git a/src/test/java/org/scijava/java3d/Java3DServiceTest.java b/src/test/java/org/scijava/java3d/Java3DServiceTest.java
@@ -84,13 +84,20 @@ public void testGetLibExtLocations() throws IOException {
 		expected.add(j3dcore2);
 		assertEquals(expected, libExtFiles());
 
+		final File j3dutils = createFile(tmp2, "j3dutils.jar");
+		expected.add(j3dutils);
+		final File jogl = createFile(tmp1, "jogl-2.2.0.jar");
+		expected.add(jogl);
+		assertEquals(expected, libExtFiles());
+
 		final File vecmath = createFile(tmp1, "vecmath.jar");
 		createFile(tmp2, "red-herring");
 		expected.add(vecmath);
 		assertEquals(expected, libExtFiles());
 
 		System.setProperty("java.ext.dirs", tmp1.getAbsolutePath());
 		expected.remove(j3dcore2);
+		expected.remove(j3dutils);
 		assertEquals(expected, libExtFiles());
 
 		System.setProperty("java.ext.dirs", "");
