1 files changed, 36 insertions, 5 deletions

diff --git a/language-web/src/main/java/tools/refinery/language/web/xtext/XtextWebSocketOkResponse.java b/language-web/src/main/java/tools/refinery/language/web/xtext/XtextWebSocketOkResponse.java
index 4ef1768b..aa453544 100644
--- a/language-web/src/main/java/tools/refinery/language/web/xtext/XtextWebSocketOkResponse.java
+++ b/language-web/src/main/java/tools/refinery/language/web/xtext/XtextWebSocketOkResponse.java
@@ -2,24 +2,46 @@ package tools.refinery.language.web.xtext;
 
 import java.util.Objects;
 
+import org.eclipse.xtext.web.server.IServiceResult;
+import org.eclipse.xtext.web.server.IUnwrappableServiceResult;
+
 import com.google.gson.annotations.SerializedName;
 
 public final class XtextWebSocketOkResponse implements XtextWebSocketResponse {
         private String id;
 
+        private int index;
+
         @SerializedName("response")
         private Object responseData;
 
-        @Override
+        public XtextWebSocketOkResponse(String id, int index, Object responseData) {
+                super();
+                this.id = id;
+                this.index = index;
+                this.responseData = responseData;
+        }
+
+        public XtextWebSocketOkResponse(XtextWebSocketRequest request, int index, IServiceResult result) {
+                this(request.getId(), index, maybeUnwrap(result));
+        }
+
         public String getId() {
                 return id;
         }
 
-        @Override
         public void setId(String id) {
                 this.id = id;
         }
 
+        public int getIndex() {
+                return index;
+        }
+
+        public void setIndex(int index) {
+                this.index = index;
+        }
+
         public Object getResponseData() {
                 return responseData;
         }
@@ -30,7 +52,7 @@ public final class XtextWebSocketOkResponse implements XtextWebSocketResponse {
 
         @Override
         public int hashCode() {
-                return Objects.hash(id, responseData);
+                return Objects.hash(id, index, responseData);
         }
 
         @Override
@@ -42,11 +64,20 @@ public final class XtextWebSocketOkResponse implements XtextWebSocketResponse {
                 if (getClass() != obj.getClass())
                         return false;
                 XtextWebSocketOkResponse other = (XtextWebSocketOkResponse) obj;
-                return Objects.equals(id, other.id) && Objects.equals(responseData, other.responseData);
+                return Objects.equals(id, other.id) && index == other.index && Objects.equals(responseData, other.responseData);
         }
 
         @Override
         public String toString() {
-                return "XtextWebSocketResponse [id=" + id + ", responseData=" + responseData + "]";
+                return "XtextWebSocketOkResponse [id=" + id + ", index=" + index + ", responseData=" + responseData + "]";
+        }
+
+        private static Object maybeUnwrap(IServiceResult result) {
+                if (result instanceof IUnwrappableServiceResult unwrappableServiceResult
+                                && unwrappableServiceResult.getContent() != null) {
+                        return unwrappableServiceResult.getContent();
+                } else {
+                        return result;
+                }
         }
 }