Skip to content

unify progress dialogs (#23547) #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

unify progress dialogs (#23547) #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68398a5
replaced custom progress dialog with platform means (#23547)
adietish Sep 12, 2025
c04edb8
provided getter for DevWorkspace properties
adietish Sep 15, 2025
71811a6
renamed wizard steps to better reflect function
adietish Sep 16, 2025
74d1306
replaced InformationDialog by Messages.showMessageDialog
adietish Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions src/main/kotlin/com/redhat/devtools/gateway/DevSpacesConnection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ class DevSpacesConnection(private val devSpacesContext: DevSpacesContext) {
onDevWorkspaceStopped: () -> Unit,
): ThinClientHandle {
if (devSpacesContext.isConnected)
throw IOException(String.format("Already connected to %s", devSpacesContext.devWorkspace.metadata.name))
throw IOException(String.format("Already connected to %s", devSpacesContext.devWorkspace.name))

devSpacesContext.isConnected = true
try {
return doConnection(onConnected, onDevWorkspaceStopped, onDisconnected)
return doConnect(onConnected, onDevWorkspaceStopped, onDisconnected)
} catch (e: Exception) {
devSpacesContext.isConnected = false
throw e
Expand All @@ -43,7 +43,7 @@ class DevSpacesConnection(private val devSpacesContext: DevSpacesContext) {

@Throws(Exception::class)
@Suppress("UnstableApiUsage")
private fun doConnection(
private fun doConnect(
onConnected: () -> Unit,
onDevWorkspaceStopped: () -> Unit,
onDisconnected: () -> Unit
Expand Down Expand Up @@ -72,8 +72,8 @@ class DevSpacesConnection(private val devSpacesContext: DevSpacesContext) {
if (remoteIdeServer.waitServerTerminated())
DevWorkspaces(devSpacesContext.client)
.stop(
devSpacesContext.devWorkspace.metadata.namespace,
devSpacesContext.devWorkspace.metadata.name
devSpacesContext.devWorkspace.namespace,
devSpacesContext.devWorkspace.name
)
.also { onDevWorkspaceStopped() }
}
Expand All @@ -86,27 +86,23 @@ class DevSpacesConnection(private val devSpacesContext: DevSpacesContext) {

@Throws(IOException::class, ApiException::class)
private fun startAndWaitDevWorkspace() {
if (!devSpacesContext.devWorkspace.spec.started) {
if (!devSpacesContext.devWorkspace.started) {
DevWorkspaces(devSpacesContext.client)
.start(
devSpacesContext.devWorkspace.metadata.namespace,
devSpacesContext.devWorkspace.metadata.name
devSpacesContext.devWorkspace.namespace,
devSpacesContext.devWorkspace.name
)
}

if (!DevWorkspaces(devSpacesContext.client)
.waitPhase(
devSpacesContext.devWorkspace.metadata.namespace,
devSpacesContext.devWorkspace.metadata.name,
devSpacesContext.devWorkspace.namespace,
devSpacesContext.devWorkspace.name,
DevWorkspaces.RUNNING,
DevWorkspaces.RUNNING_TIMEOUT
)
) throw IOException(
String.format(
"DevWorkspace '%s' is not running after %d seconds",
devSpacesContext.devWorkspace.metadata.name,
DevWorkspaces.RUNNING_TIMEOUT
)
"DevWorkspace '${devSpacesContext.devWorkspace.name}' is not running after ${DevWorkspaces.RUNNING_TIMEOUT} seconds"
)
}
}
Loading
Loading