moved swing driver, updated equals methods to include ignorecase
This commit is contained in:
parent
db825e6813
commit
2c31ab908a
@ -1,8 +1,7 @@
|
|||||||
package sarsoo.fmframework.drive;
|
package sarsoo.fmframework.jframe;
|
||||||
|
|
||||||
import javax.swing.JOptionPane;
|
import javax.swing.JOptionPane;
|
||||||
|
|
||||||
import sarsoo.fmframework.jframe.MainMenu;
|
|
||||||
import sarsoo.fmframework.util.Getter;
|
import sarsoo.fmframework.util.Getter;
|
||||||
import sarsoo.fmframework.util.Reference;
|
import sarsoo.fmframework.util.Reference;
|
||||||
|
|
@ -79,7 +79,7 @@ public class Album extends FMObj {
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
Album album = (Album) obj;
|
Album album = (Album) obj;
|
||||||
if (getName().equals(album.getName()))
|
if (getName().equalsIgnoreCase(album.getName()))
|
||||||
if (getArtist().equals(album.getArtist()))
|
if (getArtist().equals(album.getArtist()))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ public class Artist extends FMObj {
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
Artist artist = (Artist) obj;
|
Artist artist = (Artist) obj;
|
||||||
if (getName().equals(artist.getName()))
|
if (getName().equalsIgnoreCase(artist.getName()))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -77,7 +77,7 @@ public class Track extends FMObj {
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
Track track = (Track) obj;
|
Track track = (Track) obj;
|
||||||
if (getName().equals(track.getName()))
|
if (getName().equalsIgnoreCase(track.getName()))
|
||||||
if (getArtist().equals(track.getArtist()))
|
if (getArtist().equals(track.getArtist()))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user