NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[no commit message]

Browse Source
This commit is contained in:
darksnake 2016-04-20 17:52:51 +03:00
parent 61ca41e1d2
commit 10f98472a8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
numass-control/msp/src/main/java/inr/numass/control/msp/fx/MspViewController.java
View File

@ -88,7 +88,7 @@ public class MspViewController implements Initializable, MspListener {
private final String mspName = "msp"; private final String mspName = "msp";
private TextArea logArea; private ConsoleWindow logArea;
private final ConfigChangeListener viewConfigObserver = new ConfigChangeListener() { private final ConfigChangeListener viewConfigObserver = new ConfigChangeListener() {
@ -131,8 +131,7 @@ public class MspViewController implements Initializable, MspListener {
*/ */
@Override @Override
public void initialize(URL url, ResourceBundle rb) { public void initialize(URL url, ResourceBundle rb) {
ConsoleWindow cw = new ConsoleWindow(consoleButton); logArea = new ConsoleWindow(consoleButton);
this.logArea = cw.getTextArea();
fillamentSelector.setItems(FXCollections.observableArrayList(1, 2)); fillamentSelector.setItems(FXCollections.observableArrayList(1, 2));
fillamentSelector.setConverter(new StringConverter<Integer>() { fillamentSelector.setConverter(new StringConverter<Integer>() {
@Override @Override
@ -296,21 +295,21 @@ public class MspViewController implements Initializable, MspListener {
@Override @Override
public void acceptMessage(String message) { public void acceptMessage(String message) {
Platform.runLater(() -> { Platform.runLater(() -> {
logArea.appendText("RECIEVE: " + message + "\r\n"); logArea.appendLine("RECIEVE: " + message);
}); });
} }
@Override @Override
public void acceptRequest(String message) { public void acceptRequest(String message) {
Platform.runLater(() -> { Platform.runLater(() -> {
logArea.appendText("SEND: " + message + "\r\n"); logArea.appendLine("SEND: " + message);
}); });
} }
@Override @Override
public void error(String errorMessage, Throwable error) { public void error(String errorMessage, Throwable error) {
Platform.runLater(() -> { Platform.runLater(() -> {
logArea.appendText("ERROR: " + errorMessage + "\r\n"); logArea.appendLine("ERROR: " + errorMessage);
showError(errorMessage); showError(errorMessage);
}); });