diff --git a/source/net/sourceforge/filebot/web/SubsceneSubtitleClient.java b/source/net/sourceforge/filebot/web/SubsceneSubtitleClient.java index de6bf6dd..48c493b7 100644 --- a/source/net/sourceforge/filebot/web/SubsceneSubtitleClient.java +++ b/source/net/sourceforge/filebot/web/SubsceneSubtitleClient.java @@ -76,7 +76,7 @@ public class SubsceneSubtitleClient extends SubtitleClient { List nodes = XPathUtil.selectNodes("//TABLE[@class='filmSubtitleList']//A[@id]//ancestor::TR", dom); - ArrayList list = new ArrayList(); + List list = new ArrayList(); for (Node node : nodes) { try { @@ -87,8 +87,6 @@ public class SubsceneSubtitleClient extends SubtitleClient { String lang = XPathUtil.selectString("./SPAN[1]", linkNode); String name = XPathUtil.selectString("./SPAN[2]", linkNode); - int numberOfCDs = Integer.parseInt(XPathUtil.selectString("./TD[2]", node)); - boolean hearingImpaired = (XPathUtil.selectFirstNode("./TD[3]/*[@id='imgEar']", node) != null); String author = XPathUtil.selectString("./TD[4]", node); Matcher matcher = hrefPattern.matcher(href); @@ -101,7 +99,7 @@ public class SubsceneSubtitleClient extends SubtitleClient { URL downloadUrl = getDownloadUrl(url, subtitleId, typeId); - list.add(new SubsceneSubtitleDescriptor(name, lang, numberOfCDs, author, hearingImpaired, typeId, downloadUrl, url)); + list.add(new SubsceneSubtitleDescriptor(name, lang, author, typeId, downloadUrl, url)); } catch (Exception e) { Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.WARNING, "Cannot parse subtitle node", e); } diff --git a/source/net/sourceforge/filebot/web/SubsceneSubtitleDescriptor.java b/source/net/sourceforge/filebot/web/SubsceneSubtitleDescriptor.java index e13fffbf..fcff0bbc 100644 --- a/source/net/sourceforge/filebot/web/SubsceneSubtitleDescriptor.java +++ b/source/net/sourceforge/filebot/web/SubsceneSubtitleDescriptor.java @@ -11,9 +11,7 @@ public class SubsceneSubtitleDescriptor implements SubtitleDescriptor { private final String title; private final String language; - private final int numberOfCDs; private final String author; - private final boolean hearingImpaired; private final String typeId; @@ -21,12 +19,10 @@ public class SubsceneSubtitleDescriptor implements SubtitleDescriptor { private final URL referer; - public SubsceneSubtitleDescriptor(String title, String language, int numberOfCDs, String author, boolean hearingImpaired, String typeId, URL downloadUrl, URL referer) { + public SubsceneSubtitleDescriptor(String title, String language, String author, String typeId, URL downloadUrl, URL referer) { this.title = title; this.language = language; - this.numberOfCDs = numberOfCDs; this.author = author; - this.hearingImpaired = hearingImpaired; this.typeId = typeId; @@ -46,21 +42,11 @@ public class SubsceneSubtitleDescriptor implements SubtitleDescriptor { } - public int getNumberOfCDs() { - return numberOfCDs; - } - - public String getAuthor() { return author; } - public boolean getHearingImpaired() { - return hearingImpaired; - } - - @Override public DownloadTask createDownloadTask() { DownloadTask downloadTask = new DownloadTask(downloadUrl);