markil3/UniversalMusicPlayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sets the main package name to universeplayer.

Browse Source 
The extra underscore was causing problems with the JNI.
This commit is contained in:
Markil3
2021-07-17 07:23:17 -06:00
parent 94ffd80c8d
commit 97985044f8
20 changed files with 41 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -9,7 +9,7 @@
* For more details take a look at the Java Quickstart chapter in the Gradle * For more details take a look at the Java Quickstart chapter in the Gradle
* user guide available at https://docs.gradle.org/4.4.1/userguide/tutorial_java_projects.html * user guide available at https://docs.gradle.org/4.4.1/userguide/tutorial_java_projects.html
*/ */
ext.defaultPackage = "edu.regis.universe_player" ext.defaultPackage = "edu.regis.universeplayer"
task bundleAddOn(type: Zip) task bundleAddOn(type: Zip)
{ {

2
interface/src/main/java/edu/regis/universe_player/ClickListener.java → interface/src/main/java/edu/regis/universeplayer/ClickListener.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player; package edu.regis.universeplayer;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;

4
interface/src/main/java/edu/regis/universe_player/Player.java → interface/src/main/java/edu/regis/universeplayer/Player.java
View File

@@ -2,9 +2,9 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player; package edu.regis.universeplayer;
import edu.regis.universe_player.data.Song; import edu.regis.universeplayer.data.Song;
/** /**
* This interface serves as the connection to a music player of some sort, whether it be * This interface serves as the connection to a music player of some sort, whether it be

5
interface/src/main/java/edu/regis/universe_player/browser/Browser.java → interface/src/main/java/edu/regis/universeplayer/browser/Browser.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.browser; package edu.regis.universeplayer.browser;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
@@ -10,7 +10,6 @@ import com.google.gson.stream.JsonWriter;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.net.URL;
/** /**
* This serves as a central point for controlling the browser process. * This serves as a central point for controlling the browser process.
@@ -25,7 +24,7 @@ public class Browser
/** /**
* Utility method for launching a browser instance * Utility method for launching a browser instance
* *
* @throws IOException * @throws IOException - Thrown if there is a problem launching the browser.
*/ */
public static void launchBrowser() throws IOException public static void launchBrowser() throws IOException
{ {

8
interface/src/main/java/edu/regis/universe_player/browser/MessageManager.java → interface/src/main/java/edu/regis/universeplayer/browser/MessageManager.java
View File

@@ -2,22 +2,16 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.browser; package edu.regis.universeplayer.browser;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.io.Reader;
import java.util.Scanner;
/** /**
* This class will send messages to the * This class will send messages to the

2
interface/src/main/java/edu/regis/universe_player/data/Album.java → interface/src/main/java/edu/regis/universeplayer/data/Album.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.data; package edu.regis.universeplayer.data;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;

2
interface/src/main/java/edu/regis/universe_player/data/CollectionType.java → interface/src/main/java/edu/regis/universeplayer/data/CollectionType.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.data; package edu.regis.universeplayer.data;
/** /**
* Lists all of the type of collections possible. * Lists all of the type of collections possible.

2
interface/src/main/java/edu/regis/universe_player/data/CompiledSongProvider.java → interface/src/main/java/edu/regis/universeplayer/data/CompiledSongProvider.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.data; package edu.regis.universeplayer.data;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;

2
interface/src/main/java/edu/regis/universe_player/data/SimpleSongProvider.java → interface/src/main/java/edu/regis/universeplayer/data/SimpleSongProvider.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.data; package edu.regis.universeplayer.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;

2
interface/src/main/java/edu/regis/universe_player/data/Song.java → interface/src/main/java/edu/regis/universeplayer/data/Song.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.data; package edu.regis.universeplayer.data;
/** /**
* Contains data for a song. * Contains data for a song.

2
interface/src/main/java/edu/regis/universe_player/data/SongProvider.java → interface/src/main/java/edu/regis/universeplayer/data/SongProvider.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.data; package edu.regis.universeplayer.data;
import java.util.Collection; import java.util.Collection;

4
interface/src/main/java/edu/regis/universe_player/player/AlbumInfo.java → interface/src/main/java/edu/regis/universeplayer/player/AlbumInfo.java
View File

@@ -2,14 +2,14 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.player; package edu.regis.universeplayer.player;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.SpringLayout; import javax.swing.SpringLayout;
import edu.regis.universe_player.data.Album; import edu.regis.universeplayer.data.Album;
/** /**
* This panel will display information on an album. * This panel will display information on an album.

17
interface/src/main/java/edu/regis/universe_player/player/CollectionList.java → interface/src/main/java/edu/regis/universeplayer/player/CollectionList.java
View File

@@ -2,14 +2,9 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.player; package edu.regis.universeplayer.player;
import java.awt.FlowLayout; import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.event.MouseEvent;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
@@ -22,11 +17,11 @@ import javax.swing.ImageIcon;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import edu.regis.universe_player.ClickListener; import edu.regis.universeplayer.ClickListener;
import edu.regis.universe_player.data.Album; import edu.regis.universeplayer.data.Album;
import edu.regis.universe_player.data.CollectionType; import edu.regis.universeplayer.data.CollectionType;
import edu.regis.universe_player.data.Song; import edu.regis.universeplayer.data.Song;
import edu.regis.universe_player.data.SongProvider; import edu.regis.universeplayer.data.SongProvider;
/** /**
* This panel will list all the song collections on display (albums, artists, genres, etc.) * This panel will list all the song collections on display (albums, artists, genres, etc.)

13
interface/src/main/java/edu/regis/universe_player/player/Collections.java → interface/src/main/java/edu/regis/universeplayer/player/Collections.java
View File

@@ -2,23 +2,20 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.player; package edu.regis.universeplayer.player;
import java.awt.Color; import java.awt.Color;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List;
import javax.swing.BoxLayout; import javax.swing.BoxLayout;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import edu.regis.universe_player.ClickListener; import edu.regis.universeplayer.ClickListener;
import edu.regis.universe_player.data.CollectionType; import edu.regis.universeplayer.data.CollectionType;
import edu.regis.universe_player.data.Song; import edu.regis.universeplayer.data.Song;
import edu.regis.universe_player.data.SongProvider; import edu.regis.universeplayer.data.SongProvider;
/** /**
* This panel links to various song collections the player has set up. * This panel links to various song collections the player has set up.

10
interface/src/main/java/edu/regis/universe_player/player/Interface.java → interface/src/main/java/edu/regis/universeplayer/player/Interface.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.player; package edu.regis.universeplayer.player;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
@@ -17,10 +17,10 @@ import javax.swing.JFrame;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import edu.regis.universe_player.browser.Browser; import edu.regis.universeplayer.browser.Browser;
import edu.regis.universe_player.browser.MessageManager; import edu.regis.universeplayer.browser.MessageManager;
import edu.regis.universe_player.data.CollectionType; import edu.regis.universeplayer.data.CollectionType;
import edu.regis.universe_player.data.Song; import edu.regis.universeplayer.data.Song;
/** /**
* The Interface class serves as the primary GUI that the player interacts with. * The Interface class serves as the primary GUI that the player interacts with.

2
interface/src/main/java/edu/regis/universe_player/player/PlaybackCommand.java → interface/src/main/java/edu/regis/universeplayer/player/PlaybackCommand.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.player; package edu.regis.universeplayer.player;
/** /**
* Contains possible playback commands that the play can send. * Contains possible playback commands that the play can send.

2
interface/src/main/java/edu/regis/universe_player/player/PlaybackCommandListener.java → interface/src/main/java/edu/regis/universeplayer/player/PlaybackCommandListener.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.player; package edu.regis.universeplayer.player;
import java.util.EventListener; import java.util.EventListener;

2
interface/src/main/java/edu/regis/universe_player/player/PlayerControls.java → interface/src/main/java/edu/regis/universeplayer/player/PlayerControls.java
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.player; package edu.regis.universeplayer.player;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.FlowLayout; import java.awt.FlowLayout;

6
interface/src/main/java/edu/regis/universe_player/player/SongDisplayListener.java → interface/src/main/java/edu/regis/universeplayer/player/SongDisplayListener.java
View File

@@ -2,13 +2,13 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.player; package edu.regis.universeplayer.player;
import java.util.Collection; import java.util.Collection;
import java.util.EventListener; import java.util.EventListener;
import edu.regis.universe_player.data.CollectionType; import edu.regis.universeplayer.data.CollectionType;
import edu.regis.universe_player.data.Song; import edu.regis.universeplayer.data.Song;
/** /**
* A callback that is triggered whenever one element believes that the interface center display needs to be updated. * A callback that is triggered whenever one element believes that the interface center display needs to be updated.

15
interface/src/main/java/edu/regis/universe_player/player/SongList.java → interface/src/main/java/edu/regis/universeplayer/player/SongList.java
View File

@@ -2,30 +2,23 @@
* Copyright (c) 2021 William Hubbard. All Rights Reserved. * Copyright (c) 2021 William Hubbard. All Rights Reserved.
*/ */
package edu.regis.universe_player.player; package edu.regis.universeplayer.player;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout; import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.Insets; import java.awt.Insets;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.swing.BoxLayout;
import javax.swing.ImageIcon;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.SpringLayout;
import edu.regis.universe_player.data.Album; import edu.regis.universeplayer.data.Album;
import edu.regis.universe_player.data.SimpleSongProvider; import edu.regis.universeplayer.data.Song;
import edu.regis.universe_player.data.Song; import edu.regis.universeplayer.data.SongProvider;
import edu.regis.universe_player.data.SongProvider;
/** /**
* This panel will list all the songs that are to be currently displayed. * This panel will list all the songs that are to be currently displayed.