Skip to content

Commit b446046

Browse files
committed
Rename main package (#34)
1 parent 66d6e1c commit b446046

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+181
-193
lines changed

pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<configuration>
4646
<transformers>
4747
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
48-
<mainClass>the.bytecode.club.jda.JDA</mainClass>
48+
<mainClass>club.bytecode.the.jda.JDA</mainClass>
4949
</transformer>
5050
</transformers>
5151
</configuration>
@@ -126,11 +126,6 @@
126126
<artifactId>commons-lang3</artifactId>
127127
<version>3.4</version>
128128
</dependency>
129-
<dependency>
130-
<groupId>com.fifesoft</groupId>
131-
<artifactId>rsyntaxtextarea</artifactId>
132-
<version>2.5.8</version>
133-
</dependency>
134129
<dependency>
135130
<groupId>org.zeroturnaround</groupId>
136131
<artifactId>zt-zip</artifactId>

src/main/java/the/bytecode/club/jda/Boot.java renamed to src/main/java/club/bytecode/the/jda/Boot.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package the.bytecode.club.jda;
1+
package club.bytecode.the.jda;
22

3-
import the.bytecode.club.jda.api.ExceptionUI;
3+
import club.bytecode.the.jda.api.ExceptionUI;
44

55
import javax.swing.*;
66

src/main/java/the/bytecode/club/jda/FileChangeNotifier.java renamed to src/main/java/club/bytecode/the/jda/FileChangeNotifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package the.bytecode.club.jda;
1+
package club.bytecode.the.jda;
22

33
import org.objectweb.asm.tree.ClassNode;
44

src/main/java/the/bytecode/club/jda/FileContainer.java renamed to src/main/java/club/bytecode/the/jda/FileContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package the.bytecode.club.jda;
1+
package club.bytecode.the.jda;
22

33
import org.objectweb.asm.ClassReader;
44
import org.objectweb.asm.tree.ClassNode;

src/main/java/the/bytecode/club/jda/FileDrop.java renamed to src/main/java/club/bytecode/the/jda/FileDrop.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package the.bytecode.club.jda;
1+
package club.bytecode.the.jda;
22

3-
import the.bytecode.club.jda.api.ExceptionUI;
3+
import club.bytecode.the.jda.api.ExceptionUI;
44

55
import java.awt.datatransfer.DataFlavor;
66
import java.io.*;

src/main/java/the/bytecode/club/jda/InitialBootScreen.java renamed to src/main/java/club/bytecode/the/jda/InitialBootScreen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package the.bytecode.club.jda;
1+
package club.bytecode.the.jda;
22

33
import org.apache.commons.io.IOUtils;
44

@@ -53,7 +53,7 @@ else if (i >= 440)
5353
JEditorPane editorPane = new JEditorPane();
5454
editorPane.setEditorKit(new HTMLEditorKit());
5555
editorPane.setEditable(false);
56-
editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/the/bytecode/club/jda/html/intro.html"), "UTF-8"));
56+
editorPane.setText(IOUtils.toString(Resources.class.getResourceAsStream("/club/bytecode/the/jda/html/intro.html"), "UTF-8"));
5757

5858
scrollPane.setViewportView(editorPane);
5959

src/main/java/the/bytecode/club/jda/JDA.java renamed to src/main/java/club/bytecode/the/jda/JDA.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
package the.bytecode.club.jda;
1+
package club.bytecode.the.jda;
22

3+
import club.bytecode.the.jda.gui.MainViewerGUI;
4+
import club.bytecode.the.jda.gui.fileviewer.BytecodeTokenizer;
35
import org.apache.commons.io.FileUtils;
46
import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
57
import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
6-
import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser;
78
import org.fife.ui.rsyntaxtextarea.folding.FoldParserManager;
89
import org.objectweb.asm.ClassReader;
910
import org.objectweb.asm.ClassWriter;
1011
import org.objectweb.asm.tree.ClassNode;
11-
import the.bytecode.club.jda.api.ExceptionUI;
12-
import the.bytecode.club.jda.api.Plugin;
13-
import the.bytecode.club.jda.api.PluginLoader;
14-
import the.bytecode.club.jda.gui.MainViewerGUI;
15-
import the.bytecode.club.jda.gui.fileviewer.BytecodeFoldParser;
16-
import the.bytecode.club.jda.gui.fileviewer.BytecodeTokenizer;
17-
import the.bytecode.club.jda.gui.navigation.FileNavigationPane;
18-
import the.bytecode.club.jda.settings.Settings;
12+
import club.bytecode.the.jda.api.ExceptionUI;
13+
import club.bytecode.the.jda.api.Plugin;
14+
import club.bytecode.the.jda.api.PluginLoader;
15+
import club.bytecode.the.jda.gui.fileviewer.BytecodeFoldParser;
16+
import club.bytecode.the.jda.gui.navigation.FileNavigationPane;
17+
import club.bytecode.the.jda.settings.Settings;
1918

2019
import javax.swing.*;
2120
import javax.swing.filechooser.FileFilter;

src/main/java/the/bytecode/club/jda/JarUtils.java renamed to src/main/java/club/bytecode/the/jda/JarUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package the.bytecode.club.jda;
1+
package club.bytecode.the.jda;
22

3+
import club.bytecode.the.jda.api.ExceptionUI;
34
import org.objectweb.asm.ClassReader;
45
import org.objectweb.asm.ClassWriter;
56
import org.objectweb.asm.tree.ClassNode;
6-
import the.bytecode.club.jda.api.ExceptionUI;
77

88
import java.io.*;
99
import java.util.ArrayList;

src/main/java/the/bytecode/club/jda/MiscUtils.java renamed to src/main/java/club/bytecode/the/jda/MiscUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package the.bytecode.club.jda;
1+
package club.bytecode.the.jda;
22

33
import java.io.BufferedReader;
44
import java.io.File;

src/main/java/the/bytecode/club/jda/Resources.java renamed to src/main/java/club/bytecode/the/jda/Resources.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package the.bytecode.club.jda;
1+
package club.bytecode.the.jda;
22

33
import org.imgscalr.Scalr;
44

@@ -15,34 +15,34 @@
1515
*/
1616

1717
public class Resources {
18-
public static ImageIcon nextIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/nextIcon.png"));
19-
public static ImageIcon prevIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/prevIcon.png"));
20-
public static ImageIcon busyIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/1.gif"));
21-
public static ImageIcon busyB64Icon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/busyIcon2.gif"));
22-
public static ImageIcon batIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/bat.png"));
23-
public static ImageIcon shIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/sh.png"));
24-
public static ImageIcon csharpIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/c#.png"));
25-
public static ImageIcon cplusplusIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/c++.png"));
26-
public static ImageIcon configIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/config.png"));
27-
public static ImageIcon jarIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/jar.png"));
28-
public static ImageIcon zipIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/zip.png"));
29-
public static ImageIcon packagesIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/package.png"));
30-
public static ImageIcon folderIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/folder.png"));
31-
public static ImageIcon fileIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/file.png"));
32-
public static ImageIcon textIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/text.png"));
33-
public static ImageIcon classIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/class.png"));
34-
public static ImageIcon imageIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/image.png"));
35-
public static ImageIcon decodedIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/decoded.png"));
36-
public static ImageIcon javaIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/java.png"));
37-
38-
public static ImageIcon fileNavigatorIcon = new ImageIcon(Resources.class.getClass().getResource("/the/bytecode/club/jda/images/icon.png"));
18+
public static ImageIcon nextIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/nextIcon.png"));
19+
public static ImageIcon prevIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/prevIcon.png"));
20+
public static ImageIcon busyIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/1.gif"));
21+
public static ImageIcon busyB64Icon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/busyIcon2.gif"));
22+
public static ImageIcon batIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/bat.png"));
23+
public static ImageIcon shIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/sh.png"));
24+
public static ImageIcon csharpIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/c#.png"));
25+
public static ImageIcon cplusplusIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/c++.png"));
26+
public static ImageIcon configIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/config.png"));
27+
public static ImageIcon jarIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/jar.png"));
28+
public static ImageIcon zipIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/zip.png"));
29+
public static ImageIcon packagesIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/package.png"));
30+
public static ImageIcon folderIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/folder.png"));
31+
public static ImageIcon fileIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/file.png"));
32+
public static ImageIcon textIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/text.png"));
33+
public static ImageIcon classIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/class.png"));
34+
public static ImageIcon imageIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/image.png"));
35+
public static ImageIcon decodedIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/decoded.png"));
36+
public static ImageIcon javaIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/java.png"));
37+
38+
public static ImageIcon fileNavigatorIcon = new ImageIcon(Resources.class.getClass().getResource("/club/bytecode/the/jda/images/icon.png"));
3939

4040
public static ArrayList<BufferedImage> iconList;
4141
public static BufferedImage icon;
4242

4343
static {
4444
try {
45-
icon = ImageIO.read(Resources.class.getClass().getResourceAsStream("/the/bytecode/club/jda/images/icon.png"));
45+
icon = ImageIO.read(Resources.class.getClass().getResourceAsStream("/club/bytecode/the/jda/images/icon.png"));
4646
} catch (IOException e) {
4747
System.err.println("Failed to load program icon:");
4848
e.printStackTrace();

0 commit comments

Comments
 (0)