Removed println's, added about, Minors fixes and improvements.

iamKunal · Nov 16, 2016 · 598d142 · 598d142
1 parent 66048f2
commit 598d142
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -1153,8 +1153,3 @@
     <img src="docs/images/er.png" name="Picture 1" align="bottom" width="624" height="596" border="0"/>
 </p>
 <p>
-    <img src="" align="left" hspace="12" vspace="5"/>
-    <img src="" align="left" hspace="12" vspace="5"/>
-    <br/>
-    <br/>
-</p>
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -1,13 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/CreateConnection.java</file>
-            <file>file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/SongEditorController.java</file>
-            <file>file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/DataBase.java</file>
-            <file>file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/Show.java</file>
-            <file>file:/C:/Users/SANJAY%20TAYAL/Documents/NetBeansProjects/BeatBoxer/src/beatboxer/Update.java</file>
-        </group>
-    </open-files>
-</project-private>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/PlayList.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/TimerController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/DataBase.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBGenerator.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Favourites.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Delete.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Run.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Directory.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBItem.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/ItemDeleterController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Show.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/stylesheet.css</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BeatBoxer.fxml</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Timer.fxml</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/CreatePlaylistController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/CreateConnection.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/SongEditorController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/playlistStylesheet.css</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BeatBoxer.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/Search.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBScanner.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BeatBoxerController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/FolderChooserController.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/BBSong.java</file>
+            <file>file:/home/kunal/Documents/GITPRO/BeatBoxer/src/beatboxer/PlayListInfo.java</file>
+        </group>
+    </open-files>
+</project-private>
diff --git a/src/beatboxer/BBScanner.java b/src/beatboxer/BBScanner.java
@@ -9,13 +9,8 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import javafx.collections.FXCollections;
-import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
-import javafx.scene.media.Media;
-import javafx.scene.media.MediaPlayer;
-import javafx.util.Duration;
 import org.jaudiotagger.audio.*;
-import org.jaudiotagger.*;
 import org.jaudiotagger.tag.*;
 /**
  *

diff --git a/src/beatboxer/BBSong.java b/src/beatboxer/BBSong.java
@@ -5,7 +5,6 @@
  */
 package beatboxer;
 
-import java.io.File;
 import java.nio.file.Paths;
 
 

diff --git a/src/beatboxer/BeatBoxer.fxml b/src/beatboxer/BeatBoxer.fxml
@@ -103,7 +103,7 @@
                         </Menu>
                       <Menu fx:id="helpMenu" mnemonicParsing="false" text="Help">
                         <items>
-                          <MenuItem mnemonicParsing="false" text="About" />
+                          <MenuItem mnemonicParsing="false" onAction="#showHelp" text="About" />
                         </items>
                       </Menu>
                     </menus>

diff --git a/src/beatboxer/BeatBoxer.java b/src/beatboxer/BeatBoxer.java
@@ -6,7 +6,6 @@
 package beatboxer;
 
 import java.io.File;
-import java.util.ArrayList;
 import javafx.animation.Timeline;
 import javafx.application.Application;
 import javafx.beans.property.SimpleStringProperty;

diff --git a/src/beatboxer/BeatBoxerController.java b/src/beatboxer/BeatBoxerController.java
@@ -5,18 +5,17 @@
  */
 package beatboxer;
 
-import java.io.File;
+import com.sun.deploy.uitoolkit.impl.fx.HostServicesFactory;
+import com.sun.javafx.application.HostServicesDelegate;
+import java.io.IOException;
 import java.net.URL;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Optional;
 import java.util.ResourceBundle;
-import javafx.beans.binding.Bindings;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -26,12 +25,9 @@
 import javafx.scene.control.*;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.KeyCombination;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
-import javafx.scene.media.Media;
 import javafx.scene.media.MediaPlayer;
-import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
 import javafx.util.Duration;
 
@@ -125,7 +121,7 @@ public void chooseFolders () throws Exception{
     @FXML
     private void search(){
         String searchString = searchField.getText();
-        System.out.println(searchString);
+//        System.out.println(searchString);
         searchString = searchString.trim();
         if(searchString.equals("")){
             songListView.setItems(null);
@@ -140,7 +136,7 @@ private void search(){
             artistListView.setItems(se.SearchArtist(searchString));
         }
         catch(Exception e){
-            System.out.println("Hey");
+            ;
         }
     }
     @FXML
@@ -178,7 +174,7 @@ private void editItem() {
                     return;
                 selectedSong = allsongsListView.getSelectionModel().getSelectedItem();
             }
-            System.out.println(selectedSong);
+//            System.out.println(selectedSong);
             FXMLLoader loader = new FXMLLoader(getClass().getResource("SongEditor.fxml"));
             Parent songEditorRoot = (Parent) loader.load();
             Scene songEditor = new Scene(songEditorRoot);
@@ -196,7 +192,7 @@ private void editItem() {
                 allsongsListView.setItems(songList);
             }
             catch(Exception e){
-                System.out.println("Prob");
+                ;
             }
         }
         if(tabSelected==2){
@@ -207,7 +203,7 @@ private void editItem() {
             selectedPlayList = playlistListView.getSelectionModel().getSelectedItem();
             if(selectedPlayList.getId() <= 0)
                 return;
-            System.out.println(selectedPlayList);
+//            System.out.println(selectedPlayList);
 
             FXMLLoader loader = new FXMLLoader(getClass().getResource("PlaylistEditor.fxml"));
             Parent playlistEditorRoot = (Parent) loader.load();
@@ -343,6 +339,24 @@ private void timer() throws Exception{
     private void exit(){
         System.exit(0);
     }
+    @FXML
+    private void showHelp(){
+        ButtonType github = new ButtonType("Visit on GitHub");
+        ButtonType ok = new ButtonType("OK",ButtonBar.ButtonData.OK_DONE);
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
+        alert.getButtonTypes().setAll(github,ok);
+        alert.setTitle("About BeatBoxer");
+        alert.setHeaderText(null);
+        alert.setContentText("BeatBoxer is made by:\nKunal Gupta, Shivam Tayal & Punit Lakshwani.");
+        Optional<ButtonType> result = alert.showAndWait();
+        if(result.get()==github){
+            try {
+                new ProcessBuilder("x-www-browser", "https://goo.gl/fl49zi").start();
+            } catch (IOException e) {
+                ;
+            }
+        }
+    }
     public void playAll(){      //play All Songs
         Show show = new Show();
         ObservableList<BBSong> allSongs = show.ShowAllTracks();
@@ -354,7 +368,7 @@ public void playAlbum(BBItem album){
             ObservableList<BBSong> songList = sh.ShowAllTracksinAlbum(album.getId());
             BeatBoxer.nowPlaying.setAll(songList);
             for(BBSong song : songList){
-                System.out.println(song);
+//                System.out.println(song);
             }
             nowPlayingListView.setDisable(false);
             disablePlayGroup(false);
@@ -375,9 +389,6 @@ public void playArtist(BBItem artist){
             Show sh = new Show();
             ObservableList<BBSong> songList = sh.ShowAllTracksByArtists(artist.getId());
             BeatBoxer.nowPlaying.setAll(songList);
-            for(BBSong song : songList){
-                System.out.println(song);
-            }
             nowPlayingListView.setDisable(false);
             disablePlayGroup(false);
             editButton.setDisable(false);
@@ -666,7 +677,7 @@ public void handle(MouseEvent click) {
                 if (click.getClickCount() == 2) {
                    //Use ListView's getSelected Item
                    if(nowPlayingListView.getSelectionModel().getSelectedItem()==null)
-                        System.out.println("empty1");//pass
+                       ;//pass
                    else{
                         BBSong a = nowPlayingListView.getSelectionModel().getSelectedItem();
                         nowPlayingListView.getSelectionModel().select(-1);
@@ -683,11 +694,11 @@ public void handle(MouseEvent click) {
                 if (click.getClickCount() == 2) {
                    //Use ListView's getSelected Item
                    if(allsongsListView.getSelectionModel().getSelectedItem()==null)
-                        System.out.println("empty2");//pass
+                       ;//pass
                    else{
                         BBSong a = allsongsListView.getSelectionModel().getSelectedItem();
                         allsongsListView.getSelectionModel().select(-1);
-                         System.out.println(a.getId());
+//                         System.out.println(a.getId());
                          playPlaylist(new BBItem(0, "All Songs"));
                         setVolumeValue(a.getGenre());
                          BeatBoxer.play(a);
@@ -703,7 +714,7 @@ public void handle(MouseEvent click) {
                 if (click.getClickCount() == 2) {
                    //Use ListView's getSelected Item
                    if(playlistListView.getSelectionModel().getSelectedItem()==null)
-                        System.out.println("empty3");//pass
+                       ;//pass
                    else{
                         BBItem a = playlistListView.getSelectionModel().getSelectedItem();
                         playlistListView.getSelectionModel().select(-1);
@@ -720,7 +731,7 @@ public void handle(MouseEvent click) {
                 if (click.getClickCount() == 2) {
                    //Use ListView's getSelected Item
                    if(albumListView.getSelectionModel().getSelectedItem()==null)
-                        System.out.println("empty1");//pass
+                       ;//pass
                    else{
                         BBItem a = albumListView.getSelectionModel().getSelectedItem();
                         albumListView.getSelectionModel().select(-1);
@@ -736,7 +747,7 @@ public void handle(MouseEvent click) {
                 if (click.getClickCount() == 2) {
                    //Use ListView's getSelected Item
                    if(artistListView.getSelectionModel().getSelectedItem()==null)
-                        System.out.println("empty1");//pass
+                       ;//pass
                    else{
                         BBItem a = artistListView.getSelectionModel().getSelectedItem();
                         artistListView.getSelectionModel().select(-1);
@@ -752,11 +763,11 @@ public void handle(MouseEvent click) {
                 if (click.getClickCount() == 2) {
                    //Use ListView's getSelected Item
                    if(songListView.getSelectionModel().getSelectedItem()==null)
-                        System.out.println("empty2");//pass
+                       ;//pass
                    else{
                         BBSong a = songListView.getSelectionModel().getSelectedItem();
                         songListView.getSelectionModel().select(-1);
-                         System.out.println(a.getId());
+//                         System.out.println(a.getId());
                          playPlaylist(new BBItem(0, "All Songs"));
                         setVolumeValue(a.getGenre());
                          BeatBoxer.play(a);

diff --git a/src/beatboxer/FolderChooserController.java b/src/beatboxer/FolderChooserController.java
@@ -6,11 +6,8 @@
 package beatboxer;
 
 import java.net.URL;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.ResourceBundle;
-import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -19,7 +16,6 @@
 import javafx.scene.control.*;
 import javafx.stage.Stage;
 import javafx.util.Pair;
-import java.sql.*;
 
 /**
  * FXML Controller class

diff --git a/src/beatboxer/PlaylistEditorController.java b/src/beatboxer/PlaylistEditorController.java
@@ -22,7 +22,6 @@
 import javafx.scene.input.KeyEvent;
 import javafx.stage.Stage;
 import javafx.util.Pair;
-import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
 
 /**
  * FXML Controller class

diff --git a/src/beatboxer/SongEditorController.java b/src/beatboxer/SongEditorController.java
@@ -52,7 +52,7 @@ private void okExecute() {
             }
             cancel();
         } catch (Exception e) {
-            System.out.println("err");
+            ;
         }
     }
 

diff --git a/src/beatboxer/TimerController.java b/src/beatboxer/TimerController.java
@@ -9,7 +9,6 @@
 import java.util.ResourceBundle;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
-import javafx.beans.binding.Binding;
 import javafx.beans.binding.Bindings;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
      */
     package beatboxer;
-    import java.io.File;
     import java.nio.file.Paths;
@@ Expand Down @@