DefaultJava3DService: test existence of dir once

ctrueden · ctrueden · commit dfa37007dbb8 · 2015-10-07T14:36:24.000-05:00
diff --git a/src/main/java/org/scijava/java3d/DefaultJava3DService.java b/src/main/java/org/scijava/java3d/DefaultJava3DService.java
@@ -93,21 +93,21 @@ protected void onEvent(@SuppressWarnings("unused") final UIShownEvent evt) {
 	private void checkLibExtDirectory(final ArrayList<File> files,
 		final String dirPath)
 	{
-		checkFile(files, new File(dirPath, "j3dcore.jar"));
-		checkFile(files, new File(dirPath, "vecmath.jar"));
-		checkFile(files, new File(dirPath, "j3dutils.jar"));
-		checkFilePattern(files, dirPath, "j3d-core.*");
-		checkFilePattern(files, dirPath, "vecmath.*");
-		checkFilePattern(files, dirPath, "jogl.*");
+		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
 	}
 
 	private void checkFilePattern(final ArrayList<File> files,
-		final String dirPath, final String regex)
+		final File dirFile, final String regex)
 	{
-		final File dirFile = new File(dirPath.isEmpty() ? "." : dirPath);
-		if (!dirFile.exists()) return;
-
 		final FilenameFilter filter = new FilenameFilter() {
 
 			@Override
