From 55b4ed625aa8642d32accdc5653a2d72dbcfc04c Mon Sep 17 00:00:00 2001 From: aj Date: Fri, 6 Apr 2018 00:35:07 -0700 Subject: [PATCH] removed lists now covered by tags, rearranged main menu --- .../src/sarsoo/fmframework/gui/MainMenu.java | 9 ++-- .../sarsoo/fmframework/gui/RefListsView.java | 52 +++++++++---------- .../sarsoo/fmframework/net/URLBuilder.java | 2 +- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/fmframework/src/sarsoo/fmframework/gui/MainMenu.java b/fmframework/src/sarsoo/fmframework/gui/MainMenu.java index 51c20c6..ad1ee70 100644 --- a/fmframework/src/sarsoo/fmframework/gui/MainMenu.java +++ b/fmframework/src/sarsoo/fmframework/gui/MainMenu.java @@ -80,12 +80,11 @@ public class MainMenu extends JFrame { } }); add(viewLastTrack); - add(viewList); - add(viewTag); - add(getAlbum); - add(getArtist); add(today); - + add(viewTag); + add(viewList); + add(getArtist); + add(getAlbum); } } diff --git a/fmframework/src/sarsoo/fmframework/gui/RefListsView.java b/fmframework/src/sarsoo/fmframework/gui/RefListsView.java index 08402ff..3ea1157 100644 --- a/fmframework/src/sarsoo/fmframework/gui/RefListsView.java +++ b/fmframework/src/sarsoo/fmframework/gui/RefListsView.java @@ -35,13 +35,13 @@ public class RefListsView extends JFrame { // add(view); // } - JButton viewTDE = new JButton("TDE"); - viewTDE.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - Reference.getTDE().view(); - } - }); - add(viewTDE); +// JButton viewTDE = new JButton("TDE"); +// viewTDE.addActionListener(new ActionListener() { +// public void actionPerformed(ActionEvent arg0) { +// Reference.getTDE().view(); +// } +// }); +// add(viewTDE); JButton viewBPHQ = new JButton("BPHQ"); viewBPHQ.addActionListener(new ActionListener() { @@ -86,24 +86,24 @@ public class RefListsView extends JFrame { Reference.getEmoTrio().view(); } }); - add(viewEmoTrio); - - JButton viewRockTag = new JButton("Rock Tag"); - viewRockTag.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - FMObjList list = Getter.getUserTag(Reference.getUserName(), "rock"); - list.view(); - } - }); - add(viewRockTag); - - JButton viewRapTag = new JButton("Rap Tag"); - viewRapTag.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - FMObjList list = Getter.getUserTag(Reference.getUserName(), "rap"); - list.view(); - } - }); - add(viewRapTag); +// add(viewEmoTrio); +// +// JButton viewRockTag = new JButton("Rock Tag"); +// viewRockTag.addActionListener(new ActionListener() { +// public void actionPerformed(ActionEvent arg0) { +// FMObjList list = Getter.getUserTag(Reference.getUserName(), "rock"); +// list.view(); +// } +// }); +// add(viewRockTag); +// +// JButton viewRapTag = new JButton("Rap Tag"); +// viewRapTag.addActionListener(new ActionListener() { +// public void actionPerformed(ActionEvent arg0) { +// FMObjList list = Getter.getUserTag(Reference.getUserName(), "rap"); +// list.view(); +// } +// }); +// add(viewRapTag); } } diff --git a/fmframework/src/sarsoo/fmframework/net/URLBuilder.java b/fmframework/src/sarsoo/fmframework/net/URLBuilder.java index f20d1ce..5a31c30 100644 --- a/fmframework/src/sarsoo/fmframework/net/URLBuilder.java +++ b/fmframework/src/sarsoo/fmframework/net/URLBuilder.java @@ -163,7 +163,7 @@ public class URLBuilder { } String date = String.format("%d-%s-%sT07:00:00.00Z", now.getYear(), month, day); - System.out.println(date); +// System.out.println(date); // long midnight = Instant.parse("2018-04-05T07:00:00.00Z").getEpochSecond(); long midnight = Instant.parse(date).getEpochSecond();