ClassViewer
diff --git a/‎build.gradle‎
Lines changed: 6 additions & 24 deletions b/‎build.gradle‎
Lines changed: 6 additions & 24 deletions
diff --git a/‎launcher/CMakeLists.txt‎
Lines changed: 0 additions & 19 deletions b/‎launcher/CMakeLists.txt‎
Lines changed: 0 additions & 19 deletions
diff --git a/‎launcher/build.bat‎
Lines changed: 0 additions & 10 deletions b/‎launcher/build.bat‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎launcher/launcher.rc.in‎
Lines changed: 0 additions & 24 deletions b/‎launcher/launcher.rc.in‎
Lines changed: 0 additions & 24 deletions
diff --git a/‎launcher/launcher_win32.c‎
Lines changed: 0 additions & 29 deletions b/‎launcher/launcher_win32.c‎
Lines changed: 0 additions & 29 deletions
diff --git a/‎launcher/windows-x86_64/ClassViewer.exe‎
-56.5 KB b/‎launcher/windows-x86_64/ClassViewer.exe‎
-56.5 KB
diff --git a/‎src/main/java/org/glavo/viewer/gui/Options.java‎
Lines changed: 2 additions & 1 deletion b/‎src/main/java/org/glavo/viewer/gui/Options.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/main/java/org/glavo/viewer/gui/RecentFiles.java‎
Lines changed: 5 additions & 5 deletions b/‎src/main/java/org/glavo/viewer/gui/RecentFiles.java‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎src/main/java/org/glavo/viewer/gui/Viewer.java‎
Lines changed: 6 additions & 0 deletions b/‎src/main/java/org/glavo/viewer/gui/Viewer.java‎
Lines changed: 6 additions & 0 deletions
@@ -15,7 +15,7 @@ plugins {
 }
 
 group 'org.glavo'
-version '3.5'
+version '3.6'
 
 modularity.mixedJavaRelease 8
 
@@ -61,29 +61,11 @@ jlink {
             '--compress', '1',
             '--no-header-files',
             '--no-man-pages'
-
-    if (file("launcher/${jforeign.Platform.PLATFORM}").exists()) {
+    if (jforeign.Platform.isWindows()) {
+        addOptions '--strip-native-commands'
         project.tasks.getByName('jlink').doLast {
-            delete {
-                delete "$imageDir/bin/ClassViewer",
-                        "$imageDir/bin/ClassViewer.bat"
-            }
-            copy {
-                from "launcher/${jforeign.Platform.PLATFORM}"
-                into "$imageDir/bin"
-            }
-        }
-
-    } else {
-        launcher {
-            name = 'ClassViewer'
-        }
-        if(!jforeign.Platform.isWindows()) {
-            project.tasks.getByName('jlink').doLast {
-                delete {
-                    delete "$imageDir/bin/ClassViewer.bat"
-                }
-            }
+            delete "$imageDir/bin/ClassViewer"
+            delete "$imageDir/bin/ClassViewer.bat"
         }
     }
-}
+}
@@ -12,7 +12,7 @@
 import java.util.*;
 
 public final class Options {
-    public static boolean color = true;
+    public static boolean color = false;
     public static boolean debug = false;
     public static boolean useSystemTilteBar = true;
     public static String skin = null;
@@ -49,6 +49,7 @@ public static void init() {
         }
 
         RecentFiles.init();
+        Log.info("loading finished");
     }
 
     public static void init(Properties... properties) {
 
@@ -16,10 +16,10 @@
 
 public final class RecentFiles {
 
-    public static final RecentFiles Instance = new RecentFiles();
+    public static RecentFiles Instance = null;
 
     public static void init() {
-
+        Instance = new RecentFiles();
     }
 
     private final List<RecentFile> list = Collections.synchronizedList(new LinkedList<>());
@@ -115,7 +115,7 @@ private void load() {
             Path p = Options.path.resolve("recentfiles");
 
             if (Files.notExists(p)) {
-                Log.warning("Recent files not exists");
+                Log.info("Recent files not exists");
                 return;
             }
             Log.info("Load recent files from file: " + p);
@@ -132,8 +132,8 @@ private void load() {
                 });
             }
 
-        } catch (IOException e) {
-            ViewerAlert.logAndShowExceptionAlert(e);
+        } catch (Throwable e) {
+            Log.error(e);
         }
     }
 }
@@ -25,6 +25,7 @@ public final class Viewer extends Application {
 
     public static void main(String[] args) {
         Options.init();
+        Log.info("launch application");
         Application.launch(Viewer.class, args);
     }
 
@@ -38,6 +39,7 @@ public static void main(String[] args) {
     @Override
     public void init() throws Exception {
         Application.setUserAgentStylesheet(Options.skin);
+        Log.info("info " + this);
     }
 
     @Override
@@ -82,6 +84,10 @@ public void start(Stage stage) {
             javafx.application.Platform.runLater(() -> openFiles(files));
         }
         stage.show();
+        stage.setOnCloseRequest(event -> {
+            Log.info("close " + this);
+        });
+        Log.info("show " + this);
     }
 
     public void openFile() {
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`import java.util.*;`
`13`	`13`
`14`	`14`	`public final class Options {`
`15`		`- public static boolean color = true;`
	`15`	`+ public static boolean color = false;`
`16`	`16`	`public static boolean debug = false;`
`17`	`17`	`public static boolean useSystemTilteBar = true;`
`18`	`18`	`public static String skin = null;`
`@@ -49,6 +49,7 @@ public static void init() {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`RecentFiles.init();`
	`52`	`+ Log.info("loading finished");`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`public static void init(Properties... properties) {`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@`
`16`	`16`
`17`	`17`	`public final class RecentFiles {`
`18`	`18`
`19`		`- public static final RecentFiles Instance = new RecentFiles();`
	`19`	`+ public static RecentFiles Instance = null;`
`20`	`20`
`21`	`21`	`public static void init() {`
`22`		`-`
	`22`	`+ Instance = new RecentFiles();`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`private final List<RecentFile> list = Collections.synchronizedList(new LinkedList<>());`
`@@ -115,7 +115,7 @@ private void load() {`
`115`	`115`	`Path p = Options.path.resolve("recentfiles");`
`116`	`116`
`117`	`117`	`if (Files.notExists(p)) {`
`118`		`- Log.warning("Recent files not exists");`
	`118`	`+ Log.info("Recent files not exists");`
`119`	`119`	`return;`
`120`	`120`	`}`
`121`	`121`	`Log.info("Load recent files from file: " + p);`
`@@ -132,8 +132,8 @@ private void load() {`
`132`	`132`	`});`
`133`	`133`	`}`
`134`	`134`
`135`		`- } catch (IOException e) {`
`136`		`- ViewerAlert.logAndShowExceptionAlert(e);`
	`135`	`+ } catch (Throwable e) {`
	`136`	`+ Log.error(e);`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public final class Viewer extends Application {`
`25`	`25`
`26`	`26`	`public static void main(String[] args) {`
`27`	`27`	`Options.init();`
	`28`	`+ Log.info("launch application");`
`28`	`29`	`Application.launch(Viewer.class, args);`
`29`	`30`	`}`
`30`	`31`
`@@ -38,6 +39,7 @@ public static void main(String[] args) {`
`38`	`39`	`@Override`
`39`	`40`	`public void init() throws Exception {`
`40`	`41`	`Application.setUserAgentStylesheet(Options.skin);`
	`42`	`+ Log.info("info " + this);`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`@Override`
`@@ -82,6 +84,10 @@ public void start(Stage stage) {`
`82`	`84`	`javafx.application.Platform.runLater(() -> openFiles(files));`
`83`	`85`	`}`
`84`	`86`	`stage.show();`
	`87`	`+ stage.setOnCloseRequest(event -> {`
	`88`	`+ Log.info("close " + this);`
	`89`	`+ });`
	`90`	`+ Log.info("show " + this);`
`85`	`91`	`}`
`86`	`92`
`87`	`93`	`public void openFile() {`