Fixing DefaultDisksPopupFactory

luwrain · Jun 23, 2022 · 52572ab · 52572ab
1 parent 725d8cb
commit 52572ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/properties/windows.properties b/properties/windows.properties
@@ -1,2 +1,3 @@
 
 luwrain.class.os = org.luwrain.windows.Windows
+luwrain.class.diskspopupfactory = org.luwrain.windows.DefaultDisksPopupFactory
diff --git a/src/main/java/org/luwrain/windows/DefaultDisksPopupFactory.java b/src/main/java/org/luwrain/windows/DefaultDisksPopupFactory.java
@@ -31,9 +31,13 @@ public final class DefaultDisksPopupFactory implements DisksPopup.Factory
 
 private final class DisksImpl implements DisksPopup.Disks
  {
- @Override public DisksPopup.Disk[] getDisks()
+ @Override public DisksPopup.Disk[] getDisks(Set<DisksPopup.Flags> flags)
  {
  final List<DiskImpl> res = new ArrayList<>();
+ final File[] roots = File.listRoots();
+ if (roots != null)
+ for(File f: roots)
+ res.add(new DiskImpl(f.getAbsolutePath()));
  return res.toArray(new DisksPopup.Disk[res.size()]);
  }
  }
@@ -51,9 +55,13 @@ private final class DiskImpl implements DisksPopup.Disk
  {
  return true;
  }
- @Override public File activate()
+ @Override public File activate(Set<DisksPopup.Flags> flags)
  {
  return new File(path);
+ }
+ @Override public boolean deactivate(Set<DisksPopup.Flags> flags)
+ {
+ return true;
  }
  @Override public String toString()
  {