Author: solomax
Date: Tue Mar 6 19:03:35 2012
New Revision: 1297653
URL: http://svn.apache.org/viewvc?rev=1297653&view=rev
Log:
junit tests are partially fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ImportController.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/gui/TestGui.java
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/poll/TestClientListManager.java
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestDebugConnection.java
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestRPCGateway.java
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/userdata/TestLogin.java
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/whiteboard/TestWhiteboardLoad.java
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Tue Mar 6 19:03:35 2012
@@ -157,9 +157,13 @@
<target name="dist" description="binary distribution of OpenMeetings"
depends="cleanForBinary, jar, compile.laszlo.main,
compile.laszlo.main.as3, enhance, signWebStartJars, -copy-libraries"/>
- <!-- compiles the sources without the laszlo client -->
+ <!-- compiles the sources without openlaszlo client -->
<target name="dist-test" description="binary distribution of
OpenMeetings"
- depends="cleanForBinary, jar, signWebStartJars,
-copy-libraries"/>
+ depends="cleanForBinary, -dist-test-no-clean,
signWebStartJars"/>
+
+ <!-- compiles the sources without openlaszlo client and clean -->
+ <target name="-dist-test-no-clean" description="binary distribution of
OpenMeetings"
+ depends="jar, -copy-libraries"/>
<!-- compiles the sources only with laszlo debug client -->
<target name="dist-debug" description="binary distribution of
OpenMeetings"
@@ -690,16 +694,15 @@
</condition>
<path id="junit.classpath">
+ <fileset dir="${junit.lib.dir}" includes="*.jar" />
<fileset dir="${red5.root}" includes="*.jar" />
- <path refid="compile.classpath" />
- <pathelement path="${classes.dir}" />
- <pathelement path="src" />
- <pathelement path="${red5.root}/conf" />
- <pathelement path="${om.dist.webapp}" />
+ <fileset dir="${red5.server.lib}" includes="*.jar" />
<pathelement path="${om.dist.webapp}/WEB-INF" />
- <pathelement path="${basedir}/WebContent/WEB-INF" />
+ <pathelement path="${classes.dir}" />
+ <pathelement path="${om.dist.webapp}/WEB-INF/classes" />
+ <fileset dir="${om.dist.webapp}/WEB-INF/lib" includes="*.jar" />
</path>
- <target name="test" depends="enhance" description="Will run all tests
unless -Dtestcases=_file_name_pattern_ will be passed">
+ <target name="test" depends="-dist-test-no-clean" description="Will run
all tests unless -Dtestcases=_file_name_pattern_ will be passed">
<mkdir dir="${report.dir}" />
<property name="myclsp" refid="junit.classpath" />
<!-- <echo message="${myclsp}" /> -->
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/AbstractUploadController.java
Tue Mar 6 19:03:35 2012
@@ -1,8 +1,5 @@
package org.openmeetings.servlet.outputhandler;
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -37,46 +34,15 @@ public abstract class AbstractUploadCont
context = arg0;
}
- protected enum UploadParams {
- pFile
- , pUserId
- , pSID
- , pPublicSID
- }
-
- /**
- *
- * @param params
- * @param param
- * @param typeObject
- * @return
- */
- protected <T> T getParam(HashMap<UploadParams, Object> params,
- UploadParams param, Class<T> typeObject) {
- try {
- Object returnValue = params.get(param);
- if (returnValue == null) {
- return null;
- }
-
- // Either this can be directly assigned or try to find
a constructor
- // that handles it
- if
(typeObject.isAssignableFrom(returnValue.getClass())) {
- return typeObject.cast(returnValue);
- }
- Constructor<T> c = typeObject
- .getConstructor(returnValue.getClass());
- return c.newInstance(returnValue);
-
- } catch (Exception err) {
- log.error("cannot be cast to return type, error in
parameters for upload: "
- + param, err);
- return null;
- }
+ protected class UploadInfo {
+ MultipartFile file;
+ Long userId;
+ String sid;
+ String publicSID;
}
- protected HashMap<UploadParams, Object> validate(HttpServletRequest
request, boolean admin) throws ServletException {
- HashMap<UploadParams, Object> params = new HashMap<UploadParams,
Object>();
+ protected UploadInfo validate(HttpServletRequest request, boolean admin)
throws ServletException {
+ UploadInfo info = new UploadInfo();
log.debug("Starting validate");
try {
@@ -84,13 +50,13 @@ public abstract class AbstractUploadCont
if (sid == null) {
throw new ServletException("SID Missing");
}
- params.put(UploadParams.pSID, sid);
+ info.sid = sid;
log.debug("sid: " + sid);
Long userId = sessionManagement.checkSession(sid);
Long userLevel =
userManagement.getUserLevelByID(userId);
log.debug("userId = " + userId + ", userLevel = " +
userLevel);
- params.put(UploadParams.pUserId, userId);
+ info.userId = userId;
if ((admin &&
!authLevelManagement.checkAdminLevel(userLevel))
|| (!admin && userLevel <= 0)) {
@@ -104,7 +70,7 @@ public abstract class AbstractUploadCont
throw new ServletException("Missing publicSID");
}
log.debug("publicSID: " + publicSID);
- params.put(UploadParams.pPublicSID, publicSID);
+ info.publicSID= publicSID;
MultipartHttpServletRequest multipartRequest =
(MultipartHttpServletRequest)request;
MultipartFile multipartFile =
multipartRequest.getFile("Filedata");
@@ -114,13 +80,13 @@ public abstract class AbstractUploadCont
if (fileSize > maxSize) {
throw new ServletException("Maximum upload
size: " + maxSize + " exceeded: " + fileSize);
}
- params.put(UploadParams.pFile, multipartFile);
+ info.file = multipartFile;
} catch (ServletException e) {
throw e;
} catch (Exception e) {
log.error("Exception during upload: ", e);
throw new ServletException(e);
}
- return params;
+ return info;
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportController.java
Tue Mar 6 19:03:35 2012
@@ -156,7 +156,7 @@ public class BackupImportController exte
HttpServletResponse httpServletResponse)
throws ServletException, IOException {
- HashMap<UploadParams, Object> params = validate(request, true);
+ UploadInfo info = validate(request, true);
try {
String current_dir = context.getRealPath("/");
String working_dir = current_dir + "upload"
@@ -167,7 +167,7 @@ public class BackupImportController exte
working_dirFile.mkdir();
}
- MultipartFile multipartFile = getParam(params,
UploadParams.pFile, MultipartFile.class);
+ MultipartFile multipartFile = info.file;
InputStream is = multipartFile.getInputStream();
String fileSystemName =
multipartFile.getOriginalFilename();
@@ -476,14 +476,14 @@ public class BackupImportController exte
this.deleteDirectory(f);
LinkedHashMap<String, Object> hs = new
LinkedHashMap<String, Object>();
- hs.put("user", usersDao.getUser(getParam(params,
UploadParams.pUserId, Long.class)));
+ hs.put("user", usersDao.getUser(info.userId));
hs.put("message", "library");
hs.put("action", "import");
hs.put("error", "");
hs.put("fileName", completeName);
scopeApplicationAdapter.sendMessageWithClientByPublicSID(
- hs, getParam(params,
UploadParams.pPublicSID, String.class));
+ hs, info.publicSID);
} catch (Exception e) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ImportController.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ImportController.java
Tue Mar 6 19:03:35 2012
@@ -19,7 +19,6 @@
package org.openmeetings.servlet.outputhandler;
import java.io.InputStream;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import javax.servlet.ServletException;
@@ -37,7 +36,6 @@ import org.springframework.beans.factory
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.multipart.MultipartFile;
@Controller
public class ImportController extends AbstractUploadController {
@@ -57,14 +55,14 @@ public class ImportController extends Ab
protected void service(HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
ServletException {
- HashMap<UploadParams, Object> params = validate(request, true);
+ UploadInfo info = validate(request, true);
try {
String moduleName = request.getParameter("moduleName");
if (moduleName == null) {
moduleName = "moduleName";
}
log.debug("moduleName: " + moduleName);
- InputStream is = getParam(params, UploadParams.pFile,
MultipartFile.class).getInputStream();
+ InputStream is = info.file.getInputStream();
if (moduleName.equals("users")) {
log.error("Import Users");
@@ -87,7 +85,7 @@ public class ImportController extends Ab
log.debug("Return And Close");
LinkedHashMap<String, Object> hs = new
LinkedHashMap<String, Object>();
- hs.put("user", usersDao.getUser(getParam(params,
UploadParams.pUserId, Long.class)));
+ hs.put("user", usersDao.getUser(info.userId));
hs.put("message", "library");
hs.put("action", "import");
@@ -96,7 +94,7 @@ public class ImportController extends Ab
log.debug("moduleName.equals(userprofile) ! ");
scopeApplicationAdapter.sendMessageWithClientByPublicSID(hs,
- getParam(params,
UploadParams.pPublicSID, String.class));
+ info.publicSID);
} catch (Exception er) {
log.error("ERROR importing:", er);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadController.java
Tue Mar 6 19:03:35 2012
@@ -56,9 +56,9 @@ public class UploadController extends Ab
@RequestMapping(value = "/file.upload", method = RequestMethod.POST)
public void handleFileUpload(HttpServletRequest request,
HttpServletResponse response, HttpSession session) throws ServletException {
- HashMap<UploadParams, Object> params = validate(request, true);
+ UploadInfo info = validate(request, true);
try {
- LinkedHashMap<String, Object> hs = prepareMessage(params);
+ LinkedHashMap<String, Object> hs = prepareMessage(info);
String room_idAsString =
request.getParameter("room_id");
if (room_idAsString == null) {
throw new ServletException("Missing Room ID");
@@ -84,13 +84,13 @@ public class UploadController extends Ab
String current_dir = context.getRealPath("/");
- MultipartFile multipartFile = getParam(params,
UploadParams.pFile, MultipartFile.class);
+ MultipartFile multipartFile = info.file;
InputStream is = multipartFile.getInputStream();
String fileSystemName =
multipartFile.getOriginalFilename();
log.debug("fileSystemName: " + fileSystemName);
HashMap<String, HashMap<String, String>> returnError =
fileProcessor
- .processFile(getParam(params,
UploadParams.pUserId, Long.class), room_id_to_Store, isOwner, is,
+ .processFile(info.userId,
room_id_to_Store, isOwner, is,
parentFolderId,
fileSystemName, current_dir, hs, 0L, ""); // externalFilesId,
// externalType
@@ -107,7 +107,7 @@ public class UploadController extends Ab
"fileExplorerItemId").toString())));
hs.put("error", returnError);
hs.put("fileName",
returnAttributes.get("completeName"));
- sendMessage(params, hs);
+ sendMessage(info, hs);
} catch (ServletException e) {
throw e;
} catch (Exception e) {
@@ -119,8 +119,8 @@ public class UploadController extends Ab
@RequestMapping(value = "/upload.upload", method = RequestMethod.POST)
public void handleFormUpload(HttpServletRequest request,
HttpServletResponse response) throws ServletException {
try {
- HashMap<UploadParams, Object> params = validate(request, true);
- LinkedHashMap<String, Object> hs = prepareMessage(params);
+ UploadInfo info = validate(request, true);
+ LinkedHashMap<String, Object> hs = prepareMessage(info);
String room_id = request.getParameter("room_id");
if (room_id == null) {
room_id = "default";
@@ -137,15 +137,15 @@ public class UploadController extends Ab
}
boolean userProfile = moduleName.equals("userprofile");
- MultipartFile multipartFile = getParam(params,
UploadParams.pFile, MultipartFile.class);
+ MultipartFile multipartFile = info.file;
InputStream is = multipartFile.getInputStream();
String fileSystemName =
multipartFile.getOriginalFilename();
fileSystemName =
StringUtils.deleteWhitespace(fileSystemName);
// Flash cannot read the response of an upload
// httpServletResponse.getWriter().print(returnError);
- uploadFile(request, userProfile, getParam(params,
UploadParams.pUserId, Long.class), roomName, is, fileSystemName, hs);
- sendMessage(params, hs);
+ uploadFile(request, userProfile, info.userId, roomName,
is, fileSystemName, hs);
+ sendMessage(info, hs);
} catch (ServletException e) {
throw e;
} catch (Exception e) {
@@ -154,15 +154,15 @@ public class UploadController extends Ab
}
}
- private LinkedHashMap<String, Object> prepareMessage(HashMap<UploadParams,
Object> params) {
+ private LinkedHashMap<String, Object> prepareMessage(UploadInfo info) {
LinkedHashMap<String, Object> hs = new LinkedHashMap<String,
Object>();
- hs.put("user", usersDao.getUser(getParam(params,
UploadParams.pUserId, Long.class)));
+ hs.put("user", usersDao.getUser(info.userId));
return hs;
}
- private void sendMessage(HashMap<UploadParams, Object> params,
LinkedHashMap<String, Object> hs) {
+ private void sendMessage(UploadInfo info, LinkedHashMap<String, Object>
hs) {
scopeApplicationAdapter.sendMessageWithClientByPublicSID(hs,
- getParam(params, UploadParams.pPublicSID,
String.class));
+ info.publicSID);
}
private void uploadFile(HttpServletRequest request, boolean
userProfile, Long userId, String roomName,
Modified:
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/gui/TestGui.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/gui/TestGui.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/gui/TestGui.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/gui/TestGui.java
Tue Mar 6 19:03:35 2012
@@ -18,9 +18,15 @@
*/
package org.openmeetings.test.gui;
+import org.junit.Test;
+
import junit.framework.TestCase;
public class TestGui extends TestCase {
+ @Test
+ public void testNoop() {
+
+ }
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/poll/TestClientListManager.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/poll/TestClientListManager.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/poll/TestClientListManager.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/poll/TestClientListManager.java
Tue Mar 6 19:03:35 2012
@@ -33,7 +33,10 @@ public class TestClientListManager exten
@Test
public void addClientListItem() {
Random rnd = new Random();
- assertNotNull("RoomClientId created is null",
clientListManager.addClientListItem(rnd.nextLong() + "ABCDE" + rnd.nextLong(),
"scopeName", 66666, "remoteAddress", "swfUrl"));
+ assertNotNull("RoomClientId created is null",
+
clientListManager.addClientListItem(rnd.nextLong() + "ABCDE"
+ + rnd.nextLong(), "scopeName",
66666, "remoteAddress",
+ "swfUrl"));
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestDebugConnection.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestDebugConnection.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestDebugConnection.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestDebugConnection.java
Tue Mar 6 19:03:35 2012
@@ -30,15 +30,13 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-import junit.framework.TestCase;
-
import org.apache.log4j.Logger;
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import org.junit.Test;
import org.openmeetings.utils.crypt.MD5;
-public class TestDebugConnection extends TestCase {
+public class TestDebugConnection {
private static Logger log = Logger.getLogger(TestDebugConnection.class);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestRPCGateway.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestRPCGateway.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestRPCGateway.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/sip/TestRPCGateway.java
Tue Mar 6 19:03:35 2012
@@ -19,12 +19,10 @@
package org.openmeetings.test.sip;
//import org.apache.log4j.Logger;
-import junit.framework.TestCase;
-
import org.junit.Test;
import org.openmeetings.app.sip.xmlrpc.test.OpenXGClient;
-public class TestRPCGateway extends TestCase {
+public class TestRPCGateway {
//private static final Logger log =
Logger.getLogger(TestRPCGateway.class);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/userdata/TestLogin.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/userdata/TestLogin.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/userdata/TestLogin.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/userdata/TestLogin.java
Tue Mar 6 19:03:35 2012
@@ -18,6 +18,9 @@
*/
package org.openmeetings.test.userdata;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.MainService;
@@ -27,13 +30,14 @@ import org.springframework.beans.factory
public class TestLogin extends AbstractOpenmeetingsSpringTest {
@Autowired
private MainService mService;
-
+
+ @Test
public void testTestLogin(){
Sessiondata sessionData = mService.getsessiondata();
Users us = (Users)
mService.loginUser(sessionData.getSession_id(), "swagner",
"test",false,null,-1L);
- System.out.println("us: "+us.getFirstname());
+ assertNotNull(us);
//mService.getLanguageById(1);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/whiteboard/TestWhiteboardLoad.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/whiteboard/TestWhiteboardLoad.java?rev=1297653&r1=1297652&r2=1297653&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/whiteboard/TestWhiteboardLoad.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/whiteboard/TestWhiteboardLoad.java
Tue Mar 6 19:03:35 2012
@@ -36,16 +36,14 @@ public class TestWhiteboardLoad {
File dir = new File(
"C:/Users/swagner/workspaces/indigo_red6/ROOT/dist/red5/webapps/openmeetings/public/cliparts/math");
- FilenameFilter getFilesOnly = new FilenameFilter() {
+ String[] files = dir.list(new FilenameFilter() {
public boolean accept(File b, String name) {
String absPath = b.getAbsolutePath() +
File.separatorChar
+ name;
File f = new File(absPath);
return !f.isDirectory();
}
- };
-
- String[] files = dir.list(getFilesOnly);
+ });
@SuppressWarnings("unchecked")
Comparator<String> comparator =
ComparatorUtils.naturalComparator();
