diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java index 4002b32e..0ac28695 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java @@ -32,7 +32,7 @@ import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer import the.bytecode.club.bytecodeviewer.obfuscators.mapping.Refactorer; import the.bytecode.club.bytecodeviewer.plugin.PluginManager; import the.bytecode.club.bytecodeviewer.util.*; -import the.bytecode.club.bytecodeviewer.util.resources.ImportResource; +import the.bytecode.club.bytecodeviewer.util.resources.importing.ImportResource; import static the.bytecode.club.bytecodeviewer.Constants.*; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ImportResource.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportResource.java similarity index 86% rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ImportResource.java rename to src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportResource.java index 27c939a5..f2b10451 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ImportResource.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportResource.java @@ -1,25 +1,13 @@ -package the.bytecode.club.bytecodeviewer.util.resources; +package the.bytecode.club.bytecodeviewer.util.resources.importing; -import org.apache.commons.io.FileUtils; -import org.objectweb.asm.tree.ClassNode; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.api.ExceptionUI; import the.bytecode.club.bytecodeviewer.gui.resourcelist.ResourceListPane; import the.bytecode.club.bytecodeviewer.gui.MainViewerGUI; -import the.bytecode.club.bytecodeviewer.util.*; import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.HashMap; import java.util.Objects; -import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory; -import static the.bytecode.club.bytecodeviewer.Constants.fs; - /*************************************************************************** * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite * * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com * diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ImportType.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportType.java similarity index 76% rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ImportType.java rename to src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportType.java index eed29916..d822d4fb 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/ImportType.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/ImportType.java @@ -1,6 +1,6 @@ -package the.bytecode.club.bytecodeviewer.util.resources; +package the.bytecode.club.bytecodeviewer.util.resources.importing; -import the.bytecode.club.bytecodeviewer.util.resources.impl.*; +import the.bytecode.club.bytecodeviewer.util.resources.importing.impl.*; /** * @author Konloch diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/Importer.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/Importer.java similarity index 68% rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/Importer.java rename to src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/Importer.java index 46f53451..565bd44f 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/Importer.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/Importer.java @@ -1,4 +1,4 @@ -package the.bytecode.club.bytecodeviewer.util.resources; +package the.bytecode.club.bytecodeviewer.util.resources.importing; import java.io.File; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/APKResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/APKResourceImporter.java similarity index 92% rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/APKResourceImporter.java rename to src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/APKResourceImporter.java index b6935dba..b1273bed 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/APKResourceImporter.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/APKResourceImporter.java @@ -1,10 +1,10 @@ -package the.bytecode.club.bytecodeviewer.util.resources.impl; +package the.bytecode.club.bytecodeviewer.util.resources.importing.impl; import org.apache.commons.io.FileUtils; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.api.ExceptionUI; import the.bytecode.club.bytecodeviewer.util.*; -import the.bytecode.club.bytecodeviewer.util.resources.Importer; +import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer; import java.io.File; import java.util.Objects; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/ClassResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ClassResourceImporter.java similarity index 89% rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/ClassResourceImporter.java rename to src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ClassResourceImporter.java index bda0c4fe..421b9223 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/ClassResourceImporter.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ClassResourceImporter.java @@ -1,11 +1,11 @@ -package the.bytecode.club.bytecodeviewer.util.resources.impl; +package the.bytecode.club.bytecodeviewer.util.resources.importing.impl; import org.objectweb.asm.tree.ClassNode; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.api.ExceptionUI; import the.bytecode.club.bytecodeviewer.util.FileContainer; import the.bytecode.club.bytecodeviewer.util.JarUtils; -import the.bytecode.club.bytecodeviewer.util.resources.Importer; +import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/DEXResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DEXResourceImporter.java similarity index 91% rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/DEXResourceImporter.java rename to src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DEXResourceImporter.java index 84325e8c..ed782622 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/DEXResourceImporter.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DEXResourceImporter.java @@ -1,10 +1,10 @@ -package the.bytecode.club.bytecodeviewer.util.resources.impl; +package the.bytecode.club.bytecodeviewer.util.resources.importing.impl; import org.apache.commons.io.FileUtils; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.api.ExceptionUI; import the.bytecode.club.bytecodeviewer.util.*; -import the.bytecode.club.bytecodeviewer.util.resources.Importer; +import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer; import java.io.File; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/DirectoryResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DirectoryResourceImporter.java similarity index 91% rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/DirectoryResourceImporter.java rename to src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DirectoryResourceImporter.java index 7b1f2023..ec64d487 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/DirectoryResourceImporter.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/DirectoryResourceImporter.java @@ -1,8 +1,8 @@ -package the.bytecode.club.bytecodeviewer.util.resources.impl; +package the.bytecode.club.bytecodeviewer.util.resources.importing.impl; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.util.FileContainer; -import the.bytecode.club.bytecodeviewer.util.resources.Importer; +import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer; import java.io.File; import java.nio.file.Files; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/FileResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/FileResourceImporter.java similarity index 82% rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/FileResourceImporter.java rename to src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/FileResourceImporter.java index 329d2721..3036e7e8 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/FileResourceImporter.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/FileResourceImporter.java @@ -1,9 +1,9 @@ -package the.bytecode.club.bytecodeviewer.util.resources.impl; +package the.bytecode.club.bytecodeviewer.util.resources.importing.impl; import the.bytecode.club.bytecodeviewer.BytecodeViewer; import the.bytecode.club.bytecodeviewer.util.FileContainer; import the.bytecode.club.bytecodeviewer.util.JarUtils; -import the.bytecode.club.bytecodeviewer.util.resources.Importer; +import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/ZipResourceImporter.java b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ZipResourceImporter.java similarity index 80% rename from src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/ZipResourceImporter.java rename to src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ZipResourceImporter.java index d44263bf..077ce5da 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/impl/ZipResourceImporter.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/util/resources/importing/impl/ZipResourceImporter.java @@ -1,8 +1,8 @@ -package the.bytecode.club.bytecodeviewer.util.resources.impl; +package the.bytecode.club.bytecodeviewer.util.resources.importing.impl; import the.bytecode.club.bytecodeviewer.api.ExceptionUI; import the.bytecode.club.bytecodeviewer.util.JarUtils; -import the.bytecode.club.bytecodeviewer.util.resources.Importer; +import the.bytecode.club.bytecodeviewer.util.resources.importing.Importer; import java.io.File; import java.io.IOException;