X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fdata%2FDefaultArtist.java;h=151aeca9f54c7d4d0e9e7827bac14b1d6c90afb2;hb=9eee0f4f619731e5f8b79396d2476090d328be6b;hp=6fa8d43a6bc7fb245490090b1699b473d6d4dacc;hpb=d5a46d4ea7a16b4f43a79de2786034f1081463e1;p=demoscenemusic.git

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultArtist.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultArtist.java
index 6fa8d43..151aeca 100644
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultArtist.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DefaultArtist.java
@@ -17,42 +17,113 @@
 
 package net.pterodactylus.demoscenemusic.data;
 
-import java.util.Set;
+import java.util.Collection;
+import java.util.Comparator;
 
 /**
- * TODO
+ * Default implementation for an artist data container.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class DefaultArtist extends DefaultBase implements Artist {
 
+	/** Comparator that sorts artists by name. */
+	public static final Comparator<Artist> NAME_COMPARATOR = new Comparator<Artist>() {
+
+		@Override
+		public int compare(Artist leftArtist, Artist rightArtist) {
+			return leftArtist.getName().compareToIgnoreCase(rightArtist.getName());
+		}
+	};
+
+	/**
+	 * Creates a new artist data container.
+	 *
+	 * @param id
+	 *            The ID of the artist
+	 */
 	public DefaultArtist(String id) {
 		super(id);
 	}
 
-	public String name() {
-		return value("name", String.class).get();
+	//
+	// ARTIST METHODS
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public String getName() {
+		return getValue("name", String.class).get();
 	}
 
-	public Artist name(String name) {
-		value("name", String.class).set(name);
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Artist setName(String name) {
+		getValue("name", String.class).set(name);
 		return this;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
-	public Set<Group> groups() {
-		return value("groups", Set.class).get();
+	public Collection<Group> getGroups() {
+		return getValue("groups", Collection.class).get();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public Artist groups(Set<Group> groups) {
-		value("groups", Set.class).set(groups);
+	@Override
+	public Artist setGroups(Collection<Group> groups) {
+		getValue("groups", Collection.class).set(groups);
 		return this;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	@SuppressWarnings({ "unchecked" })
+	public Collection<Track> getTracks() {
+		return getValue("tracks", Collection.class).get();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Artist setTracks(Collection<Track> tracks) {
+		getValue("tracks", Collection.class).set(tracks);
+		return this;
+	}
+
+	//
+	// OBJECT METHODS
+	//
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int hashCode() {
+		return getId().hashCode();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof Artist)) {
+			return false;
+		}
+		return ((Artist) object).getId().equals(getId());
+	}
+
 }