From 307c9ad18e4bb684303b84f1e00a923f46d7d1bd Mon Sep 17 00:00:00 2001 From: SANJAY TAYAL Date: Sat, 12 Nov 2016 10:12:16 +0530 Subject: [PATCH] Bugs Resolved - while editing track info album and artist name where not changing - changed the order by which the tracks appear in recently added(by dataeadded desc) --- .../private/configs/Run_in_Browser.properties | 2 +- nbproject/private/private.properties | 2 +- nbproject/private/private.xml | 17 +++++------------ src/beatboxer/DataBase.java | 3 ++- src/beatboxer/Show.java | 2 +- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/nbproject/private/configs/Run_in_Browser.properties b/nbproject/private/configs/Run_in_Browser.properties index 730e06b..7ed14dd 100644 --- a/nbproject/private/configs/Run_in_Browser.properties +++ b/nbproject/private/configs/Run_in_Browser.properties @@ -1,4 +1,4 @@ # Do not modify this property in this configuration. It can be re-generated. javafx.run.as=embedded javafx.run.inbrowser= -javafx.run.inbrowser.path=C:\\Program Files\\Internet Explorer\\iexplore.exe +javafx.run.inbrowser.path=C:\\Program Files (x86)\\UCBrowser\\Application\\UCBrowser.exe diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index c0112a2..9e31515 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -9,4 +9,4 @@ javadoc.preview=true javafx.run.as=standalone javafx.run.inbrowser= javafx.run.inbrowser.path= -user.properties.file=C:\\Users\\Punit\\AppData\\Roaming\\NetBeans\\8.2\\build.properties +user.properties.file=C:\\Users\\SANJAY TAYAL\\AppData\\Roaming\\NetBeans\\8.2\\build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 6392e4e..4ace81b 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,18 +3,11 @@ - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/SongEditorController.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/AddTrack.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/Update.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/BeatBoxerController.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/PlayList.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/Show.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/Directory.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/Favourites.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/BeatBoxer.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/PlayListInfo.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/DataBase.java - file:/C:/Users/Punit/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/FolderChooserController.java + file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/CreateConnection.java + file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/SongEditorController.java + file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/DataBase.java + file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/Show.java + file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/Update.java diff --git a/src/beatboxer/DataBase.java b/src/beatboxer/DataBase.java index 71cd791..9b27347 100644 --- a/src/beatboxer/DataBase.java +++ b/src/beatboxer/DataBase.java @@ -36,7 +36,7 @@ public void CreateDataBase() { + "artistid int NOT NULL,albumid int NOT NULL)"); check.execute("create table id(newid int, playlistid int)"); check.execute("insert into id values(1,1)"); - check.execute("create trigger incrementid after insert on track for each row update id set newid = newid + 1"); + check.execute("create trigger incrementidinsert after insert on trackinfo for each row update id set newid = newid + 1"); check.execute("create trigger incrementplaylistid after insert on playlist for each row update id set playlistid = playlistid + 1"); check.execute("create trigger deleterefresh after delete on trackinfo " + "for each row begin " @@ -47,6 +47,7 @@ public void CreateDataBase() { + "for each row begin " + "delete from album where albumid not in (select distinct albumid from trackinfo); " + "delete from artist where artistid not in (select distinct artistid from trackinfo); " + + "update id set newid = newid + 1;" + "end"); check.execute("CREATE PROCEDURE addtrack(in trackname varchar(50),in artistname varchar(50),in albumname varchar(100),in location varchar(500),in genre varchar(30)) " diff --git a/src/beatboxer/Show.java b/src/beatboxer/Show.java index 1d49c50..4753d3c 100644 --- a/src/beatboxer/Show.java +++ b/src/beatboxer/Show.java @@ -147,7 +147,7 @@ public ObservableList ShowByMode(String mode) { public ObservableList ShowRecentlyAdded() { try { - String sql = "select * from track natural join artist natural join album natural join trackinfo where to_seconds(dateadded) + 86400 >= to_seconds(current_timestamp()) order by dateadded"; + String sql = "select * from track natural join artist natural join album natural join trackinfo where to_seconds(dateadded) + 86400 >= to_seconds(current_timestamp()) order by dateadded desc"; Statement tracks = con.createStatement(); ResultSet res = tracks.executeQuery(sql); return BBGenerator.song(res);