From d9c05b2975baa3cbb076e6dc5af126b9cde9ee5a Mon Sep 17 00:00:00 2001 From: Luca Warmenhoven Date: Tue, 28 May 2024 14:08:12 +0200 Subject: [PATCH] But crack --- .../src/main/java/com/example/fitbot/exercise/Exercise.java | 5 +++-- .../main/java/com/example/fitbot/util/server/WebServer.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/Exercise.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/Exercise.java index e4a8fb6..2354325 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/Exercise.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/exercise/Exercise.java @@ -3,13 +3,14 @@ package com.example.fitbot.exercise; import android.util.Log; import com.example.fitbot.util.path.GesturePath; +import com.example.fitbot.util.processing.IMotionDataConsumer; import com.example.fitbot.util.server.IWebServerHandler; import com.example.fitbot.util.server.WebServer; import java.util.Objects; import java.util.function.Consumer; -public class Exercise implements Consumer { +public class Exercise implements IWebServerHandler { private EMuscleGroup muscleGroup; private GesturePath path; @@ -128,7 +129,7 @@ public class Exercise implements Consumer { } @Override - public void accept(String message) { + public void onReceive(String message) { } } diff --git a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/WebServer.java b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/WebServer.java index f3462f7..9fc3c4d 100644 --- a/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/WebServer.java +++ b/code/src/Fitbot/app/src/main/java/com/example/fitbot/util/server/WebServer.java @@ -17,7 +17,7 @@ import java.util.function.Consumer; public class WebServer implements Runnable { private ServerSocket serverSocket; - protected Consumer eventHandler = (input) -> {}; // No-op. + protected IWebServerHandler eventHandler = (input) -> {}; // No-op. private Thread thread; private AtomicBoolean forceClose = new AtomicBoolean(false); @@ -72,7 +72,7 @@ public class WebServer implements Runnable { newSocket.close(); - this.eventHandler.accept(builder.toString()); + this.eventHandler.onReceive(builder.toString()); } catch (IOException error) { String reason = error.getMessage() == null ? "Unknown reason" : error.getMessage(); @@ -105,7 +105,7 @@ public class WebServer implements Runnable { * - onDisconnected(Socket) * - onError(Socket, String) */ - public void setEventHandler(Consumer handler) { + public void setEventHandler(IWebServerHandler handler) { this.eventHandler = handler; }