eighteenth commit

1 files changed, 27 insertions, 30 deletions

diff --git a/src/main/java/files/Anime.java b/src/main/java/files/Anime.java
index 4f60149..f6cccff 100644
--- a/src/main/java/files/Anime.java
+++ b/src/main/java/files/Anime.java
@@ -3,19 +3,21 @@ package files;
 public class Anime {
     private final String name;
     private final String description;
-    private final String[] genres;
+    private final String genres;
     private final String year;
     private String series;
     private final String rating;
     public final String image;
     private final String url;
+    public static String dub;
+    public static String typeOfAnime;
     public static Anime[] list;
     public static byte indexOfAnime = 0;
     public static String searchedAnime;
-    public static byte searchedAnimeSize;
-    public static boolean isSearchingAnAnime;
+    public static byte size;
+    public static boolean isSearching;
 
-    public Anime(String name, String description, String[] genres, String year, String rating, String image, String url) {
+    public Anime(String name, String description, String genres, String year, String rating, String image, String url) {
         this.name = name;
         this.description = description;
         this.genres = genres;
@@ -25,7 +27,7 @@ public class Anime {
         this.url = url;
     }
 
-    public Anime(String name, String description, String[] genres, String year, String series, String rating, String image, String url) {
+    public Anime(String name, String description, String genres, String year, String series, String rating, String image, String url) {
         this.name = name;
         this.description = description;
         this.genres = genres;
@@ -37,32 +39,35 @@ public class Anime {
     }
 
     public String showInfo() {
-        return "<b>Название:</b> " + this.name + System.lineSeparator() +
-                getYear() +
-                getSeries() +
-                "<b>Рейтинг:</b> " + this.rating + " / 10" + System.lineSeparator() +
-                "<b>Описание:</b> " + this.description;
-    }
-
-    public String showInfo(String dub) {
-        return "<b>Название:</b> " + this.name + System.lineSeparator() +
-                getYear() +
-                getSeries() +
-                "<b>Рейтинг:</b> " + this.rating + " / 10" + System.lineSeparator() +
-                "<b>Озвучка:</b> " + dub + System.lineSeparator() +
-                "<b>Описание:</b> " + this.description;
+        return  getName() + getYear() + getGenres() + getSeries() + getRating() + getDub() + getDescription();
     }
 
     public String getName() {
-        return name;
+        return (name != null) ? ("<b>Название:</b> " + this.name + System.lineSeparator()) : "";
     }
 
     public String getYear() {
-        return (year != null) ? ("<b>Год выхода:</b> " + this.year + System.lineSeparator()) : "";
+        return (year != null) ? ("<b>Год:</b> " + this.year + System.lineSeparator()) : "";
+    }
+
+    public String getGenres() {
+        return (genres != null) ? ("<b>Жанр:</b> " + this.genres + System.lineSeparator()) : "";
     }
 
     public String getSeries() {
-        return (series != null) ? ("<b>Всего серий:</b> " + this.series + System.lineSeparator()) : "";
+        return (series != null) ? ("<b>Серий:</b> " + this.series + System.lineSeparator()) : "";
+    }
+
+    public String getRating() {
+        return (rating != null) ? ("<b>Рейтинг:</b> " + this.rating + System.lineSeparator()) : "";
+    }
+
+    public String getDub() {
+        return (dub != null) ? ("<b>Озвучка:</b> " + dub + System.lineSeparator()) : "";
+    }
+
+    public String getDescription() {
+        return (description != null) ? ("<b>Описание:</b> " + description + System.lineSeparator()) : "";
     }
 
     public String getImage() {
@@ -89,14 +94,6 @@ public class Anime {
         Anime.searchedAnime = searchedAnime.replace(' ', '+');
     }
 
-    public static void setIsSearchingAnAnime(boolean isSearchingAnAnime) {
-        Anime.isSearchingAnAnime = isSearchingAnAnime;
-    }
-
-    public static void setSearchedAnimeSize(byte searchedAnimeSize) {
-        Anime.searchedAnimeSize = searchedAnimeSize;
-    }
-
     public static void setList(Anime[] list) {
         Anime.list = list;
     }