update build.gradle

Glavo · Glavo · commit d7c901100e65 · 2018-03-19T14:41:26.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -24,6 +24,15 @@ compileJava.options.encoding = "UTF-8"
 compileTestJava.options.encoding = "UTF-8"
 javadoc.options.encoding = "UTF-8"
 
+import org.apache.tools.ant.filters.EscapeUnicode
+
+tasks.withType(ProcessResources).each { task ->
+    task.from(task.getSource()) {
+        include '**/*.properties'
+        filter(EscapeUnicode)
+    }
+}
+
 task run(type: JavaExec, dependsOn: jar) {
     main = "-jar"
     args jar.archivePath
diff --git a/src/main/java/org/glavo/viewer/gui/filetypes/classfile/ClassFileType.java b/src/main/java/org/glavo/viewer/gui/filetypes/classfile/ClassFileType.java
@@ -35,24 +35,23 @@ public ViewerTab open(Viewer viewer, URL url) {
         ViewerTab tab = ViewerTab.create(url);
         tab.setGraphic(new ImageView(icon));
 
-        ViewerTask<Pair<ClassFile, HexText>> task = new ViewerTask<Pair<ClassFile, HexText>>() {
+        ViewerTask<Void> task = new ViewerTask<Void>() {
             @Override
-            protected Pair<ClassFile, HexText> call() throws Exception {
+            protected Void call() throws Exception {
                 byte[] bytes = UrlUtils.readData(url);
                 ClassFile classFile = new ClassFileParser().parse(bytes);
                 RecentFiles.Instance.add(Instance, url);
-                return new Pair<>(classFile, new HexText(bytes));
+                HexText text = new HexText(bytes);
+                Platform.runLater(() -> {
+                    ParsedViewerPane pane = new ParsedViewerPane(viewer, classFile, text);
+                    ((ClassFileComponent)pane.getTree().getRoot()).setName(UrlUtils.getClassName(url));
+                    tab.setContent(pane);
+                    tab.getUserData().showOrHideSearchBar = pane::showOrHideSearchBar;
+                    RecentFiles.Instance.add(Instance, url);
+                });
+                return null;
             }
         };
-        task.setOnSucceeded((Pair<ClassFile, HexText> value) -> {
-            Platform.runLater(() -> {
-                ParsedViewerPane pane = new ParsedViewerPane(viewer, value.getKey(), value.getValue());
-                ((ClassFileComponent)pane.getTree().getRoot()).setName(UrlUtils.getClassName(url));
-                tab.setContent(pane);
-                tab.getUserData().showOrHideSearchBar = pane::showOrHideSearchBar;
-                RecentFiles.Instance.add(Instance, url);
-            });
-        });
         task.setOnFailed((Throwable e) -> {
             viewer.getTabPane().getTabs().remove(tab);
             ViewerAlert.logAndShowExceptionAlert(e);
