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

fix path problem

Browse Source
This commit is contained in:
sirjonasxx 2018-09-27 15:53:39 +02:00
parent 072bf1d273
commit ebe253fe95
6 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Extensions/AdminOnConnect-6311305156.jar Normal file
View File

Binary file not shown.

4
src/main/ui/extensions/ExtensionItemContainer.java
View File

@ -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);

21
src/main/ui/extensions/ExtensionItemContainerProducer.java Normal file
View File

@ -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;
}
}

3
src/main/ui/extensions/GEarthExtension.java
View File

@ -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();

9
src/main/ui/extensions/executer/ExtensionRunnerFactory.java
View File

@ -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();
}
}

17
src/main/ui/extensions/executer/NormalExtensionRunner.java
View File

@ -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();
}