From f91ef591986194f6ed7c4b25b455126eb5048317 Mon Sep 17 00:00:00 2001
From: Patrick Hammer <patham9@gmail.com>
Date: Tue, 12 Jun 2018 14:16:26 -0400
Subject: [PATCH] Refactor: HTTP Nar: Use interfaces as Robert suggested.
---
src/main/java/org/opennars/web/httpnar/NARConnection.java | 7 ++++---
src/main/java/org/opennars/web/httpnar/NARServer.java | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/opennars/web/httpnar/NARConnection.java b/src/main/java/org/opennars/web/httpnar/NARConnection.java
index a10cb8a69..7ea69c022 100644
--- a/src/main/java/org/opennars/web/httpnar/NARConnection.java
+++ b/src/main/java/org/opennars/web/httpnar/NARConnection.java
@@ -20,6 +20,7 @@
package org.opennars.web.httpnar;
+import org.opennars.interfaces.pub.Reasoner;
import org.opennars.main.Nar;
import org.opennars.io.events.TextOutputHandler;
import org.opennars.io.events.TextOutputHandler.LineOutput;
@@ -29,17 +30,17 @@ import org.opennars.io.events.TextOutputHandler.LineOutput;
* @author me
*/
abstract public class NARConnection implements LineOutput {
- public final Nar nar;
+ public final Reasoner nar;
protected final TextOutputHandler writer;
int cycleIntervalMS;
//private final TextReaction extraParser;
- public NARConnection(Nar nar, int cycleIntervalMS) {
+ public NARConnection(Reasoner nar, int cycleIntervalMS) {
this.nar = nar;
this.cycleIntervalMS = cycleIntervalMS;
- this.writer = new TextOutputHandler(nar, this);
+ this.writer = new TextOutputHandler((Nar) nar, this);
}
public void read(final String message) {
diff --git a/src/main/java/org/opennars/web/httpnar/NARServer.java b/src/main/java/org/opennars/web/httpnar/NARServer.java
index 8a0b423a3..fdf482f02 100644
--- a/src/main/java/org/opennars/web/httpnar/NARServer.java
+++ b/src/main/java/org/opennars/web/httpnar/NARServer.java
@@ -23,6 +23,7 @@ import org.java_websocket.WebSocket;
import org.java_websocket.WebSocketImpl;
import org.java_websocket.handshake.ClientHandshake;
import org.java_websocket.server.WebSocketServer;
+import org.opennars.interfaces.pub.Reasoner;
import org.opennars.main.Nar;
public class NARServer {
@@ -42,7 +43,7 @@ public class NARServer {
public void onStart() {
}
- public Nar nar;
+ public Reasoner nar;
@Override
public void onOpen(final WebSocket conn, ClientHandshake handshake) {
--
GitLab