diff --git a/G-Earth/src/main/java/gearth/extensions/Extension.java b/G-Earth/src/main/java/gearth/extensions/Extension.java index 9294c61..c0c848b 100644 --- a/G-Earth/src/main/java/gearth/extensions/Extension.java +++ b/G-Earth/src/main/java/gearth/extensions/Extension.java @@ -5,11 +5,10 @@ import gearth.protocol.HMessage; import gearth.protocol.HPacket; import gearth.protocol.connection.HClient; import gearth.services.Constants; -import gearth.services.extensionhandler.extensions.implementations.network.NetworkExtensionInfo; +import gearth.services.extension_handler.extensions.implementations.network.NetworkExtensionInfo; import java.io.*; import java.net.Socket; -import java.util.ArrayList; /** * Created by Jonas on 23/06/18. diff --git a/G-Earth/src/main/java/gearth/extensions/InternalExtensionBuilder.java b/G-Earth/src/main/java/gearth/extensions/InternalExtensionBuilder.java index 07cb9e2..e6fa158 100644 --- a/G-Earth/src/main/java/gearth/extensions/InternalExtensionBuilder.java +++ b/G-Earth/src/main/java/gearth/extensions/InternalExtensionBuilder.java @@ -5,8 +5,8 @@ import gearth.services.packet_info.PacketInfoManager; import gearth.protocol.HMessage; import gearth.protocol.HPacket; import gearth.protocol.connection.HClient; -import gearth.services.extensionhandler.extensions.ExtensionType; -import gearth.services.extensionhandler.extensions.GEarthExtension; +import gearth.services.extension_handler.extensions.ExtensionType; +import gearth.services.extension_handler.extensions.GEarthExtension; // wraps internal GEarthExtension class to IExtension interface // to allow internal extensions that follow the same remote-extensions interface diff --git a/G-Earth/src/main/java/gearth/extensions/InternalExtensionFormBuilder.java b/G-Earth/src/main/java/gearth/extensions/InternalExtensionFormBuilder.java index 7ca824d..ee15a33 100644 --- a/G-Earth/src/main/java/gearth/extensions/InternalExtensionFormBuilder.java +++ b/G-Earth/src/main/java/gearth/extensions/InternalExtensionFormBuilder.java @@ -1,8 +1,8 @@ package gearth.extensions; import gearth.Main; -import gearth.services.extensionhandler.extensions.GEarthExtension; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; +import gearth.services.extension_handler.extensions.GEarthExtension; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver; import javafx.application.Platform; import javafx.stage.Stage; diff --git a/G-Earth/src/main/java/gearth/protocol/HConnection.java b/G-Earth/src/main/java/gearth/protocol/HConnection.java index f4fa37f..5d22167 100644 --- a/G-Earth/src/main/java/gearth/protocol/HConnection.java +++ b/G-Earth/src/main/java/gearth/protocol/HConnection.java @@ -9,7 +9,7 @@ import gearth.protocol.connection.proxy.ProxyProvider; import gearth.protocol.connection.proxy.ProxyProviderFactory; import gearth.protocol.connection.proxy.flash.unix.LinuxRawIpFlashProxyProvider; import gearth.protocol.connection.proxy.unity.UnityProxyProvider; -import gearth.services.extensionhandler.ExtensionHandler; +import gearth.services.extension_handler.ExtensionHandler; import java.io.IOException; diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/PacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/PacketHandler.java index 54d2226..1336b7d 100644 --- a/G-Earth/src/main/java/gearth/protocol/packethandler/PacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/PacketHandler.java @@ -3,7 +3,7 @@ package gearth.protocol.packethandler; import gearth.misc.listenerpattern.Observable; import gearth.protocol.HMessage; import gearth.protocol.TrafficListener; -import gearth.services.extensionhandler.ExtensionHandler; +import gearth.services.extension_handler.ExtensionHandler; import java.io.IOException; diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/flash/FlashPacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/flash/FlashPacketHandler.java index 245422f..44c2e59 100644 --- a/G-Earth/src/main/java/gearth/protocol/packethandler/flash/FlashPacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/flash/FlashPacketHandler.java @@ -4,12 +4,11 @@ import gearth.misc.listenerpattern.Observable; import gearth.protocol.HConnection; import gearth.protocol.HMessage; import gearth.protocol.HPacket; -import gearth.protocol.TrafficListener; import gearth.protocol.crypto.RC4; import gearth.protocol.packethandler.PacketHandler; import gearth.protocol.packethandler.PayloadBuffer; -import gearth.services.extensionhandler.ExtensionHandler; -import gearth.services.extensionhandler.OnHMessageHandled; +import gearth.services.extension_handler.ExtensionHandler; +import gearth.services.extension_handler.OnHMessageHandled; import java.io.IOException; import java.io.OutputStream; diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/flash/IncomingFlashPacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/flash/IncomingFlashPacketHandler.java index a7819aa..d51935c 100644 --- a/G-Earth/src/main/java/gearth/protocol/packethandler/flash/IncomingFlashPacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/flash/IncomingFlashPacketHandler.java @@ -4,7 +4,7 @@ import gearth.misc.listenerpattern.Observable; import gearth.protocol.HMessage; import gearth.protocol.HPacket; import gearth.protocol.TrafficListener; -import gearth.services.extensionhandler.ExtensionHandler; +import gearth.services.extension_handler.ExtensionHandler; import java.io.OutputStream; diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/flash/OutgoingFlashPacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/flash/OutgoingFlashPacketHandler.java index 84ddf7b..ee7e823 100644 --- a/G-Earth/src/main/java/gearth/protocol/packethandler/flash/OutgoingFlashPacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/flash/OutgoingFlashPacketHandler.java @@ -3,7 +3,7 @@ package gearth.protocol.packethandler.flash; import gearth.misc.listenerpattern.Observable; import gearth.protocol.HMessage; import gearth.protocol.HPacket; -import gearth.services.extensionhandler.ExtensionHandler; +import gearth.services.extension_handler.ExtensionHandler; import java.io.IOException; import java.io.OutputStream; diff --git a/G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java b/G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java index 5f3030d..2455bbc 100644 --- a/G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java +++ b/G-Earth/src/main/java/gearth/protocol/packethandler/unity/UnityPacketHandler.java @@ -4,9 +4,8 @@ import gearth.protocol.HMessage; import gearth.protocol.HPacket; import gearth.protocol.packethandler.ByteArrayUtils; import gearth.protocol.packethandler.PacketHandler; -import gearth.protocol.packethandler.PayloadBuffer; -import gearth.services.extensionhandler.ExtensionHandler; -import gearth.services.extensionhandler.OnHMessageHandled; +import gearth.services.extension_handler.ExtensionHandler; +import gearth.services.extension_handler.OnHMessageHandled; import javax.websocket.Session; import java.io.IOException; diff --git a/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionConnectedListener.java b/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionConnectedListener.java new file mode 100644 index 0000000..abb3f02 --- /dev/null +++ b/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionConnectedListener.java @@ -0,0 +1,7 @@ +package gearth.services.extension_handler; + +import gearth.services.extension_handler.extensions.GEarthExtension; + +public interface ExtensionConnectedListener { + void onExtensionConnect(GEarthExtension e); +} diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java b/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java similarity index 95% rename from G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java rename to G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java index b0b7175..5870c48 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/ExtensionHandler.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler; +package gearth.services.extension_handler; import gearth.Main; import gearth.misc.listenerpattern.Observable; @@ -6,12 +6,11 @@ import gearth.protocol.HConnection; import gearth.protocol.HMessage; import gearth.protocol.HPacket; import gearth.protocol.connection.HState; -import gearth.services.extensionhandler.extensions.ExtensionListener; -import gearth.services.extensionhandler.extensions.GEarthExtension; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerFactory; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; -import gearth.services.packet_info.PacketInfoManager; +import gearth.services.extension_handler.extensions.ExtensionListener; +import gearth.services.extension_handler.extensions.GEarthExtension; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducer; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerFactory; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver; import javafx.util.Pair; import java.io.IOException; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/OnHMessageHandled.java b/G-Earth/src/main/java/gearth/services/extension_handler/OnHMessageHandled.java similarity index 79% rename from G-Earth/src/main/java/gearth/services/extensionhandler/OnHMessageHandled.java rename to G-Earth/src/main/java/gearth/services/extension_handler/OnHMessageHandled.java index 8cce3f1..e618183 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/OnHMessageHandled.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/OnHMessageHandled.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler; +package gearth.services.extension_handler; import gearth.protocol.HMessage; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/ExtensionListener.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionListener.java similarity index 90% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/ExtensionListener.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionListener.java index 080c7c9..5e90397 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/ExtensionListener.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionListener.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler.extensions; +package gearth.services.extension_handler.extensions; import gearth.protocol.HMessage; import gearth.protocol.HPacket; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/ExtensionType.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionType.java similarity index 51% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/ExtensionType.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionType.java index 00d0358..4f7d2d6 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/ExtensionType.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/ExtensionType.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler.extensions; +package gearth.services.extension_handler.extensions; public enum ExtensionType { INTERNAL, diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/GEarthExtension.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/GEarthExtension.java similarity index 93% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/GEarthExtension.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/GEarthExtension.java index ffafecd..8310475 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/GEarthExtension.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/GEarthExtension.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler.extensions; +package gearth.services.extension_handler.extensions; import gearth.misc.listenerpattern.Observable; import gearth.misc.listenerpattern.SynchronizedObservable; @@ -6,9 +6,9 @@ import gearth.services.packet_info.PacketInfoManager; import gearth.protocol.HMessage; import gearth.protocol.HPacket; import gearth.protocol.connection.HClient; -import gearth.services.extensionhandler.extensions.listeners.OmRemoveClickListener; -import gearth.services.extensionhandler.extensions.listeners.OnClickListener; -import gearth.services.extensionhandler.extensions.listeners.OnDeleteListener; +import gearth.services.extension_handler.extensions.listeners.OmRemoveClickListener; +import gearth.services.extension_handler.extensions.listeners.OnClickListener; +import gearth.services.extension_handler.extensions.listeners.OnDeleteListener; public abstract class GEarthExtension { diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducer.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducer.java similarity index 58% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducer.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducer.java index 4f4902d..e482d1d 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducer.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducer.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler.extensions.extensionproducers; +package gearth.services.extension_handler.extensions.extensionproducers; public interface ExtensionProducer { diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerFactory.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducerFactory.java similarity index 59% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerFactory.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducerFactory.java index 40c0b83..bfb8dc2 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerFactory.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducerFactory.java @@ -1,10 +1,9 @@ -package gearth.services.extensionhandler.extensions.extensionproducers; +package gearth.services.extension_handler.extensions.extensionproducers; -import gearth.services.extensionhandler.extensions.implementations.network.NetworkExtensionsProducer; -import gearth.services.extensionhandler.extensions.implementations.simple.SimpleExtensionProducer; +import gearth.services.extension_handler.extensions.implementations.network.NetworkExtensionsProducer; +import gearth.services.extension_handler.extensions.implementations.simple.SimpleExtensionProducer; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class ExtensionProducerFactory { diff --git a/G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducerObserver.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducerObserver.java new file mode 100644 index 0000000..71548af --- /dev/null +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/extensionproducers/ExtensionProducerObserver.java @@ -0,0 +1,7 @@ +package gearth.services.extension_handler.extensions.extensionproducers; + +import gearth.services.extension_handler.extensions.GEarthExtension; + +public interface ExtensionProducerObserver { + void onExtensionProduced(GEarthExtension extension); +} diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtension.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtension.java similarity index 97% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtension.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtension.java index 7e46460..3100a76 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtension.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtension.java @@ -1,10 +1,10 @@ -package gearth.services.extensionhandler.extensions.implementations.network; +package gearth.services.extension_handler.extensions.implementations.network; import gearth.services.packet_info.PacketInfoManager; import gearth.protocol.HMessage; import gearth.protocol.connection.HClient; -import gearth.services.extensionhandler.extensions.ExtensionType; -import gearth.services.extensionhandler.extensions.GEarthExtension; +import gearth.services.extension_handler.extensions.ExtensionType; +import gearth.services.extension_handler.extensions.GEarthExtension; import gearth.protocol.HPacket; import java.io.DataInputStream; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionInfo.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionInfo.java similarity index 99% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionInfo.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionInfo.java index 9ea10e1..6ac87cb 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionInfo.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionInfo.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler.extensions.implementations.network; +package gearth.services.extension_handler.extensions.implementations.network; public class NetworkExtensionInfo { diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionsProducer.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionsProducer.java similarity index 89% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionsProducer.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionsProducer.java index d4448f8..527b801 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/NetworkExtensionsProducer.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionsProducer.java @@ -1,9 +1,9 @@ -package gearth.services.extensionhandler.extensions.implementations.network; +package gearth.services.extension_handler.extensions.implementations.network; import gearth.protocol.HPacket; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; -import gearth.services.extensionhandler.extensions.implementations.network.authentication.Authenticator; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducer; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver; +import gearth.services.extension_handler.extensions.implementations.network.authentication.Authenticator; import java.io.DataInputStream; import java.io.IOException; @@ -67,7 +67,7 @@ public class NetworkExtensionsProducer implements ExtensionProducer { observer.onExtensionProduced(gEarthExtension); } else { - gEarthExtension.close(); //you shall not pass... + gEarthExtension.close(); } break; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/authentication/Authenticator.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/authentication/Authenticator.java similarity index 94% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/authentication/Authenticator.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/authentication/Authenticator.java index 76c4df2..ebea488 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/authentication/Authenticator.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/authentication/Authenticator.java @@ -1,7 +1,7 @@ -package gearth.services.extensionhandler.extensions.implementations.network.authentication; +package gearth.services.extension_handler.extensions.implementations.network.authentication; import gearth.misc.ConfirmationDialog; -import gearth.services.extensionhandler.extensions.implementations.network.NetworkExtension; +import gearth.services.extension_handler.extensions.implementations.network.NetworkExtension; import javafx.application.Platform; import javafx.scene.control.Alert; import javafx.scene.control.ButtonType; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExecutionInfo.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExecutionInfo.java similarity index 95% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExecutionInfo.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExecutionInfo.java index 773a425..f8aa242 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExecutionInfo.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExecutionInfo.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler.extensions.implementations.network.executer; +package gearth.services.extension_handler.extensions.implementations.network.executer; import java.util.ArrayList; import java.util.HashMap; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunner.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExtensionRunner.java similarity index 78% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunner.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExtensionRunner.java index ba41dc0..0f8d1b3 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunner.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExtensionRunner.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler.extensions.implementations.network.executer; +package gearth.services.extension_handler.extensions.implementations.network.executer; /** * Created by Jonas on 21/09/18. 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/extension_handler/extensions/implementations/network/executer/ExtensionRunnerFactory.java similarity index 72% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunnerFactory.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExtensionRunnerFactory.java index d0e21c0..fd26dcb 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/ExtensionRunnerFactory.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/ExtensionRunnerFactory.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler.extensions.implementations.network.executer; +package gearth.services.extension_handler.extensions.implementations.network.executer; /** * Created by Jonas on 22/09/18. diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/NormalExtensionRunner.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/NormalExtensionRunner.java similarity index 96% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/NormalExtensionRunner.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/NormalExtensionRunner.java index 5ee7f68..bf91101 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/network/executer/NormalExtensionRunner.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/executer/NormalExtensionRunner.java @@ -1,7 +1,7 @@ -package gearth.services.extensionhandler.extensions.implementations.network.executer; +package gearth.services.extension_handler.extensions.implementations.network.executer; import gearth.Main; -import gearth.services.extensionhandler.extensions.implementations.network.authentication.Authenticator; +import gearth.services.extension_handler.extensions.implementations.network.authentication.Authenticator; import java.io.BufferedReader; import java.io.File; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/ExampleExtension.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/ExampleExtension.java similarity index 94% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/ExampleExtension.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/ExampleExtension.java index 3880c68..99f4e24 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/ExampleExtension.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/ExampleExtension.java @@ -1,11 +1,11 @@ -package gearth.services.extensionhandler.extensions.implementations.simple; +package gearth.services.extension_handler.extensions.implementations.simple; import gearth.services.packet_info.PacketInfoManager; import gearth.protocol.HMessage; import gearth.protocol.HPacket; import gearth.protocol.connection.HClient; -import gearth.services.extensionhandler.extensions.ExtensionType; -import gearth.services.extensionhandler.extensions.GEarthExtension; +import gearth.services.extension_handler.extensions.ExtensionType; +import gearth.services.extension_handler.extensions.GEarthExtension; public class ExampleExtension extends GEarthExtension { @Override diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/README.md b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/README.md similarity index 100% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/README.md rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/README.md diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/SimpleExtensionProducer.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/SimpleExtensionProducer.java similarity index 75% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/SimpleExtensionProducer.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/SimpleExtensionProducer.java index 25b753c..da2cb75 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/implementations/simple/SimpleExtensionProducer.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/simple/SimpleExtensionProducer.java @@ -1,8 +1,8 @@ -package gearth.services.extensionhandler.extensions.implementations.simple; +package gearth.services.extension_handler.extensions.implementations.simple; import gearth.extensions.InternalExtensionFormBuilder; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducer; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver; import gearth.services.internal_extensions.blockreplacepackets.BlockAndReplacePackets; import gearth.services.internal_extensions.packetinfoexplorer.PacketInfoExplorer; diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OmRemoveClickListener.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OmRemoveClickListener.java similarity index 50% rename from G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OmRemoveClickListener.java rename to G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OmRemoveClickListener.java index 93057e1..459cffc 100644 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OmRemoveClickListener.java +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OmRemoveClickListener.java @@ -1,4 +1,4 @@ -package gearth.services.extensionhandler.extensions.listeners; +package gearth.services.extension_handler.extensions.listeners; public interface OmRemoveClickListener { void onRemove(); diff --git a/G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OnClickListener.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OnClickListener.java new file mode 100644 index 0000000..d0f40fe --- /dev/null +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OnClickListener.java @@ -0,0 +1,5 @@ +package gearth.services.extension_handler.extensions.listeners; + +public interface OnClickListener { + void onClick(); +} diff --git a/G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OnDeleteListener.java b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OnDeleteListener.java new file mode 100644 index 0000000..8e70320 --- /dev/null +++ b/G-Earth/src/main/java/gearth/services/extension_handler/extensions/listeners/OnDeleteListener.java @@ -0,0 +1,5 @@ +package gearth.services.extension_handler.extensions.listeners; + +public interface OnDeleteListener { + void onDelete(); +} diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionConnectedListener.java b/G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionConnectedListener.java deleted file mode 100644 index 05bcb68..0000000 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionConnectedListener.java +++ /dev/null @@ -1,7 +0,0 @@ -package gearth.services.extensionhandler; - -import gearth.services.extensionhandler.extensions.GEarthExtension; - -public interface ExtensionConnectedListener { - void onExtensionConnect(GEarthExtension e); -} diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerObserver.java b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerObserver.java deleted file mode 100644 index 4903166..0000000 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerObserver.java +++ /dev/null @@ -1,7 +0,0 @@ -package gearth.services.extensionhandler.extensions.extensionproducers; - -import gearth.services.extensionhandler.extensions.GEarthExtension; - -public interface ExtensionProducerObserver { - void onExtensionProduced(GEarthExtension extension); -} diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OnClickListener.java b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OnClickListener.java deleted file mode 100644 index 4717872..0000000 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OnClickListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package gearth.services.extensionhandler.extensions.listeners; - -public interface OnClickListener { - void onClick(); -} diff --git a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OnDeleteListener.java b/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OnDeleteListener.java deleted file mode 100644 index fd8fbcf..0000000 --- a/G-Earth/src/main/java/gearth/services/extensionhandler/extensions/listeners/OnDeleteListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package gearth.services.extensionhandler.extensions.listeners; - -public interface OnDeleteListener { - void onDelete(); -} diff --git a/G-Earth/src/main/java/gearth/services/gpython/GPythonShell.java b/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java similarity index 98% rename from G-Earth/src/main/java/gearth/services/gpython/GPythonShell.java rename to G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java index 734e1f2..ad9d628 100644 --- a/G-Earth/src/main/java/gearth/services/gpython/GPythonShell.java +++ b/G-Earth/src/main/java/gearth/services/g_python/GPythonShell.java @@ -1,4 +1,4 @@ -package gearth.services.gpython; +package gearth.services.g_python; import gearth.Main; import gearth.ui.extra.ExtraController; @@ -11,11 +11,7 @@ import javafx.scene.layout.FlowPane; import javafx.scene.layout.Region; import java.io.*; -import java.net.URI; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/G-Earth/src/main/java/gearth/services/gpython/GPythonVersionUtils.java b/G-Earth/src/main/java/gearth/services/g_python/GPythonVersionUtils.java similarity index 98% rename from G-Earth/src/main/java/gearth/services/gpython/GPythonVersionUtils.java rename to G-Earth/src/main/java/gearth/services/g_python/GPythonVersionUtils.java index ee6e005..84f4378 100644 --- a/G-Earth/src/main/java/gearth/services/gpython/GPythonVersionUtils.java +++ b/G-Earth/src/main/java/gearth/services/g_python/GPythonVersionUtils.java @@ -1,4 +1,4 @@ -package gearth.services.gpython; +package gearth.services.g_python; import org.apache.maven.artifact.versioning.ComparableVersion; diff --git a/G-Earth/src/main/java/gearth/services/gpython/OnQtConsoleLaunch.java b/G-Earth/src/main/java/gearth/services/g_python/OnQtConsoleLaunch.java similarity index 69% rename from G-Earth/src/main/java/gearth/services/gpython/OnQtConsoleLaunch.java rename to G-Earth/src/main/java/gearth/services/g_python/OnQtConsoleLaunch.java index 8414672..e0d8a13 100644 --- a/G-Earth/src/main/java/gearth/services/gpython/OnQtConsoleLaunch.java +++ b/G-Earth/src/main/java/gearth/services/g_python/OnQtConsoleLaunch.java @@ -1,4 +1,4 @@ -package gearth.services.gpython; +package gearth.services.g_python; public interface OnQtConsoleLaunch { diff --git a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java b/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java index 12729b5..86738f1 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java +++ b/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java @@ -1,7 +1,7 @@ package gearth.ui.extensions; -import gearth.services.extensionhandler.extensions.ExtensionType; -import gearth.services.extensionhandler.extensions.GEarthExtension; +import gearth.services.extension_handler.extensions.ExtensionType; +import gearth.services.extension_handler.extensions.GEarthExtension; import javafx.application.Platform; import javafx.event.EventHandler; import javafx.geometry.Insets; @@ -13,10 +13,10 @@ import javafx.scene.paint.Paint; import javafx.scene.text.Font; import gearth.misc.ConfirmationDialog; import gearth.ui.buttons.*; -import gearth.services.extensionhandler.extensions.implementations.network.executer.ExecutionInfo; -import gearth.services.extensionhandler.extensions.implementations.network.executer.ExtensionRunner; -import gearth.services.extensionhandler.extensions.implementations.network.executer.ExtensionRunnerFactory; -import gearth.services.extensionhandler.extensions.implementations.network.executer.NormalExtensionRunner; +import gearth.services.extension_handler.extensions.implementations.network.executer.ExecutionInfo; +import gearth.services.extension_handler.extensions.implementations.network.executer.ExtensionRunner; +import gearth.services.extension_handler.extensions.implementations.network.executer.ExtensionRunnerFactory; +import gearth.services.extension_handler.extensions.implementations.network.executer.NormalExtensionRunner; import java.nio.file.Paths; diff --git a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java b/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java index 3ce3ba0..6bc2a2e 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java +++ b/G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java @@ -1,6 +1,6 @@ package gearth.ui.extensions; -import gearth.services.extensionhandler.extensions.GEarthExtension; +import gearth.services.extension_handler.extensions.GEarthExtension; import javafx.scene.Node; import javafx.scene.control.ScrollPane; import javafx.scene.layout.VBox; diff --git a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionsController.java b/G-Earth/src/main/java/gearth/ui/extensions/ExtensionsController.java index 214acea..979b073 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/ExtensionsController.java +++ b/G-Earth/src/main/java/gearth/ui/extensions/ExtensionsController.java @@ -1,31 +1,23 @@ package gearth.ui.extensions; -import gearth.Main; -import gearth.services.extensionhandler.ExtensionConnectedListener; -import gearth.services.extensionhandler.ExtensionHandler; -import gearth.services.extensionhandler.extensions.ExtensionListener; -import gearth.services.extensionhandler.extensions.GEarthExtension; -import gearth.services.extensionhandler.extensions.implementations.network.NetworkExtensionsProducer; -import gearth.services.extensionhandler.extensions.implementations.network.authentication.Authenticator; -import gearth.services.extensionhandler.extensions.implementations.network.executer.ExecutionInfo; -import gearth.services.extensionhandler.extensions.implementations.network.executer.ExtensionRunner; -import gearth.services.extensionhandler.extensions.implementations.network.executer.ExtensionRunnerFactory; -import gearth.services.gpython.GPythonShell; -import gearth.services.gpython.OnQtConsoleLaunch; +import gearth.services.extension_handler.ExtensionHandler; +import gearth.services.extension_handler.extensions.ExtensionListener; +import gearth.services.extension_handler.extensions.implementations.network.NetworkExtensionsProducer; +import gearth.services.extension_handler.extensions.implementations.network.authentication.Authenticator; +import gearth.services.extension_handler.extensions.implementations.network.executer.ExecutionInfo; +import gearth.services.extension_handler.extensions.implementations.network.executer.ExtensionRunner; +import gearth.services.extension_handler.extensions.implementations.network.executer.ExtensionRunnerFactory; +import gearth.services.g_python.GPythonShell; import gearth.ui.SubForm; import gearth.ui.extensions.logger.ExtensionLogger; -import gearth.ui.extra.ExtraController; import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.scene.control.*; -import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import javafx.scene.layout.Region; import javafx.scene.layout.VBox; import javafx.stage.FileChooser; import java.io.File; -import java.io.IOException; /** * Created by Jonas on 06/04/18. diff --git a/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java b/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java index ee0ca80..2bfb373 100644 --- a/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java +++ b/G-Earth/src/main/java/gearth/ui/extra/ExtraController.java @@ -6,7 +6,7 @@ import gearth.protocol.HConnection; import gearth.protocol.connection.HState; import gearth.protocol.connection.proxy.ProxyProviderFactory; import gearth.protocol.connection.proxy.SocksConfiguration; -import gearth.services.gpython.GPythonVersionUtils; +import gearth.services.g_python.GPythonVersionUtils; import gearth.ui.SubForm; import gearth.ui.info.InfoController; import javafx.application.Platform; diff --git a/G-Earth/src/main/java/gearth/ui/logger/LoggerController.java b/G-Earth/src/main/java/gearth/ui/logger/LoggerController.java index 905cf1d..1eba104 100644 --- a/G-Earth/src/main/java/gearth/ui/logger/LoggerController.java +++ b/G-Earth/src/main/java/gearth/ui/logger/LoggerController.java @@ -1,8 +1,6 @@ package gearth.ui.logger; -import gearth.extensions.parsers.HDirection; import gearth.protocol.connection.HState; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer; import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.scene.control.Button; @@ -12,14 +10,12 @@ import javafx.scene.input.KeyCode; import javafx.scene.paint.Color; import javafx.scene.text.Text; import javafx.scene.text.TextFlow; -import gearth.protocol.HConnection; import gearth.protocol.HMessage; import gearth.ui.SubForm; import gearth.ui.logger.loggerdisplays.PacketLogger; import gearth.ui.logger.loggerdisplays.PacketLoggerFactory; import java.util.Calendar; -import java.util.function.Predicate; public class LoggerController extends SubForm { diff --git a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java index cc1b41b..ef53e90 100644 --- a/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java +++ b/G-Earth/src/main/java/gearth/ui/logger/loggerdisplays/PacketLoggerFactory.java @@ -3,9 +3,9 @@ package gearth.ui.logger.loggerdisplays; import gearth.Main; import gearth.extensions.InternalExtensionFormBuilder; import gearth.misc.OSValidator; -import gearth.services.extensionhandler.ExtensionHandler; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer; -import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver; +import gearth.services.extension_handler.ExtensionHandler; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducer; +import gearth.services.extension_handler.extensions.extensionproducers.ExtensionProducerObserver; import gearth.services.internal_extensions.uilogger.UiLogger; /** diff --git a/G-Earth/src/main/resources/gearth/services/gpython/init_script.py b/G-Earth/src/main/resources/gearth/services/g_python/init_script.py similarity index 100% rename from G-Earth/src/main/resources/gearth/services/gpython/init_script.py rename to G-Earth/src/main/resources/gearth/services/g_python/init_script.py