diff --git a/Extensions/AdminOnConnect-6311305156.jar b/Extensions/AdminOnConnect-6311305156.jar new file mode 100644 index 0000000..40a1e21 Binary files /dev/null and b/Extensions/AdminOnConnect-6311305156.jar differ diff --git a/src/main/ui/extensions/ExtensionItemContainer.java b/src/main/ui/extensions/ExtensionItemContainer.java index 519344c..55396a6 100644 --- a/src/main/ui/extensions/ExtensionItemContainer.java +++ b/src/main/ui/extensions/ExtensionItemContainer.java @@ -60,10 +60,6 @@ public class ExtensionItemContainer extends GridPane { add(authorLabel, 2, 0); add(versionLabel, 3, 0); -// getChildren().addAll(indexLabel, packetLabel, delayLabel, destinationLabel); - - - ExitButton exitButton = new ExitButton(); Tooltip delete = new Tooltip("Close connection with this extension"); Tooltip.install(exitButton,delete); diff --git a/src/main/ui/extensions/ExtensionItemContainerProducer.java b/src/main/ui/extensions/ExtensionItemContainerProducer.java new file mode 100644 index 0000000..afd0b32 --- /dev/null +++ b/src/main/ui/extensions/ExtensionItemContainerProducer.java @@ -0,0 +1,21 @@ +package main.ui.extensions; + +import javafx.scene.control.ScrollPane; +import javafx.scene.layout.VBox; + +/** + * Created by Jonas on 27/09/18. + */ +public class ExtensionItemContainerProducer { + + private VBox parent; + private ScrollPane scrollPane; + + public ExtensionItemContainerProducer(VBox parent, ScrollPane scrollPane) { + this.parent = parent; + this.scrollPane = scrollPane; + } + + + +} diff --git a/src/main/ui/extensions/GEarthExtension.java b/src/main/ui/extensions/GEarthExtension.java index 459e668..c38a3b5 100644 --- a/src/main/ui/extensions/GEarthExtension.java +++ b/src/main/ui/extensions/GEarthExtension.java @@ -71,9 +71,6 @@ public class GEarthExtension { } private GEarthExtension(HPacket extensionInfo, Socket connection, OnDisconnectedCallback onDisconnectedCallback) { - - - this.title = extensionInfo.readString(); this.author = extensionInfo.readString(); this.version = extensionInfo.readString(); diff --git a/src/main/ui/extensions/executer/ExtensionRunnerFactory.java b/src/main/ui/extensions/executer/ExtensionRunnerFactory.java index 2ae174d..ae18e63 100644 --- a/src/main/ui/extensions/executer/ExtensionRunnerFactory.java +++ b/src/main/ui/extensions/executer/ExtensionRunnerFactory.java @@ -1,14 +1,17 @@ package main.ui.extensions.executer; -import main.misc.OSValidator; - /** * Created by Jonas on 22/09/18. */ public class ExtensionRunnerFactory { - public static ExtensionRunner get() { + private static ExtensionRunner runner = obtain(); + public static ExtensionRunner get() { + return runner; + } + + private static ExtensionRunner obtain() { return new NormalExtensionRunner(); } } diff --git a/src/main/ui/extensions/executer/NormalExtensionRunner.java b/src/main/ui/extensions/executer/NormalExtensionRunner.java index 4af272f..b825a93 100644 --- a/src/main/ui/extensions/executer/NormalExtensionRunner.java +++ b/src/main/ui/extensions/executer/NormalExtensionRunner.java @@ -1,5 +1,7 @@ package main.ui.extensions.executer; +import main.Main; + import java.io.File; import java.io.IOException; import java.nio.file.*; @@ -11,16 +13,17 @@ import java.util.Random; */ public class NormalExtensionRunner implements ExtensionRunner { + String jarPath = new File(Main.class.getProtectionDomain().getCodeSource().getLocation().getPath()).getParent(); + @Override public void runAllExtensions(int port) { if (dirExists(ExecutionInfo.EXTENSIONSDIRECTORY)){ File folder = - new File(FileSystems.getDefault().getPath(".").toString() + - FileSystems.getDefault().getSeparator() + + new File(jarPath + + FileSystems.getDefault().getSeparator()+ ExecutionInfo.EXTENSIONSDIRECTORY); File[] childs = folder.listFiles(); - for (File file : childs) { tryRunExtension(file.getPath(), port); } @@ -44,7 +47,7 @@ public class NormalExtensionRunner implements ExtensionRunner { Path originalPath = Paths.get(path); Path newPath = Paths.get( - FileSystems.getDefault().getPath(".").toString(), + jarPath, ExecutionInfo.EXTENSIONSDIRECTORY, newname ); @@ -65,7 +68,7 @@ public class NormalExtensionRunner implements ExtensionRunner { } - private void tryRunExtension(String path, int port) { + public void tryRunExtension(String path, int port) { try { Runtime.getRuntime().exec( ExecutionInfo.getExecutionCommand(getFileExtension(path)) @@ -89,12 +92,12 @@ public class NormalExtensionRunner implements ExtensionRunner { } private boolean dirExists(String dir) { - return Files.isDirectory(Paths.get(FileSystems.getDefault().getPath(".").toString(), dir)); + return Files.isDirectory(Paths.get(jarPath, dir)); } private void createDirectory(String dir) { if (!dirExists(dir)) { try { - Files.createDirectories(Paths.get(FileSystems.getDefault().getPath(".").toString(), dir)); + Files.createDirectories(Paths.get(jarPath, dir)); } catch (IOException e) { e.printStackTrace(); }