From 32849e6109de0659621f5ff21eb44aa4a4ce84fc Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 15 Jan 2017 11:54:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D1=83=D1=8E=D1=82=D1=81=D1=8F=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?= =?UTF-8?q?=D0=BE=20=D0=BA=D0=B8=D0=BD=D0=BE=D1=82=D0=B5=D0=B0=D1=82=D1=80?= =?UTF-8?q?=D1=8B,=20=D0=B8=D0=B7=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B?= =?UTF-8?q?=D1=85=20=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D1=82=D1=8F=D0=BD?= =?UTF-8?q?=D1=83=D1=82=D1=8C=20=D0=B2=D0=B8=D0=B4=D0=B5=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kinosearch/core/Kino.java | 17 ++------- .../kinosearch/core/warez/Onlinelife.java | 4 +-- .../java/kinosearch/core/warez/Seasonvar.java | 6 ++-- src/main/webapp/WEB-INF/index.html | 36 +++++++------------ 4 files changed, 17 insertions(+), 46 deletions(-) diff --git a/src/main/java/kinosearch/core/Kino.java b/src/main/java/kinosearch/core/Kino.java index 247265f..7e1320e 100644 --- a/src/main/java/kinosearch/core/Kino.java +++ b/src/main/java/kinosearch/core/Kino.java @@ -5,7 +5,6 @@ import kinosearch.core.warez.KinoWarez; public class Kino { private String name; private String url; - private boolean player = false; private KinoWarez kinowarez; public Kino(String name, String url, KinoWarez kinoWarez) { @@ -26,24 +25,12 @@ public class Kino { return url; } - public boolean hasPlayer() { - return player; - } - - public void setPlayer(boolean value) { - this.player = value; - } - public KinoWarez getKinowarez() { return kinowarez; } public String getPlayerUrl() { - if (player) { - String path = url.substring(kinowarez.getDomain().length()); - return kinowarez.getName().toLowerCase() + path; - } else { - return "#"; - } + String path = url.substring(kinowarez.getDomain().length()); + return kinowarez.getName().toLowerCase() + path; } } diff --git a/src/main/java/kinosearch/core/warez/Onlinelife.java b/src/main/java/kinosearch/core/warez/Onlinelife.java index 4ffa8c7..37bb474 100644 --- a/src/main/java/kinosearch/core/warez/Onlinelife.java +++ b/src/main/java/kinosearch/core/warez/Onlinelife.java @@ -73,9 +73,7 @@ public class Onlinelife implements KinoWarez { } name = name.replaceAll("\\[.+", "").trim(); - Kino kino = new Kino(name, url, this); - kino.setPlayer(true); - outList.add(kino); + outList.add(new Kino(name, url, this)); } return outList; diff --git a/src/main/java/kinosearch/core/warez/Seasonvar.java b/src/main/java/kinosearch/core/warez/Seasonvar.java index d11977e..73bad16 100644 --- a/src/main/java/kinosearch/core/warez/Seasonvar.java +++ b/src/main/java/kinosearch/core/warez/Seasonvar.java @@ -58,13 +58,11 @@ public class Seasonvar implements KinoWarez { List outList = new ArrayList<>(); for (int i = 0; i < suggestions.size(); i++) { - Kino kino = new Kino( + outList.add(new Kino( suggestions.get(i).getAsString(), DOMAIN + "/" + data.get(i).getAsString(), this - ); - kino.setPlayer(true); - outList.add(kino); + )); } return outList; diff --git a/src/main/webapp/WEB-INF/index.html b/src/main/webapp/WEB-INF/index.html index a66dc95..f2de89e 100644 --- a/src/main/webapp/WEB-INF/index.html +++ b/src/main/webapp/WEB-INF/index.html @@ -23,18 +23,12 @@
${kino_groupped.name}
- <#if kino_groupped.hasPlayer()> -
- на сайте -
-
- в плеере -
- <#else> -
- на сайте -
- +
+ на сайте +
+
+ в плеере +
@@ -47,18 +41,12 @@
${kino.name}
- <#if kino.hasPlayer()> -
- на сайте -
-
- в плеере -
- <#else> -
- на сайте -
- +
+ на сайте +
+
+ в плеере +