From 9fe1b7f3620eacb83b5307b057d16e230eb4298d Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sun, 8 Jan 2017 17:02:13 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=BA=20=D1=81=D0=B5=D0=B7=D0=BE=D0=BD=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

P.S.: ошибки с возобновлением просмотра не наблюдается
---
 src/main/java/kinosearch/core/KinoPlay.java        | 14 +++++++-------
 .../java/kinosearch/core/warez/Onlinelife.java     |  4 +++-
 .../java/kinosearch/webapp/KinoPlaySerializer.java |  3 ++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/kinosearch/core/KinoPlay.java b/src/main/java/kinosearch/core/KinoPlay.java
index f45bdc4..f6bc575 100644
--- a/src/main/java/kinosearch/core/KinoPlay.java
+++ b/src/main/java/kinosearch/core/KinoPlay.java
@@ -4,15 +4,15 @@
  */
 package kinosearch.core;
 
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 public class KinoPlay {
     private String title;
     private KinoType type = KinoType.UNKNOW;
     private KinoItem oneFilm;
-    private ArrayList<KinoItem> serials;
-    private Map<String, ArrayList<KinoItem>> seasons;
+    private List<KinoItem> serials;
+    private Map<String, List<KinoItem>> seasons;
 
     public enum KinoType {
         UNKNOW, ONE_FILM, SIMPLE_SERIAL, SEASONS_SERIAL
@@ -42,19 +42,19 @@ public class KinoPlay {
         this.oneFilm = oneFilm;
     }
 
-    public ArrayList<KinoItem> getSerials() {
+    public List<KinoItem> getSerials() {
         return serials;
     }
 
-    public void setSerials(ArrayList<KinoItem> serials) {
+    public void setSerials(List<KinoItem> serials) {
         this.serials = serials;
     }
 
-    public Map<String, ArrayList<KinoItem>> getSeasons() {
+    public Map<String, List<KinoItem>> getSeasons() {
         return seasons;
     }
 
-    public void setSeasons(Map<String, ArrayList<KinoItem>> seasons) {
+    public void setSeasons(Map<String, List<KinoItem>> seasons) {
         this.seasons = seasons;
     }
 }
diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java
index 1f3d256..7a8da80 100644
--- a/src/main/java/kinosearch/core/warez/Onlinelife.java
+++ b/src/main/java/kinosearch/core/warez/Onlinelife.java
@@ -117,7 +117,7 @@ public class Onlinelife implements KinoWarez {
                 // сезонный сериал
                 kinoPlay.setType(KinoPlay.KinoType.SEASONS_SERIAL);
 
-                Map<String, ArrayList<KinoItem>> seasons = new HashMap<>();
+                Map<String, List<KinoItem>> seasons = new LinkedHashMap<>();
                 for (JsonElement element : jsonArray) {
                     jsonObj = element.getAsJsonObject();
                     String titleSeason = jsonObj.get("comment").getAsString();
@@ -132,6 +132,7 @@ public class Onlinelife implements KinoWarez {
                         ));
                     }
 
+                    serials.sort(Comparator.comparing(KinoItem::getTitle));
                     seasons.put(titleSeason, serials);
                 }
 
@@ -148,6 +149,7 @@ public class Onlinelife implements KinoWarez {
                             jsonObj.get("file").getAsString().replace("http://", "/proxy/onlinelife/")
                     ));
                 }
+                serials.sort(Comparator.comparing(KinoItem::getTitle));
                 kinoPlay.setSerials(serials);
             }
         }
diff --git a/src/main/java/kinosearch/webapp/KinoPlaySerializer.java b/src/main/java/kinosearch/webapp/KinoPlaySerializer.java
index 509c142..2382630 100644
--- a/src/main/java/kinosearch/webapp/KinoPlaySerializer.java
+++ b/src/main/java/kinosearch/webapp/KinoPlaySerializer.java
@@ -10,6 +10,7 @@ import kinosearch.core.KinoPlay;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 public class KinoPlaySerializer implements JsonSerializer<KinoPlay> {
@@ -68,7 +69,7 @@ public class KinoPlaySerializer implements JsonSerializer<KinoPlay> {
              */
             JsonArray jsonSeasons = new JsonArray();
 
-            for (Map.Entry<String, ArrayList<KinoItem>> entry : kinoPlay.getSeasons().entrySet()) {
+            for (Map.Entry<String, List<KinoItem>> entry : kinoPlay.getSeasons().entrySet()) {
                 JsonObject jsonSeason = new JsonObject();
                 jsonSeason.addProperty("title", entry.getKey());