From b620b6e5d692327ed438cca6b94327066c533f5d Mon Sep 17 00:00:00 2001 From: aj Date: Thu, 5 Apr 2018 01:26:15 -0700 Subject: [PATCH] change == for equals and fixed equals methods --- .../sarsoo/fmframework/gui/RefListsView.java | 2 +- .../src/sarsoo/fmframework/music/Album.java | 2 +- .../src/sarsoo/fmframework/music/Artist.java | 2 +- .../src/sarsoo/fmframework/music/FMObj.java | 2 +- .../src/sarsoo/fmframework/music/Track.java | 2 +- .../sarsoo/fmframework/util/FMObjList.java | 63 ++++++++++++++++--- .../sarsoo/fmframework/util/Reference.java | 11 ++-- 7 files changed, 68 insertions(+), 16 deletions(-) diff --git a/fmframework/src/sarsoo/fmframework/gui/RefListsView.java b/fmframework/src/sarsoo/fmframework/gui/RefListsView.java index dfe51ae..7c76721 100644 --- a/fmframework/src/sarsoo/fmframework/gui/RefListsView.java +++ b/fmframework/src/sarsoo/fmframework/gui/RefListsView.java @@ -45,7 +45,7 @@ public class RefListsView extends JFrame { JButton viewBPHQ = new JButton("BPHQ"); viewBPHQ.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - Reference.getBPHQ().view(); + Reference.getBB().view(); } }); add(viewBPHQ); diff --git a/fmframework/src/sarsoo/fmframework/music/Album.java b/fmframework/src/sarsoo/fmframework/music/Album.java index bd36dbd..3757c3c 100644 --- a/fmframework/src/sarsoo/fmframework/music/Album.java +++ b/fmframework/src/sarsoo/fmframework/music/Album.java @@ -78,7 +78,7 @@ public class Album extends FMObj { return false; Album album = (Album) obj; - if (getName() == album.getName()) + if (getName().equals(album.getName())) if (getArtist().equals(album.getArtist())) return true; diff --git a/fmframework/src/sarsoo/fmframework/music/Artist.java b/fmframework/src/sarsoo/fmframework/music/Artist.java index 2192583..5f723f6 100644 --- a/fmframework/src/sarsoo/fmframework/music/Artist.java +++ b/fmframework/src/sarsoo/fmframework/music/Artist.java @@ -68,7 +68,7 @@ public class Artist extends FMObj { return false; Artist artist = (Artist) obj; - if (getName() == artist.getName()) + if (getName().equals(artist.getName())) return true; return false; diff --git a/fmframework/src/sarsoo/fmframework/music/FMObj.java b/fmframework/src/sarsoo/fmframework/music/FMObj.java index be12c3a..ed28b84 100644 --- a/fmframework/src/sarsoo/fmframework/music/FMObj.java +++ b/fmframework/src/sarsoo/fmframework/music/FMObj.java @@ -10,7 +10,7 @@ public abstract class FMObj implements Comparable{ protected int listeners; protected int playCount; - protected int userPlayCount; + protected int userPlayCount = 0; protected Wiki wiki; diff --git a/fmframework/src/sarsoo/fmframework/music/Track.java b/fmframework/src/sarsoo/fmframework/music/Track.java index 315b3ea..5689e46 100644 --- a/fmframework/src/sarsoo/fmframework/music/Track.java +++ b/fmframework/src/sarsoo/fmframework/music/Track.java @@ -71,7 +71,7 @@ public class Track extends FMObj { return false; Track track = (Track) obj; - if (getName() == track.getName()) + if (getName().equals(track.getName())) if (getArtist().equals(track.getArtist())) return true; diff --git a/fmframework/src/sarsoo/fmframework/util/FMObjList.java b/fmframework/src/sarsoo/fmframework/util/FMObjList.java index aaf193d..9f3f497 100644 --- a/fmframework/src/sarsoo/fmframework/util/FMObjList.java +++ b/fmframework/src/sarsoo/fmframework/util/FMObjList.java @@ -3,16 +3,19 @@ package sarsoo.fmframework.util; import java.util.ArrayList; import sarsoo.fmframework.gui.FMObjListView; +import sarsoo.fmframework.music.Album; +import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.music.FMObj; +import sarsoo.fmframework.music.Track; public class FMObjList extends ArrayList { private String groupName = null; - + public FMObjList() { super(); } - + public FMObjList(String name) { super(); this.groupName = name; @@ -22,7 +25,53 @@ public class FMObjList extends ArrayList { int counter; int totalScrobbles = 0; for (counter = 0; counter < size(); counter++) { - totalScrobbles += get(counter).getUserPlayCount(); + FMObj obj = get(counter); + + if (obj.getClass() == Artist.class) + totalScrobbles += obj.getUserPlayCount(); + + else if (obj.getClass() == Track.class) { + Track track = (Track) obj; + + Artist artist = track.getArtist(); + + boolean found = false; + int counter2; + for (counter2 = 0; counter2 < size(); counter2++) { + if (artist.equals(get(counter2))) { + found = true; + break; + } + } + if (!found) { + totalScrobbles += obj.getUserPlayCount(); + } + +// if (!super.contains(track.getArtist())) { +// Album album = track.getAlbum(); +// if (album != null) { +// if (!super.contains(album)) +// totalScrobbles += obj.getUserPlayCount(); +// } +// } + } + else if (obj.getClass() == Album.class) { + Album album = (Album) obj; + + Artist artist = album.getArtist(); + + boolean found = false; + int counter2; + for (counter2 = 0; counter2 < size(); counter2++) { + if (artist.equals(get(counter2))) { + found = true; + break; + } + } + if (!found) { + totalScrobbles += obj.getUserPlayCount(); + } + } } return totalScrobbles; } @@ -33,19 +82,19 @@ public class FMObjList extends ArrayList { } public void view() { - if(groupName != null) { + if (groupName != null) { FMObjListView view = new FMObjListView(this, getGroupName()); view.setVisible(true); - }else { + } else { FMObjListView view = new FMObjListView(this, "List View"); view.setVisible(true); } } - + public String getGroupName() { return groupName; } - + public void setGroupName(String name) { this.groupName = name; } diff --git a/fmframework/src/sarsoo/fmframework/util/Reference.java b/fmframework/src/sarsoo/fmframework/util/Reference.java index f34e151..0622d7e 100644 --- a/fmframework/src/sarsoo/fmframework/util/Reference.java +++ b/fmframework/src/sarsoo/fmframework/util/Reference.java @@ -79,7 +79,7 @@ public class Reference { tde.add(Artist.getArtist("Jay Rock", Reference.getUserName())); tde.add(Artist.getArtist("ScHoolboy Q", Reference.getUserName())); tde.add(Artist.getArtist("Ab-Soul", Reference.getUserName())); - tde.add(Artist.getArtistByMbid("6fc5c0c6-bf05-4b29-bda0-5fa6cc863785", Reference.getUserName())); // Black Hippy + tde.add(Artist.getArtist("Black Hippy", Reference.getUserName())); tde.add(Artist.getArtist("Isaiah Rashad", Reference.getUserName())); tde.add(Artist.getArtist("SZA", Reference.getUserName())); tde.add(Artist.getArtist("Sir", Reference.getUserName())); @@ -87,14 +87,15 @@ public class Reference { return tde; } - public static FMObjList getBPHQ() { - FMObjList bphq = new FMObjList("BPHQ"); + public static FMObjList getBB() { + FMObjList bphq = new FMObjList("British Rock"); - bphq.add(Artist.getArtistByMbid("98edd2f1-d136-4c47-ab9b-c31839dd1d98", Reference.getUserName())); + bphq.add(Artist.getArtist("Deaf Havana", Reference.getUserName())); bphq.add(Artist.getArtist("Lower Than Atlantis", Reference.getUserName())); bphq.add(Artist.getArtist("Mallory Knox", Reference.getUserName())); bphq.add(Artist.getArtist("Don Broco", Reference.getUserName())); bphq.add(Artist.getArtist("Moose Blood", Reference.getUserName())); + bphq.add(Artist.getArtist("Young Guns", Reference.getUserName())); return bphq; } @@ -103,6 +104,8 @@ public class Reference { FMObjList dre = new FMObjList("Dre"); dre.add(Artist.getArtist("N.W.A", Reference.getUserName())); +// dre.add(Album.getAlbum("Straight Outta Compton", "N.W.A", Reference.getUserName())); +// dre.add(Album.getAlbum("Doggystyle", "Snoop Dogg", Reference.getUserName())); dre.add(Artist.getArtist("Dr. Dre", Reference.getUserName())); dre.add(Artist.getArtist("Snoop Dogg", Reference.getUserName())); dre.add(Artist.getArtist("Eminem", Reference.getUserName()));