Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move interrupt message to ShellMessageBuilder

Browse Source 
- Relates #761
This commit is contained in:
Janne Valkealahti
2023-08-30 09:18:17 +03:00
parent a3ca69bc72
commit aa3c580220
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-shell-core/src/main/java/org/springframework/shell/component/ViewComponent.java
View File

@@ -17,7 +17,6 @@ package org.springframework.shell.component;
import org.jline.terminal.Terminal; import org.jline.terminal.Terminal;
import org.springframework.messaging.Message;
import org.springframework.shell.component.view.TerminalUI; import org.springframework.shell.component.view.TerminalUI;
import org.springframework.shell.component.view.control.View; import org.springframework.shell.component.view.control.View;
import org.springframework.shell.component.view.control.ViewDoneEvent; import org.springframework.shell.component.view.control.ViewDoneEvent;
@@ -66,11 +65,7 @@ public class ViewComponent {
if (eventLoop == null) { if (eventLoop == null) {
return; return;
} }
Message<String> msg = ShellMessageBuilder.withPayload("int") eventLoop.dispatch(ShellMessageBuilder.ofInterrupt());
.setEventType(EventLoop.Type.SYSTEM)
.setPriority(0)
.build();
eventLoop.dispatch(msg);
} }
} }

12
spring-shell-core/src/main/java/org/springframework/shell/component/view/message/ShellMessageBuilder.java
View File

@@ -71,6 +71,18 @@ public final class ShellMessageBuilder<T> {
.build(); .build();
} }
/**
* Create a {@code interrupt} message.
*
* @return a interrupt message
*/
public static Message<String> ofInterrupt() {
return new ShellMessageBuilder<>("int", null)
.setEventType(EventLoop.Type.SYSTEM)
.setPriority(0)
.build();
}
/** /**
* Create a message of a {@link MouseEvent}. * Create a message of a {@link MouseEvent}.
* *

7
spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/Catalog.java
View File

@@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.messaging.Message;
import org.springframework.shell.component.view.TerminalUI; import org.springframework.shell.component.view.TerminalUI;
import org.springframework.shell.component.view.control.AppView; import org.springframework.shell.component.view.control.AppView;
import org.springframework.shell.component.view.control.AppView.AppViewEvent; import org.springframework.shell.component.view.control.AppView.AppViewEvent;
@@ -116,11 +115,7 @@ public class Catalog {
} }
private void requestQuit() { private void requestQuit() {
Message<String> msg = ShellMessageBuilder.withPayload("int") eventLoop.dispatch(ShellMessageBuilder.ofInterrupt());
.setEventType(EventLoop.Type.SYSTEM)
.setPriority(0)
.build();
eventLoop.dispatch(msg);
} }
/** /**