@@ -96,25 +96,30 @@ private void checkLibExtDirectory(final ArrayList<File> files,
9696 checkFile (files , new File (dir , "j3dcore.jar" ));
9797 checkFile (files , new File (dir , "vecmath.jar" ));
9898 checkFile (files , new File (dir , "j3dutils.jar" ));
99- checkFilePattern ( files , dir , "j3d-core*" );
100- checkFilePattern ( files , dir , "vecmath*" );
101- checkFilePattern ( files , dir , "jogl*" );
102- // Maybe libJ3DUtils.jnilib libJ3DAudio.jnilib
99+ checkFilePattern (files , dir , "j3d-core*" );
100+ checkFilePattern (files , dir , "vecmath*" );
101+ checkFilePattern (files , dir , "jogl*" );
102+ // Maybe libJ3DUtils.jnilib libJ3DAudio.jnilib
103103 }
104-
105- private void checkFilePattern (ArrayList <File > files , String dir , String argPattern ) {
106- final String pattern = argPattern .replace ("." ,"\\ ." ).replace ("*" ,".*" );
107-
108- if ( dir .isEmpty () ) dir = "." ;
109- else if ( (new File (dir )).exists () ) {
110- for ( File f : new File ( dir ).listFiles ( new FilenameFilter (){
111- public boolean accept ( File dir , String name ) {
112- return name .matches ( pattern );
113- }
114- })){
115- files .add (f );
116- }
117- }
104+
105+ private void checkFilePattern (final ArrayList <File > files ,
106+ final String dirPath , final String argPattern )
107+ {
108+ final String pattern = argPattern .replace ("." , "\\ ." ).replace ("*" , ".*" );
109+
110+ final File dirFile = new File (dirPath .isEmpty () ? "." : dirPath );
111+ if (!dirFile .exists ()) return ;
112+
113+ final FilenameFilter filter = new FilenameFilter () {
114+
115+ @ Override
116+ public boolean accept (final File dir , final String name ) {
117+ return name .matches (pattern );
118+ }
119+ };
120+ for (final File f : dirFile .listFiles (filter )) {
121+ files .add (f );
122+ }
118123 }
119124
120125 private void checkFile (ArrayList <File > files , File file ) {
0 commit comments