From a5cd7e38dfc3b8ddb3dfc8912da875b99586a6c8 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 17 Apr 2016 11:29:59 +0100 Subject: [PATCH] fixes crash when running exporter on headless server --- .../manual/designer/ManualDesigner.java | 9 +-------- .../manual/designer/exporter/Exporter.java | 19 +++++++------------ .../manual/designer/fileUtils/LoadSystem.java | 1 - .../windows/MainWindowController.java | 6 +++++- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/main/java/techreborn/manual/designer/ManualDesigner.java b/src/main/java/techreborn/manual/designer/ManualDesigner.java index 71960e44f..5b2c3e0d2 100644 --- a/src/main/java/techreborn/manual/designer/ManualDesigner.java +++ b/src/main/java/techreborn/manual/designer/ManualDesigner.java @@ -11,14 +11,11 @@ import javafx.scene.control.Alert; import javafx.scene.control.TreeItem; import javafx.scene.image.Image; import javafx.stage.Stage; -import techreborn.manual.designer.exporter.Exporter; import techreborn.manual.designer.fileUtils.SaveSystem; import techreborn.manual.designer.windows.MainWindowController; import techreborn.manual.saveFormat.Entry; import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; import java.net.URL; /** @@ -28,12 +25,8 @@ public class ManualDesigner extends Application { public static Stage stage; - public static void main(String[] args) throws Exception { - if(args.length > 0 && args[0].equals("-export")){ - Exporter.run(args); - } else { + public static void main(String[] args) { launch(args); - } } @Override diff --git a/src/main/java/techreborn/manual/designer/exporter/Exporter.java b/src/main/java/techreborn/manual/designer/exporter/Exporter.java index 0a8f2a6bf..6630b36ea 100644 --- a/src/main/java/techreborn/manual/designer/exporter/Exporter.java +++ b/src/main/java/techreborn/manual/designer/exporter/Exporter.java @@ -2,39 +2,34 @@ package techreborn.manual.designer.exporter; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.time.DateUtils; import org.zeroturnaround.zip.ZipUtil; import reborncore.shields.json.ShieldJsonLoader; -import techreborn.manual.saveFormat.ManualFormat; import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.FileReader; import java.io.FileWriter; -import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; /** * Created by Mark on 16/04/2016. */ public class Exporter { + public static void main(String[] args) throws Exception { + run(args); + } + public static void run(String[] arg) throws Exception { - if(arg.length < 3){ + if(arg.length < 2){ System.out.println("Error incorrect arguments!"); System.exit(-1); } - File input = new File(arg[1]); - File output = new File(arg[2]); + File input = new File(arg[0]); + File output = new File(arg[1]); if(!input.exists()){ System.out.println("that input file does not exist!"); System.exit(-1); diff --git a/src/main/java/techreborn/manual/designer/fileUtils/LoadSystem.java b/src/main/java/techreborn/manual/designer/fileUtils/LoadSystem.java index 0e035acf4..302b4e650 100644 --- a/src/main/java/techreborn/manual/designer/fileUtils/LoadSystem.java +++ b/src/main/java/techreborn/manual/designer/fileUtils/LoadSystem.java @@ -4,7 +4,6 @@ import com.google.gson.Gson; import javafx.scene.control.Alert; import javafx.scene.control.TreeItem; import javafx.stage.DirectoryChooser; -import javafx.stage.FileChooser; import techreborn.manual.designer.ManualCatergories; import techreborn.manual.designer.ManualDesigner; import techreborn.manual.saveFormat.Entry; diff --git a/src/main/java/techreborn/manual/designer/windows/MainWindowController.java b/src/main/java/techreborn/manual/designer/windows/MainWindowController.java index e656b7d25..15acfddb8 100644 --- a/src/main/java/techreborn/manual/designer/windows/MainWindowController.java +++ b/src/main/java/techreborn/manual/designer/windows/MainWindowController.java @@ -3,11 +3,15 @@ package techreborn.manual.designer.windows; import javafx.event.ActionEvent; import javafx.event.Event; import javafx.scene.control.Button; -import javafx.scene.control.*; +import javafx.scene.control.ChoiceDialog; import javafx.scene.control.Label; import javafx.scene.control.MenuBar; +import javafx.scene.control.SplitPane; import javafx.scene.control.TextArea; import javafx.scene.control.TextField; +import javafx.scene.control.TextInputDialog; +import javafx.scene.control.TreeItem; +import javafx.scene.control.TreeView; import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import techreborn.manual.designer.ManualCatergories;