diff --git a/src/main/java/com/webcodepro/applecommander/ui/fx/DiskWindow.java b/src/main/java/com/webcodepro/applecommander/ui/fx/DiskWindow.java index ebfb7b4..eb16aac 100644 --- a/src/main/java/com/webcodepro/applecommander/ui/fx/DiskWindow.java +++ b/src/main/java/com/webcodepro/applecommander/ui/fx/DiskWindow.java @@ -4,13 +4,15 @@ import java.io.File; import javafx.stage.Stage; +import com.webcodepro.applecommander.storage.FormattedDisk; + public class DiskWindow { // This won't take a File ultimately, probably a Disk. And obviously // it will, y'know, do something. :) All TODO! - public DiskWindow(File file) { + public DiskWindow(FormattedDisk[] disks) { Stage diskStage = new Stage(); - System.out.println("Yeah, we're opening \""+file+"\""); + diskStage.setTitle(disks[0].getFilename()); diskStage.show(); } diff --git a/src/main/java/com/webcodepro/applecommander/ui/fx/FXAppleCommander.java b/src/main/java/com/webcodepro/applecommander/ui/fx/FXAppleCommander.java index d117484..09e28a0 100644 --- a/src/main/java/com/webcodepro/applecommander/ui/fx/FXAppleCommander.java +++ b/src/main/java/com/webcodepro/applecommander/ui/fx/FXAppleCommander.java @@ -37,6 +37,7 @@ import javafx.stage.Stage; import com.webcodepro.applecommander.storage.Disk; import com.webcodepro.applecommander.storage.Disk.FilenameFilter; +import com.webcodepro.applecommander.storage.FormattedDisk; import com.webcodepro.applecommander.ui.AppleCommander; import com.webcodepro.applecommander.ui.UiBundle; import com.webcodepro.applecommander.ui.UserPreferences; @@ -196,7 +197,18 @@ public class FXAppleCommander extends Application { if (null != selectedFile) { userPreferences.setDiskImageDirectory(selectedFile.getParent()); UserPreferences.getInstance().save(); - DiskWindow window = new DiskWindow(selectedFile); + try { + Disk disk = new Disk(selectedFile.getPath()); + FormattedDisk[] formattedDisks = disk.getFormattedDisks(); + if (formattedDisks != null) { + DiskWindow window = new DiskWindow(formattedDisks); + } else { + System.out.println("We can't open " + selectedFile + " for some reason."); + } + } catch (Exception ignored) { + System.out.println("We can't open " + selectedFile + " for some reason. (Exception thrown)"); + + } } }