Apple-2-Tools
/
AppleCommander
mirror of https://github.com/AppleCommander/AppleCommander.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change to passing FormattedDisk[] to DiskWindow

This commit is contained in:
T. Joseph Carter 2017-11-20 17:47:43 -08:00
parent 485338dc49
commit 42cfac68c6
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/webcodepro/applecommander/ui/fx/DiskWindow.java
View File

@ -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();
}

14
src/main/java/com/webcodepro/applecommander/ui/fx/FXAppleCommander.java
View File

@ -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)");
}
}
}