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

Merge pull request #14 from iKarith/master 

Fix SWT file dialog with cherry-pick from javafx branch
This commit is contained in:
A2 Geek 2017-11-20 20:42:10 -06:00 committed by GitHub
parent 5d9ac872fd bfaf30bffe
commit 43f599943e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/com/webcodepro/applecommander/storage/Disk.java
View File

@ -62,12 +62,15 @@ public class Disk {
*/ */
public class FilenameFilter { public class FilenameFilter {
private String names; private String names;
private String extensions; private String[] extensions;
public FilenameFilter(String names, String extensions) { public FilenameFilter(String names, String... extensions) {
this.names = names; this.names = names;
this.extensions = extensions; this.extensions = extensions;
} }
public String getExtensions() { public String getExtensions() {
return String.join(";", extensions);
}
public String[] getExtensionList() {
return extensions; return extensions;
} }
public String getNames() { public String getNames() {
@ -127,38 +130,38 @@ public class Disk {
private Disk() { private Disk() {
filenameFilters = new FilenameFilter[] { filenameFilters = new FilenameFilter[] {
new FilenameFilter(textBundle.get("Disk.AllImages"), //$NON-NLS-1$ new FilenameFilter(textBundle.get("Disk.AllImages"), //$NON-NLS-1$
"*.do; *.dsk; *.po; *.nib; *.2mg; *.2img; *.hdv; *.do.gz; *.dsk.gz; *.po.gz; *.nib.gz; *.2mg.gz; *.2img.gz"), //$NON-NLS-1$ "*.do", "*.dsk", "*.po", "*.nib", "*.2mg", "*.2img", "*.hdv", "*.do.gz", "*.dsk.gz", "*.po.gz", "*.nib.gz", "*.2mg.gz", "*.2img.gz"), //$NON-NLS-1$
new FilenameFilter(textBundle.get("Disk.140kDosImages"), //$NON-NLS-1$ new FilenameFilter(textBundle.get("Disk.140kDosImages"), //$NON-NLS-1$
"*.do; *.dsk; *.do.gz; *.dsk.gz"), //$NON-NLS-1$ "*.do", "*.dsk", "*.do.gz", "*.dsk.gz"), //$NON-NLS-1$
new FilenameFilter(textBundle.get("Disk.140kNibbleImages"), //$NON-NLS-1$ new FilenameFilter(textBundle.get("Disk.140kNibbleImages"), //$NON-NLS-1$
"*.nib; *.nib.gz"), //$NON-NLS-1$ "*.nib", "*.nib.gz"), //$NON-NLS-1$
new FilenameFilter(textBundle.get("Disk.140kProdosImages"), //$NON-NLS-1$ new FilenameFilter(textBundle.get("Disk.140kProdosImages"), //$NON-NLS-1$
"*.po; *.po.gz"), //$NON-NLS-1$ "*.po", "*.po.gz"), //$NON-NLS-1$
new FilenameFilter(textBundle.get("Disk.800kProdosImages"), //$NON-NLS-1$ new FilenameFilter(textBundle.get("Disk.800kProdosImages"), //$NON-NLS-1$
"*.2mg; *.2img; *.2mg.gz, *.2img.gz"), //$NON-NLS-1$ "*.2mg", "*.2img", "*.2mg.gz", "*.2img.gz"), //$NON-NLS-1$
new FilenameFilter(textBundle.get("Disk.ApplePcImages"), //$NON-NLS-1$ new FilenameFilter(textBundle.get("Disk.ApplePcImages"), //$NON-NLS-1$
"*.hdv"), //$NON-NLS-1$ "*.hdv"), //$NON-NLS-1$
new FilenameFilter(textBundle.get("Disk.CompressedImages"), //$NON-NLS-1$ new FilenameFilter(textBundle.get("Disk.CompressedImages"), //$NON-NLS-1$
"*.sdk; *.shk; *.do.gz; *.dsk.gz; *.po.gz; *.2mg.gz; *.2img.gz"), //$NON-NLS-1$ "*.sdk", "*.shk", "*.do.gz", "*.dsk.gz", "*.po.gz", "*.2mg.gz", "*.2img.gz"), //$NON-NLS-1$
new FilenameFilter(textBundle.get("Disk.AllFiles"), //$NON-NLS-1$ new FilenameFilter(textBundle.get("Disk.AllFiles"), //$NON-NLS-1$
"*.*") //$NON-NLS-1$ "*.*") //$NON-NLS-1$
}; };
allFileExtensions = new String[] { allFileExtensions = new String[] {
".do", //$NON-NLS-1$ ".do", //$NON-NLS-1$
".dsk", //$NON-NLS-1$ ".dsk", //$NON-NLS-1$
".po", //$NON-NLS-1$ ".po", //$NON-NLS-1$
".nib", //$NON-NLS-1$ ".nib", //$NON-NLS-1$
".sdk", //$NON-NLS-1$ ".sdk", //$NON-NLS-1$
".shk", //$NON-NLS-1$ ".shk", //$NON-NLS-1$
".2mg", //$NON-NLS-1$ ".2mg", //$NON-NLS-1$
".2img", //$NON-NLS-1$ ".2img", //$NON-NLS-1$
".hdv", //$NON-NLS-1$ ".hdv", //$NON-NLS-1$
".do.gz", //$NON-NLS-1$ ".do.gz", //$NON-NLS-1$
".dsk.gz", //$NON-NLS-1$ ".dsk.gz", //$NON-NLS-1$
".po.gz", //$NON-NLS-1$ ".po.gz", //$NON-NLS-1$
".nib.gz", //$NON-NLS-1$ ".nib.gz", //$NON-NLS-1$
".2mg.gz", //$NON-NLS-1$ ".2mg.gz", //$NON-NLS-1$
".2img.gz" //$NON-NLS-1$ ".2img.gz" //$NON-NLS-1$
}; };
} }