From f484b7965c9ad8d6151c6dd8c99cc9d04915d780 Mon Sep 17 00:00:00 2001 From: Anderson Mesquita Date: Sun, 21 Jul 2019 23:26:47 -0400 Subject: Reformat exceptions This also makes the variable and attribute names consistent with the standard `Exception` class. --- .../GpodnetServiceAuthenticationException.java | 1 - .../GpodnetServiceBadStatusCodeException.java | 2 - .../core/storage/DownloadRequestException.java | 25 ++++++----- .../handler/UnsupportedFeedtypeException.java | 50 +++++++++++----------- .../antennapod/core/util/InvalidFeedException.java | 27 ++++++------ .../util/exception/MediaFileNotFoundException.java | 18 ++++---- .../core/util/id3reader/ID3ReaderException.java | 23 +++++----- .../VorbisCommentReaderException.java | 30 ++++++------- 8 files changed, 83 insertions(+), 93 deletions(-) (limited to 'core/src/main') diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java index 8bd56218c..2f9c6b54c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceAuthenticationException.java @@ -17,5 +17,4 @@ public class GpodnetServiceAuthenticationException extends GpodnetServiceExcepti public GpodnetServiceAuthenticationException(Throwable cause) { super(cause); } - } diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java index 84c085ed2..3592cbc5a 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetServiceBadStatusCodeException.java @@ -7,6 +7,4 @@ class GpodnetServiceBadStatusCodeException extends GpodnetServiceException { super(message); this.statusCode = statusCode; } - - } diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java index c85559e20..35b41d0d2 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequestException.java @@ -6,20 +6,19 @@ package de.danoeh.antennapod.core.storage; */ public class DownloadRequestException extends Exception { - public DownloadRequestException() { - super(); - } + public DownloadRequestException() { + super(); + } - public DownloadRequestException(String detailMessage, Throwable throwable) { - super(detailMessage, throwable); - } + public DownloadRequestException(String message, Throwable cause) { + super(message, cause); + } - public DownloadRequestException(String detailMessage) { - super(detailMessage); - } - - public DownloadRequestException(Throwable throwable) { - super(throwable); - } + public DownloadRequestException(String message) { + super(message); + } + public DownloadRequestException(Throwable cause) { + super(cause); + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java index fd7d0a4e1..c9f9f19c8 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java @@ -3,44 +3,42 @@ package de.danoeh.antennapod.core.syndication.handler; import de.danoeh.antennapod.core.syndication.handler.TypeGetter.Type; public class UnsupportedFeedtypeException extends Exception { - private static final long serialVersionUID = 9105878964928170669L; - private final TypeGetter.Type type; - private String rootElement; - private String message = null; - - public UnsupportedFeedtypeException(Type type) { - super(); - this.type = type; - } + private static final long serialVersionUID = 9105878964928170669L; + private final TypeGetter.Type type; + private String rootElement; + private String message = null; + + public UnsupportedFeedtypeException(Type type) { + super(); + this.type = type; + } public UnsupportedFeedtypeException(Type type, String rootElement) { this.type = type; this.rootElement = rootElement; } - public UnsupportedFeedtypeException(String message) { - this.message = message; - type = Type.INVALID; - } + public UnsupportedFeedtypeException(String message) { + this.message = message; + type = Type.INVALID; + } public TypeGetter.Type getType() { - return type; - } + return type; + } public String getRootElement() { return rootElement; } @Override - public String getMessage() { - if (message != null) { - return message; - } else if (type == TypeGetter.Type.INVALID) { - return "Invalid type"; - } else { - return "Type " + type + " not supported"; - } - } - - + public String getMessage() { + if (message != null) { + return message; + } else if (type == TypeGetter.Type.INVALID) { + return "Invalid type"; + } else { + return "Type " + type + " not supported"; + } + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java b/core/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java index c98c2d82a..1e0cd2d9b 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/InvalidFeedException.java @@ -1,21 +1,22 @@ package de.danoeh.antennapod.core.util; -/** Thrown if a feed has invalid attribute values. */ +/** + * Thrown if a feed has invalid attribute values. + */ public class InvalidFeedException extends Exception { - public InvalidFeedException() { - } + public InvalidFeedException() { + } - public InvalidFeedException(String detailMessage) { - super(detailMessage); - } + public InvalidFeedException(String message) { + super(message); + } - public InvalidFeedException(Throwable throwable) { - super(throwable); - } - - public InvalidFeedException(String detailMessage, Throwable throwable) { - super(detailMessage, throwable); - } + public InvalidFeedException(Throwable cause) { + super(cause); + } + public InvalidFeedException(String message, Throwable cause) { + super(message, cause); + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java b/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java index 3000e2fa4..f9e2e9991 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java @@ -3,16 +3,16 @@ package de.danoeh.antennapod.core.util.exception; import de.danoeh.antennapod.core.feed.FeedMedia; public class MediaFileNotFoundException extends Exception { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - private final FeedMedia media; + private final FeedMedia media; - public MediaFileNotFoundException(String msg, FeedMedia media) { - super(msg); - this.media = media; - } + public MediaFileNotFoundException(String msg, FeedMedia media) { + super(msg); + this.media = media; + } - public FeedMedia getMedia() { - return media; - } + public FeedMedia getMedia() { + return media; + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java b/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java index 0c746d7e5..35f009d2d 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/id3reader/ID3ReaderException.java @@ -2,19 +2,18 @@ package de.danoeh.antennapod.core.util.id3reader; public class ID3ReaderException extends Exception { - public ID3ReaderException() { - } + public ID3ReaderException() { + } - public ID3ReaderException(String arg0) { - super(arg0); - } + public ID3ReaderException(String message) { + super(message); + } - public ID3ReaderException(Throwable arg0) { - super(arg0); - } - - public ID3ReaderException(String arg0, Throwable arg1) { - super(arg0, arg1); - } + public ID3ReaderException(Throwable message) { + super(message); + } + public ID3ReaderException(String message, Throwable cause) { + super(message, cause); + } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java b/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java index 89ab20db0..d7839a803 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentReaderException.java @@ -1,24 +1,20 @@ package de.danoeh.antennapod.core.util.vorbiscommentreader; -public class VorbisCommentReaderException extends Exception { - public VorbisCommentReaderException() { - super(); - // TODO Auto-generated constructor stub - } +public class VorbisCommentReaderException extends Exception { - public VorbisCommentReaderException(String arg0, Throwable arg1) { - super(arg0, arg1); - // TODO Auto-generated constructor stub - } + public VorbisCommentReaderException() { + super(); + } - public VorbisCommentReaderException(String arg0) { - super(arg0); - // TODO Auto-generated constructor stub - } + public VorbisCommentReaderException(String message, Throwable cause) { + super(message, cause); + } - public VorbisCommentReaderException(Throwable arg0) { - super(arg0); - // TODO Auto-generated constructor stub - } + public VorbisCommentReaderException(String message) { + super(message); + } + public VorbisCommentReaderException(Throwable message) { + super(message); + } } -- cgit v1.2.3