diff --git a/pom.xml b/pom.xml index 6cf5aa3..a1dd374 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ - the.bytecode.club.jda.JDA + club.bytecode.the.jda.JDA @@ -126,11 +126,6 @@ commons-lang3 3.4 - - com.fifesoft - rsyntaxtextarea - 2.5.8 - org.zeroturnaround zt-zip diff --git a/src/main/java/the/bytecode/club/jda/Boot.java b/src/main/java/club/bytecode/the/jda/Boot.java similarity index 93% rename from src/main/java/the/bytecode/club/jda/Boot.java rename to src/main/java/club/bytecode/the/jda/Boot.java index 36ee2b9..46c3dbe 100644 --- a/src/main/java/the/bytecode/club/jda/Boot.java +++ b/src/main/java/club/bytecode/the/jda/Boot.java @@ -1,6 +1,6 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; -import the.bytecode.club.jda.api.ExceptionUI; +import club.bytecode.the.jda.api.ExceptionUI; import javax.swing.*; diff --git a/src/main/java/the/bytecode/club/jda/FileChangeNotifier.java b/src/main/java/club/bytecode/the/jda/FileChangeNotifier.java similarity index 90% rename from src/main/java/the/bytecode/club/jda/FileChangeNotifier.java rename to src/main/java/club/bytecode/the/jda/FileChangeNotifier.java index 54f21d4..ef8423a 100644 --- a/src/main/java/the/bytecode/club/jda/FileChangeNotifier.java +++ b/src/main/java/club/bytecode/the/jda/FileChangeNotifier.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; import org.objectweb.asm.tree.ClassNode; diff --git a/src/main/java/the/bytecode/club/jda/FileContainer.java b/src/main/java/club/bytecode/the/jda/FileContainer.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/FileContainer.java rename to src/main/java/club/bytecode/the/jda/FileContainer.java index 15cb365..f064683 100644 --- a/src/main/java/the/bytecode/club/jda/FileContainer.java +++ b/src/main/java/club/bytecode/the/jda/FileContainer.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; import org.objectweb.asm.ClassReader; import org.objectweb.asm.tree.ClassNode; diff --git a/src/main/java/the/bytecode/club/jda/FileDrop.java b/src/main/java/club/bytecode/the/jda/FileDrop.java similarity index 99% rename from src/main/java/the/bytecode/club/jda/FileDrop.java rename to src/main/java/club/bytecode/the/jda/FileDrop.java index 6d0ff09..77b5111 100644 --- a/src/main/java/the/bytecode/club/jda/FileDrop.java +++ b/src/main/java/club/bytecode/the/jda/FileDrop.java @@ -1,6 +1,6 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; -import the.bytecode.club.jda.api.ExceptionUI; +import club.bytecode.the.jda.api.ExceptionUI; import java.awt.datatransfer.DataFlavor; import java.io.*; diff --git a/src/main/java/the/bytecode/club/jda/InitialBootScreen.java b/src/main/java/club/bytecode/the/jda/InitialBootScreen.java similarity index 96% rename from src/main/java/the/bytecode/club/jda/InitialBootScreen.java rename to src/main/java/club/bytecode/the/jda/InitialBootScreen.java index 4c14cef..7e4ad8f 100644 --- a/src/main/java/the/bytecode/club/jda/InitialBootScreen.java +++ b/src/main/java/club/bytecode/the/jda/InitialBootScreen.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; import org.apache.commons.io.IOUtils; @@ -53,7 +53,7 @@ else if (i >= 440) JEditorPane editorPane = new JEditorPane(); editorPane.setEditorKit(new HTMLEditorKit()); editorPane.setEditable(false); - editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/the/bytecode/club/jda/html/intro.html"), "UTF-8")); + editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/club/bytecode/the/jda/html/intro.html"), "UTF-8")); scrollPane.setViewportView(editorPane); diff --git a/src/main/java/the/bytecode/club/jda/JDA.java b/src/main/java/club/bytecode/the/jda/JDA.java similarity index 98% rename from src/main/java/the/bytecode/club/jda/JDA.java rename to src/main/java/club/bytecode/the/jda/JDA.java index 224b139..b26b654 100644 --- a/src/main/java/the/bytecode/club/jda/JDA.java +++ b/src/main/java/club/bytecode/the/jda/JDA.java @@ -1,21 +1,20 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; +import club.bytecode.the.jda.gui.MainViewerGUI; +import club.bytecode.the.jda.gui.fileviewer.BytecodeTokenizer; import org.apache.commons.io.FileUtils; import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory; import org.fife.ui.rsyntaxtextarea.TokenMakerFactory; -import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; import org.fife.ui.rsyntaxtextarea.folding.FoldParserManager; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.api.ExceptionUI; -import the.bytecode.club.jda.api.Plugin; -import the.bytecode.club.jda.api.PluginLoader; -import the.bytecode.club.jda.gui.MainViewerGUI; -import the.bytecode.club.jda.gui.fileviewer.BytecodeFoldParser; -import the.bytecode.club.jda.gui.fileviewer.BytecodeTokenizer; -import the.bytecode.club.jda.gui.navigation.FileNavigationPane; -import the.bytecode.club.jda.settings.Settings; +import club.bytecode.the.jda.api.ExceptionUI; +import club.bytecode.the.jda.api.Plugin; +import club.bytecode.the.jda.api.PluginLoader; +import club.bytecode.the.jda.gui.fileviewer.BytecodeFoldParser; +import club.bytecode.the.jda.gui.navigation.FileNavigationPane; +import club.bytecode.the.jda.settings.Settings; import javax.swing.*; import javax.swing.filechooser.FileFilter; diff --git a/src/main/java/the/bytecode/club/jda/JarUtils.java b/src/main/java/club/bytecode/the/jda/JarUtils.java similarity index 99% rename from src/main/java/the/bytecode/club/jda/JarUtils.java rename to src/main/java/club/bytecode/the/jda/JarUtils.java index c5f6b77..a980242 100644 --- a/src/main/java/the/bytecode/club/jda/JarUtils.java +++ b/src/main/java/club/bytecode/the/jda/JarUtils.java @@ -1,9 +1,9 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; +import club.bytecode.the.jda.api.ExceptionUI; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.api.ExceptionUI; import java.io.*; import java.util.ArrayList; diff --git a/src/main/java/the/bytecode/club/jda/MiscUtils.java b/src/main/java/club/bytecode/the/jda/MiscUtils.java similarity index 99% rename from src/main/java/the/bytecode/club/jda/MiscUtils.java rename to src/main/java/club/bytecode/the/jda/MiscUtils.java index 7a1891a..7e53f8e 100644 --- a/src/main/java/the/bytecode/club/jda/MiscUtils.java +++ b/src/main/java/club/bytecode/the/jda/MiscUtils.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/the/bytecode/club/jda/Resources.java b/src/main/java/club/bytecode/the/jda/Resources.java similarity index 64% rename from src/main/java/the/bytecode/club/jda/Resources.java rename to src/main/java/club/bytecode/the/jda/Resources.java index 7270ff3..df69133 100644 --- a/src/main/java/the/bytecode/club/jda/Resources.java +++ b/src/main/java/club/bytecode/the/jda/Resources.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; import org.imgscalr.Scalr; @@ -15,34 +15,34 @@ */ public class Resources { - public static ImageIcon nextIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/nextIcon.png")); - public static ImageIcon prevIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/prevIcon.png")); - public static ImageIcon busyIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/1.gif")); - public static ImageIcon busyB64Icon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/busyIcon2.gif")); - public static ImageIcon batIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/bat.png")); - public static ImageIcon shIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/sh.png")); - public static ImageIcon csharpIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/c#.png")); - public static ImageIcon cplusplusIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/c++.png")); - public static ImageIcon configIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/config.png")); - public static ImageIcon jarIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/jar.png")); - public static ImageIcon zipIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/zip.png")); - public static ImageIcon packagesIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/package.png")); - public static ImageIcon folderIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/folder.png")); - public static ImageIcon fileIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/file.png")); - public static ImageIcon textIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/text.png")); - public static ImageIcon classIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/class.png")); - public static ImageIcon imageIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/image.png")); - public static ImageIcon decodedIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/decoded.png")); - public static ImageIcon javaIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/java.png")); - - public static ImageIcon fileNavigatorIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/icon.png")); + public static ImageIcon nextIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/nextIcon.png")); + public static ImageIcon prevIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/prevIcon.png")); + public static ImageIcon busyIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/1.gif")); + public static ImageIcon busyB64Icon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/busyIcon2.gif")); + public static ImageIcon batIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/bat.png")); + public static ImageIcon shIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/sh.png")); + public static ImageIcon csharpIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/c#.png")); + public static ImageIcon cplusplusIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/c++.png")); + public static ImageIcon configIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/config.png")); + public static ImageIcon jarIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/jar.png")); + public static ImageIcon zipIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/zip.png")); + public static ImageIcon packagesIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/package.png")); + public static ImageIcon folderIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/folder.png")); + public static ImageIcon fileIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/file.png")); + public static ImageIcon textIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/text.png")); + public static ImageIcon classIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/class.png")); + public static ImageIcon imageIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/image.png")); + public static ImageIcon decodedIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/decoded.png")); + public static ImageIcon javaIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/java.png")); + + public static ImageIcon fileNavigatorIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/icon.png")); public static ArrayList iconList; public static BufferedImage icon; static { try { - icon = ImageIO.read(Resources.class.getClass().getResourceAsStream("/the/bytecode/club/jda/images/icon.png")); + icon = ImageIO.read(Resources.class.getClass().getResourceAsStream("/club/bytecode/the/jda/images/icon.png")); } catch (IOException e) { System.err.println("Failed to load program icon:"); e.printStackTrace(); diff --git a/src/main/java/the/bytecode/club/jda/SecurityMan.java b/src/main/java/club/bytecode/the/jda/SecurityMan.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/SecurityMan.java rename to src/main/java/club/bytecode/the/jda/SecurityMan.java index cefe2ba..13c2827 100644 --- a/src/main/java/the/bytecode/club/jda/SecurityMan.java +++ b/src/main/java/club/bytecode/the/jda/SecurityMan.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda; +package club.bytecode.the.jda; import java.io.FileDescriptor; import java.net.InetAddress; @@ -21,7 +21,7 @@ public void stopBlocking() { //slightly safer security system than just a public if (executedClass.equals("CFRDecompiler") || executedClass.equals("ProcyonDecompiler") || executedClass.equals("FernflowerDecompiler") || - executedClass.equals("the.bytecode.club.jda.JDA")) { + executedClass.equals("JDA")) { blocking = false; } else for (StackTraceElement stackTraceElements : Thread.currentThread().getStackTrace()) { diff --git a/src/main/java/the/bytecode/club/jda/api/ExceptionUI.java b/src/main/java/club/bytecode/the/jda/api/ExceptionUI.java similarity index 96% rename from src/main/java/the/bytecode/club/jda/api/ExceptionUI.java rename to src/main/java/club/bytecode/the/jda/api/ExceptionUI.java index cc4532c..cecd44e 100644 --- a/src/main/java/the/bytecode/club/jda/api/ExceptionUI.java +++ b/src/main/java/club/bytecode/the/jda/api/ExceptionUI.java @@ -1,7 +1,7 @@ -package the.bytecode.club.jda.api; +package club.bytecode.the.jda.api; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.Resources; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.Resources; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/api/Plugin.java b/src/main/java/club/bytecode/the/jda/api/Plugin.java similarity index 59% rename from src/main/java/the/bytecode/club/jda/api/Plugin.java rename to src/main/java/club/bytecode/the/jda/api/Plugin.java index 8f1faca..580a079 100644 --- a/src/main/java/the/bytecode/club/jda/api/Plugin.java +++ b/src/main/java/club/bytecode/the/jda/api/Plugin.java @@ -1,6 +1,6 @@ -package the.bytecode.club.jda.api; +package club.bytecode.the.jda.api; -import the.bytecode.club.jda.FileContainer; +import club.bytecode.the.jda.FileContainer; public interface Plugin { int onGUILoad(); diff --git a/src/main/java/the/bytecode/club/jda/api/PluginLoader.java b/src/main/java/club/bytecode/the/jda/api/PluginLoader.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/api/PluginLoader.java rename to src/main/java/club/bytecode/the/jda/api/PluginLoader.java index b3e7a11..9c31512 100644 --- a/src/main/java/the/bytecode/club/jda/api/PluginLoader.java +++ b/src/main/java/club/bytecode/the/jda/api/PluginLoader.java @@ -1,6 +1,6 @@ -package the.bytecode.club.jda.api; +package club.bytecode.the.jda.api; -import the.bytecode.club.jda.JDA; +import club.bytecode.the.jda.JDA; import java.io.*; import java.net.MalformedURLException; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/CFRDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/CFRDecompiler.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/decompilers/CFRDecompiler.java rename to src/main/java/club/bytecode/the/jda/decompilers/CFRDecompiler.java index 58bef40..71c0589 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/CFRDecompiler.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/CFRDecompiler.java @@ -1,5 +1,6 @@ -package the.bytecode.club.jda.decompilers; +package club.bytecode.the.jda.decompilers; +import club.bytecode.the.jda.JDA; import org.apache.commons.io.FileUtils; import org.benf.cfr.reader.bytecode.analysis.types.JavaTypeInstance; import org.benf.cfr.reader.entities.ClassFile; @@ -19,10 +20,9 @@ import org.benf.cfr.reader.util.output.*; import org.objectweb.asm.tree.ClassNode; import org.zeroturnaround.zip.ZipUtil; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.JarUtils; -import the.bytecode.club.jda.settings.JDADecompilerSettings; -import the.bytecode.club.jda.settings.JDADecompilerSettings.SettingsEntry; +import club.bytecode.the.jda.JarUtils; +import club.bytecode.the.jda.settings.JDADecompilerSettings; +import club.bytecode.the.jda.settings.JDADecompilerSettings.SettingsEntry; import java.io.File; import java.io.IOException; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/Decompilers.java b/src/main/java/club/bytecode/the/jda/decompilers/Decompilers.java similarity index 89% rename from src/main/java/the/bytecode/club/jda/decompilers/Decompilers.java rename to src/main/java/club/bytecode/the/jda/decompilers/Decompilers.java index b02aa41..6dcc3ad 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/Decompilers.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/Decompilers.java @@ -1,6 +1,6 @@ -package the.bytecode.club.jda.decompilers; +package club.bytecode.the.jda.decompilers; -import the.bytecode.club.jda.decompilers.bytecode.BytecodeDecompiler; +import club.bytecode.the.jda.decompilers.bytecode.BytecodeDecompiler; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/FernflowerDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/FernflowerDecompiler.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/decompilers/FernflowerDecompiler.java rename to src/main/java/club/bytecode/the/jda/decompilers/FernflowerDecompiler.java index f41e43a..845b4ea 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/FernflowerDecompiler.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/FernflowerDecompiler.java @@ -1,13 +1,13 @@ -package the.bytecode.club.jda.decompilers; +package club.bytecode.the.jda.decompilers; import org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler; import org.jetbrains.java.decompiler.main.decompiler.PrintStreamLogger; import org.jetbrains.java.decompiler.main.extern.IResultSaver; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.InnerClassNode; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.settings.JDADecompilerSettings.SettingsEntry; -import the.bytecode.club.jda.settings.Setting; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.settings.JDADecompilerSettings.SettingsEntry; +import club.bytecode.the.jda.settings.Setting; import java.io.IOException; import java.util.*; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/JDADecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/JDADecompiler.java similarity index 88% rename from src/main/java/the/bytecode/club/jda/decompilers/JDADecompiler.java rename to src/main/java/club/bytecode/the/jda/decompilers/JDADecompiler.java index 7087bc5..740ec88 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/JDADecompiler.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/JDADecompiler.java @@ -1,9 +1,9 @@ -package the.bytecode.club.jda.decompilers; +package club.bytecode.the.jda.decompilers; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.api.ExceptionUI; -import the.bytecode.club.jda.settings.JDADecompilerSettings; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.api.ExceptionUI; +import club.bytecode.the.jda.settings.JDADecompilerSettings; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/ProcyonDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/ProcyonDecompiler.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/decompilers/ProcyonDecompiler.java rename to src/main/java/club/bytecode/the/jda/decompilers/ProcyonDecompiler.java index 61556a4..7c30fc4 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/ProcyonDecompiler.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/ProcyonDecompiler.java @@ -1,13 +1,13 @@ -package the.bytecode.club.jda.decompilers; +package club.bytecode.the.jda.decompilers; +import club.bytecode.the.jda.JDA; import com.strobel.assembler.InputTypeLoader; import com.strobel.assembler.metadata.*; import com.strobel.decompiler.DecompilationOptions; import com.strobel.decompiler.DecompilerSettings; import com.strobel.decompiler.PlainTextOutput; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.settings.JDADecompilerSettings.SettingsEntry; +import club.bytecode.the.jda.settings.JDADecompilerSettings.SettingsEntry; import java.io.StringWriter; import java.util.Map; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/BytecodeDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/BytecodeDecompiler.java similarity index 96% rename from src/main/java/the/bytecode/club/jda/decompilers/bytecode/BytecodeDecompiler.java rename to src/main/java/club/bytecode/the/jda/decompilers/bytecode/BytecodeDecompiler.java index 7619c70..6af5657 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/BytecodeDecompiler.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/BytecodeDecompiler.java @@ -1,13 +1,13 @@ -package the.bytecode.club.jda.decompilers.bytecode; +package club.bytecode.the.jda.decompilers.bytecode; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.decompilers.JDADecompiler; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.InnerClassNode; import org.objectweb.asm.tree.MethodNode; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.decompilers.JDADecompiler; -import the.bytecode.club.jda.settings.JDADecompilerSettings.SettingsEntry; +import club.bytecode.the.jda.settings.JDADecompilerSettings.SettingsEntry; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/FieldNodeDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/FieldNodeDecompiler.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/decompilers/bytecode/FieldNodeDecompiler.java rename to src/main/java/club/bytecode/the/jda/decompilers/bytecode/FieldNodeDecompiler.java index 0f1c97a..787421a 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/FieldNodeDecompiler.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/FieldNodeDecompiler.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.decompilers.bytecode; +package club.bytecode.the.jda.decompilers.bytecode; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/InstructionPrinter.java b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/InstructionPrinter.java similarity index 99% rename from src/main/java/the/bytecode/club/jda/decompilers/bytecode/InstructionPrinter.java rename to src/main/java/club/bytecode/the/jda/decompilers/bytecode/InstructionPrinter.java index 690c328..dbf9573 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/InstructionPrinter.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/InstructionPrinter.java @@ -1,9 +1,9 @@ -package the.bytecode.club.jda.decompilers.bytecode; +package club.bytecode.the.jda.decompilers.bytecode; import org.apache.commons.lang3.StringEscapeUtils; import org.objectweb.asm.Type; import org.objectweb.asm.tree.*; -import the.bytecode.club.jda.api.ExceptionUI; +import club.bytecode.the.jda.api.ExceptionUI; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/MethodNodeDecompiler.java b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/MethodNodeDecompiler.java similarity index 99% rename from src/main/java/the/bytecode/club/jda/decompilers/bytecode/MethodNodeDecompiler.java rename to src/main/java/club/bytecode/the/jda/decompilers/bytecode/MethodNodeDecompiler.java index 1fe42df..6947c35 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/MethodNodeDecompiler.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/MethodNodeDecompiler.java @@ -1,9 +1,9 @@ -package the.bytecode.club.jda.decompilers.bytecode; +package club.bytecode.the.jda.decompilers.bytecode; +import club.bytecode.the.jda.JDA; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.tree.*; -import the.bytecode.club.jda.JDA; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/OpcodeInfo.java b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/OpcodeInfo.java similarity index 98% rename from src/main/java/the/bytecode/club/jda/decompilers/bytecode/OpcodeInfo.java rename to src/main/java/club/bytecode/the/jda/decompilers/bytecode/OpcodeInfo.java index ccbab2e..6e084de 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/OpcodeInfo.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/OpcodeInfo.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.decompilers.bytecode; +package club.bytecode.the.jda.decompilers.bytecode; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/PrefixedStringBuilder.java b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/PrefixedStringBuilder.java similarity index 96% rename from src/main/java/the/bytecode/club/jda/decompilers/bytecode/PrefixedStringBuilder.java rename to src/main/java/club/bytecode/the/jda/decompilers/bytecode/PrefixedStringBuilder.java index 6455fc8..52d095c 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/PrefixedStringBuilder.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/PrefixedStringBuilder.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.decompilers.bytecode; +package club.bytecode.the.jda.decompilers.bytecode; /** * @author Bibl diff --git a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/TypeAndName.java b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/TypeAndName.java similarity index 82% rename from src/main/java/the/bytecode/club/jda/decompilers/bytecode/TypeAndName.java rename to src/main/java/club/bytecode/the/jda/decompilers/bytecode/TypeAndName.java index 28357f2..db6209f 100644 --- a/src/main/java/the/bytecode/club/jda/decompilers/bytecode/TypeAndName.java +++ b/src/main/java/club/bytecode/the/jda/decompilers/bytecode/TypeAndName.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.decompilers.bytecode; +package club.bytecode.the.jda.decompilers.bytecode; import org.objectweb.asm.Type; diff --git a/src/main/java/the/bytecode/club/jda/gui/JDAWindow.java b/src/main/java/club/bytecode/the/jda/gui/JDAWindow.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/gui/JDAWindow.java rename to src/main/java/club/bytecode/the/jda/gui/JDAWindow.java index a58ae30..c0421a9 100644 --- a/src/main/java/the/bytecode/club/jda/gui/JDAWindow.java +++ b/src/main/java/club/bytecode/the/jda/gui/JDAWindow.java @@ -1,8 +1,8 @@ -package the.bytecode.club.jda.gui; +package club.bytecode.the.jda.gui; +import club.bytecode.the.jda.settings.IPersistentWindow; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.FileChangeNotifier; -import the.bytecode.club.jda.settings.IPersistentWindow; +import club.bytecode.the.jda.FileChangeNotifier; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/MainViewerGUI.java b/src/main/java/club/bytecode/the/jda/gui/MainViewerGUI.java similarity index 96% rename from src/main/java/the/bytecode/club/jda/gui/MainViewerGUI.java rename to src/main/java/club/bytecode/the/jda/gui/MainViewerGUI.java index 7cc4ce4..19dbeef 100644 --- a/src/main/java/the/bytecode/club/jda/gui/MainViewerGUI.java +++ b/src/main/java/club/bytecode/the/jda/gui/MainViewerGUI.java @@ -1,19 +1,20 @@ -package the.bytecode.club.jda.gui; +package club.bytecode.the.jda.gui; +import club.bytecode.the.jda.*; +import club.bytecode.the.jda.decompilers.JDADecompiler; +import club.bytecode.the.jda.gui.dialogs.AboutWindow; +import club.bytecode.the.jda.gui.fileviewer.FileViewerPane; +import club.bytecode.the.jda.settings.IPersistentWindow; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.*; -import the.bytecode.club.jda.api.ExceptionUI; -import the.bytecode.club.jda.decompilers.Decompilers; -import the.bytecode.club.jda.decompilers.JDADecompiler; -import the.bytecode.club.jda.gui.dialogs.AboutWindow; -import the.bytecode.club.jda.gui.dialogs.FontOptionsDialog; -import the.bytecode.club.jda.gui.dialogs.IntroWindow; -import the.bytecode.club.jda.gui.dialogs.TabbedPane; -import the.bytecode.club.jda.gui.fileviewer.FileViewerPane; -import the.bytecode.club.jda.gui.fileviewer.Viewer; -import the.bytecode.club.jda.gui.navigation.FileNavigationPane; -import the.bytecode.club.jda.settings.IPersistentWindow; -import the.bytecode.club.jda.settings.Settings; +import club.bytecode.the.*; +import club.bytecode.the.jda.api.ExceptionUI; +import club.bytecode.the.jda.decompilers.Decompilers; +import club.bytecode.the.jda.gui.dialogs.FontOptionsDialog; +import club.bytecode.the.jda.gui.dialogs.IntroWindow; +import club.bytecode.the.jda.gui.dialogs.TabbedPane; +import club.bytecode.the.jda.gui.fileviewer.Viewer; +import club.bytecode.the.jda.gui.navigation.FileNavigationPane; +import club.bytecode.the.jda.settings.Settings; import javax.swing.*; import javax.swing.filechooser.FileFilter; @@ -50,7 +51,7 @@ public class MainViewerGUI extends JFrame implements FileChangeNotifier, IPersis public JDesktopPane desktop; public FileNavigationPane navigator; - public FileViewerPane FileViewerPane; + public club.bytecode.the.jda.gui.fileviewer.FileViewerPane FileViewerPane; public static ArrayList windows = new ArrayList<>(); private final ActionListener listener = new ActionListener() { @Override diff --git a/src/main/java/the/bytecode/club/jda/gui/WorkspaceDesktopManager.java b/src/main/java/club/bytecode/the/jda/gui/WorkspaceDesktopManager.java similarity index 94% rename from src/main/java/the/bytecode/club/jda/gui/WorkspaceDesktopManager.java rename to src/main/java/club/bytecode/the/jda/gui/WorkspaceDesktopManager.java index 0f84ddb..8ed1281 100644 --- a/src/main/java/the/bytecode/club/jda/gui/WorkspaceDesktopManager.java +++ b/src/main/java/club/bytecode/the/jda/gui/WorkspaceDesktopManager.java @@ -1,6 +1,6 @@ -package the.bytecode.club.jda.gui; +package club.bytecode.the.jda.gui; -import the.bytecode.club.jda.settings.Settings; +import club.bytecode.the.jda.settings.Settings; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/dialogs/AboutWindow.java b/src/main/java/club/bytecode/the/jda/gui/dialogs/AboutWindow.java similarity index 86% rename from src/main/java/the/bytecode/club/jda/gui/dialogs/AboutWindow.java rename to src/main/java/club/bytecode/the/jda/gui/dialogs/AboutWindow.java index 6bab5b6..16e4ea4 100644 --- a/src/main/java/the/bytecode/club/jda/gui/dialogs/AboutWindow.java +++ b/src/main/java/club/bytecode/the/jda/gui/dialogs/AboutWindow.java @@ -1,8 +1,8 @@ -package the.bytecode.club.jda.gui.dialogs; +package club.bytecode.the.jda.gui.dialogs; import org.apache.commons.io.IOUtils; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.Resources; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.Resources; import javax.swing.*; import javax.swing.text.html.HTMLEditorKit; @@ -36,9 +36,9 @@ public AboutWindow() { editorPane.setContentType("text/html"); editorPane.setEditable(false); try { - String text = IOUtils.toString(Resources.class.getResourceAsStream("/the/bytecode/club/jda/html/about.html"), "UTF-8"); + String text = IOUtils.toString(Resources.class.getResourceAsStream("/club/bytecode/the/jda/html/about.html"), "UTF-8"); text = text.replace("$JDA_VERSION$", JDA.version + (JDA.previewCopy ? " (preview)" : "")); - text = text.replace("$JDA_ICON$", Resources.class.getClass().getResource("/the/bytecode/club/jda/images/icon.png").toString()); + text = text.replace("$JDA_ICON$", Resources.class.getClass().getResource("/club/bytecode/the/jda/images/icon.png").toString()); editorPane.setText(text); } catch (IOException e) { System.err.println("Couldn't load about html:"); diff --git a/src/main/java/the/bytecode/club/jda/gui/dialogs/ExportJar.java b/src/main/java/club/bytecode/the/jda/gui/dialogs/ExportJar.java similarity index 93% rename from src/main/java/the/bytecode/club/jda/gui/dialogs/ExportJar.java rename to src/main/java/club/bytecode/the/jda/gui/dialogs/ExportJar.java index 64e9010..3504c5c 100644 --- a/src/main/java/the/bytecode/club/jda/gui/dialogs/ExportJar.java +++ b/src/main/java/club/bytecode/the/jda/gui/dialogs/ExportJar.java @@ -1,7 +1,7 @@ -package the.bytecode.club.jda.gui.dialogs; +package club.bytecode.the.jda.gui.dialogs; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.JarUtils; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.JarUtils; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/dialogs/FileChooser.java b/src/main/java/club/bytecode/the/jda/gui/dialogs/FileChooser.java similarity index 88% rename from src/main/java/the/bytecode/club/jda/gui/dialogs/FileChooser.java rename to src/main/java/club/bytecode/the/jda/gui/dialogs/FileChooser.java index 44676c2..e611542 100644 --- a/src/main/java/the/bytecode/club/jda/gui/dialogs/FileChooser.java +++ b/src/main/java/club/bytecode/the/jda/gui/dialogs/FileChooser.java @@ -1,8 +1,8 @@ -package the.bytecode.club.jda.gui.dialogs; +package club.bytecode.the.jda.gui.dialogs; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.api.ExceptionUI; -import the.bytecode.club.jda.settings.Setting; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.api.ExceptionUI; +import club.bytecode.the.jda.settings.Setting; import javax.swing.*; import javax.swing.filechooser.FileFilter; diff --git a/src/main/java/the/bytecode/club/jda/gui/dialogs/FontOptionsDialog.java b/src/main/java/club/bytecode/the/jda/gui/dialogs/FontOptionsDialog.java similarity index 95% rename from src/main/java/the/bytecode/club/jda/gui/dialogs/FontOptionsDialog.java rename to src/main/java/club/bytecode/the/jda/gui/dialogs/FontOptionsDialog.java index d64352e..a9df95e 100644 --- a/src/main/java/the/bytecode/club/jda/gui/dialogs/FontOptionsDialog.java +++ b/src/main/java/club/bytecode/the/jda/gui/dialogs/FontOptionsDialog.java @@ -1,7 +1,7 @@ -package the.bytecode.club.jda.gui.dialogs; +package club.bytecode.the.jda.gui.dialogs; import net.miginfocom.swing.MigLayout; -import the.bytecode.club.jda.settings.Settings; +import club.bytecode.the.jda.settings.Settings; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/dialogs/IntroWindow.java b/src/main/java/club/bytecode/the/jda/gui/dialogs/IntroWindow.java similarity index 89% rename from src/main/java/the/bytecode/club/jda/gui/dialogs/IntroWindow.java rename to src/main/java/club/bytecode/the/jda/gui/dialogs/IntroWindow.java index c5f85af..5fb0539 100644 --- a/src/main/java/the/bytecode/club/jda/gui/dialogs/IntroWindow.java +++ b/src/main/java/club/bytecode/the/jda/gui/dialogs/IntroWindow.java @@ -1,7 +1,7 @@ -package the.bytecode.club.jda.gui.dialogs; +package club.bytecode.the.jda.gui.dialogs; import org.apache.commons.io.IOUtils; -import the.bytecode.club.jda.Resources; +import club.bytecode.the.jda.Resources; import javax.swing.*; import javax.swing.text.html.HTMLEditorKit; @@ -30,7 +30,7 @@ public IntroWindow() { editorPane.setContentType("text/html"); editorPane.setEditable(false); try { - editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/the/bytecode/club/jda/html/intro.html"), "UTF-8")); + editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/club/bytecode/the/jda/html/intro.html"), "UTF-8")); } catch (IOException e) { System.err.println("Couldn't load intro html:"); e.printStackTrace(); diff --git a/src/main/java/the/bytecode/club/jda/gui/dialogs/SystemErrConsole.java b/src/main/java/club/bytecode/the/jda/gui/dialogs/SystemErrConsole.java similarity index 94% rename from src/main/java/the/bytecode/club/jda/gui/dialogs/SystemErrConsole.java rename to src/main/java/club/bytecode/the/jda/gui/dialogs/SystemErrConsole.java index 386d1d8..c1edc84 100644 --- a/src/main/java/the/bytecode/club/jda/gui/dialogs/SystemErrConsole.java +++ b/src/main/java/club/bytecode/the/jda/gui/dialogs/SystemErrConsole.java @@ -1,8 +1,8 @@ -package the.bytecode.club.jda.gui.dialogs; +package club.bytecode.the.jda.gui.dialogs; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.Resources; -import the.bytecode.club.jda.gui.fileviewer.SearchPanel; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.Resources; +import club.bytecode.the.jda.gui.fileviewer.SearchPanel; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/dialogs/TabbedPane.java b/src/main/java/club/bytecode/the/jda/gui/dialogs/TabbedPane.java similarity index 99% rename from src/main/java/the/bytecode/club/jda/gui/dialogs/TabbedPane.java rename to src/main/java/club/bytecode/the/jda/gui/dialogs/TabbedPane.java index 24e46eb..905dd18 100644 --- a/src/main/java/the/bytecode/club/jda/gui/dialogs/TabbedPane.java +++ b/src/main/java/club/bytecode/the/jda/gui/dialogs/TabbedPane.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.gui.dialogs; +package club.bytecode.the.jda.gui.dialogs; import javax.swing.*; import javax.swing.plaf.basic.BasicButtonUI; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeFoldParser.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeFoldParser.java similarity index 89% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeFoldParser.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeFoldParser.java index 8a68b5a..5557898 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeFoldParser.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeFoldParser.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeSyntaxArea.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeSyntaxArea.java similarity index 99% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeSyntaxArea.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeSyntaxArea.java index 2ad24ad..8d4e3d1 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeSyntaxArea.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeSyntaxArea.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; import org.fife.ui.rsyntaxtextarea.*; import org.fife.ui.rsyntaxtextarea.folding.Fold; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeTokenizer.flex b/src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeTokenizer.flex similarity index 99% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeTokenizer.flex rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeTokenizer.flex index 7747fd1..01afd5d 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeTokenizer.flex +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeTokenizer.flex @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; import java.io.*; import javax.swing.text.Segment; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeTokenizer.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeTokenizer.java similarity index 99% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeTokenizer.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeTokenizer.java index 578a3e7..575fe60 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/BytecodeTokenizer.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/BytecodeTokenizer.java @@ -1,6 +1,6 @@ /* The following code was generated by JFlex 1.6.1 */ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; import java.io.*; import javax.swing.text.Segment; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/ClassViewer.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/ClassViewer.java similarity index 98% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/ClassViewer.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/ClassViewer.java index 17db09b..2230326 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/ClassViewer.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/ClassViewer.java @@ -1,9 +1,9 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.decompilers.JDADecompiler; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.decompilers.JDADecompiler; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/FileViewer.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewer.java similarity index 98% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/FileViewer.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewer.java index eeffc2b..74cbf73 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/FileViewer.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewer.java @@ -1,10 +1,10 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; +import club.bytecode.the.jda.api.ExceptionUI; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; import org.fife.ui.rtextarea.RTextScrollPane; import org.imgscalr.Scalr; -import the.bytecode.club.jda.api.ExceptionUI; import javax.imageio.ImageIO; import javax.swing.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/FileViewerPane.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewerPane.java similarity index 93% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/FileViewerPane.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewerPane.java index 06606ec..c260ce7 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/FileViewerPane.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewerPane.java @@ -1,13 +1,13 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.FileChangeNotifier; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.Resources; -import the.bytecode.club.jda.gui.JDAWindow; -import the.bytecode.club.jda.gui.MainViewerGUI; -import the.bytecode.club.jda.gui.dialogs.TabbedPane; -import the.bytecode.club.jda.gui.navigation.FileNavigationPane; +import club.bytecode.the.jda.FileChangeNotifier; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.Resources; +import club.bytecode.the.jda.gui.JDAWindow; +import club.bytecode.the.jda.gui.MainViewerGUI; +import club.bytecode.the.jda.gui.dialogs.TabbedPane; +import club.bytecode.the.jda.gui.navigation.FileNavigationPane; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/JDAURLHandler.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/JDAURLHandler.java similarity index 87% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/JDAURLHandler.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/JDAURLHandler.java index 7f22a2f..f4adae8 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/JDAURLHandler.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/JDAURLHandler.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/PaneUpdaterThread.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/PaneUpdaterThread.java similarity index 83% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/PaneUpdaterThread.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/PaneUpdaterThread.java index ddf9954..1196b7c 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/PaneUpdaterThread.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/PaneUpdaterThread.java @@ -1,18 +1,13 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.api.ExceptionUI; +import club.bytecode.the.jda.decompilers.JDADecompiler; +import club.bytecode.the.jda.decompilers.bytecode.BytecodeDecompiler; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; -import org.fife.ui.rsyntaxtextarea.Token; -import org.fife.ui.rsyntaxtextarea.TokenTypes; import org.fife.ui.rtextarea.RTextScrollPane; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.api.ExceptionUI; -import the.bytecode.club.jda.decompilers.JDADecompiler; -import the.bytecode.club.jda.decompilers.bytecode.BytecodeDecompiler; -import the.bytecode.club.jda.gui.fileviewer.BytecodeSyntaxArea; -import the.bytecode.club.jda.gui.fileviewer.BytecodeTokenizer; -import the.bytecode.club.jda.gui.fileviewer.ClassViewer; -import the.bytecode.club.jda.settings.Settings; +import club.bytecode.the.jda.settings.Settings; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/SearchPanel.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/SearchPanel.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/SearchPanel.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/SearchPanel.java index 7ae1eb1..f03d7ea 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/SearchPanel.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/SearchPanel.java @@ -1,8 +1,8 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.Resources; -import the.bytecode.club.jda.api.ExceptionUI; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.api.ExceptionUI; +import club.bytecode.the.jda.Resources; import javax.swing.*; import javax.swing.text.DefaultHighlighter; diff --git a/src/main/java/the/bytecode/club/jda/gui/fileviewer/Viewer.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/Viewer.java similarity index 81% rename from src/main/java/the/bytecode/club/jda/gui/fileviewer/Viewer.java rename to src/main/java/club/bytecode/the/jda/gui/fileviewer/Viewer.java index b32a6a4..dcccdfa 100644 --- a/src/main/java/the/bytecode/club/jda/gui/fileviewer/Viewer.java +++ b/src/main/java/club/bytecode/the/jda/gui/fileviewer/Viewer.java @@ -1,7 +1,7 @@ -package the.bytecode.club.jda.gui.fileviewer; +package club.bytecode.the.jda.gui.fileviewer; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.settings.Settings; +import club.bytecode.the.jda.settings.Settings; import javax.swing.*; diff --git a/src/main/java/the/bytecode/club/jda/gui/navigation/FileNavigationPane.java b/src/main/java/club/bytecode/the/jda/gui/navigation/FileNavigationPane.java similarity index 98% rename from src/main/java/the/bytecode/club/jda/gui/navigation/FileNavigationPane.java rename to src/main/java/club/bytecode/the/jda/gui/navigation/FileNavigationPane.java index 1e3b34c..03b3e8c 100644 --- a/src/main/java/the/bytecode/club/jda/gui/navigation/FileNavigationPane.java +++ b/src/main/java/club/bytecode/the/jda/gui/navigation/FileNavigationPane.java @@ -1,9 +1,10 @@ -package the.bytecode.club.jda.gui.navigation; +package club.bytecode.the.jda.gui.navigation; +import club.bytecode.the.jda.*; +import club.bytecode.the.jda.gui.JDAWindow; +import club.bytecode.the.jda.gui.MainViewerGUI; import org.objectweb.asm.tree.ClassNode; -import the.bytecode.club.jda.*; -import the.bytecode.club.jda.gui.JDAWindow; -import the.bytecode.club.jda.gui.MainViewerGUI; +import club.bytecode.the.jda.*; import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/src/main/java/the/bytecode/club/jda/gui/navigation/JDATreeCellRenderer.java b/src/main/java/club/bytecode/the/jda/gui/navigation/JDATreeCellRenderer.java similarity index 97% rename from src/main/java/the/bytecode/club/jda/gui/navigation/JDATreeCellRenderer.java rename to src/main/java/club/bytecode/the/jda/gui/navigation/JDATreeCellRenderer.java index 36fe820..5930ed9 100644 --- a/src/main/java/the/bytecode/club/jda/gui/navigation/JDATreeCellRenderer.java +++ b/src/main/java/club/bytecode/the/jda/gui/navigation/JDATreeCellRenderer.java @@ -1,6 +1,6 @@ -package the.bytecode.club.jda.gui.navigation; +package club.bytecode.the.jda.gui.navigation; -import the.bytecode.club.jda.Resources; +import club.bytecode.the.jda.Resources; import javax.swing.*; import javax.swing.tree.DefaultTreeCellRenderer; diff --git a/src/main/java/the/bytecode/club/jda/gui/navigation/TreeContextMenu.java b/src/main/java/club/bytecode/the/jda/gui/navigation/TreeContextMenu.java similarity index 96% rename from src/main/java/the/bytecode/club/jda/gui/navigation/TreeContextMenu.java rename to src/main/java/club/bytecode/the/jda/gui/navigation/TreeContextMenu.java index 6d7875b..3636f2d 100644 --- a/src/main/java/the/bytecode/club/jda/gui/navigation/TreeContextMenu.java +++ b/src/main/java/club/bytecode/the/jda/gui/navigation/TreeContextMenu.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.gui.navigation; +package club.bytecode.the.jda.gui.navigation; import javax.swing.*; import javax.swing.tree.TreePath; diff --git a/src/main/java/the/bytecode/club/jda/settings/IPersistentWindow.java b/src/main/java/club/bytecode/the/jda/settings/IPersistentWindow.java similarity index 89% rename from src/main/java/the/bytecode/club/jda/settings/IPersistentWindow.java rename to src/main/java/club/bytecode/the/jda/settings/IPersistentWindow.java index 426c9cb..c334f6a 100644 --- a/src/main/java/the/bytecode/club/jda/settings/IPersistentWindow.java +++ b/src/main/java/club/bytecode/the/jda/settings/IPersistentWindow.java @@ -1,4 +1,4 @@ -package the.bytecode.club.jda.settings; +package club.bytecode.the.jda.settings; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/settings/JDADecompilerSettings.java b/src/main/java/club/bytecode/the/jda/settings/JDADecompilerSettings.java similarity index 98% rename from src/main/java/the/bytecode/club/jda/settings/JDADecompilerSettings.java rename to src/main/java/club/bytecode/the/jda/settings/JDADecompilerSettings.java index 7b19fc3..71cf746 100644 --- a/src/main/java/the/bytecode/club/jda/settings/JDADecompilerSettings.java +++ b/src/main/java/club/bytecode/the/jda/settings/JDADecompilerSettings.java @@ -1,8 +1,8 @@ -package the.bytecode.club.jda.settings; +package club.bytecode.the.jda.settings; +import club.bytecode.the.jda.decompilers.JDADecompiler; import com.eclipsesource.json.JsonObject; import net.miginfocom.swing.MigLayout; -import the.bytecode.club.jda.decompilers.JDADecompiler; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/the/bytecode/club/jda/settings/Setting.java b/src/main/java/club/bytecode/the/jda/settings/Setting.java similarity index 94% rename from src/main/java/the/bytecode/club/jda/settings/Setting.java rename to src/main/java/club/bytecode/the/jda/settings/Setting.java index 3a70d95..853445a 100644 --- a/src/main/java/the/bytecode/club/jda/settings/Setting.java +++ b/src/main/java/club/bytecode/the/jda/settings/Setting.java @@ -1,6 +1,6 @@ -package the.bytecode.club.jda.settings; +package club.bytecode.the.jda.settings; -import static the.bytecode.club.jda.settings.Setting.SettingType.*; +import static club.bytecode.the.jda.settings.Setting.SettingType.*; public class Setting { public final String node; //TODO: convert to JSON node or something diff --git a/src/main/java/the/bytecode/club/jda/settings/Settings.java b/src/main/java/club/bytecode/the/jda/settings/Settings.java similarity index 89% rename from src/main/java/the/bytecode/club/jda/settings/Settings.java rename to src/main/java/club/bytecode/the/jda/settings/Settings.java index a57e28b..c5b9830 100644 --- a/src/main/java/the/bytecode/club/jda/settings/Settings.java +++ b/src/main/java/club/bytecode/the/jda/settings/Settings.java @@ -1,12 +1,12 @@ -package the.bytecode.club.jda.settings; +package club.bytecode.the.jda.settings; +import club.bytecode.the.jda.JDA; +import club.bytecode.the.jda.decompilers.Decompilers; +import club.bytecode.the.jda.decompilers.JDADecompiler; +import club.bytecode.the.jda.gui.JDAWindow; +import club.bytecode.the.jda.gui.MainViewerGUI; import com.eclipsesource.json.JsonObject; import com.eclipsesource.json.JsonValue; -import the.bytecode.club.jda.JDA; -import the.bytecode.club.jda.decompilers.Decompilers; -import the.bytecode.club.jda.decompilers.JDADecompiler; -import the.bytecode.club.jda.gui.JDAWindow; -import the.bytecode.club.jda.gui.MainViewerGUI; import java.awt.*; import java.io.FileOutputStream; @@ -14,9 +14,6 @@ import java.util.ArrayList; import java.util.List; -import static the.bytecode.club.jda.settings.Setting.SettingType.BOOLEAN; -import static the.bytecode.club.jda.settings.Setting.SettingType.INT; - /** * Used to handle loading/saving the GUI (options). * @@ -27,14 +24,14 @@ public class Settings { // todo: I should really refactor this public static final Setting PATH = new Setting("path", ""); - public static final Setting SHOW_CONTAINER_NAME = new Setting("showfilename", false, BOOLEAN); - public static final Setting SNAP_TO_EDGES = new Setting("snaptoedges", false, BOOLEAN); - public static final Setting DO_UPDATE_CHECK = new Setting("doupdatecheck", false, BOOLEAN); - public static final Setting REFRESH_ON_VIEW_CHANGE = new Setting("refreshonviewchange", false, BOOLEAN); + public static final Setting SHOW_CONTAINER_NAME = new Setting("showfilename", false, Setting.SettingType.BOOLEAN); + public static final Setting SNAP_TO_EDGES = new Setting("snaptoedges", false, Setting.SettingType.BOOLEAN); + public static final Setting DO_UPDATE_CHECK = new Setting("doupdatecheck", false, Setting.SettingType.BOOLEAN); + public static final Setting REFRESH_ON_VIEW_CHANGE = new Setting("refreshonviewchange", false, Setting.SettingType.BOOLEAN); - public static final Setting FONT_SIZE = new Setting("font", "fontsize", 12, INT); + public static final Setting FONT_SIZE = new Setting("font", "fontsize", 12, Setting.SettingType.INT); public static final Setting FONT_FAMILY = new Setting("font", "fontfamily", Font.MONOSPACED); - public static final Setting FONT_OPTIONS = new Setting("font", "fontoptions", Font.PLAIN, INT); + public static final Setting FONT_OPTIONS = new Setting("font", "fontoptions", Font.PLAIN, Setting.SettingType.INT); static { diff --git a/src/main/resources/the/bytecode/club/jda/html/about.html b/src/main/resources/club/bytecode/the/jda/html/about.html similarity index 100% rename from src/main/resources/the/bytecode/club/jda/html/about.html rename to src/main/resources/club/bytecode/the/jda/html/about.html diff --git a/src/main/resources/the/bytecode/club/jda/html/intro.html b/src/main/resources/club/bytecode/the/jda/html/intro.html similarity index 100% rename from src/main/resources/the/bytecode/club/jda/html/intro.html rename to src/main/resources/club/bytecode/the/jda/html/intro.html diff --git a/src/main/resources/the/bytecode/club/jda/images/1.gif b/src/main/resources/club/bytecode/the/jda/images/1.gif similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/1.gif rename to src/main/resources/club/bytecode/the/jda/images/1.gif diff --git a/src/main/resources/the/bytecode/club/jda/images/bat.png b/src/main/resources/club/bytecode/the/jda/images/bat.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/bat.png rename to src/main/resources/club/bytecode/the/jda/images/bat.png diff --git a/src/main/resources/the/bytecode/club/jda/images/busyIcon2.gif b/src/main/resources/club/bytecode/the/jda/images/busyIcon2.gif similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/busyIcon2.gif rename to src/main/resources/club/bytecode/the/jda/images/busyIcon2.gif diff --git a/src/main/resources/the/bytecode/club/jda/images/c#.png b/src/main/resources/club/bytecode/the/jda/images/c#.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/c#.png rename to src/main/resources/club/bytecode/the/jda/images/c#.png diff --git a/src/main/resources/the/bytecode/club/jda/images/c++.png b/src/main/resources/club/bytecode/the/jda/images/c++.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/c++.png rename to src/main/resources/club/bytecode/the/jda/images/c++.png diff --git a/src/main/resources/the/bytecode/club/jda/images/class.png b/src/main/resources/club/bytecode/the/jda/images/class.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/class.png rename to src/main/resources/club/bytecode/the/jda/images/class.png diff --git a/src/main/resources/the/bytecode/club/jda/images/config.png b/src/main/resources/club/bytecode/the/jda/images/config.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/config.png rename to src/main/resources/club/bytecode/the/jda/images/config.png diff --git a/src/main/resources/the/bytecode/club/jda/images/decoded.png b/src/main/resources/club/bytecode/the/jda/images/decoded.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/decoded.png rename to src/main/resources/club/bytecode/the/jda/images/decoded.png diff --git a/src/main/resources/the/bytecode/club/jda/images/file.png b/src/main/resources/club/bytecode/the/jda/images/file.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/file.png rename to src/main/resources/club/bytecode/the/jda/images/file.png diff --git a/src/main/resources/the/bytecode/club/jda/images/folder.png b/src/main/resources/club/bytecode/the/jda/images/folder.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/folder.png rename to src/main/resources/club/bytecode/the/jda/images/folder.png diff --git a/src/main/resources/the/bytecode/club/jda/images/icon.png b/src/main/resources/club/bytecode/the/jda/images/icon.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/icon.png rename to src/main/resources/club/bytecode/the/jda/images/icon.png diff --git a/src/main/resources/the/bytecode/club/jda/images/image.png b/src/main/resources/club/bytecode/the/jda/images/image.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/image.png rename to src/main/resources/club/bytecode/the/jda/images/image.png diff --git a/src/main/resources/the/bytecode/club/jda/images/jar.png b/src/main/resources/club/bytecode/the/jda/images/jar.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/jar.png rename to src/main/resources/club/bytecode/the/jda/images/jar.png diff --git a/src/main/resources/the/bytecode/club/jda/images/java.png b/src/main/resources/club/bytecode/the/jda/images/java.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/java.png rename to src/main/resources/club/bytecode/the/jda/images/java.png diff --git a/src/main/resources/the/bytecode/club/jda/images/nextIcon.png b/src/main/resources/club/bytecode/the/jda/images/nextIcon.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/nextIcon.png rename to src/main/resources/club/bytecode/the/jda/images/nextIcon.png diff --git a/src/main/resources/the/bytecode/club/jda/images/package.png b/src/main/resources/club/bytecode/the/jda/images/package.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/package.png rename to src/main/resources/club/bytecode/the/jda/images/package.png diff --git a/src/main/resources/the/bytecode/club/jda/images/prevIcon.png b/src/main/resources/club/bytecode/the/jda/images/prevIcon.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/prevIcon.png rename to src/main/resources/club/bytecode/the/jda/images/prevIcon.png diff --git a/src/main/resources/the/bytecode/club/jda/images/sh.png b/src/main/resources/club/bytecode/the/jda/images/sh.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/sh.png rename to src/main/resources/club/bytecode/the/jda/images/sh.png diff --git a/src/main/resources/the/bytecode/club/jda/images/text.png b/src/main/resources/club/bytecode/the/jda/images/text.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/text.png rename to src/main/resources/club/bytecode/the/jda/images/text.png diff --git a/src/main/resources/the/bytecode/club/jda/images/zip.png b/src/main/resources/club/bytecode/the/jda/images/zip.png similarity index 100% rename from src/main/resources/the/bytecode/club/jda/images/zip.png rename to src/main/resources/club/bytecode/the/jda/images/zip.png