From 764d0fbcbc8d9e4bda25fc481897e4d3a8fb1227 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Mon, 11 May 2020 14:51:17 +0200 Subject: [PATCH] things --- .../OnDatastreamConfirmedListener.java | 7 +++++++ .../packethandler/OutgoingPacketHandler.java | 15 +++++++------- .../network/NetworkExtensionInfo.java | 20 +++++++++---------- .../executer/ExtensionRunnerFactory.java | 6 +----- 4 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 G-Earth/src/main/java/gearth/protocol/packethandler/OnDatastreamConfirmedListener.java diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/OnDatastreamConfirmedListener.java b/G-Earth/src/main/java/gearth/protocol/packethandler/OnDatastreamConfirmedListener.java new file mode 100644 index 0000000..fd6dabc --- /dev/null +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/OnDatastreamConfirmedListener.java @@ -0,0 +1,7 @@ +package gearth.protocol.packethandler; + +public interface OnDatastreamConfirmedListener { + + void confirm(String hotelVersion); + +} diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/OutgoingPacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/OutgoingPacketHandler.java index 4002c4b..da6eb2a 100644 --- a/G-Earth/src/main/java/gearth/protocol/packethandler/OutgoingPacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/OutgoingPacketHandler.java @@ -1,5 +1,6 @@ package gearth.protocol.packethandler; +import gearth.misc.listenerpattern.Observable; import gearth.protocol.HMessage; import gearth.protocol.HPacket; @@ -7,6 +8,7 @@ import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; public class OutgoingPacketHandler extends PacketHandler { @@ -14,12 +16,11 @@ public class OutgoingPacketHandler extends PacketHandler { super(outputStream, trafficObservables); } - private List onDatastreamConfirmedListeners = new ArrayList<>(); + + + private Observable datastreamConfirmedObservable = new Observable<>(); public void addOnDatastreamConfirmedListener(OnDatastreamConfirmedListener listener) { - onDatastreamConfirmedListeners.add(listener); - } - public interface OnDatastreamConfirmedListener { - void confirm(String hotelVersion); + datastreamConfirmedObservable.addListener(listener); } private void dataStreamCheck(byte[] buffer) { @@ -28,9 +29,7 @@ public class OutgoingPacketHandler extends PacketHandler { isDataStream = (hpacket.getBytesLength() > 6 && hpacket.length() < 100); if (isDataStream) { String version = hpacket.readString(); - for (OnDatastreamConfirmedListener listener : onDatastreamConfirmedListeners) { - listener.confirm(version); - } + datastreamConfirmedObservable.fireEvent(l -> l.confirm(version)); } } } diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionInfo.java b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionInfo.java index c2c8e5e..17d9f2e 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionInfo.java +++ b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionInfo.java @@ -81,20 +81,20 @@ public class NetworkExtensionInfo { public static class OUTGOING_MESSAGES_IDS { public static final int ONDOUBLECLICK = 1; - public static final int INFOREQUEST = 2; // backend: implemented - public static final int PACKETINTERCEPT = 3; // backend: implemented - public static final int FLAGSCHECK = 4; // backend: implemented - public static final int CONNECTIONSTART = 5; // backend: implemented - public static final int CONNECTIONEND = 6; // backend: implemented - public static final int INIT = 7; // backend: implemented + public static final int INFOREQUEST = 2; + public static final int PACKETINTERCEPT = 3; + public static final int FLAGSCHECK = 4; + public static final int CONNECTIONSTART = 5; + public static final int CONNECTIONEND = 6; + public static final int INIT = 7; } public static class INCOMING_MESSAGES_IDS { - public static final int EXTENSIONINFO = 1; // backend: implemented - public static final int MANIPULATEDPACKET = 2; // backend: implemented - public static final int REQUESTFLAGS = 3; // backend: implemented - public static final int SENDMESSAGE = 4; // backend: implemented + public static final int EXTENSIONINFO = 1; + public static final int MANIPULATEDPACKET = 2; + public static final int REQUESTFLAGS = 3; + public static final int SENDMESSAGE = 4; public static final int EXTENSIONCONSOLELOG = 98; } diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunnerFactory.java b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunnerFactory.java index 58e04d4..d0e21c0 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunnerFactory.java +++ b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunnerFactory.java @@ -5,13 +5,9 @@ package gearth.services.extensionhandler.extensions.implementations.network.exec */ public class ExtensionRunnerFactory { - private static ExtensionRunner runner = obtain(); + private static ExtensionRunner runner = new NormalExtensionRunner(); public static ExtensionRunner get() { return runner; } - - private static ExtensionRunner obtain() { - return new NormalExtensionRunner(); - } }