From 483339172906a0052a245b71862bab013199f248 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 9 Oct 2016 17:39:04 +0800 Subject: [PATCH] com.cedarsoftware.util.io.JsonReader requires a public constructor with no arguments (otherwise it'll try to find another constructor and call it with default values, e.g. null may change to 0) --- source/net/filebot/vfs/SimpleFileInfo.java | 8 ++++++-- source/net/filebot/web/AudioTrack.java | 3 ++- source/net/filebot/web/Episode.java | 8 ++++---- source/net/filebot/web/Movie.java | 4 ++-- source/net/filebot/web/MoviePart.java | 4 ++-- source/net/filebot/web/MultiEpisode.java | 4 ++-- source/net/filebot/web/SubtitleSearchResult.java | 4 ++++ 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/source/net/filebot/vfs/SimpleFileInfo.java b/source/net/filebot/vfs/SimpleFileInfo.java index f01f5aa7..2e954149 100644 --- a/source/net/filebot/vfs/SimpleFileInfo.java +++ b/source/net/filebot/vfs/SimpleFileInfo.java @@ -7,8 +7,12 @@ import java.util.Arrays; public class SimpleFileInfo implements FileInfo, Comparable { - private final String path; - private final long length; + private String path; + private long length; + + public SimpleFileInfo() { + // used by deserializer + } public SimpleFileInfo(String path, long length) { this.path = path; diff --git a/source/net/filebot/web/AudioTrack.java b/source/net/filebot/web/AudioTrack.java index 80e177be..ea36bcdb 100644 --- a/source/net/filebot/web/AudioTrack.java +++ b/source/net/filebot/web/AudioTrack.java @@ -20,7 +20,8 @@ public class AudioTrack implements Serializable { protected String mbid; // MusicBrainz Identifier - protected AudioTrack() { + public AudioTrack() { + // used by deserializer } public AudioTrack(AudioTrack other) { diff --git a/source/net/filebot/web/Episode.java b/source/net/filebot/web/Episode.java index acea85b6..81fa57d6 100644 --- a/source/net/filebot/web/Episode.java +++ b/source/net/filebot/web/Episode.java @@ -26,8 +26,8 @@ public class Episode implements Serializable { // extended series metadata protected SeriesInfo seriesInfo; - protected Episode() { - + public Episode() { + // used by deserializer } public Episode(Episode obj) { @@ -45,8 +45,8 @@ public class Episode implements Serializable { this.title = title; this.absolute = absolute; this.special = special; - this.airdate = (airdate == null ? null : airdate.clone()); - this.seriesInfo = (seriesInfo == null ? null : seriesInfo.clone()); + this.airdate = airdate == null ? null : airdate.clone(); + this.seriesInfo = seriesInfo == null ? null : seriesInfo.clone(); } public String getSeriesName() { diff --git a/source/net/filebot/web/Movie.java b/source/net/filebot/web/Movie.java index 59b95108..8bc92cba 100644 --- a/source/net/filebot/web/Movie.java +++ b/source/net/filebot/web/Movie.java @@ -14,8 +14,8 @@ public class Movie extends SearchResult { // optional movie name language hint protected String language; - protected Movie() { - // used by serializer + public Movie() { + // used by deserializer } public Movie(int imdbId) { diff --git a/source/net/filebot/web/MoviePart.java b/source/net/filebot/web/MoviePart.java index d9b14204..30c92cbc 100644 --- a/source/net/filebot/web/MoviePart.java +++ b/source/net/filebot/web/MoviePart.java @@ -5,8 +5,8 @@ public class MoviePart extends Movie { protected int partIndex; protected int partCount; - protected MoviePart() { - // used by serializer + public MoviePart() { + // used by deserializer } public MoviePart(MoviePart obj) { diff --git a/source/net/filebot/web/MultiEpisode.java b/source/net/filebot/web/MultiEpisode.java index dc2cb6ca..7bdbc2ba 100644 --- a/source/net/filebot/web/MultiEpisode.java +++ b/source/net/filebot/web/MultiEpisode.java @@ -11,8 +11,8 @@ public class MultiEpisode extends Episode { protected Episode[] episodes; - protected MultiEpisode() { - // used by serializer + public MultiEpisode() { + // used by deserializer } public MultiEpisode(Episode... episodes) { diff --git a/source/net/filebot/web/SubtitleSearchResult.java b/source/net/filebot/web/SubtitleSearchResult.java index 68ad7a90..343caec7 100644 --- a/source/net/filebot/web/SubtitleSearchResult.java +++ b/source/net/filebot/web/SubtitleSearchResult.java @@ -23,6 +23,10 @@ public class SubtitleSearchResult extends Movie { private Kind kind; private int score; + public SubtitleSearchResult() { + // used by deserializer + } + public SubtitleSearchResult(int imdbId, String name, int year, String kind, int score) { this(name, null, year, imdbId, -1, Locale.ENGLISH, Kind.forName(kind), score); }