From 97985044f8bf822ad9c0cf7488bb9cc0ac4242da Mon Sep 17 00:00:00 2001 From: Markil3 <75867393+Markil3@users.noreply.github.com> Date: Sat, 17 Jul 2021 07:23:17 -0600 Subject: [PATCH] Sets the main package name to universeplayer. The extra underscore was causing problems with the JNI. --- build.gradle | 2 +- .../ClickListener.java | 2 +- .../Player.java | 4 ++-- .../browser/Browser.java | 5 ++--- .../browser/MessageManager.java | 8 +------- .../data/Album.java | 2 +- .../data/CollectionType.java | 2 +- .../data/CompiledSongProvider.java | 2 +- .../data/SimpleSongProvider.java | 2 +- .../data/Song.java | 2 +- .../data/SongProvider.java | 2 +- .../player/AlbumInfo.java | 4 ++-- .../player/CollectionList.java | 17 ++++++----------- .../player/Collections.java | 13 +++++-------- .../player/Interface.java | 10 +++++----- .../player/PlaybackCommand.java | 2 +- .../player/PlaybackCommandListener.java | 2 +- .../player/PlayerControls.java | 2 +- .../player/SongDisplayListener.java | 6 +++--- .../player/SongList.java | 15 ++++----------- 20 files changed, 41 insertions(+), 63 deletions(-) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/ClickListener.java (94%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/Player.java (95%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/browser/Browser.java (97%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/browser/MessageManager.java (92%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/data/Album.java (93%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/data/CollectionType.java (93%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/data/CompiledSongProvider.java (99%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/data/SimpleSongProvider.java (99%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/data/Song.java (96%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/data/SongProvider.java (98%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/player/AlbumInfo.java (98%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/player/CollectionList.java (95%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/player/Collections.java (91%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/player/Interface.java (96%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/player/PlaybackCommand.java (85%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/player/PlaybackCommandListener.java (92%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/player/PlayerControls.java (99%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/player/SongDisplayListener.java (85%) rename interface/src/main/java/edu/regis/{universe_player => universeplayer}/player/SongList.java (88%) diff --git a/build.gradle b/build.gradle index f2ed389..eecf863 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ * 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 */ -ext.defaultPackage = "edu.regis.universe_player" +ext.defaultPackage = "edu.regis.universeplayer" task bundleAddOn(type: Zip) { diff --git a/interface/src/main/java/edu/regis/universe_player/ClickListener.java b/interface/src/main/java/edu/regis/universeplayer/ClickListener.java similarity index 94% rename from interface/src/main/java/edu/regis/universe_player/ClickListener.java rename to interface/src/main/java/edu/regis/universeplayer/ClickListener.java index a5442a0..bdc6aba 100644 --- a/interface/src/main/java/edu/regis/universe_player/ClickListener.java +++ b/interface/src/main/java/edu/regis/universeplayer/ClickListener.java @@ -2,7 +2,7 @@ * 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.MouseListener; diff --git a/interface/src/main/java/edu/regis/universe_player/Player.java b/interface/src/main/java/edu/regis/universeplayer/Player.java similarity index 95% rename from interface/src/main/java/edu/regis/universe_player/Player.java rename to interface/src/main/java/edu/regis/universeplayer/Player.java index e41ebdb..75438d6 100644 --- a/interface/src/main/java/edu/regis/universe_player/Player.java +++ b/interface/src/main/java/edu/regis/universeplayer/Player.java @@ -2,9 +2,9 @@ * 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 diff --git a/interface/src/main/java/edu/regis/universe_player/browser/Browser.java b/interface/src/main/java/edu/regis/universeplayer/browser/Browser.java similarity index 97% rename from interface/src/main/java/edu/regis/universe_player/browser/Browser.java rename to interface/src/main/java/edu/regis/universeplayer/browser/Browser.java index f0f11c7..3066498 100644 --- a/interface/src/main/java/edu/regis/universe_player/browser/Browser.java +++ b/interface/src/main/java/edu/regis/universeplayer/browser/Browser.java @@ -2,7 +2,7 @@ * 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.stream.JsonWriter; @@ -10,7 +10,6 @@ import com.google.gson.stream.JsonWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.net.URL; /** * 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 * - * @throws IOException + * @throws IOException - Thrown if there is a problem launching the browser. */ public static void launchBrowser() throws IOException { diff --git a/interface/src/main/java/edu/regis/universe_player/browser/MessageManager.java b/interface/src/main/java/edu/regis/universeplayer/browser/MessageManager.java similarity index 92% rename from interface/src/main/java/edu/regis/universe_player/browser/MessageManager.java rename to interface/src/main/java/edu/regis/universeplayer/browser/MessageManager.java index 34d1462..4945fec 100644 --- a/interface/src/main/java/edu/regis/universe_player/browser/MessageManager.java +++ b/interface/src/main/java/edu/regis/universeplayer/browser/MessageManager.java @@ -2,22 +2,16 @@ * 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.stream.JsonReader; -import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; -import java.io.BufferedInputStream; -import java.io.BufferedReader; import java.io.Closeable; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; -import java.io.PrintStream; -import java.io.Reader; -import java.util.Scanner; /** * This class will send messages to the diff --git a/interface/src/main/java/edu/regis/universe_player/data/Album.java b/interface/src/main/java/edu/regis/universeplayer/data/Album.java similarity index 93% rename from interface/src/main/java/edu/regis/universe_player/data/Album.java rename to interface/src/main/java/edu/regis/universeplayer/data/Album.java index eed8545..8bb79af 100644 --- a/interface/src/main/java/edu/regis/universe_player/data/Album.java +++ b/interface/src/main/java/edu/regis/universeplayer/data/Album.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 William Hubbard. All Rights Reserved. */ -package edu.regis.universe_player.data; +package edu.regis.universeplayer.data; import javax.swing.ImageIcon; diff --git a/interface/src/main/java/edu/regis/universe_player/data/CollectionType.java b/interface/src/main/java/edu/regis/universeplayer/data/CollectionType.java similarity index 93% rename from interface/src/main/java/edu/regis/universe_player/data/CollectionType.java rename to interface/src/main/java/edu/regis/universeplayer/data/CollectionType.java index 6c45eed..68df18e 100644 --- a/interface/src/main/java/edu/regis/universe_player/data/CollectionType.java +++ b/interface/src/main/java/edu/regis/universeplayer/data/CollectionType.java @@ -2,7 +2,7 @@ * 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. diff --git a/interface/src/main/java/edu/regis/universe_player/data/CompiledSongProvider.java b/interface/src/main/java/edu/regis/universeplayer/data/CompiledSongProvider.java similarity index 99% rename from interface/src/main/java/edu/regis/universe_player/data/CompiledSongProvider.java rename to interface/src/main/java/edu/regis/universeplayer/data/CompiledSongProvider.java index 3315f49..8052e0c 100644 --- a/interface/src/main/java/edu/regis/universe_player/data/CompiledSongProvider.java +++ b/interface/src/main/java/edu/regis/universeplayer/data/CompiledSongProvider.java @@ -2,7 +2,7 @@ * 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.HashMap; diff --git a/interface/src/main/java/edu/regis/universe_player/data/SimpleSongProvider.java b/interface/src/main/java/edu/regis/universeplayer/data/SimpleSongProvider.java similarity index 99% rename from interface/src/main/java/edu/regis/universe_player/data/SimpleSongProvider.java rename to interface/src/main/java/edu/regis/universeplayer/data/SimpleSongProvider.java index 824b5c0..89f7ee7 100644 --- a/interface/src/main/java/edu/regis/universe_player/data/SimpleSongProvider.java +++ b/interface/src/main/java/edu/regis/universeplayer/data/SimpleSongProvider.java @@ -2,7 +2,7 @@ * 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.Arrays; diff --git a/interface/src/main/java/edu/regis/universe_player/data/Song.java b/interface/src/main/java/edu/regis/universeplayer/data/Song.java similarity index 96% rename from interface/src/main/java/edu/regis/universe_player/data/Song.java rename to interface/src/main/java/edu/regis/universeplayer/data/Song.java index 27fb773..2a54785 100644 --- a/interface/src/main/java/edu/regis/universe_player/data/Song.java +++ b/interface/src/main/java/edu/regis/universeplayer/data/Song.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 William Hubbard. All Rights Reserved. */ -package edu.regis.universe_player.data; +package edu.regis.universeplayer.data; /** * Contains data for a song. diff --git a/interface/src/main/java/edu/regis/universe_player/data/SongProvider.java b/interface/src/main/java/edu/regis/universeplayer/data/SongProvider.java similarity index 98% rename from interface/src/main/java/edu/regis/universe_player/data/SongProvider.java rename to interface/src/main/java/edu/regis/universeplayer/data/SongProvider.java index 91b5545..d84ad0e 100644 --- a/interface/src/main/java/edu/regis/universe_player/data/SongProvider.java +++ b/interface/src/main/java/edu/regis/universeplayer/data/SongProvider.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 William Hubbard. All Rights Reserved. */ -package edu.regis.universe_player.data; +package edu.regis.universeplayer.data; import java.util.Collection; diff --git a/interface/src/main/java/edu/regis/universe_player/player/AlbumInfo.java b/interface/src/main/java/edu/regis/universeplayer/player/AlbumInfo.java similarity index 98% rename from interface/src/main/java/edu/regis/universe_player/player/AlbumInfo.java rename to interface/src/main/java/edu/regis/universeplayer/player/AlbumInfo.java index fd81e3c..93c1fd5 100644 --- a/interface/src/main/java/edu/regis/universe_player/player/AlbumInfo.java +++ b/interface/src/main/java/edu/regis/universeplayer/player/AlbumInfo.java @@ -2,14 +2,14 @@ * 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.JLabel; import javax.swing.JPanel; 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. diff --git a/interface/src/main/java/edu/regis/universe_player/player/CollectionList.java b/interface/src/main/java/edu/regis/universeplayer/player/CollectionList.java similarity index 95% rename from interface/src/main/java/edu/regis/universe_player/player/CollectionList.java rename to interface/src/main/java/edu/regis/universeplayer/player/CollectionList.java index 6afab05..7415974 100644 --- a/interface/src/main/java/edu/regis/universe_player/player/CollectionList.java +++ b/interface/src/main/java/edu/regis/universeplayer/player/CollectionList.java @@ -2,14 +2,9 @@ * 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.GridBagLayout; -import java.awt.GridLayout; -import java.awt.Insets; -import java.awt.event.MouseEvent; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; @@ -22,11 +17,11 @@ import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; -import edu.regis.universe_player.ClickListener; -import edu.regis.universe_player.data.Album; -import edu.regis.universe_player.data.CollectionType; -import edu.regis.universe_player.data.Song; -import edu.regis.universe_player.data.SongProvider; +import edu.regis.universeplayer.ClickListener; +import edu.regis.universeplayer.data.Album; +import edu.regis.universeplayer.data.CollectionType; +import edu.regis.universeplayer.data.Song; +import edu.regis.universeplayer.data.SongProvider; /** * This panel will list all the song collections on display (albums, artists, genres, etc.) diff --git a/interface/src/main/java/edu/regis/universe_player/player/Collections.java b/interface/src/main/java/edu/regis/universeplayer/player/Collections.java similarity index 91% rename from interface/src/main/java/edu/regis/universe_player/player/Collections.java rename to interface/src/main/java/edu/regis/universeplayer/player/Collections.java index 4b444ba..532020a 100644 --- a/interface/src/main/java/edu/regis/universe_player/player/Collections.java +++ b/interface/src/main/java/edu/regis/universeplayer/player/Collections.java @@ -2,23 +2,20 @@ * 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.event.MouseEvent; -import java.awt.event.MouseListener; import java.util.Collection; import java.util.LinkedList; -import java.util.List; import javax.swing.BoxLayout; import javax.swing.JLabel; import javax.swing.JPanel; -import edu.regis.universe_player.ClickListener; -import edu.regis.universe_player.data.CollectionType; -import edu.regis.universe_player.data.Song; -import edu.regis.universe_player.data.SongProvider; +import edu.regis.universeplayer.ClickListener; +import edu.regis.universeplayer.data.CollectionType; +import edu.regis.universeplayer.data.Song; +import edu.regis.universeplayer.data.SongProvider; /** * This panel links to various song collections the player has set up. diff --git a/interface/src/main/java/edu/regis/universe_player/player/Interface.java b/interface/src/main/java/edu/regis/universeplayer/player/Interface.java similarity index 96% rename from interface/src/main/java/edu/regis/universe_player/player/Interface.java rename to interface/src/main/java/edu/regis/universeplayer/player/Interface.java index cfd559f..f5be022 100644 --- a/interface/src/main/java/edu/regis/universe_player/player/Interface.java +++ b/interface/src/main/java/edu/regis/universeplayer/player/Interface.java @@ -2,7 +2,7 @@ * 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.Dimension; @@ -17,10 +17,10 @@ import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.JScrollPane; -import edu.regis.universe_player.browser.Browser; -import edu.regis.universe_player.browser.MessageManager; -import edu.regis.universe_player.data.CollectionType; -import edu.regis.universe_player.data.Song; +import edu.regis.universeplayer.browser.Browser; +import edu.regis.universeplayer.browser.MessageManager; +import edu.regis.universeplayer.data.CollectionType; +import edu.regis.universeplayer.data.Song; /** * The Interface class serves as the primary GUI that the player interacts with. diff --git a/interface/src/main/java/edu/regis/universe_player/player/PlaybackCommand.java b/interface/src/main/java/edu/regis/universeplayer/player/PlaybackCommand.java similarity index 85% rename from interface/src/main/java/edu/regis/universe_player/player/PlaybackCommand.java rename to interface/src/main/java/edu/regis/universeplayer/player/PlaybackCommand.java index 94cd498..b804d54 100644 --- a/interface/src/main/java/edu/regis/universe_player/player/PlaybackCommand.java +++ b/interface/src/main/java/edu/regis/universeplayer/player/PlaybackCommand.java @@ -2,7 +2,7 @@ * 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. diff --git a/interface/src/main/java/edu/regis/universe_player/player/PlaybackCommandListener.java b/interface/src/main/java/edu/regis/universeplayer/player/PlaybackCommandListener.java similarity index 92% rename from interface/src/main/java/edu/regis/universe_player/player/PlaybackCommandListener.java rename to interface/src/main/java/edu/regis/universeplayer/player/PlaybackCommandListener.java index 4c64a41..5c37963 100644 --- a/interface/src/main/java/edu/regis/universe_player/player/PlaybackCommandListener.java +++ b/interface/src/main/java/edu/regis/universeplayer/player/PlaybackCommandListener.java @@ -2,7 +2,7 @@ * Copyright (c) 2021 William Hubbard. All Rights Reserved. */ -package edu.regis.universe_player.player; +package edu.regis.universeplayer.player; import java.util.EventListener; diff --git a/interface/src/main/java/edu/regis/universe_player/player/PlayerControls.java b/interface/src/main/java/edu/regis/universeplayer/player/PlayerControls.java similarity index 99% rename from interface/src/main/java/edu/regis/universe_player/player/PlayerControls.java rename to interface/src/main/java/edu/regis/universeplayer/player/PlayerControls.java index 3700dbe..dcbd29e 100644 --- a/interface/src/main/java/edu/regis/universe_player/player/PlayerControls.java +++ b/interface/src/main/java/edu/regis/universeplayer/player/PlayerControls.java @@ -2,7 +2,7 @@ * 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.FlowLayout; diff --git a/interface/src/main/java/edu/regis/universe_player/player/SongDisplayListener.java b/interface/src/main/java/edu/regis/universeplayer/player/SongDisplayListener.java similarity index 85% rename from interface/src/main/java/edu/regis/universe_player/player/SongDisplayListener.java rename to interface/src/main/java/edu/regis/universeplayer/player/SongDisplayListener.java index a9f02f7..94e5adb 100644 --- a/interface/src/main/java/edu/regis/universe_player/player/SongDisplayListener.java +++ b/interface/src/main/java/edu/regis/universeplayer/player/SongDisplayListener.java @@ -2,13 +2,13 @@ * 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.EventListener; -import edu.regis.universe_player.data.CollectionType; -import edu.regis.universe_player.data.Song; +import edu.regis.universeplayer.data.CollectionType; +import edu.regis.universeplayer.data.Song; /** * A callback that is triggered whenever one element believes that the interface center display needs to be updated. diff --git a/interface/src/main/java/edu/regis/universe_player/player/SongList.java b/interface/src/main/java/edu/regis/universeplayer/player/SongList.java similarity index 88% rename from interface/src/main/java/edu/regis/universe_player/player/SongList.java rename to interface/src/main/java/edu/regis/universeplayer/player/SongList.java index 931757f..b07efd5 100644 --- a/interface/src/main/java/edu/regis/universe_player/player/SongList.java +++ b/interface/src/main/java/edu/regis/universeplayer/player/SongList.java @@ -2,30 +2,23 @@ * 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.GridBagLayout; -import java.awt.GridLayout; import java.awt.Insets; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.swing.BoxLayout; -import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.SpringLayout; -import edu.regis.universe_player.data.Album; -import edu.regis.universe_player.data.SimpleSongProvider; -import edu.regis.universe_player.data.Song; -import edu.regis.universe_player.data.SongProvider; +import edu.regis.universeplayer.data.Album; +import edu.regis.universeplayer.data.Song; +import edu.regis.universeplayer.data.SongProvider; /** * This panel will list all the songs that are to be currently displayed.