From 9f0014437a6d0628662ba30a8537c9ce310e2692 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sat, 2 Nov 2019 17:38:30 +0100 Subject: [PATCH] =?utf8?q?=F0=9F=8E=A8=20Replace=20PluginException=20with?= =?utf8?q?=20Kotlin=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../sone/freenet/plugin/PluginException.java | 66 ---------------------- .../sone/freenet/wot/WebOfTrustException.java | 65 --------------------- .../sone/freenet/plugin/FredPluginConnector.kt | 2 +- .../sone/freenet/plugin/PluginException.kt | 25 ++++++++ .../sone/freenet/wot/WebOfTrustException.kt | 24 ++++++++ 5 files changed, 50 insertions(+), 132 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/freenet/plugin/PluginException.java delete mode 100644 src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustException.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/freenet/plugin/PluginException.kt create mode 100644 src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustException.kt diff --git a/src/main/java/net/pterodactylus/sone/freenet/plugin/PluginException.java b/src/main/java/net/pterodactylus/sone/freenet/plugin/PluginException.java deleted file mode 100644 index e263a60..0000000 --- a/src/main/java/net/pterodactylus/sone/freenet/plugin/PluginException.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Sone - PluginException.java - Copyright © 2010–2019 David Roden - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.pterodactylus.sone.freenet.plugin; - -import net.pterodactylus.sone.freenet.wot.WebOfTrustException; - -/** - * Exception that signals an error when communicating with a plugin. - */ -public class PluginException extends WebOfTrustException { - - /** - * Creates a new plugin exception. - */ - public PluginException() { - super(); - } - - /** - * Creates a new plugin exception. - * - * @param message - * The message of the exception - */ - public PluginException(String message) { - super(message); - } - - /** - * Creates a new plugin exception. - * - * @param cause - * The cause of the exception - */ - public PluginException(Throwable cause) { - super(cause); - } - - /** - * Creates a new plugin exception. - * - * @param message - * The message of the exception - * @param cause - * The cause of the exception - */ - public PluginException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustException.java b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustException.java deleted file mode 100644 index 954fe04..0000000 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustException.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Sone - WebOfTrustException.java - Copyright © 2010–2019 David Roden - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.pterodactylus.sone.freenet.wot; - -/** - * Exception that signals an error processing web of trust identities, mostly - * when communicating with the web of trust plugin. - */ -public class WebOfTrustException extends Exception { - - /** - * Creates a new web of trust exception. - */ - public WebOfTrustException() { - super(); - } - - /** - * Creates a new web of trust exception. - * - * @param message - * The message of the exception - */ - public WebOfTrustException(String message) { - super(message); - } - - /** - * Creates a new web of trust exception. - * - * @param cause - * The cause of the exception - */ - public WebOfTrustException(Throwable cause) { - super(cause); - } - - /** - * Creates a new web of trust exception. - * - * @param message - * The message of the exception - * @param cause - * The cause of the exception - */ - public WebOfTrustException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt index 9852e61..45afb36 100644 --- a/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt +++ b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt @@ -30,7 +30,7 @@ class FredPluginConnector @Inject constructor(private val pluginRespiratorFacade receivedReply.receive() } } catch (e: PluginNotFoundException) { - throw PluginException(e) + throw PluginException(cause = e) } } diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/PluginException.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/PluginException.kt new file mode 100644 index 0000000..8515f0c --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/PluginException.kt @@ -0,0 +1,25 @@ +/* + * Sone - PluginException.java - Copyright © 2010–2019 David Roden + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.sone.freenet.plugin + +import net.pterodactylus.sone.freenet.wot.* + +/** + * Exception that signals an error when communicating with a plugin. + */ +class PluginException(message: String? = null, cause: Throwable? = null) : WebOfTrustException(message, cause) diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustException.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustException.kt new file mode 100644 index 0000000..a3ba9aa --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustException.kt @@ -0,0 +1,24 @@ +/* + * Sone - WebOfTrustException.java - Copyright © 2010–2019 David Roden + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.sone.freenet.wot + +/** + * Exception that signals an error processing web of trust identities, mostly + * when communicating with the web of trust plugin. + */ +open class WebOfTrustException(message: String? = null, cause: Throwable?) : Exception(message, cause) -- 2.7.4