diff --git a/Favorite_Movies/bin/Database.class b/Favorite_Movies/bin/Database.class index d9343ce..8d642ca 100644 Binary files a/Favorite_Movies/bin/Database.class and b/Favorite_Movies/bin/Database.class differ diff --git a/Favorite_Movies/bin/Login.class b/Favorite_Movies/bin/Login.class deleted file mode 100644 index 5961482..0000000 Binary files a/Favorite_Movies/bin/Login.class and /dev/null differ diff --git a/Favorite_Movies/bin/LoginFrame$1.class b/Favorite_Movies/bin/LoginFrame$1.class index eb3ec66..e64c6a4 100644 Binary files a/Favorite_Movies/bin/LoginFrame$1.class and b/Favorite_Movies/bin/LoginFrame$1.class differ diff --git a/Favorite_Movies/bin/LoginFrame.class b/Favorite_Movies/bin/LoginFrame.class index d6f6c5f..cc220d8 100644 Binary files a/Favorite_Movies/bin/LoginFrame.class and b/Favorite_Movies/bin/LoginFrame.class differ diff --git a/Favorite_Movies/src/Database.java b/Favorite_Movies/src/Database.java index 9f355c9..964020c 100644 --- a/Favorite_Movies/src/Database.java +++ b/Favorite_Movies/src/Database.java @@ -1,9 +1,41 @@ import java.io.IOException; import java.io.FileWriter; +import java.io.File; +import java.util.Scanner; +import java.io.FileNotFoundException; public class Database { + public static boolean userExists(String username) + { + boolean found = false; + + try { + File filex=new File("c:\\tmp\\FavoriteMovies\\files\\login_cred.txt"); + Scanner scan; + scan = new Scanner(filex); + + scan.useDelimiter("[\n]"); + + + if(scan.hasNext() && !found ) { + + String line_ = scan.nextLine(); + + if(line_.equals(username)) + found = true; + } + scan.close(); + } + catch (FileNotFoundException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + + return found; + } + public static void addMovie(Movie m){ try { @@ -32,8 +64,20 @@ public class Database { fw.close(); - } catch (IOException e1) { // TODO Auto-generated catch block - e1.printStackTrace(); } + } + catch (IOException e1) { // TODO Auto-generated catch block + e1.printStackTrace(); + } + + } + + public static void addStar(Star s) + { + + } + + public static void addRating(Rating r) + { } diff --git a/Favorite_Movies/src/Login.java b/Favorite_Movies/src/Login.java deleted file mode 100644 index a460949..0000000 --- a/Favorite_Movies/src/Login.java +++ /dev/null @@ -1,11 +0,0 @@ - -public class Login { - - private String Username; - - - - public void validateUsername(String username) { - Username = username; - } -} diff --git a/Favorite_Movies/src/LoginFrame.java b/Favorite_Movies/src/LoginFrame.java index 15b4bda..8c09ee1 100644 --- a/Favorite_Movies/src/LoginFrame.java +++ b/Favorite_Movies/src/LoginFrame.java @@ -70,69 +70,26 @@ public class LoginFrame extends JFrame { panel.add(tf_login); tf_login.setColumns(10); - JButton btnLogin = new JButton("OK"); + JButton btnLogin = new JButton("Login"); btnLogin.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { String username= tf_login.getText(); - - //file importing for login credentials Manager - - File filex=new File("C:\\Users\\skc\\eclipse-workspace\\first\\Favorite_Movies\\src\\files\\login_cred.txt"); - Scanner scan; - - try { - scan = new Scanner(filex); - - scan.useDelimiter("[\n]"); - - - if(scan.hasNext() && !found ) { - - String line_ = scan.nextLine(); - - if(line_.equals(username)) { - - found=true; - if(found==true) { - JOptionPane.showMessageDialog(null,"Login Successful"); - - Main_HomePage mhp=new Main_HomePage(); - mhp.setVisible(true); - if(mhp.isVisible()) { - //use to display only one screen - LoginFrame.this.dispose(); - } - - } - else { - JOptionPane.showMessageDialog(null,"Enter Valid UserName !"); - - } - - } - else - { - JOptionPane.showMessageDialog(null,"User Name not found !"); - } - - - } - else { - JOptionPane.showMessageDialog(null,"Please Try Again !"); + if (Database.userExists(username)) + { + JOptionPane.showMessageDialog(null,"Login Successful"); + Main_HomePage mhp=new Main_HomePage(); + mhp.setVisible(true); + if(mhp.isVisible()) { + //use to display only one screen + LoginFrame.this.dispose(); } - scan.close(); - } catch (FileNotFoundException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + } + else + { + JOptionPane.showMessageDialog(null,"User Name not found !"); } - - /*Main_HomePage mhp=new Main_HomePage(); - mhp.setVisible(true); - if(mhp.isVisible()) { - //use to display only one screen - LoginFrame.this.dispose(); - }*/ + } }); btnLogin.setBackground(UIManager.getColor("Button.light")); diff --git a/Favorite_Movies/src/MoviesFrame.java b/Favorite_Movies/src/MoviesFrame.java index 98e1e0b..06ebc5c 100644 --- a/Favorite_Movies/src/MoviesFrame.java +++ b/Favorite_Movies/src/MoviesFrame.java @@ -1,57 +1,14 @@ - -/* - * import java.awt.BorderLayout; import java.awt.EventQueue; - * - * import javax.swing.JFrame; import javax.swing.JPanel; import - * javax.swing.JTextField; import javax.swing.border.EmptyBorder; import - * javax.swing.table.DefaultTableModel; import javax.swing.table.TableRowSorter; - * - * import java.awt.Color; import javax.swing.JLabel; import - * javax.swing.JOptionPane; - * - * import java.awt.Font; import javax.swing.JButton; import - * java.awt.event.ActionListener; import java.io.FileWriter; import - * java.io.IOException; import java.awt.event.ActionEvent; import - * java.awt.TextField; import java.io.FileReader; import java.io.FileWriter; - * import java.io.Writer; - * - * - * public class Movies extends JFrame { - * - * private JPanel contentPane; private JTextField tf_mid; private JTextField - * tf_title; private JTextField tf_year; private JTextField tf_sname; private - * JTextField tf_length; private JTextField tf_genre ; private JTextField - * tf_pname; private JTextField tf_shortDesc; private JTextField tf_avgrate; - * private JTextField tf_num_watch; - * - */ - - - -import java.awt.BorderLayout; -import java.awt.EventQueue; - import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.border.EmptyBorder; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.TableRowSorter; - import java.awt.Color; import javax.swing.JLabel; import javax.swing.JOptionPane; - import java.awt.Font; import javax.swing.JButton; import java.awt.event.ActionListener; -import java.io.FileWriter; -import java.io.IOException; import java.awt.event.ActionEvent; -import java.awt.TextField; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.Writer; public class MoviesFrame extends JFrame{ @@ -235,6 +192,7 @@ public class MoviesFrame extends JFrame{ }); btnM_ok.setBounds(281, 538, 89, 23); panel.add(btnM_ok); } + public void addMovie(MoviesFrame mf) { } diff --git a/Favorite_Movies/src/RatingsFrame.java b/Favorite_Movies/src/RatingsFrame.java index 9ced216..71369bd 100644 --- a/Favorite_Movies/src/RatingsFrame.java +++ b/Favorite_Movies/src/RatingsFrame.java @@ -1,26 +1,6 @@ -/* - * import java.awt.BorderLayout; import java.awt.EventQueue; - * - * import javax.swing.JFrame; import javax.swing.JPanel; import - * javax.swing.border.EmptyBorder; import java.awt.Color; import - * javax.swing.JLabel; import javax.swing.JTextField; import - * javax.swing.JButton; import java.awt.Font; import javax.swing.SwingConstants; - * import java.awt.event.ActionListener; import java.awt.event.ActionEvent; - * - * public class Ratings extends JFrame { - * - * private JPanel contentPane; private JTextField textField; private JTextField - * textField_1; private JTextField textField_2; private JTextField textField_3; - * - */ - - - - import java.awt.BorderLayout; -import java.awt.EventQueue; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; diff --git a/Favorite_Movies/src/StarsFrame.java b/Favorite_Movies/src/StarsFrame.java index e9fdbc7..2bdae9f 100644 --- a/Favorite_Movies/src/StarsFrame.java +++ b/Favorite_Movies/src/StarsFrame.java @@ -1,5 +1,4 @@ import java.awt.BorderLayout; -import java.awt.EventQueue; import javax.swing.JFrame; import javax.swing.JPanel; diff --git a/ReadMe.txt b/ReadMe.txt index 05d705a..571b913 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,3 +1,10 @@ +Mac: +1. Removed Login.java +2. added userExists method in Database +3. called Database.userExists in LoginFrame to simplify code +4. moved files to tmp folder + + Mac: 1. moved Readme.txt from src folder to top level 2. Fixed camelcase naming of attributes in Star.java