Be able to drag new media directories into the media-list

Author: Borewit

src/main/java/listfix/view/FileListTransferHandler.java

@@ -0,0 +1,53 @@
+package listfix.view;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.swing.*;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+public abstract class FileListTransferHandler extends TransferHandler
+{
+
+  private final Logger _logger = LogManager.getLogger(FileListTransferHandler.class);
+
+  @Override
+  public boolean canImport(JComponent comp, DataFlavor[] transferFlavors)
+  {
+    return Arrays.stream(transferFlavors).anyMatch(DataFlavor.javaFileListFlavor::equals);
+  }
+
+  /**
+   * Causes a transfer to occur from a clipboard or a drag and drop operation.
+   *
+   * @param support the object containing the details of the transfer, not <code>null</code>.
+   * @return true if the data was inserted into the component, false otherwise
+   */
+  @Override
+  public boolean importData(TransferSupport support)
+  {
+    final Transferable transferable = support.getTransferable();
+    if (transferable.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
+    {
+      try
+      {
+        handleFileList((List<File>) transferable.getTransferData(DataFlavor.javaFileListFlavor));
+      }
+      catch (Exception e)
+      {
+        _logger.error("Transfer Java-file-list failed", e);
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Called when a Java-File-List is transferred
+   * @param fileList Transferred Java-File-List
+   */
+  public abstract boolean handleFileList(List<File> fileList);
+}

src/main/java/listfix/view/GUIScreen.java

@@ -150,7 +150,20 @@ private void postInitComponents()
     initPlaylistListener();
 
     // drag-n-drop support for the playlist directory tree
-    _playlistDirectoryTree.setTransferHandler(new PlaylistFolderTransferHandler(_playlistDirectoryTree, this));
+    _playlistDirectoryTree.setTransferHandler(new FileListTransferHandler()
+    {
+      @Override
+      public boolean handleFileList(List<File> fileList)
+      {
+        return fileList.stream()
+          .filter(File::isDirectory)
+          .map(folder -> {
+            GUIScreen.this.addPlaylistFolder(folder);
+            return true;
+          })
+          .reduce(false, (t, v) -> true);
+      }
+    });
     _playlistDirectoryTree.setRootVisible(false);
     // Show tooltips
     ToolTipManager.sharedInstance().registerComponent(_playlistDirectoryTree);
@@ -638,13 +651,22 @@ public void windowClosing(WindowEvent evt)
 
     _mediaLibraryPanel.add(_mediaLibraryButtonPanel, BorderLayout.SOUTH);
 
-    _mediaLibraryScrollPane.setMaximumSize(null);
-    _mediaLibraryScrollPane.setMinimumSize(null);
-
     _lstMediaLibraryDirs.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-    _lstMediaLibraryDirs.setMaximumSize(null);
-    _lstMediaLibraryDirs.setMinimumSize(null);
-    _lstMediaLibraryDirs.setPreferredSize(null);
+    _lstMediaLibraryDirs.setTransferHandler(new FileListTransferHandler()
+    {
+      @Override
+      public boolean handleFileList(List<File> fileList)
+      {
+        return fileList.stream()
+          .filter(File::isDirectory)
+          .map(folder -> {
+            GUIScreen.this.addMediaFolder(folder);
+            return true;
+          })
+          .reduce(false, (t, v) -> true);
+      }
+    });
+
     _mediaLibraryScrollPane.setViewportView(_lstMediaLibraryDirs);
 
     _mediaLibraryPanel.add(_mediaLibraryScrollPane, BorderLayout.CENTER);
@@ -656,13 +678,7 @@ public void windowClosing(WindowEvent evt)
     _playlistDirectoryPanel.setAlignmentY(0.0F);
     _playlistDirectoryPanel.setLayout(new BorderLayout());
 
-    _treeScrollPane.setMaximumSize(null);
-    _treeScrollPane.setMinimumSize(null);
-
     _playlistDirectoryTree.setDragEnabled(true);
-    _playlistDirectoryTree.setMaximumSize(null);
-    _playlistDirectoryTree.setMinimumSize(null);
-    _playlistDirectoryTree.setPreferredSize(null);
     _playlistDirectoryTree.addKeyListener(new KeyAdapter()
     {
       @Override
@@ -1877,82 +1893,88 @@ private void _addMediaDirButtonActionPerformed()
     int response = _jMediaDirChooser.showOpenDialog(this);
     if (response == JFileChooser.APPROVE_OPTION)
     {
-      try
+      this.addMediaFolder(_jMediaDirChooser.getSelectedFile());
+    }
+    else
+    {
+      _jMediaDirChooser.cancelSelection();
+    }
+    updateMediaDirButtons();
+  }
+
+  private void addMediaFolder(File mediaFolderToAdd)
+  {
+    try
+    {
+      UNCFile mediaDir = new UNCFile(mediaFolderToAdd);
+      if (getApplicationConfig().getAlwaysUseUNCPaths())
       {
-        UNCFile mediaDir = new UNCFile(_jMediaDirChooser.getSelectedFile());
-        if (getApplicationConfig().getAlwaysUseUNCPaths())
+        if (mediaDir.onNetworkDrive())
         {
-          if (mediaDir.onNetworkDrive())
-          {
-            mediaDir = new UNCFile(mediaDir.getUNCPath());
-          }
+          mediaDir = new UNCFile(mediaDir.getUNCPath());
         }
-        final String dir = mediaDir.getPath();
+      }
+      final String dir = mediaDir.getPath();
 
-        // first let's see if this is a subdirectory of any of the media directories already in the list, and error out if so...
-        if (ArrayFunctions.containsStringPrefixingAnotherString(_listFixController.getMediaLibrary().getMediaDirectories(), dir, !ListFixController.FILE_SYSTEM_IS_CASE_SENSITIVE))
-        {
-          JOptionPane.showMessageDialog(this, new JTransparentTextArea("The directory you attempted to add is a subdirectory of one already in your media library, no change was made."),
-            "Reminder", JOptionPane.INFORMATION_MESSAGE);
-          return;
-        }
-        else
+      // first let's see if this is a subdirectory of any of the media directories already in the list, and error out if so...
+      if (ArrayFunctions.containsStringPrefixingAnotherString(_listFixController.getMediaLibrary().getMediaDirectories(), dir, !ListFixController.FILE_SYSTEM_IS_CASE_SENSITIVE))
+      {
+        JOptionPane.showMessageDialog(this, new JTransparentTextArea("The directory you attempted to add is a subdirectory of one already in your media library, no change was made."),
+          "Reminder", JOptionPane.INFORMATION_MESSAGE);
+        return;
+      }
+      else
+      {
+        // Now check if any of the media directories is a subdirectory of the one we're adding and remove the media directory if so.
+        int matchCount = 0;
+        for (String dirToCheck : _listFixController.getMediaLibrary().getMediaDirectories())
         {
-          // Now check if any of the media directories is a subdirectory of the one we're adding and remove the media directory if so.
-          int matchCount = 0;
-          for (String dirToCheck : _listFixController.getMediaLibrary().getMediaDirectories())
+          if (dirToCheck.startsWith(dir))
           {
-            if (dirToCheck.startsWith(dir))
+            // Only showing the message the first time we find this condition...
+            if (matchCount == 0)
             {
-              // Only showing the message the first time we find this condition...
-              if (matchCount == 0)
-              {
-                JOptionPane.showMessageDialog(this,
-                  new JTransparentTextArea("One or more of your existing media directories is a subdirectory of the directory you just added.  These directories will be removed from your list automatically."),
-                  "Reminder", JOptionPane.INFORMATION_MESSAGE);
-              }
-              removeMediaDir(dirToCheck);
-              matchCount++;
+              JOptionPane.showMessageDialog(this,
+                new JTransparentTextArea("One or more of your existing media directories is a subdirectory of the directory you just added.  These directories will be removed from your list automatically."),
+                "Reminder", JOptionPane.INFORMATION_MESSAGE);
             }
+            removeMediaDir(dirToCheck);
+            matchCount++;
           }
         }
+      }
 
-        ProgressWorker<Void, Void> worker = new ProgressWorker<>()
-        {
-          @Override
-          protected Void doInBackground()
-          {
-            MediaLibraryOperator operator = new MediaLibraryOperator(this);
-            operator.addDirectory(dir);
-            return null;
-          }
-        };
-        ProgressDialog pd = new ProgressDialog(this, true, worker, "Updating Media Library...", true, true);
-        pd.setVisible(true);
-
-        try
-        {
-          worker.get();
-        }
-        catch (InterruptedException | CancellationException ex)
-        {
-          _logger.debug("Cancelled");
-        }
-        catch (ExecutionException ex)
+      ProgressWorker<Void, Void> worker = new ProgressWorker<>()
+      {
+        @Override
+        protected Void doInBackground()
         {
-          _logger.error(ex);
+          MediaLibraryOperator operator = new MediaLibraryOperator(this);
+          operator.addDirectory(dir);
+          return null;
         }
-        _lstMediaLibraryDirs.setListData(new Vector<>(_listFixController.getMediaLibrary().getMediaDirectories()));
+      };
+      ProgressDialog pd = new ProgressDialog(this, true, worker, "Updating Media Library...", true, true);
+      pd.setVisible(true);
+
+      try
+      {
+        worker.get();
+      }
+      catch (InterruptedException | CancellationException ex)
+      {
+        _logger.debug("Cancelled");
       }
-      catch (HeadlessException e)
+      catch (ExecutionException ex)
       {
-        JOptionPane.showMessageDialog(this, new JTransparentTextArea("An error has occurred, media directory could not be added."));
-        _logger.error("Error adding media directory", e);
+        _logger.error(ex);
       }
+      _lstMediaLibraryDirs.setListData(new Vector<>(_listFixController.getMediaLibrary().getMediaDirectories()));
     }
-    else
+    catch (HeadlessException e)
     {
-      _jMediaDirChooser.cancelSelection();
+      JOptionPane.showMessageDialog(this, new JTransparentTextArea("An error has occurred, media directory could not be added."));
+      _logger.error("Error adding media directory", e);
     }
     updateMediaDirButtons();
   }
@@ -2042,8 +2064,8 @@ protected Void doInBackground()
     }
   }
 
-  private void _miExactMatchesSearchActionPerformed()//GEN-FIRST:event__miExactMatchesSearchActionPerformed
-  {//GEN-HEADEREND:event__miExactMatchesSearchActionPerformed
+  private void _miExactMatchesSearchActionPerformed()
+  {
     try
     {
       runExactMatchesSearchOnSelectedPlaylists();
@@ -2052,7 +2074,7 @@ private void _miExactMatchesSearchActionPerformed()//GEN-FIRST:event__miExactMat
     {
       throw new RuntimeException(e);
     }
-  }//GEN-LAST:event__miExactMatchesSearchActionPerformed
+  }
 
   private void launchListFixProjectUrl()
   {