From 2479693cee6f5302533b082d0f436c0c5b123667 Mon Sep 17 00:00:00 2001 From: mac Date: Fri, 27 May 2022 07:24:28 +0530 Subject: [PATCH] second round of fixes --- Favorite_Movies/bin/Database.class | Bin 1246 -> 1958 bytes Favorite_Movies/bin/Login.class | Bin 325 -> 0 bytes Favorite_Movies/bin/LoginFrame$1.class | Bin 1774 -> 1064 bytes Favorite_Movies/bin/LoginFrame.class | Bin 1995 -> 1998 bytes Favorite_Movies/src/Database.java | 48 ++++++++++++++++- Favorite_Movies/src/Login.java | 11 ---- Favorite_Movies/src/LoginFrame.java | 71 +++++-------------------- Favorite_Movies/src/MoviesFrame.java | 44 +-------------- Favorite_Movies/src/RatingsFrame.java | 20 ------- Favorite_Movies/src/StarsFrame.java | 1 - ReadMe.txt | 7 +++ 11 files changed, 68 insertions(+), 134 deletions(-) delete mode 100644 Favorite_Movies/bin/Login.class delete mode 100644 Favorite_Movies/src/Login.java diff --git a/Favorite_Movies/bin/Database.class b/Favorite_Movies/bin/Database.class index d9343cef12d3996122327b7d465a9cbc13da0f35..8d642ca3175f370906c7e4651bbc25afb32bbab5 100644 GIT binary patch literal 1958 zcmah~NmCnF5dKC8Mht^x)?j1DOPpBjal8ZGf{;xjz_zdnwj45yp2Zk3BhQR5+4o#> z%E483s*-Cix%eVdaaDdm{!ngCz8)b;6_bh%J>C6!@9#bR`QrCK0Gz^i22!}7<6;7r z48(9*#}xz3csqe9`KEkQ5_1OTab36@3EY%#PBaS! zZsE3Yi^AOy?mZz(LhcB;DD>ym9nhpnMy(s7;eqK2l_ zz-5>~P7nqfdQ#a3)`m4!vfScWF7zF@I5BWX zLwhc??6p~|9650g>|aNL9coBeg~F`2;Yh4hHsU4*ZnGQ>I*;h-YiLbnh2a5tYHwO0 zV{2$jWovA7V&uGvZ>x+Wg|(-x&|0wqH7X^U7{H(gGb+#V#%eZ$_IN&AFXuDXhUYt> zin0g!`wS4|OJ31&mu+7aM#Ife0x)Vv6rd71rLmlCxvui%;6BH6*SKe*h*c8~9++4| zi5;3)hik%<+y@(T&v{|StGI>fOi$D>hMj5-^Q7NsV3e|2g+e~V)d^1+&&S9ZxM z2WsSz=dT52%T}z{55k=$mbbeIe0#f-0w+=L;h_$e9Dof~u%SUaY~m3%O?)T?e^@+H19@io3N@hw7zFf?@4>zrQmpT);i@R)$_x&3T)qr zFwFZ!?UjvU{d#h~Y0i7YDpk}xFG)`-z3Y4>9bc72E3{Wt0Y`A0@1^{jp~=N19inuQ zUrn@wThN}7(J)Nf5-AgC#Rx{pi|H1c=nQ0&MLZwI=idrq0n2!D?37875jFC{f$C@quGH* z;b5ciYNK%IHym!1k3<2FR`J?U6~{Q8EWd9&i^l&LPx$vy8%~A;0k_u1RdjJ2huQWB zPGB4-`R8*Q3pfi4=iy?4Ps;^-&k_BAD|n0yqonZ^)A$M3qG7cn_7|S$I3uGu%bC{p ayN?M33NOK6mS*Rf>3_^_(qMxA-0DAlRk-i~ delta 757 zcmYjPO-~b16g_V`Wv0U`rL9=`5)ee%f(67cP*I^E(u&#&qHdn0A=PHu)P}IK8+WeA zgaj74)HN;!gNZ-DAK~9{XS{ceW@eIe&pGejJMX?XpCUg)tslQnz5|%S3k$s%HE_Yi zm<0_<3n`?TjhmR@c#)lqg-J{?n`So7>=MHa!)1mm3|AShS-6f_W^*QPa1W}~aMQpo z3uiEIK)-F^&fZBXX{xQQd~K&v7O=*09-B+93xo?zReGIQ^`d%NEmNUmi-ABN`kg6F zwfb<^z=FggvJy*J77&9H_pl;yAFBp(?B*pN@cJ6VL##?XVtC9@U?}2=fpv)uJeAl) zmbzFH&(JRrf2DR*rc%qStYvpg<$AMHvn8JMlDViHJ<#ju`a9=KAQ9>Km%7oYG|LTV zGSK53>UOl#^Q+3<&J>!BioNXwgVQa6V5wSrL*qv3WH!Aqiw#vOV+cKT75r!rpiv3W zlHw>R22;lnM??e$2;2Ue2w{*)y;Ko~PQ}2-Z_qYl0sR4irKQMtt;jN z(Svoic@*ePZe9g~r)o=dkXdJ54*T5HE1j2AhDTl6t!_-0cQN@N=rh!^I@BBUY`srq zRbkzoe>p{reu@y0K-kKR?N(akJF{tU#q9(BMnHO$ljKY%Yr@kdyI>EepAhdYs92*` f^ympvR*zoOD*fH`_5-qGRjVe9S0qnKNSyrvX7)O- diff --git a/Favorite_Movies/bin/LoginFrame$1.class b/Favorite_Movies/bin/LoginFrame$1.class index eb3ec66013f7691ee0e28cabaa3efdbdffd6ded5..e64c6a405cb270d2e5defd82319136a6fa16334e 100644 GIT binary patch delta 494 zcmW-eTTc^F6otRjnKIMEsnjA~K&4)gQd$bO;tj+LL}OY6F(!~0Gve3`!PYRX@r`HW zlTKp7FVI&LQyWcu@y#FOFEGYEJ;`1>>+F@i*FNV@`m?+G```DUK$VpghsbG$7}uQU zjOHxoH0POcxuBUO?=YotG+80LuFjzqJ`vHhdM2ZX_W!DAecE5hE2 z(w4kf_=@Ubb+PNk9?1hHRd%3<^8!Wj-9?wW3?86kZ5Q*2l**<>^F HHte7OUnWhh literal 1774 zcmZuy-BTM?6#w0jWW#o`5DRUpXj-uaS_rlE1E{qK#DWQ=CZz>}xNL61h0Si*y8${n z>WnWw_~eWa=u2lDhZ%k9OdC2f;~(IkRo*LA#ww{^UOcQw2h!?2DBMl_7-h~Z`o@2mTkIzDJ6&D)9^)A1q3W0=q}iL{1~ zbi|dTIPR!pO1Yel;o}%GF=Um+jD}equOO%4u7>a| zzbPEy-(oo3+brmtV+fDCB~F5jaQIBUy28DJxne7hY5Br+a@;GsUX_;^UhmDUnVV+H z-11X=lRJKDEKr$L^r&*ymiJ9-J!{qiA3uAE*O}{f`&x{MJ!Q`K{CQk9XQL5j}-4o?#ZHDw~E}d zMNRU7E!SI@HPhn7vhbu|Oq-joCw#t~bvFekUC$zkO_Z$~wrqL4H0W>pD(a^U9YKt` zFYHv_G98C|O0dk(vZyZ^_zb3j6<7vJ;0DTAqG}CPu*%RL6qn4`EsIN8uG<=ffi`pHr&Naod!V zOR6JqVVh1RHM_FLE&s^ti!jIt>2tDVI3Jk2C=XzA!e8F^=%oo1#|cnpdliy&GiY1S z&=8^d(n-_?DBMoTEiz6`7x=cH7Thio&bw6L|4JCN3ip*F!L3s7#8hO`BSOBB_Jsk1D&fC(4`+-ZEz@(+;`nZe1oog7xnq^q9B|Z_*j18`6t;qMR6+))kRwTf+A~K5&SMyhxQ!)DVHtO6p%h`N zje>PrDI4H;NZaIVS{vWcmiP`5-(w3u5cem1PX5252w&hAe2HK2EqW=!Fk;WiAgZBH zL%)VA8m?*>AcCGD_7@_d$aCsuxLFRSVK7QvPLYEUhH#DUF#Y0O$0tPTR7^MB^!E>f Cq_IK( diff --git a/Favorite_Movies/bin/LoginFrame.class b/Favorite_Movies/bin/LoginFrame.class index d6f6c5feabb487c852af27fc1486e9b72f26761e..cc220d80ff607eeef86c98b9dd63a64bdd7f9164 100644 GIT binary patch delta 37 tcmX@je~y2{BPKRhpZxU9yv8BPM1hfA7sNn5MAsb}=S0bTj5N^e~n&^iS?&cLe~^MGFo9 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