From 34d370ab7715b766c877e46e250c80ce12017c9a Mon Sep 17 00:00:00 2001 From: mac Date: Fri, 27 May 2022 17:04:19 +0530 Subject: [PATCH] new code --- Favorite_Movies/bin/Database.class | Bin 5820 -> 8372 bytes Favorite_Movies/bin/Main_HomePage.class | Bin 2467 -> 549 bytes Favorite_Movies/bin/Star.class | Bin 1151 -> 1533 bytes Favorite_Movies/src/Database.java | 157 ++++++++++++++++++++++-- Favorite_Movies/src/Main_HomePage.java | 7 ++ Favorite_Movies/src/Movie.java | 8 ++ Favorite_Movies/src/MoviesFrame.java | 35 +++--- Favorite_Movies/src/Rating.java | 12 ++ Favorite_Movies/src/RatingsFrame.java | 23 ++-- Favorite_Movies/src/Star.java | 5 +- Favorite_Movies/src/StarsFrame.java | 11 ++ 11 files changed, 219 insertions(+), 39 deletions(-) diff --git a/Favorite_Movies/bin/Database.class b/Favorite_Movies/bin/Database.class index 60c40a1621f1d1434fb0715ca190760082ef9e9b..359dd4a83cee0d7e032bcda9f50bca313eeb0730 100644 GIT binary patch literal 8372 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 OxG_elHttcNcK$DlKaG3< delta 2770 zcmbVO32;+I82&bS$xD;hLIb6ia*2p-(ojXGVnMVhGA(IwC>E;~i8R(=4<=13jDvB+ z`$Bz+7NII0D1sb93PeEx!3#mfTR~LtKvcX>;`jC?P!M%=GI`mzyZ`S09s6&VmptWj zzPNw&8UQB=_fqF|HcyoUHwffRDz1q%OsQ!OPpY{%R3B`vsSQK|gCbKSPK?7%8f>^( z@38mIyH&%P7-@8#;KV2t31s;v2U-J#p{BypF(ao=3QmcHni_}db8G|kI<@c=6?Y4C zlT%tEq58s-a5yl{A8O{pvyi4@wtzdez**dRY%ow83_CDKzt)~_Z$p-f`}DY)>uARV zMjG?=I&@r>{sD{T-C}0iL);iIS$2BZOzJMdlwfv#RpuW%EU$1eD z&miH1>{bcnVMJyKDpPYw@g#XY@>awsjrW>t1^wn+t1kjK0rNSoFL=pTDrv z90`OkJV?=tcv;0u0!k(Ojnp>lfi%A!c6Rer38XQvv4Kdau};91=Qo=}^Eo2I%re!X zm%5JYi+Az9iuVM%N>b_rjdg{U)0!i}1`QuzyFSy^*MblAC9YfxKGHY4vNN#*Sx!E7 zX{f<&0iWK*k)=DeoL=nwOvC4ribzvsB+Lw)*n_<)zSK|CvUBkjdI+dfI1s6CbVA@8 z4R=6y;9I>;JE;giYxo7f3Zyp&BNZ(T;{%aNmjr8xGp{ti%9#JVh8Q}yMnh9;C|JrN zQL1m$`W9IkS^x)gjR@67xvhp-Dc!;+DHq2_+fUO1S&NYiuE=P)COL2pH% zA;{*%E%o(=UG#Msc_RJEJsB5RqPQLkEHrWNIL1}GuU9&7qu=XUiCere%$!e3`Fq<^ z<_B~~HhpS^lkGlG`5XloO3@XgIabcm3LJ$o=!LQD2l{a?7sl1NhQBVP;VR7FN=I?a z65P(#8Bq?Xu#8tRO5r#OV={NL(}KH<9fZa;Yp3k%|z(7oZkL@B%WJmzTxCp~hD`5?XoiRhO2v0CEHwIuajOBCrS&C&$y*G03 zB;%}HN0smuu8;z~oKc!gX9%K;u!65=@H+rXf_p0}W~pdX(XPVFi3#p0*k?Q>M>NR+ zj#f$)c5)+yE1WDPBsZ)4o)}h>6}N8{)(AXYDRH9*)g6Qr4sbJ& zS^$@lrv|FogroWEK^TM3%vli(MhmIAOw!>o_fFE`Bo0&MUewJ{-on|3Luam>PvlVv zy}tq7orFG)nAQRr33NFW_;a1ivGE_wvFV8Bc;SfVh)R3^ojY(jg`UpLuAsD0%6cUQ zx{9LCpgFE21J_XGYbot@G{+79#~e|-f-R)y$nIE#t^d&+ui`a2%Q%|!4qN;#<-;N! zZkFnY;V8#oX#S_H0n1^rytIskFV~sf- z%OyVZ5RSkf*w3Ub>@UVpCTQm@qfS}4LU#$&$_TUm7-O>jSR~TEuo_3sCSH++ z39H#*NS(kVNze)MZ#zcV8loft`>izdG61dk<rL#(M76j lXxf9DJ6L{=!peUOa_kTkSxFSUUy@Gdzc(SeGS(t8{{)MJMUemi diff --git a/Favorite_Movies/bin/Main_HomePage.class b/Favorite_Movies/bin/Main_HomePage.class index 45a46332ea421cac0c1bfa723f9030d1c38d8d6e..c795959fdb2e683ccf1624d4c74a55135bf8d594 100644 GIT binary patch delta 351 zcmZWlJxc>Y5S`P+=z1DW{AjmKAdp57Ok_2ipOKCS(tb__=au99zRL60DnF&4tU^G)Veh~$8{rFVe^RyryM$|H=NlRn PhYJ=oVUIGhDOm@9jJZoDJva(^@h-GL%!Ysz5_r*9=uN z#ubg;TB3CfD>HopuDxk3ZS)J++dHNN91%UC%CMus3khx+6ntxx;#)b2pKJC@R0Fp zFPv~mcu1g;V+||wMmVBp^qhy|rM27eQ>K2-%wwKaDX5t<%2_dE@%}g zy~1Xfj1=2s=!ix2B#od1I@-&2-Yp}G0a8b4ddCXc88tVl%w*_(X^QG`B{QYu()?al zI*e4Bu7Fj`+ArXo<@<*Qe#X$uDI==2{)V!~k*+9-7>=5{N0QY%!W&slJu=OQxd@~% z`%uv|)go4z$xT_wwKVH!;#8?xI8UXrd~$?VJ;?urUdYAOp|qKB-AHfYqa@%R)@Xbq z86}@r^VmrDft_w{0UKX!rbPL`O&Ski*GX;wZ0kackVCE_ydhu0m+*@&zqnU~FH}NH zY!MHBiMG%cw3QHu+3mhKH0a|k1Iaf{prpwrb{630D)uO zC5$i_C9s>oqZP2b0*(^6#}ROpaFEew2@N=iJzHS|jtYE;VQ0Wu!X(2}3_E?YAMaLa zXN5k@v@75$A;$DErd>>5snS&0a>U1(mI6`<(@a0lw8ZpJRa&ah3e)a@yM#E?D${PJ z@Az@cDn`Ivp-(aG33y6KF@2h857DBry0@o7pJ7@K$R%W%)|r->p03g|)1TAW*f2|< zH_=0%N8q4q#Dk+~!!i2BI!=EKPGE>`iZPtT6cmzX=#<9s5)ya=D&9mAm+5rBj~qTl z9$%n<>zKn0oX5|&fM4-CZWDPI?+Ag5!i`I!8J9&6ABZqM6g%;e7{JG33|GYoToVag z7dpNY=kT3)8{dmdxFO!d58@Nt5?Aq?_!hs5AMuCy1$V@s_*?viyW$_*v$=5J){6gZ zYX$HEWio3GKSh9XcjUSNODq4x9}oK zE{f(e%61MC#c>|zNODsIhww5<9`d~zuaG3uj<1p@8!;DX9ib}r)5_0?wb1o%J(J}% RR$iyeYrMRs%4^nI{|9L(VO0PC diff --git a/Favorite_Movies/bin/Star.class b/Favorite_Movies/bin/Star.class index f80ce3489204254bca7745ace509ea77abf95787..81fd86ce61c412f9f92fc119bfb97484a21da21c 100644 GIT binary patch literal 1533 zcmZ`(+fEZv6kVscDZ|iWxhWtw1xlw-F5W@BpqM5FA4*7wPXkQqkkXRrK;kF(FFt4@ zU^MXq{3zqvGbP1#c$ss~K6|gd&f2T}^Y`a(01xm^Lqs7~_AFOJOriJ4Ik2${<4G$G=wT4`*d3MEi4LrsZg{04v zF@;cBio)=jf!nwvyEOx27?<6;fqOyhrGZ(D^97u0q(PuKF+CpoLMU;h<@%|6U~f9& zkS;O7f{?=`L8CNu3=x?+CM-nmhbl7NuEig_wlpy-Rp k@t3`X6`#yR&<3x3mnWJ1nug^c1XbC<8@fp0t#6IZe|g~If&c&j literal 1151 zcmZuv+iuf96r6P~P8=sqLod+KTY%=;rj&9=@PLFADJ>7FkSd;>b``lwoXT-3@lQN} zL|X(BAHYW;X5B<-9Lv%tEQiaVj7h0*1dkvc0Yp$TiQb3#;C>oKC&vxwg}JEfD=8Emt7r zSUuSqx~d7p-`I}ry%mU*%Ad%2-#;Zf*R&mZIPA5hdt|khqS2Aw!T3IM)s2H&P_)!g z=hI`_$jCye9A+gwK02Z;mS$N>PN&?l?^@@Hn^lI`;q4JJd^H86&MkK!Z{`+Q3Da)2 zJj-P!Myo$`Pvi$%&6rf+j!MqN9W0ngBV%F?SrhYWl|z;ZDH0>!(6MjgDW2(gZsG-A znz)A*f$SvtkL@#g;!QzgQ?bE$*XFBYn7PlhVF=7mbQ_K*JCY_6{-E3ngeKU)CjSBrn)k{Qz(o2+HCUZU1bu{Q& z`P~S29SusaQF@*H%~02|pz8vug>cugp!61{i%8-D9`cmR`W+&Cfc$U7kFTLOE4joK kk_XjVWbY@8E2OHE3v>MHKotqpnCmvb!!BhW5!0~sA5!|hk^lez diff --git a/Favorite_Movies/src/Database.java b/Favorite_Movies/src/Database.java index 2ac5f5c..c28c551 100644 --- a/Favorite_Movies/src/Database.java +++ b/Favorite_Movies/src/Database.java @@ -65,10 +65,22 @@ public class Database { fw.write("\n"); } - public static void addMovie(Movie m){ + public static int addMovie(Movie m){ + int lastid = 0; try { - FileWriter fw = new FileWriter( "c:\\tmp\\src\\files\\data.txt",true); + ArrayList list = getMovies(); + for (Movie mv: list) + { + if (mv.equals(m)) + { + return 0; + } + if (mv.getMovieId() > lastid) + lastid = mv.getMovieId(); + } + m.setMovieId(lastid + 1); + FileWriter fw = new FileWriter( "C:\\tmp\\FavoriteMovies\\files\\data.txt",true); writeMovieToFile(fw, m); @@ -78,6 +90,7 @@ public class Database { catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } + return lastid+1; } @@ -93,6 +106,9 @@ public class Database { Movie m = Movie.parseString(line); list.add(m); } + br.close(); + fr.close(); + } catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -122,7 +138,7 @@ public class Database { { ArrayList list = new ArrayList(); try{ - FileReader fr = new FileReader( "c:\\tmp\\src\\files\\star_data.txt"); + FileReader fr = new FileReader( "C:\\tmp\\FavoriteMovies\\files\\star_data.txt"); BufferedReader br = new BufferedReader(fr); String line = null; while ((line=br.readLine())!=null) @@ -130,6 +146,8 @@ public class Database { Star s = Star.parseString(line); list.add(s); } + br.close(); + fr.close(); } catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -137,14 +155,93 @@ public class Database { return list; } - public static void addStar(Star s) + public static ArrayList getRatings() { + ArrayList list = new ArrayList(); + try{ + FileReader fr = new FileReader( "C:\\tmp\\FavoriteMovies\\files\\ratings_data.txt"); + BufferedReader br = new BufferedReader(fr); + String line = null; + while ((line=br.readLine())!=null) + { + Rating s = Rating.parseString(line); + list.add(s); + } + br.close(); + fr.close(); + } + catch (IOException e1) { // TODO Auto-generated catch block + e1.printStackTrace(); + } + return list; + } + public static boolean addStar(Star s) + { + boolean movieFound = false; + try + { + + ArrayList list = getMovies(); + for (Movie m: list) + { + if (m.getMovieId() == s.getMovieId()) + { + movieFound = true; + } + } + if (movieFound) + { + FileWriter fw = new FileWriter( "C:\\tmp\\FavoriteMovies\\files\\star_data.txt",true); + fw.write(String.valueOf(s.getMovieId())); + fw.append(" ").write(s.getMovieTitle()); + fw.append(" ").write(String.valueOf(s.getYear())); + fw.append(" ").write(s.getNameSurname()); + fw.append(" ").write("\n"); + fw.close(); + } + } + catch (IOException e1) { // TODO Auto-generated catch block + e1.printStackTrace(); + movieFound = false; + } + return movieFound; } - public static void addRating(Rating r) + public static boolean addRating(Rating r) { + boolean movieFound = false; + try + { + + ArrayList list = getMovies(); + for (Movie m: list) + { + if (m.getMovieId() == r.getMovieId()) + { + movieFound = true; + } + } + if (movieFound) + { + //(movieId: int, NameSurname: string, relation: string, rating: int) + FileWriter fw = new FileWriter( "C:\\tmp\\FavoriteMovies\\files\\ratings_data.txt",true); + fw.write(String.valueOf(r.getMovieId())); + fw.append(" ").write(r.getNameSurname()); + fw.append(" ").write(r.getRelation()); + fw.append(" ").write(String.valueOf(r.getRating())); + fw.append(" ").write("\n"); + fw.close(); + UpdateRating(r.getMovieId(), r.getRating()); + } + } + catch (IOException e1) { // TODO Auto-generated catch block + e1.printStackTrace(); + movieFound = false; + } + return movieFound; + } public static int findMovieId(String title) @@ -202,14 +299,58 @@ public class Database { public static ArrayList findMoviesForStar(String starName) { - ArrayList list = new ArrayList(); // TODO 9: search all movies in which the star has acted and return a list + ArrayList movieIdList = new ArrayList(); + + ArrayList starList = getStars(); + for (Star s: starList) + { + if (s.getNameSurname().equals(starName)) + movieIdList.add(s.getMovieId()); + } ArrayList fullList = getMovies(); - for (Movie movie : fullList) + ArrayList list = new ArrayList(); + for(Movie m: fullList) { - + if (movieIdList.contains(m.getMovieId())) + { + System.out.println("Adding " + m.getTitle() + " to list"); + list.add(m); + } } + return list; } + + + public static void UpdateRating(int movieId, int newRating) + { + // get all ratings + ArrayList ratings = getRatings(); + // calculate avg rating + int totalRating = 0; + int numRatings = 0; + for (Rating r: ratings) + { + if (r.getMovieId() == movieId) + { + totalRating += r.getRating(); + numRatings++; + } + } + // find movie by id + ArrayList list = getMovies(); + // update movie + for (Movie m: list) + { + if (m.getMovieId() == movieId) + { + m.setAvgRating(totalRating/numRatings); + break; + } + } + // save movies to file + saveMoviesList(list); + } } \ No newline at end of file diff --git a/Favorite_Movies/src/Main_HomePage.java b/Favorite_Movies/src/Main_HomePage.java index 1236e25..e1336f2 100644 --- a/Favorite_Movies/src/Main_HomePage.java +++ b/Favorite_Movies/src/Main_HomePage.java @@ -227,13 +227,20 @@ public class Main_HomePage extends JFrame { // form should have a text field to take the name of the star // upon clicking the button, it should call Database.findMoviesForStar(String starName) // and display a list of movie titles below +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes ShowMoviesForStarFrame sm=new ShowMoviesForStarFrame(); sm.setVisible(true); if(sm.isVisible()) { //use to display only one screen Main_HomePage.this.dispose(); } +<<<<<<< Updated upstream +======= +>>>>>>> Stashed changes } }); diff --git a/Favorite_Movies/src/Movie.java b/Favorite_Movies/src/Movie.java index 1f2cb88..780532c 100644 --- a/Favorite_Movies/src/Movie.java +++ b/Favorite_Movies/src/Movie.java @@ -91,6 +91,14 @@ public class Movie { this.numWatched = numWatched; } + public boolean equals(Movie m) + { + if (m.getTitle().equals(this.getTitle()) + && m.getGenre().equals(this.getGenre())) + return true; + return false; + } + public static Movie parseString(String s) { String[] parts = s.split(" "); diff --git a/Favorite_Movies/src/MoviesFrame.java b/Favorite_Movies/src/MoviesFrame.java index 06ebc5c..140fa68 100644 --- a/Favorite_Movies/src/MoviesFrame.java +++ b/Favorite_Movies/src/MoviesFrame.java @@ -52,12 +52,12 @@ public class MoviesFrame extends JFrame{ lblNewLabel.setBounds(273,11, 160, 29); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 24)); lblNewLabel.setForeground(new Color(255, 255, 255)); panel.add(lblNewLabel); - JLabel lblNewLabel_1 = new JLabel("Movie Id:"); + /*JLabel lblNewLabel_1 = new JLabel("Movie Id:"); lblNewLabel_1.setFont(new Font("Tahoma", Font.PLAIN, 14)); lblNewLabel_1.setForeground(Color.WHITE); lblNewLabel_1.setBounds(31, 74, 109, 14); panel.add(lblNewLabel_1); - +*/ JLabel lblNewLabel_1_1 = new JLabel("Title:"); lblNewLabel_1_1.setFont(new Font("Tahoma", Font.PLAIN, 14)); lblNewLabel_1_1.setForeground(Color.WHITE); @@ -112,9 +112,10 @@ public class MoviesFrame extends JFrame{ lblNewLabel_1_3_6.setBounds(31, 479, 127,23); panel.add(lblNewLabel_1_3_6); + /* tf_mid = new JTextField(); tf_mid.setBounds(231, 66, 222, 29); panel.add(tf_mid); - +*/ tf_title = new JTextField(); tf_title.setBounds(231, 110, 222, 29); panel.add(tf_title); @@ -160,13 +161,13 @@ public class MoviesFrame extends JFrame{ JButton btnM_ok = new JButton("OK"); btnM_ok.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - if(tf_mid.getText().isEmpty() || tf_title.getText().isEmpty() ||tf_year.getText().isEmpty() || tf_genre.getText().isEmpty()||tf_num_watch.getText().isEmpty() || tf_avgrate.getText().isEmpty() ||tf_pname.getText().isEmpty() || tf_sname.getText().isEmpty() ||tf_shortDesc.getText().isEmpty() || tf_length.getText().isEmpty()) { + if(tf_title.getText().isEmpty() ||tf_year.getText().isEmpty() || tf_genre.getText().isEmpty()||tf_num_watch.getText().isEmpty() || tf_avgrate.getText().isEmpty() ||tf_pname.getText().isEmpty() || tf_sname.getText().isEmpty() ||tf_shortDesc.getText().isEmpty() || tf_length.getText().isEmpty()) { JOptionPane.showMessageDialog(null, "Please Enter All the Fields !!"); } else{ Movie mv = new Movie(); - mv.setMovieId(Integer.parseInt(tf_mid.getText())); + //mv.setMovieId(Integer.parseInt(tf_mid.getText())); mv.setTitle(tf_title.getText()); mv.setLength(Integer.parseInt(tf_length.getText())); mv.setYear(Integer.parseInt(tf_year.getText())); @@ -176,16 +177,22 @@ public class MoviesFrame extends JFrame{ mv.setShortDescription(tf_shortDesc.getText()); mv.setAvgRating(Double.parseDouble(tf_avgrate.getText())); mv.setNumWatched(Integer.parseInt(tf_num_watch.getText())); - Database.addMovie(mv); - - JOptionPane.showMessageDialog(null, "Movie added Successfully....."); - - tf_mid.setText(""); - tf_title.setText(""); - tf_year.setText(""); tf_length.setText(""); tf_genre.setText(""); - tf_sname.setText(""); tf_pname.setText(""); tf_shortDesc.setText(""); - tf_avgrate.setText(""); tf_num_watch.setText(""); + int movieId = Database.addMovie(mv); + if (movieId > 0) + { + JOptionPane.showMessageDialog(null, "Movie added Successfully.....new id: " + String.valueOf(movieId)); + tf_title.setText(""); + tf_year.setText(""); tf_length.setText(""); tf_genre.setText(""); + tf_sname.setText(""); tf_pname.setText(""); tf_shortDesc.setText(""); + tf_avgrate.setText(""); tf_num_watch.setText(""); + + } + else + { + JOptionPane.showMessageDialog(null, "Movie already exists!!"); + } + } } diff --git a/Favorite_Movies/src/Rating.java b/Favorite_Movies/src/Rating.java index 51d48f8..b15fc6f 100644 --- a/Favorite_Movies/src/Rating.java +++ b/Favorite_Movies/src/Rating.java @@ -39,4 +39,16 @@ public class Rating { this.nameSurname = nameSurname; } + public static Rating parseString(String s) + { + //(movieId: int, NameSurname: string, relation: string, rating: int) + Rating r = new Rating(); + String[] parts = s.split(" "); + r.setMovieId(Integer.parseInt(parts[0])); + r.setNameSurname(parts[1]); + r.setRelation(parts[2]); + r.setRating(Integer.parseInt(parts[3])); + + return r; + } } \ No newline at end of file diff --git a/Favorite_Movies/src/RatingsFrame.java b/Favorite_Movies/src/RatingsFrame.java index 71369bd..5640e10 100644 --- a/Favorite_Movies/src/RatingsFrame.java +++ b/Favorite_Movies/src/RatingsFrame.java @@ -96,28 +96,19 @@ public class RatingsFrame extends JFrame { rt.setRelation(tf_relationR.getText()); rt.setNameSurname(tf_snameR.getText()); rt.setRating(Integer.parseInt(tf_ratingsR.getText())); - - try { - - FileWriter fw = new FileWriter( "C:\\Users\\skc\\eclipse-workspace\\first\\Favorite_Movies\\src\\files\\ratings_data.txt",true); - tf_midR.write(fw); - tf_snameR.write(fw.append(" ")); - tf_relationR.write(fw.append(" ")); - tf_ratingsR.write(fw.append(" ")); - - fw.write("\n"); - - fw.close(); - + if (Database.addRating(rt)) + { JOptionPane.showMessageDialog(null, "Ratings added Successfully....."); tf_midR.setText(""); tf_relationR.setText(""); tf_ratingsR.setText(""); tf_snameR.setText(""); - - } catch (IOException e1) { // TODO Auto-generated catch block - e1.printStackTrace(); } + } + else + { + JOptionPane.showMessageDialog(null, "Movie not found, Ratings not added!!"); + } } } }); diff --git a/Favorite_Movies/src/Star.java b/Favorite_Movies/src/Star.java index fd5e6f1..f212e37 100644 --- a/Favorite_Movies/src/Star.java +++ b/Favorite_Movies/src/Star.java @@ -43,7 +43,10 @@ public class Star{ Star st = new Star(); String[] parts = s.split(" "); st.setMovieId(Integer.parseInt(parts[0])); - + //movieId: int, movieTitle: string, movieYear: int, NameSurname: string + st.setMovieTitle(parts[1]); + st.setYear(Integer.parseInt(parts[2])); + st.setNameSurname(parts[3]); return st; } diff --git a/Favorite_Movies/src/StarsFrame.java b/Favorite_Movies/src/StarsFrame.java index d2a5fd4..d9f0a9f 100644 --- a/Favorite_Movies/src/StarsFrame.java +++ b/Favorite_Movies/src/StarsFrame.java @@ -90,7 +90,10 @@ public class StarsFrame extends JFrame { s.setMovieTitle(tf_mtitleS.getText()); s.setNameSurname(tf_snameS.getText()); s.setYear(Integer.parseInt(tf_yearS.getText())); +<<<<<<< Updated upstream +======= +>>>>>>> Stashed changes if (Database.addStar(s)) { JOptionPane.showMessageDialog(null, "Star added Successfully....."); @@ -98,6 +101,7 @@ public class StarsFrame extends JFrame { tf_midS.setText(""); tf_mtitleS.setText(""); tf_yearS.setText(""); +<<<<<<< Updated upstream tf_snameS.setText(""); } else{ @@ -106,6 +110,13 @@ public class StarsFrame extends JFrame { } +======= + tf_snameS.setText(""); + } + else { + JOptionPane.showMessageDialog(null, "Movie not found, Star not added!!"); + } +>>>>>>> Stashed changes } } });btnStar.setBounds(195, 320, 89, 23);