From c350a5e0936bfdd4c557c9c80ac9547bca1c9caf Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Fri, 28 Jun 2019 13:09:10 +0200 Subject: [PATCH] =?utf8?q?=F0=9F=8E=A8=20Replace=20post=20events=20with=20?= =?utf8?q?Kotlin=20versions?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../sone/core/event/MarkPostKnownEvent.kt | 33 --------------- .../net/pterodactylus/sone/core/event/PostEvent.kt | 49 ---------------------- .../net/pterodactylus/sone/web/WebInterface.java | 2 +- .../sone/core/event/MarkPostKnownEvent.kt | 26 ++++++++++++ .../net/pterodactylus/sone/core/event/PostEvent.kt | 25 +++++++++++ 5 files changed, 52 insertions(+), 83 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/core/event/MarkPostKnownEvent.kt delete mode 100644 src/main/java/net/pterodactylus/sone/core/event/PostEvent.kt create mode 100644 src/main/kotlin/net/pterodactylus/sone/core/event/MarkPostKnownEvent.kt create mode 100644 src/main/kotlin/net/pterodactylus/sone/core/event/PostEvent.kt diff --git a/src/main/java/net/pterodactylus/sone/core/event/MarkPostKnownEvent.kt b/src/main/java/net/pterodactylus/sone/core/event/MarkPostKnownEvent.kt deleted file mode 100644 index 0f12a86..0000000 --- a/src/main/java/net/pterodactylus/sone/core/event/MarkPostKnownEvent.kt +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Sone - MarkPostKnownEvent.java - Copyright © 2013–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.core.event - -import net.pterodactylus.sone.data.Post - -/** - * Event that signals that a [Post] has been marked as - * [known][Post.isKnown]. - */ -class MarkPostKnownEvent -/** - * Creates a new “post marked known” event. - * - * @param post - * The post that was marked as known - */ -(post: Post) : PostEvent(post) diff --git a/src/main/java/net/pterodactylus/sone/core/event/PostEvent.kt b/src/main/java/net/pterodactylus/sone/core/event/PostEvent.kt deleted file mode 100644 index 04d46c6..0000000 --- a/src/main/java/net/pterodactylus/sone/core/event/PostEvent.kt +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Sone - PostEvent.java - Copyright © 2013–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.core.event - -import net.pterodactylus.sone.data.Post - -/** - * Base class for post events. - */ -open class PostEvent -/** - * Creates a new post event. - * - * @param post - * The post the event is about - */ -protected constructor( - /** The post the event is about. */ - private val post: Post) { - - // - // ACCESSORS - // - - /** - * Returns the post the event is about. - * - * @return The post the event is about - */ - fun post(): Post { - return post - } - -} diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java index 0ed9e47..c78ad53 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -839,7 +839,7 @@ public class WebInterface implements SessionProvider { @Subscribe public void markPostKnown(MarkPostKnownEvent markPostKnownEvent) { - removePost(markPostKnownEvent.post()); + removePost(markPostKnownEvent.getPost()); } @Subscribe diff --git a/src/main/kotlin/net/pterodactylus/sone/core/event/MarkPostKnownEvent.kt b/src/main/kotlin/net/pterodactylus/sone/core/event/MarkPostKnownEvent.kt new file mode 100644 index 0000000..96e8d7f --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/core/event/MarkPostKnownEvent.kt @@ -0,0 +1,26 @@ +/* + * Sone - MarkPostKnownEvent.kt - Copyright © 2013–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.core.event + +import net.pterodactylus.sone.data.* + +/** + * Event that signals that a [Post] has been marked as + * [known][Post.isKnown]. + */ +class MarkPostKnownEvent(post: Post) : PostEvent(post) diff --git a/src/main/kotlin/net/pterodactylus/sone/core/event/PostEvent.kt b/src/main/kotlin/net/pterodactylus/sone/core/event/PostEvent.kt new file mode 100644 index 0000000..55a3f99 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/core/event/PostEvent.kt @@ -0,0 +1,25 @@ +/* + * Sone - PostEvent.kt - Copyright © 2013–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.core.event + +import net.pterodactylus.sone.data.* + +/** + * Base class for post events. + */ +abstract class PostEvent(val post: Post) -- 2.7.4