Skip to content

Commit 5f82539

Browse files
Code cleanup
1 parent 6766d2a commit 5f82539

File tree

10 files changed

+17
-18
lines changed

10 files changed

+17
-18
lines changed

manami-app/src/main/kotlin/io/github/manamiproject/manami/app/commands/GenericReversibleCommand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ internal class GenericReversibleCommand(
4949
}
5050

5151
private sealed class StatefulSnapshot
52-
private object Uninitialized : StatefulSnapshot()
52+
private data object Uninitialized : StatefulSnapshot()
5353
private data class Initialized(val snapshot: Snapshot) : StatefulSnapshot()

manami-app/src/main/kotlin/io/github/manamiproject/manami/app/commands/history/SimpleEventStream.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ internal class SimpleEventStream<T> : EventStream<T> {
6363
}
6464

6565
private sealed class Events
66-
private object InitialState : Events()
66+
private data object InitialState : Events()
6767
private data class Event<T>(val element: T) : Events()

manami-app/src/main/kotlin/io/github/manamiproject/manami/app/search/SearchHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ interface SearchHandler {
1313

1414
fun findSeason(season: AnimeSeason, metaDataProvider: Hostname)
1515

16-
fun findByTag(tags: Set<Tag>, metaDataProvider: Hostname, searchType: SearchType = AND, status: Set<Anime.Status> = Anime.Status.values().toSet())
16+
fun findByTag(tags: Set<Tag>, metaDataProvider: Hostname, searchType: SearchType = AND, status: Set<Anime.Status> = Anime.Status.entries.toSet())
1717

1818
fun findSimilarAnime(uri: URI)
1919

manami-app/src/main/kotlin/io/github/manamiproject/manami/app/state/InternalState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,5 @@ internal object InternalState : State {
9898
}
9999

100100
internal sealed class OpenedFile
101-
internal object NoFile : OpenedFile()
101+
internal data object NoFile : OpenedFile()
102102
internal data class CurrentFile(val regularFile: RegularFile) : OpenedFile()

manami-gui/src/main/kotlin/io/github/manamiproject/manami/gui/animelist/AnimeForm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class AnimeForm: Fragment() {
116116

117117
field("Type") {
118118
combobox<String>(selectedType) {
119-
items = FXCollections.observableArrayList(Anime.Type.values().map { it.toString() })
119+
items = FXCollections.observableArrayList(Anime.Type.entries.map { it.toString() })
120120
disableProperty().bindBidirectional(disableTypeProperty)
121121
}
122122
}

manami-gui/src/main/kotlin/io/github/manamiproject/manami/gui/animelist/SimpleAnimeFormTriggerProperty.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import io.github.manamiproject.manami.gui.animelist.AnimeFormTrigger.CREATE_CUST
44
import io.github.manamiproject.modb.core.extensions.EMPTY
55
import javafx.beans.property.ObjectPropertyBase
66

7-
class SimpleAnimeFormTriggerProperty(private var initialValue: AnimeFormTrigger = CREATE_CUSTOM): ObjectPropertyBase<AnimeFormTrigger>(initialValue) {
7+
class SimpleAnimeFormTriggerProperty(initialValue: AnimeFormTrigger = CREATE_CUSTOM): ObjectPropertyBase<AnimeFormTrigger>(initialValue) {
88

99
override fun getBean(): Any = this
1010
override fun getName(): String = EMPTY

manami-gui/src/main/kotlin/io/github/manamiproject/manami/gui/animelist/SimpleAnimeListEntryProperty.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import io.github.manamiproject.manami.app.lists.animelist.AnimeListEntry
44
import io.github.manamiproject.modb.core.extensions.EMPTY
55
import javafx.beans.property.ObjectPropertyBase
66

7-
class SimpleAnimeListEntryProperty(private val initialValue: AnimeListEntry? = null): ObjectPropertyBase<AnimeListEntry>(initialValue) {
7+
class SimpleAnimeListEntryProperty(initialValue: AnimeListEntry? = null): ObjectPropertyBase<AnimeListEntry>(initialValue) {
88

99
override fun getBean(): Any = this
1010
override fun getName(): String = EMPTY

manami-gui/src/main/kotlin/io/github/manamiproject/manami/gui/animelist/SimpleAnimeProperty.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import io.github.manamiproject.modb.core.extensions.EMPTY
44
import io.github.manamiproject.modb.core.models.Anime
55
import javafx.beans.property.ObjectPropertyBase
66

7-
class SimpleAnimeProperty(private val initialValue: Anime? = null): ObjectPropertyBase<Anime>(initialValue) {
7+
class SimpleAnimeProperty(initialValue: Anime? = null): ObjectPropertyBase<Anime>(initialValue) {
88

99
override fun getBean(): Any = this
1010
override fun getName(): String = EMPTY

manami-gui/src/main/kotlin/io/github/manamiproject/manami/gui/events/GuiEvents.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.github.manamiproject.manami.gui.events
22

3-
import io.github.manamiproject.manami.app.events.Event
43
import io.github.manamiproject.manami.app.inconsistencies.animelist.episodes.EpisodeDiff
54
import io.github.manamiproject.manami.app.inconsistencies.animelist.metadata.AnimeListMetaDataDiff
65
import io.github.manamiproject.manami.app.lists.Link
@@ -17,7 +16,7 @@ sealed class GuiEvent : FXEvent()
1716
data class FileOpenedGuiEvent(val fileName: String): GuiEvent()
1817
data class SavedAsFileGuiEvent(val fileName: String): GuiEvent()
1918
data class FileSavedStatusChangedGuiEvent(val isFileSaved: Boolean): GuiEvent()
20-
object CachePopulatorFinishedGuiEvent: GuiEvent()
19+
data object CachePopulatorFinishedGuiEvent: GuiEvent()
2120
data class UndoRedoStatusGuiEvent(val isUndoPossible: Boolean, val isRedoPossible: Boolean): GuiEvent()
2221
data class NewVersionAvailableGuiEvent(val version: SemanticVersion): GuiEvent()
2322

@@ -32,7 +31,7 @@ data class RemoveAnimeListEntryGuiEvent(val entries: Set<AnimeListEntry>) : GuiE
3231
data class AddWatchListEntryGuiEvent(val entries: Set<WatchListEntry>) : GuiEvent()
3332
data class RemoveWatchListEntryGuiEvent(val entries: Set<WatchListEntry>) : GuiEvent()
3433
data class AddWatchListStatusUpdateGuiEvent(val finishedTasks: Int, val tasks: Int): GuiEvent()
35-
object AnimeEntryFinishedGuiEvent: GuiEvent()
34+
data object AnimeEntryFinishedGuiEvent: GuiEvent()
3635

3736
// IgnoreList
3837
data class AddIgnoreListEntryGuiEvent(val entries: Set<IgnoreListEntry>) : GuiEvent()
@@ -42,16 +41,16 @@ data class AddIgnoreListStatusUpdateGuiEvent(val finishedTasks: Int, val tasks:
4241
// Related Anime
4342
data class AnimeListRelatedAnimeFoundGuiEvent(val anime: Anime): GuiEvent()
4443
data class AnimeListRelatedAnimeStatusGuiEvent(val finishedChecking: Int, val toBeChecked: Int): GuiEvent()
45-
object AnimeListRelatedAnimeFinishedGuiEvent: GuiEvent()
44+
data object AnimeListRelatedAnimeFinishedGuiEvent: GuiEvent()
4645

4746
// IgnoreList Search
4847
data class IgnoreListRelatedAnimeFoundGuiEvent(val anime: Anime): GuiEvent()
4948
data class IgnoreListRelatedAnimeStatusGuiEvent(val finishedChecking: Int, val toBeChecked: Int): GuiEvent()
50-
object IgnoreListRelatedAnimeFinishedGuiEvent: GuiEvent()
49+
data object IgnoreListRelatedAnimeFinishedGuiEvent: GuiEvent()
5150

5251
// Anime Season
5352
data class AnimeSeasonEntryFoundGuiEvent(val anime: Anime): GuiEvent()
54-
object AnimeSeasonSearchFinishedGuiEvent: GuiEvent()
53+
data object AnimeSeasonSearchFinishedGuiEvent: GuiEvent()
5554

5655
// File Search
5756
data class FileSearchAnimeListResultsGuiEvent(val anime: Collection<AnimeListEntry>): GuiEvent()
@@ -60,11 +59,11 @@ data class FileSearchIgnoreListResultsGuiEvent(val anime: Collection<IgnoreListE
6059

6160
// Anime Search
6261
data class AnimeSearchEntryFoundGuiEvent(val anime: Anime): GuiEvent()
63-
object AnimeSearchFinishedGuiEvent: GuiEvent()
62+
data object AnimeSearchFinishedGuiEvent: GuiEvent()
6463
data class AnimeEntryFoundGuiEvent(val anime: Anime): GuiEvent()
6564

6665
// Similar Anime Search
67-
object SimilarAnimeSearchFinishedGuiEvent: GuiEvent()
66+
data object SimilarAnimeSearchFinishedGuiEvent: GuiEvent()
6867
data class SimilarAnimeFoundGuiEvent(val entries: List<Anime>) : GuiEvent()
6968

7069
// Inconsistencies
@@ -74,7 +73,7 @@ data class DeadEntriesInconsistenciesResultGuiEvent(val numberOfAffectedEntries:
7473
data class AnimeListMetaDataInconsistenciesResultGuiEvent(val diff: AnimeListMetaDataDiff): GuiEvent()
7574
data class AnimeListDeadEntriesInconsistenciesResultGuiEvent(val entries: Collection<AnimeListEntry>): GuiEvent()
7675
data class AnimeListEpisodesInconsistenciesResultGuiEvent(val entries: Collection<EpisodeDiff>): GuiEvent()
77-
object InconsistenciesCheckFinishedGuiEvent: GuiEvent()
76+
data object InconsistenciesCheckFinishedGuiEvent: GuiEvent()
7877

7978
// Meta Data Provider Migration
8079
data class MetaDataProviderMigrationGuiEvent(val finishedTasks: Int, val tasks: Int): GuiEvent()

manami-gui/src/main/kotlin/io/github/manamiproject/manami/gui/main/TabPaneView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class TabPaneView : View() {
7474
subscribe<ShowSimilarAnimeSearchTabRequest> {
7575
tabPane.openTab("Similar Anime") { add(similarAnimeSearchView.root) }
7676
}
77-
subscribe<ShowMetaDataProviderMigrationViewTabRequest>() {
77+
subscribe<ShowMetaDataProviderMigrationViewTabRequest> {
7878
tabPane.openTab("Meta Data Provider Migration") { add(metaDataProviderMigrationView.root) }
7979
}
8080
}

0 commit comments

Comments
 (0)