afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

corefx - updated terminal and session dialogs to leverage javafx tasks for running background work

Browse source
This commit is contained in:
Blake J. Harnden 2018-11-30 16:02:28 -08:00
parent 3025287486
commit e37caedf61
2 changed files with 96 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

160
corefx/src/main/java/com/core/ui/dialogs/SessionsDialog.java
View file

@ -5,6 +5,7 @@ import com.core.data.SessionOverview;
import com.core.data.SessionState; import com.core.data.SessionState;
import com.core.ui.Toast; import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXButton;
import javafx.concurrent.Task;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.TableColumn; import javafx.scene.control.TableColumn;
import javafx.scene.control.TableView; import javafx.scene.control.TableView;
@ -26,17 +27,36 @@ public class SessionsDialog extends StageDialog {
@FXML private TableColumn<SessionRow, String> stateColumn; @FXML private TableColumn<SessionRow, String> stateColumn;
@FXML private TableColumn<SessionRow, Integer> nodeCountColumn; @FXML private TableColumn<SessionRow, Integer> nodeCountColumn;
private final ExecutorService executorService = Executors.newSingleThreadExecutor(); private final ExecutorService executorService = Executors.newSingleThreadExecutor();
private final JFXButton joinButton;
private final JFXButton deleteButton;
public SessionsDialog(Controller controller) { public SessionsDialog(Controller controller) {
super(controller, "/fxml/sessions_dialog.fxml"); super(controller, "/fxml/sessions_dialog.fxml");
setTitle("Sessions"); setTitle("Sessions");
// add dialog buttons // add dialog buttons
addCreateButton(); JFXButton createButton = createButton("New");
deleteButton = createDeleteButton(); createButton.setOnAction(event -> {
joinButton = createJoinButton(); logger.info("creating new session");
executorService.submit(new CreateSessionTask());
});
JFXButton deleteButton = createButton("Delete");
deleteButton.setDisable(true);
deleteButton.setOnAction(event -> {
SessionRow row = sessionsTable.getSelectionModel().getSelectedItem();
Integer sessionId = row.getId();
logger.info("deleting session: {}", sessionId);
executorService.submit(new DeleteSessionTask(row, sessionId));
});
JFXButton joinButton = createButton("Join");
joinButton.setDisable(true);
joinButton.setOnAction(event -> {
SessionRow row = sessionsTable.getSelectionModel().getSelectedItem();
Integer sessionId = row.getId();
logger.info("joining session: {}", sessionId);
executorService.submit(new JoinSessionTask(sessionId));
});
addCancelButton(); addCancelButton();
// update table cell factories // update table cell factories
@ -57,66 +77,81 @@ public class SessionsDialog extends StageDialog {
}); });
} }
private void addCreateButton() { private class CreateSessionTask extends Task<Integer> {
JFXButton createButton = createButton("New"); @Override
createButton.setOnAction(event -> { protected Integer call() throws Exception {
logger.info("creating new session"); SessionOverview sessionOverview = getCoreClient().createSession();
executorService.submit(() -> { Integer sessionId = sessionOverview.getId();
try { getController().joinSession(sessionId);
SessionOverview sessionOverview = getCoreClient().createSession(); return sessionId;
getController().joinSession(sessionOverview.getId()); }
Toast.success(String.format("Created Session %s", sessionOverview.getId()));
} catch (IOException ex) { @Override
Toast.error("Error creating new session", ex); protected void succeeded() {
} Toast.success(String.format("Created Session %s", getValue()));
});
close(); close();
}); }
@Override
protected void failed() {
Toast.error("Error creating new session", new RuntimeException(getException()));
}
} }
private JFXButton createJoinButton() { private class JoinSessionTask extends Task<Void> {
JFXButton button = createButton("Join"); private Integer sessionId;
button.setDisable(true);
button.setOnAction(event -> { JoinSessionTask(Integer sessionId) {
SessionRow row = sessionsTable.getSelectionModel().getSelectedItem(); this.sessionId = sessionId;
Integer sessionId = row.getId(); }
logger.info("joining session: {}", sessionId);
executorService.submit(() -> { @Override
try { protected Void call() throws Exception {
getController().joinSession(sessionId); getController().joinSession(sessionId);
Toast.info(String.format("Joined Session %s", sessionId)); return null;
} catch (IOException ex) { }
Toast.error(String.format("Error joining session: %s", sessionId), ex);
} @Override
}); protected void succeeded() {
Toast.info(String.format("Joined Session %s", sessionId));
close(); close();
}); }
return button;
@Override
protected void failed() {
Toast.error(String.format("Error joining session: %s", sessionId), new RuntimeException(getException()));
}
} }
private JFXButton createDeleteButton() { private class DeleteSessionTask extends Task<Boolean> {
JFXButton button = createButton("Delete"); private SessionRow row;
button.setDisable(true); private Integer sessionId;
button.setOnAction(event -> {
SessionRow row = sessionsTable.getSelectionModel().getSelectedItem(); DeleteSessionTask(SessionRow row, Integer sessionId) {
Integer sessionId = row.getId(); this.row = row;
logger.info("deleting session: {}", sessionId); this.sessionId = sessionId;
executorService.submit(() -> { }
try {
boolean result = getCoreClient().deleteSession(sessionId); @Override
if (result) { protected Boolean call() throws Exception {
sessionsTable.getItems().remove(row); return getCoreClient().deleteSession(sessionId);
sessionsTable.getSelectionModel().clearSelection(); }
Toast.info(String.format("Deleted Session %s", sessionId));
} else { @Override
Toast.error(String.format("Failure to delete session %s", sessionId)); protected void succeeded() {
} if (getValue()) {
} catch (IOException ex) { sessionsTable.getItems().remove(row);
Toast.error(String.format("Error deleting session: %s", sessionId), ex); sessionsTable.getSelectionModel().clearSelection();
} Toast.info(String.format("Deleted Session %s", sessionId));
}); } else {
}); Toast.error(String.format("Failure to delete session %s", sessionId));
return button; }
}
@Override
protected void failed() {
Toast.error(String.format("Error deleting session: %s", sessionId), new RuntimeException(getException()));
}
} }
@Data @Data
@ -135,13 +170,8 @@ public class SessionsDialog extends StageDialog {
public void showDialog() throws IOException { public void showDialog() throws IOException {
List<SessionOverview> sessions = getCoreClient().getSessions(); List<SessionOverview> sessions = getCoreClient().getSessions();
List<SessionRow> rows = sessions.stream().map(SessionRow::new).collect(Collectors.toList()); List<SessionRow> rows = sessions.stream().map(SessionRow::new).collect(Collectors.toList());
sessionsTable.getSelectionModel().clearSelection();
sessionsTable.getItems().setAll(rows); sessionsTable.getItems().setAll(rows);
show(); show();
} }
@Override
public void close() {
sessionsTable.getSelectionModel().clearSelection();
super.close();
}
} }

2
corefx/src/main/java/com/core/ui/dialogs/TerminalDialog.java
View file

@ -52,7 +52,7 @@ public class TerminalDialog extends StageDialog {
@Override @Override
protected void failed() { protected void failed() {
Toast.error("Failed sending terminal command"); Toast.error("Failed sending terminal command", new RuntimeException(getException()));
} }
} }