nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 08:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename extensionserver to extensionhandler

Browse Source
This commit is contained in:
sirjonasxx 2020-04-26 02:43:40 +02:00
parent 15628b5eec
commit eb8f6afecd
22 changed files with 56 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
G-Earth/src/main/java/gearth/extensions/Extension.java
View File

@ -2,9 +2,7 @@ package gearth.extensions;
import gearth.protocol.HMessage;
import gearth.protocol.HPacket;
import gearth.services.extensionserver.ExtensionServer;
import gearth.services.extensionserver.extensions.network.NetworkExtensionInfo;
import gearth.ui.extensions.Extensions;
import gearth.services.extensionhandler.extensions.network.NetworkExtensionInfo;
import java.io.*;
import java.net.Socket;

16
G-Earth/src/main/java/gearth/services/extensionserver/ExtensionServer.java → G-Earth/src/main/java/gearth/services/extensionhandler/ExtensionHandler.java
View File

@ -1,26 +1,26 @@
package gearth.services.extensionserver;
package gearth.services.extensionhandler;
import gearth.Main;
import gearth.misc.harble_api.HarbleAPIFetcher;
import gearth.protocol.HConnection;
import gearth.protocol.HMessage;
import gearth.protocol.HPacket;
import gearth.services.extensionserver.extensions.ExtensionListener;
import gearth.services.extensionserver.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionserver.extensions.extensionproducers.ExtensionProducerFactory;
import gearth.services.extensionserver.extensions.extensionproducers.ExtensionProducerObserver;
import gearth.services.extensionserver.extensions.GEarthExtension;
import gearth.services.extensionhandler.extensions.ExtensionListener;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerFactory;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver;
import gearth.services.extensionhandler.extensions.GEarthExtension;
import java.util.*;
public class ExtensionServer {
public class ExtensionHandler {
private final List<GEarthExtension> gEarthExtensions = new ArrayList<>();
private final HConnection hConnection;
private List<ExtensionProducer> extensionProducers;
public ExtensionServer(HConnection hConnection) {
public ExtensionHandler(HConnection hConnection) {
this.hConnection = hConnection;
initialize();
}

2
G-Earth/src/main/java/gearth/services/extensionserver/extensions/ExtensionListener.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/ExtensionListener.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionserver.extensions;
package gearth.services.extensionhandler.extensions;
import gearth.protocol.HMessage;
import gearth.protocol.HPacket;

2
G-Earth/src/main/java/gearth/services/extensionserver/extensions/GEarthExtension.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/GEarthExtension.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionserver.extensions;
package gearth.services.extensionhandler.extensions;
import gearth.protocol.HMessage;
import gearth.protocol.HPacket;

2
G-Earth/src/main/java/gearth/services/extensionserver/extensions/extensionproducers/ExtensionProducer.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducer.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionserver.extensions.extensionproducers;
package gearth.services.extensionhandler.extensions.extensionproducers;
public interface ExtensionProducer {

6
G-Earth/src/main/java/gearth/services/extensionserver/extensions/extensionproducers/ExtensionProducerFactory.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerFactory.java
View File

@ -1,7 +1,7 @@
package gearth.services.extensionserver.extensions.extensionproducers;
package gearth.services.extensionhandler.extensions.extensionproducers;
import gearth.services.extensionserver.extensions.network.NetworkExtensionsProducer;
import gearth.services.extensionserver.extensions.simple.SimpleExtensionProducer;
import gearth.services.extensionhandler.extensions.network.NetworkExtensionsProducer;
import gearth.services.extensionhandler.extensions.simple.SimpleExtensionProducer;
import java.util.Arrays;
import java.util.List;

7
G-Earth/src/main/java/gearth/services/extensionhandler/extensions/extensionproducers/ExtensionProducerObserver.java Normal file
View File

@ -0,0 +1,7 @@
package gearth.services.extensionhandler.extensions.extensionproducers;
import gearth.services.extensionhandler.extensions.GEarthExtension;
public interface ExtensionProducerObserver {
void onExtensionConnect(GEarthExtension extension);
}

9
G-Earth/src/main/java/gearth/services/extensionserver/extensions/network/NetworkExtension.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/network/NetworkExtension.java
View File

@ -1,18 +1,13 @@
package gearth.services.extensionserver.extensions.network;
package gearth.services.extensionhandler.extensions.network;
import gearth.Main;
import gearth.protocol.HMessage;
import gearth.services.extensionserver.extensions.GEarthExtension;
import javafx.beans.InvalidationListener;
import gearth.services.extensionhandler.extensions.GEarthExtension;
import gearth.protocol.HPacket;
import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
import gearth.services.extensionserver.extensions.network.authentication.Authenticator;
import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
/**
* Created by Jonas on 21/06/18.

2
G-Earth/src/main/java/gearth/services/extensionserver/extensions/network/NetworkExtensionInfo.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/network/NetworkExtensionInfo.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionserver.extensions.network;
package gearth.services.extensionhandler.extensions.network;
public class NetworkExtensionInfo {

8
G-Earth/src/main/java/gearth/services/extensionserver/extensions/network/NetworkExtensionsProducer.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/network/NetworkExtensionsProducer.java
View File

@ -1,9 +1,9 @@
package gearth.services.extensionserver.extensions.network;
package gearth.services.extensionhandler.extensions.network;
import gearth.protocol.HPacket;
import gearth.services.extensionserver.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionserver.extensions.extensionproducers.ExtensionProducerObserver;
import gearth.services.extensionserver.extensions.network.authentication.Authenticator;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver;
import gearth.services.extensionhandler.extensions.network.authentication.Authenticator;
import java.io.DataInputStream;
import java.io.IOException;

4
G-Earth/src/main/java/gearth/services/extensionserver/extensions/network/authentication/Authenticator.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/network/authentication/Authenticator.java
View File

@ -1,7 +1,7 @@
package gearth.services.extensionserver.extensions.network.authentication;
package gearth.services.extensionhandler.extensions.network.authentication;
import gearth.misc.ConfirmationDialog;
import gearth.services.extensionserver.extensions.network.NetworkExtension;
import gearth.services.extensionhandler.extensions.network.NetworkExtension;
import javafx.application.Platform;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;

2
G-Earth/src/main/java/gearth/services/extensionserver/extensions/network/executer/ExecutionInfo.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/network/executer/ExecutionInfo.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionserver.extensions.network.executer;
package gearth.services.extensionhandler.extensions.network.executer;
import java.util.ArrayList;
import java.util.HashMap;

2
G-Earth/src/main/java/gearth/services/extensionserver/extensions/network/executer/ExtensionRunner.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/network/executer/ExtensionRunner.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionserver.extensions.network.executer;
package gearth.services.extensionhandler.extensions.network.executer;
/**
* Created by Jonas on 21/09/18.

2
G-Earth/src/main/java/gearth/services/extensionserver/extensions/network/executer/ExtensionRunnerFactory.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/network/executer/ExtensionRunnerFactory.java
View File

@ -1,4 +1,4 @@
package gearth.services.extensionserver.extensions.network.executer;
package gearth.services.extensionhandler.extensions.network.executer;
/**
* Created by Jonas on 22/09/18.

4
G-Earth/src/main/java/gearth/services/extensionserver/extensions/network/executer/NormalExtensionRunner.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/network/executer/NormalExtensionRunner.java
View File

@ -1,7 +1,7 @@
package gearth.services.extensionserver.extensions.network.executer;
package gearth.services.extensionhandler.extensions.network.executer;
import gearth.Main;
import gearth.services.extensionserver.extensions.network.authentication.Authenticator;
import gearth.services.extensionhandler.extensions.network.authentication.Authenticator;
import java.io.BufferedReader;
import java.io.File;

7
G-Earth/src/main/java/gearth/services/extensionserver/extensions/simple/ExampleExtension.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/simple/ExampleExtension.java
View File

@ -1,10 +1,7 @@
package gearth.services.extensionserver.extensions.simple;
package gearth.services.extensionhandler.extensions.simple;
import gearth.protocol.HMessage;
import gearth.protocol.HPacket;
import gearth.services.extensionserver.extensions.GEarthExtension;
import java.util.Arrays;
import gearth.services.extensionhandler.extensions.GEarthExtension;
public class ExampleExtension extends GEarthExtension {
@Override

0
G-Earth/src/main/java/gearth/services/extensionserver/extensions/simple/README.md → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/simple/README.md
View File

6
G-Earth/src/main/java/gearth/services/extensionserver/extensions/simple/SimpleExtensionProducer.java → G-Earth/src/main/java/gearth/services/extensionhandler/extensions/simple/SimpleExtensionProducer.java
View File

@ -1,7 +1,7 @@
package gearth.services.extensionserver.extensions.simple;
package gearth.services.extensionhandler.extensions.simple;
import gearth.services.extensionserver.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionserver.extensions.extensionproducers.ExtensionProducerObserver;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionhandler.extensions.extensionproducers.ExtensionProducerObserver;
public class SimpleExtensionProducer implements ExtensionProducer {

8
G-Earth/src/main/java/gearth/services/extensionserver/extensions/extensionproducers/ExtensionProducerObserver.java
View File

@ -1,8 +0,0 @@
package gearth.services.extensionserver.extensions.extensionproducers;
import gearth.services.extensionserver.extensions.GEarthExtension;
import gearth.services.extensionserver.extensions.network.NetworkExtension;
public interface ExtensionProducerObserver {
void onExtensionConnect(GEarthExtension extension);
}

10
G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainer.java
View File

@ -1,6 +1,6 @@
package gearth.ui.extensions;
import gearth.services.extensionserver.extensions.GEarthExtension;
import gearth.services.extensionhandler.extensions.GEarthExtension;
import javafx.application.Platform;
import javafx.event.EventHandler;
import javafx.geometry.Insets;
@ -12,10 +12,10 @@ import javafx.scene.paint.Paint;
import javafx.scene.text.Font;
import gearth.misc.ConfirmationDialog;
import gearth.ui.buttons.*;
import gearth.services.extensionserver.extensions.network.executer.ExecutionInfo;
import gearth.services.extensionserver.extensions.network.executer.ExtensionRunner;
import gearth.services.extensionserver.extensions.network.executer.ExtensionRunnerFactory;
import gearth.services.extensionserver.extensions.network.executer.NormalExtensionRunner;
import gearth.services.extensionhandler.extensions.network.executer.ExecutionInfo;
import gearth.services.extensionhandler.extensions.network.executer.ExtensionRunner;
import gearth.services.extensionhandler.extensions.network.executer.ExtensionRunnerFactory;
import gearth.services.extensionhandler.extensions.network.executer.NormalExtensionRunner;
import java.nio.file.Paths;

3
G-Earth/src/main/java/gearth/ui/extensions/ExtensionItemContainerProducer.java
View File

@ -1,7 +1,6 @@
package gearth.ui.extensions;
import gearth.services.extensionserver.extensions.GEarthExtension;
import gearth.services.extensionserver.extensions.network.NetworkExtension;
import gearth.services.extensionhandler.extensions.GEarthExtension;
import javafx.scene.Node;
import javafx.scene.control.ScrollPane;
import javafx.scene.layout.VBox;

20
G-Earth/src/main/java/gearth/ui/extensions/Extensions.java
View File

@ -1,11 +1,10 @@
package gearth.ui.extensions;
import gearth.services.extensionserver.ExtensionServer;
import gearth.services.extensionserver.extensions.extensionproducers.ExtensionProducer;
import gearth.services.extensionserver.extensions.network.NetworkExtensionsProducer;
import gearth.services.extensionserver.extensions.network.executer.ExecutionInfo;
import gearth.services.extensionserver.extensions.network.executer.ExtensionRunner;
import gearth.services.extensionserver.extensions.network.executer.ExtensionRunnerFactory;
import gearth.services.extensionhandler.ExtensionHandler;
import gearth.services.extensionhandler.extensions.network.NetworkExtensionsProducer;
import gearth.services.extensionhandler.extensions.network.executer.ExecutionInfo;
import gearth.services.extensionhandler.extensions.network.executer.ExtensionRunner;
import gearth.services.extensionhandler.extensions.network.executer.ExtensionRunnerFactory;
import gearth.ui.SubForm;
import javafx.application.Platform;
import javafx.event.ActionEvent;
@ -17,7 +16,6 @@ import javafx.scene.layout.VBox;
import javafx.stage.FileChooser;
import java.io.File;
import java.util.function.Predicate;
/**
* Created by Jonas on 06/04/18.
@ -34,7 +32,7 @@ public class Extensions extends SubForm {
public ScrollPane scroller;
private ExtensionRunner extensionRunner = null;
private ExtensionServer extensionServer;
private ExtensionHandler extensionHandler;
private NetworkExtensionsProducer networkExtensionsProducer; // needed for port
@ -44,14 +42,14 @@ public class Extensions extends SubForm {
protected void onParentSet() {
ExtensionItemContainerProducer producer = new ExtensionItemContainerProducer(extensioncontainer, scroller);
extensionServer = new ExtensionServer(getHConnection());
extensionServer.onExtensionConnected((e -> {
extensionHandler = new ExtensionHandler(getHConnection());
extensionHandler.onExtensionConnected((e -> {
Platform.runLater(() -> producer.extensionConnected(e));
}));
//noinspection OptionalGetWithoutIsPresent
networkExtensionsProducer
= (NetworkExtensionsProducer) extensionServer.getExtensionProducers().stream()
= (NetworkExtensionsProducer) extensionHandler.getExtensionProducers().stream()
.filter(producer1 -> producer1 instanceof NetworkExtensionsProducer)
.findFirst().get();