Browse Source

Code optimization

toomanysugar 4 years ago
parent
commit
c835d1b306
1 changed files with 11 additions and 36 deletions
  1. 11 36
      src/com/moviesdb/Movie.java

+ 11 - 36
src/com/moviesdb/Movie.java

@@ -2,6 +2,8 @@ package com.moviesdb;
 
 import javafx.scene.image.Image;
 
+import java.util.Objects;
+
 public class Movie {
 
     private int movie_ID;
@@ -27,66 +29,39 @@ public class Movie {
     }
 
     public String name(){
-        if (movie_Name != null)
-            return movie_Name;
-        else
-            return "Movie_name_undefined";
+        return Objects.requireNonNullElse(movie_Name,"Movie_name_undefined");
     }
 
     public String genre(){
-        if (movie_Genre != null)
-            return movie_Genre;
-        else
-            return "Movie_genre_undefined";
+        return Objects.requireNonNullElse(movie_Genre,"Movie_genre_undefined");
     }
 
     public String description(){
-        if (movie_Description != null)
-            return movie_Description;
-        else
-            return "Movie_description_undefined";
+        return Objects.requireNonNullElse(movie_Description,"Movie_description_undefined");
     }
 
     public String duration(){
-        if (movie_Duration != null)
-            return movie_Duration;
-        else
-            return "Movie_duration_undefined";
+        return Objects.requireNonNullElse(movie_Duration,"Movie_duration_undefined");
     }
 
     public String rating(){
-        if (movie_Rating != null)
-            return movie_Rating;
-        else
-            return "Movie_rating_undefined";
+        return Objects.requireNonNullElse(movie_Rating,"Movie_rating_undefined");
     }
 
     public String year(){
-        if (movie_Year != null)
-            return movie_Year;
-        else
-            return "Movie_year_undefined";
+        return Objects.requireNonNullElse(movie_Year,"Movie_year_undefined");
     }
 
     public String studio(){
-        if (movie_Studio != null)
-            return movie_Studio;
-        else
-            return "Movie_studio_undefined";
+        return Objects.requireNonNullElse(movie_Studio,"Movie_studio_undefined");
     }
 
     public String director(){
-        if (movie_Director != null)
-            return movie_Director;
-        else
-            return "Movie_director_undefined";
+        return Objects.requireNonNullElse(movie_Director,"Movie_director_undefined");
     }
 
     public String getImageLink(){
-        if (movie_ImageLink != null)
-            return movie_ImageLink;
-        else
-            return "Movie_ImageLink_undefined";
+        return Objects.requireNonNullElse(movie_ImageLink,"Movie_ImageLink_undefined");
     }
 
     public Image cover(){