Add simple file renderer

marcin-chwedczuk · Dec 31, 2021 · 86cfccc · 86cfccc
1 parent f55fdb4
commit 86cfccc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/gui/src/main/java/pl/marcinchwedczuk/elfviewer/gui/mainwindow/MainWindow.java b/gui/src/main/java/pl/marcinchwedczuk/elfviewer/gui/mainwindow/MainWindow.java
@@ -1,6 +1,7 @@
 package pl.marcinchwedczuk.elfviewer.gui.mainwindow;
 
 import javafx.application.Platform;
+import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -24,6 +25,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.List;
 import java.util.ResourceBundle;
 
 public class MainWindow implements Initializable {
@@ -115,7 +117,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
     }
 
     private void clearTable() {
-        tableView.getItems().clear();
+        tableView.setItems(FXCollections.emptyObservableList());
         tableView.getColumns().clear();
     }
 

diff --git a/gui/src/main/java/pl/marcinchwedczuk/elfviewer/gui/mainwindow/renderer/FileRenderer.java b/gui/src/main/java/pl/marcinchwedczuk/elfviewer/gui/mainwindow/renderer/FileRenderer.java
@@ -35,33 +35,32 @@ protected List<TableColumn<String[], String>> defineColumns() {
 
     @Override
     protected List<String[]> defineRows() {
-        try {
-            Path p = elfFile.toPath();
-            BasicFileAttributes attr = Files.readAttributes(p, BasicFileAttributes.class);
+        Path path = elfFile.toPath();
+        List<String[]> fields = new ArrayList<>();
 
-            List<String[]> fields = new ArrayList<>();
+        try {
+            BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
             fields.addAll(List.of(
-                    mkStrings("name", p.getFileName().toString()),
-                    mkStrings("path", p.toAbsolutePath().toString()),
+                    mkStrings("name", path.getFileName().toString()),
+                    mkStrings("path", path.toAbsolutePath().toString()),
                     mkStrings("size", dec(attr.size())), // TODO: KB MB etc.
-                    mkStrings("creation time", attr.creationTime().toString()),
-                    mkStrings("last modified time", attr.lastModifiedTime().toString()),
-                    mkStrings("last access time", attr.lastAccessTime().toString())
+                    mkStrings("ctime", attr.creationTime().toString()),
+                    mkStrings("mtime", attr.lastModifiedTime().toString()),
+                    mkStrings("atime", attr.lastAccessTime().toString())
             ));
 
-            try {
-                PosixFileAttributes posixAttr = Files.readAttributes(p, PosixFileAttributes.class);
-                fields.addAll(List.of(
-                   mkStrings("owner", posixAttr.owner().toString()),
-                   mkStrings("group", posixAttr.group().toString()),
-                   mkStrings("permissions", PosixFilePermissions.toString(posixAttr.permissions()))
-                ));
-            } catch (Exception e) { }
-
-            return fields;
+            // This may result in an error on e.g. Windows filesystem
+            PosixFileAttributes posixAttr = Files.readAttributes(path, PosixFileAttributes.class);
+            fields.addAll(List.of(
+               mkStrings("owner", posixAttr.owner().toString()),
+               mkStrings("group", posixAttr.group().toString()),
+               mkStrings("perms", PosixFilePermissions.toString(posixAttr.permissions()))
+            ));
         } catch (IOException e) {
-            return List.<String[]>of(mkStrings("(error)", e.toString()));
+            fields.add(mkStrings("(error)", e.getMessage()));
         }
+
+        return fields;
     }
 
     @Override