diff --git a/trunk/src/com/jpexs/asdec/Main.java b/trunk/src/com/jpexs/asdec/Main.java index cc55f2b2a..823e2fe26 100644 --- a/trunk/src/com/jpexs/asdec/Main.java +++ b/trunk/src/com/jpexs/asdec/Main.java @@ -151,9 +151,6 @@ public class Main { mainFrame.setPercent(percent); } } - /*if (actionMainFrame != null) { - actionMainFrame.setStatus(name); - }*/ if (loadingDialog != null) { loadingDialog.setDetail(name); if(percent==-1){ @@ -244,9 +241,6 @@ public class Main { if (mainFrame != null) { mainFrame.setVisible(false); } - /*if (actionMainFrame != null) { - actionMainFrame.setVisible(false); - }*/ Main.file = swfFile; if (Main.loadingDialog == null) { Main.loadingDialog = new LoadingDialog(); @@ -441,7 +435,7 @@ public class Main { fos.close(); } - public static void restartApplication2(String[] args) { + public static void restartApplication(String[] args) { StringBuilder cmd = new StringBuilder(); cmd.append(System.getProperty("java.home") + File.separator + "bin" + File.separator + "java "); for (String jvmArg : ManagementFactory.getRuntimeMXBean().getInputArguments()) { @@ -460,32 +454,6 @@ public class Main { System.exit(0); } - public static void restartApplication() { - try { - System.out.println("1"); - final String javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java"; - final File currentJar = new File(Main.class.getProtectionDomain().getCodeSource().getLocation().toURI()); - - System.out.println("currentJar=" + currentJar); - /* is it a jar file? */ - if (!currentJar.getName().endsWith(".jar")) { - return; - } - - /* Build command: java -jar application.jar */ - final ArrayList command = new ArrayList(); - command.add(javaBin); - command.add("-jar"); - command.add(currentJar.getPath()); - - final ProcessBuilder builder = new ProcessBuilder(command); - builder.start(); - } catch (Exception ex) { - ex.printStackTrace();; - } - System.exit(0); - } - public static void checkSWT(String[] args) { if (System.getProperty("os.name").toLowerCase().indexOf("win") == -1) { return; @@ -505,7 +473,7 @@ public class Main { } Configuration.setConfig("bits", System.getProperty("sun.arch.data.model")); Configuration.save(); - restartApplication2(args); + restartApplication(args); } }