Skip to content

Commit f3e6b9a

Browse files
committed
feature: remove DebugStage
1 parent 0efa7d4 commit f3e6b9a

20 files changed

Lines changed: 12 additions & 402 deletions

File tree

panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/DebugStage.kt

Lines changed: 0 additions & 8 deletions
This file was deleted.

panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/interceptor/DebugStageInterceptor.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServerSelectedEvent.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,5 @@ package com.redmadrobot.debug.plugin.servers
22

33
import com.redmadrobot.debug.core.DebugEvent
44
import com.redmadrobot.debug.plugin.servers.data.model.DebugServer
5-
import com.redmadrobot.debug.plugin.servers.data.model.DebugStage
65

76
public data class ServerSelectedEvent(val debugServer: DebugServer) : DebugEvent
8-
9-
public data class StageSelectedEvent(val debugServer: DebugStage) : DebugEvent

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPlugin.kt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ import com.redmadrobot.debug.core.internal.EditablePlugin
88
import com.redmadrobot.debug.core.internal.PluginDependencyContainer
99
import com.redmadrobot.debug.core.plugin.Plugin
1010
import com.redmadrobot.debug.plugin.servers.data.model.DebugServer
11-
import com.redmadrobot.debug.plugin.servers.data.model.DebugServerData
12-
import com.redmadrobot.debug.plugin.servers.data.model.DebugStage
1311
import com.redmadrobot.debug.plugin.servers.ui.ServersScreen
1412
import kotlinx.coroutines.runBlocking
1513

1614
public class ServersPlugin(
17-
private val preInstalledServers: List<DebugServerData> = emptyList(),
15+
private val preInstalledServers: List<DebugServer> = emptyList(),
1816
) : Plugin(), EditablePlugin {
1917

2018
init {
@@ -34,14 +32,6 @@ public class ServersPlugin(
3432
public fun getDefaultServer(): DebugServer {
3533
return getPlugin<ServersPlugin>().getContainer<ServersPluginContainer>().serversRepository.getDefault()
3634
}
37-
38-
public fun getSelectedStage(): DebugStage? {
39-
return getPlugin<ServersPlugin>().getContainer<ServersPluginContainer>().stagesRepository.getSelectedStage()
40-
}
41-
42-
public fun getDefaultStage(): DebugStage? {
43-
return getPlugin<ServersPlugin>().getContainer<ServersPluginContainer>().stagesRepository.getDefault()
44-
}
4535
}
4636

4737
public constructor(preInstalledServers: DebugDataProvider<List<DebugServer>>) : this(

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPluginContainer.kt

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,27 @@ package com.redmadrobot.debug.plugin.servers
33
import com.redmadrobot.debug.core.internal.CommonContainer
44
import com.redmadrobot.debug.core.internal.PluginDependencyContainer
55
import com.redmadrobot.debug.plugin.servers.data.DebugServerRepository
6-
import com.redmadrobot.debug.plugin.servers.data.DebugStageRepository
76
import com.redmadrobot.debug.plugin.servers.data.model.DebugServer
8-
import com.redmadrobot.debug.plugin.servers.data.model.DebugServerData
9-
import com.redmadrobot.debug.plugin.servers.data.model.DebugStage
107
import com.redmadrobot.debug.plugin.servers.data.storage.ServersPluginDatabase
118
import com.redmadrobot.debug.plugin.servers.ui.ServersViewModel
129

1310
internal class ServersPluginContainer(
14-
private val preinstalledStages: List<DebugServerData>,
11+
private val preinstalledServers: List<DebugServer>,
1512
private val container: CommonContainer
1613
) : PluginDependencyContainer {
17-
1814
private val pluginStorage by lazy { ServersPluginDatabase.getInstance(container.context) }
1915

2016
val serversRepository by lazy {
2117
DebugServerRepository(
22-
container.context,
23-
pluginStorage.getDebugServersDao(),
24-
preinstalledStages.filterIsInstance<DebugServer>(),
25-
)
26-
}
27-
28-
val stagesRepository by lazy {
29-
DebugStageRepository(
30-
container.context,
31-
pluginStorage.getDebugStagesDao(),
32-
preinstalledStages.filterIsInstance<DebugStage>()
18+
context = container.context,
19+
debugServersDao = pluginStorage.getDebugServersDao(),
20+
preInstalledServers = preinstalledServers,
3321
)
3422
}
3523

3624
fun createServersViewModel(): ServersViewModel {
3725
return ServersViewModel(
3826
serversRepository,
39-
stagesRepository
4027
)
4128
}
4229
}

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugServerRepository.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ internal class DebugServerRepository(
1313
private val debugServersDao: DebugServersDao,
1414
private val preInstalledServers: List<DebugServer>
1515
) {
16-
1716
companion object {
1817
private const val SELECTED_SERVER_URL = "SELECTED_SERVER_URL"
1918
private const val SELECTED_SERVER_NAME = "SELECTED_SERVER_NAME"

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugStageRepository.kt

Lines changed: 0 additions & 66 deletions
This file was deleted.

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServer.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import androidx.room.PrimaryKey
66
@Entity(tableName = DebugServer.TABLE_NAME)
77
public data class DebugServer(
88
@PrimaryKey(autoGenerate = true)
9-
override val id: Int = 0,
10-
override val name: String,
9+
val id: Int = 0,
10+
val name: String,
1111
val url: String,
12-
override val isDefault: Boolean = false
13-
) : DebugServerData {
12+
val isDefault: Boolean = false
13+
) {
1414
internal companion object {
1515
const val TABLE_NAME = "debug_server"
1616
}

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServerData.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugStage.kt

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)