Rename main package (#34)

pom.xml

@@ -45,7 +45,7 @@
  <configuration>
  <transformers>
  <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>the.bytecode.club.jda.JDA</mainClass>
+ <mainClass>club.bytecode.the.jda.JDA</mainClass>
  </transformer>
  </transformers>
  </configuration>
@@ -126,11 +126,6 @@
  <artifactId>commons-lang3</artifactId>
  <version>3.4</version>
  </dependency>
- <dependency>
- <groupId>com.fifesoft</groupId>
- <artifactId>rsyntaxtextarea</artifactId>
- <version>2.5.8</version>
- </dependency>
  <dependency>
  <groupId>org.zeroturnaround</groupId>
  <artifactId>zt-zip</artifactId>

src/main/java/the/bytecode/club/jda/Boot.java → 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.*;
 

src/main/java/the/bytecode/club/jda/FileChangeNotifier.java → 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;
 

src/main/java/the/bytecode/club/jda/FileContainer.java → 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;

src/main/java/the/bytecode/club/jda/FileDrop.java → 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.*;

src/main/java/the/bytecode/club/jda/InitialBootScreen.java → 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);
 

src/main/java/the/bytecode/club/jda/JDA.java → 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;

src/main/java/the/bytecode/club/jda/JarUtils.java → 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;

src/main/java/the/bytecode/club/jda/MiscUtils.java → 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;

src/main/java/the/bytecode/club/jda/Resources.java → 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<BufferedImage> 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();

src/main/java/the/bytecode/club/jda/SecurityMan.java → 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()) {

src/main/java/the/bytecode/club/jda/api/ExceptionUI.java → 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.*;

src/main/java/the/bytecode/club/jda/api/Plugin.java → 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();

src/main/java/the/bytecode/club/jda/api/PluginLoader.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/CFRDecompiler.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/Decompilers.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/FernflowerDecompiler.java → 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.*;

src/main/java/the/bytecode/club/jda/decompilers/JDADecompiler.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/ProcyonDecompiler.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/bytecode/BytecodeDecompiler.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/bytecode/FieldNodeDecompiler.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/bytecode/InstructionPrinter.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/bytecode/MethodNodeDecompiler.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/bytecode/OpcodeInfo.java → 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;

src/main/java/the/bytecode/club/jda/decompilers/bytecode/PrefixedStringBuilder.java → 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

src/main/java/the/bytecode/club/jda/decompilers/bytecode/TypeAndName.java → 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;
 

src/main/java/the/bytecode/club/jda/gui/JDAWindow.java → 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.*;