Skip to content
This repository has been archived by the owner on Jan 24, 2019. It is now read-only.

Commit

Permalink
Final modifications to manifest, constants, and main. Everything work…
Browse files Browse the repository at this point in the history
…s in both the IDE and the ANT build. First release will be after this commit.
  • Loading branch information
Adamantcheese committed May 20, 2015
1 parent b80a2cc commit 850bff6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Class-Path: lib/jsoup-1.8.1.jar lib/jlayer-1.0.1-1.jar lib/commons-io-
2.4.jar BCPlayer.jar
2.4.jar
Main-Class: Main

2 changes: 1 addition & 1 deletion src/main/java/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void handle (WindowEvent event) {
}

public static void writeTrackFile () throws Exception {
Scanner tempScanner = new Scanner(new File(Main.class.getResource("tracks.nll").toURI()));
Scanner tempScanner = new Scanner(ClassLoader.getSystemClassLoader().getResourceAsStream("tracks.nll"));
PrintWriter tempWriter = new PrintWriter(Constants.TRACK_FILE);
while (tempScanner.hasNextLine()) {
tempWriter.println(tempScanner.nextLine());
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/boot/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static void setHostServices(HostServicesDelegate hsd) {

public static URL getDefaultCover () {
if (DEFAULT_COVER == null) {
DEFAULT_COVER = Constants.class.getResource("../default_cover.png");
DEFAULT_COVER = ClassLoader.getSystemClassLoader().getResource("default_cover.png");
}
return DEFAULT_COVER;
}
Expand All @@ -55,7 +55,7 @@ public static URL getDefaultCover () {

public static Image getPlayButton () {
if (PLAY_BUTTON == null) {
PLAY_BUTTON = new Image(Constants.class.getResource("../play.png").toString());
PLAY_BUTTON = new Image(ClassLoader.getSystemClassLoader().getResource("play.png").toString());
}
return PLAY_BUTTON;
}
Expand All @@ -64,7 +64,7 @@ public static Image getPlayButton () {

public static Image getPauseButton () {
if (PAUSE_BUTTON == null) {
PAUSE_BUTTON = new Image(Constants.class.getResource("../pause.png").toString());
PAUSE_BUTTON = new Image(ClassLoader.getSystemClassLoader().getResource("pause.png").toString());
}
return PAUSE_BUTTON;
}
Expand All @@ -74,14 +74,14 @@ public static Image getPauseButton () {
public static List<Image> getIcons() {
if(ICONS == null) {
ICONS = new ArrayList<Image>();
ICONS.add(new Image(Constants.class.getResource("../icons/16x16.png").toString()));
ICONS.add(new Image(Constants.class.getResource("../icons/24x24.png").toString()));
ICONS.add(new Image(Constants.class.getResource("../icons/32x32.png").toString()));
ICONS.add(new Image(Constants.class.getResource("../icons/48x48.png").toString()));
ICONS.add(new Image(Constants.class.getResource("../icons/64x64.png").toString()));
ICONS.add(new Image(Constants.class.getResource("../icons/96x96.png").toString()));
ICONS.add(new Image(Constants.class.getResource("../icons/128x128.png").toString()));
ICONS.add(new Image(Constants.class.getResource("../icons/256x256.png").toString()));
ICONS.add(new Image(ClassLoader.getSystemClassLoader().getResource("icons/16x16.png").toString()));
ICONS.add(new Image(ClassLoader.getSystemClassLoader().getResource("icons/24x24.png").toString()));
ICONS.add(new Image(ClassLoader.getSystemClassLoader().getResource("icons/32x32.png").toString()));
ICONS.add(new Image(ClassLoader.getSystemClassLoader().getResource("icons/48x48.png").toString()));
ICONS.add(new Image(ClassLoader.getSystemClassLoader().getResource("icons/64x64.png").toString()));
ICONS.add(new Image(ClassLoader.getSystemClassLoader().getResource("icons/96x96.png").toString()));
ICONS.add(new Image(ClassLoader.getSystemClassLoader().getResource("icons/128x128.png").toString()));
ICONS.add(new Image(ClassLoader.getSystemClassLoader().getResource("icons/256x256.png").toString()));
}
return ICONS;
}
Expand Down

0 comments on commit 850bff6

Please sign in to comment.