Refactor ExtFile to brut.j.dir

- move to using Paths when possible
 - adapt calls to FileDirectory to leverage Paths
This commit is contained in:
Connor Tumbleson
2016-12-25 07:57:41 -05:00
parent 166bf508e2
commit 891d0d39e0
17 changed files with 28 additions and 32 deletions

View File

@ -16,7 +16,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import java.io.File;

View File

@ -15,7 +15,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

View File

@ -16,7 +16,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.FileDirectory;
import brut.util.OS;
@ -31,7 +31,6 @@ import org.custommonkey.xmlunit.*;
import org.junit.*;
import static org.junit.Assert.*;
import org.junit.rules.ExpectedException;
import org.xml.sax.SAXException;
import javax.imageio.ImageIO;
@ -420,7 +419,7 @@ public class BuildAndDecodeTest {
String location = tmp + path;
FileDirectory fileDirectory = new FileDirectory(sTestOrigDir + location);
FileDirectory fileDirectory = new FileDirectory(sTestOrigDir, location);
Set<String> files = fileDirectory.getFiles(true);
for (String filename : files) {

View File

@ -15,7 +15,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

View File

@ -17,7 +17,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.apache.commons.lang3.StringUtils;

View File

@ -16,15 +16,12 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.FileDirectory;
import brut.util.OS;
import java.io.*;
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
import org.custommonkey.xmlunit.*;

View File

@ -16,7 +16,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

View File

@ -16,9 +16,8 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.DirectoryException;
import brut.util.OS;
import org.junit.AfterClass;
import org.junit.BeforeClass;

View File

@ -16,7 +16,7 @@
package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;

View File

@ -16,9 +16,8 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.directory.DirectoryException;
import brut.util.OS;
import org.junit.AfterClass;
import org.junit.BeforeClass;

View File

@ -16,7 +16,7 @@
*/
package brut.androlib;
import brut.androlib.res.util.ExtFile;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
import org.junit.AfterClass;