Merge pull request #186 from JLLeitschuh/fix/textAreaSocketPreviewView

ThomasJClark · ThomasJClark · commit e70e2aa9eb90 · 2015-12-08T01:37:03.000-05:00
Fix TextAreaSocketPreviewView after Optional Refactor
diff --git a/ui/src/main/java/edu/wpi/grip/ui/preview/TextAreaSocketPreviewView.java b/ui/src/main/java/edu/wpi/grip/ui/preview/TextAreaSocketPreviewView.java
@@ -24,7 +24,7 @@ public TextAreaSocketPreviewView(EventBus eventBus, OutputSocket<T> socket) {
 
         this.setStyle("-fx-pref-width: 20em;");
 
-        this.text = new TextArea(socket.getValue().toString());
+        this.text = new TextArea(socket.getValue().orElse((T)"").toString());
         text.setEditable(false);
 
         this.setContent(text);
@@ -35,7 +35,7 @@ public void onSocketChanged(SocketChangedEvent event) {
         final Socket socket = event.getSocket();
 
         if (socket == this.getSocket()) {
-            this.text.setText(socket.getValue().toString());
+            this.text.setText(socket.getValue().orElse("").toString());
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public TextAreaSocketPreviewView(EventBus eventBus, OutputSocket<T> socket) {`
`24`	`24`
`25`	`25`	`this.setStyle("-fx-pref-width: 20em;");`
`26`	`26`
`27`		`- this.text = new TextArea(socket.getValue().toString());`
	`27`	`+ this.text = new TextArea(socket.getValue().orElse((T)"").toString());`
`28`	`28`	`text.setEditable(false);`
`29`	`29`
`30`	`30`	`this.setContent(text);`
`@@ -35,7 +35,7 @@ public void onSocketChanged(SocketChangedEvent event) {`
`35`	`35`	`final Socket socket = event.getSocket();`
`36`	`36`
`37`	`37`	`if (socket == this.getSocket()) {`
`38`		`- this.text.setText(socket.getValue().toString());`
	`38`	`+ this.text.setText(socket.getValue().orElse("").toString());`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`