Skip to content

Commit f7e57f1

Browse files
author
firewyre
committed
Undoing changes I accidentally made to this branch in rev 252...
1 parent a12401e commit f7e57f1

File tree

4 files changed

+21
-188
lines changed

4 files changed

+21
-188
lines changed

‎dev/listfix/model/Playlist.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ private List<PlaylistEntry> getEntriesForFiles(File[] files, IProgressObserver<S
481481
List<PlaylistEntry> ents = new ArrayList<PlaylistEntry>();
482482
for (File file : files)
483483
{
484-
if (observer == null || !observer.getCancelled())
484+
if (!observer.getCancelled())
485485
{
486486
if (Playlist.isPlaylist(file))
487487
{

‎dev/listfix/view/GUIScreen.form

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,9 @@
712712
<Property name="text" type="java.lang.String" value="Open A Playlist"/>
713713
<Property name="toolTipText" type="java.lang.String" value="Open A Playlist"/>
714714
<Property name="alignmentY" type="float" value="0.0"/>
715+
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
716+
<Border info="null"/>
717+
</Property>
715718
<Property name="focusable" type="boolean" value="false"/>
716719
<Property name="horizontalTextPosition" type="int" value="0"/>
717720
<Property name="iconTextGap" type="int" value="-2"/>
@@ -751,6 +754,9 @@
751754
<Property name="text" type="java.lang.String" value="New Playlist"/>
752755
<Property name="toolTipText" type="java.lang.String" value="New Playlist"/>
753756
<Property name="alignmentY" type="float" value="0.0"/>
757+
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
758+
<Border info="null"/>
759+
</Property>
754760
<Property name="focusable" type="boolean" value="false"/>
755761
<Property name="horizontalTextPosition" type="int" value="0"/>
756762
<Property name="iconTextGap" type="int" value="3"/>

‎dev/listfix/view/GUIScreen.java

Lines changed: 3 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,8 @@
2828
import java.awt.GraphicsEnvironment;
2929
import java.awt.Insets;
3030
import java.awt.Rectangle;
31-
import java.awt.datatransfer.DataFlavor;
3231
import java.awt.datatransfer.StringSelection;
3332
import java.awt.datatransfer.Transferable;
34-
import java.awt.dnd.DnDConstants;
35-
import java.awt.dnd.DropTarget;
36-
import java.awt.dnd.DropTargetDragEvent;
37-
import java.awt.dnd.DropTargetDropEvent;
38-
import java.awt.dnd.DropTargetEvent;
39-
import java.awt.dnd.DropTargetListener;
4033
import java.awt.event.ComponentAdapter;
4134
import java.awt.event.ComponentEvent;
4235
import java.awt.event.KeyEvent;
@@ -84,6 +77,7 @@
8477
import listfix.model.BatchRepair;
8578
import listfix.model.BatchRepairItem;
8679
import listfix.model.Playlist;
80+
import listfix.model.PlaylistEntry;
8781
import listfix.model.PlaylistHistory;
8882

8983
import listfix.util.ArrayFunctions;
@@ -100,14 +94,13 @@
10094
import listfix.view.support.ICloseableTabManager;
10195
import listfix.view.support.ProgressWorker;
10296

103-
public final class GUIScreen extends JFrame implements ICloseableTabManager, DropTargetListener
97+
public final class GUIScreen extends JFrame implements ICloseableTabManager
10498
{
10599
private static final long serialVersionUID = 7691786927987534889L;
106100
private final JFileChooser jM3UChooser;
107101
private final JFileChooser jMediaDirChooser;
108102
private final JFileChooser jSaveFileChooser;
109103
private GUIDriver guiDriver = null;
110-
private DropTarget dropTarget = null;
111104

112105
/** Creates new form GUIScreen */
113106
public GUIScreen()
@@ -174,7 +167,7 @@ public GUIScreen()
174167

175168
syncJMenuFonts();
176169

177-
// drag-n-drop support for the playlist directory tree
170+
// drag-n-drop support
178171
_playlistDirectoryTree.setTransferHandler(new TransferHandler()
179172
{
180173
@Override
@@ -183,7 +176,6 @@ public boolean canImport(TransferHandler.TransferSupport info)
183176
return false;
184177
}
185178

186-
@Override
187179
public boolean importData(TransferHandler.TransferSupport info)
188180
{
189181
return false;
@@ -212,69 +204,6 @@ protected Transferable createTransferable(JComponent c)
212204

213205
}
214206
});
215-
216-
dropTarget = new DropTarget(this, this);
217-
}
218-
219-
public void dragEnter(DropTargetDragEvent dtde)
220-
{
221-
222-
}
223-
224-
public void dragExit(DropTargetEvent dte)
225-
{
226-
227-
}
228-
229-
public void dragOver(DropTargetDragEvent dtde)
230-
{
231-
232-
}
233-
234-
public void dropActionChanged(DropTargetDragEvent dtde)
235-
{
236-
237-
}
238-
239-
public void drop(DropTargetDropEvent dtde)
240-
{
241-
try
242-
{
243-
// Ok, get the dropped object and try to figure out what it is
244-
Transferable tr = dtde.getTransferable();
245-
DataFlavor[] flavors = tr.getTransferDataFlavors();
246-
for (int i = 0; i < flavors.length; i++)
247-
{
248-
System.out.println("Possible flavor: " + flavors[i].getMimeType());
249-
// Check for file lists specifically
250-
if (flavors[i].isFlavorJavaFileListType())
251-
{
252-
// Great! Accept copy drops...
253-
dtde.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
254-
255-
// And add the list of file names to our text area
256-
java.util.List list = (java.util.List) tr.getTransferData(flavors[i]);
257-
for (int j = 0; j < list.size(); j++)
258-
{
259-
if (list.get(j) instanceof File)
260-
{
261-
openPlaylist((File) list.get(j));
262-
}
263-
}
264-
265-
// If we made it this far, everything worked.
266-
dtde.dropComplete(true);
267-
return;
268-
}
269-
}
270-
// Hmm, the user must not have dropped a file list
271-
dtde.rejectDrop();
272-
}
273-
catch (Exception e)
274-
{
275-
e.printStackTrace();
276-
dtde.rejectDrop();
277-
}
278207
}
279208

280209
public AppOptions getOptions()

‎dev/listfix/view/PlaylistEditCtrl.java

Lines changed: 11 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.awt.datatransfer.DataFlavor;
2828
import java.awt.datatransfer.Transferable;
2929
import java.awt.datatransfer.UnsupportedFlavorException;
30-
import java.awt.dnd.DnDConstants;
3130
import java.awt.event.ActionEvent;
3231
import java.awt.event.KeyEvent;
3332
import java.awt.event.MouseAdapter;
@@ -1558,9 +1557,7 @@ else if ((isOverItem && _uiTable.getSelectedRowCount() == 0)
15581557
@Override
15591558
public boolean canImport(TransferHandler.TransferSupport info)
15601559
{
1561-
if (!info.isDataFlavorSupported(_playlistEntryListFlavor)
1562-
&& !info.isDataFlavorSupported(DataFlavor.stringFlavor)
1563-
&& !info.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
1560+
if (!info.isDataFlavorSupported(_playlistEntryListFlavor) && !info.isDataFlavorSupported(DataFlavor.stringFlavor))
15641561
{
15651562
return false;
15661563
}
@@ -1582,9 +1579,7 @@ public boolean importData(TransferHandler.TransferSupport info)
15821579
}
15831580

15841581
// Check for custom PlaylistEntryList flavor
1585-
if (!info.isDataFlavorSupported(_playlistEntryListFlavor)
1586-
&& !info.isDataFlavorSupported(DataFlavor.stringFlavor)
1587-
&& !info.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
1582+
if (!info.isDataFlavorSupported(_playlistEntryListFlavor) && !info.isDataFlavorSupported(DataFlavor.stringFlavor))
15881583
{
15891584
return false;
15901585
}
@@ -1624,114 +1619,16 @@ public boolean importData(TransferHandler.TransferSupport info)
16241619
return false;
16251620
}
16261621
}
1627-
else if (info.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
1628-
{
1629-
return HandleFileListFlavor(info, dl);
1630-
}
16311622
else
1632-
{
1633-
return HandleStringFlavor(info, dl);
1634-
}
1635-
}
1636-
1637-
private boolean HandleFileListFlavor(TransferSupport info, final JTable.DropLocation dl)
1638-
{
1639-
Transferable t = info.getTransferable();
1640-
DataFlavor[] flavors = t.getTransferDataFlavors();
1641-
for (int i = 0; i < flavors.length; i++)
16421623
{
1624+
// Currently we're only dealing w/ a string that represents the path to a playlist
1625+
// Get the entries that are being dropped.
1626+
Transferable t = info.getTransferable();
1627+
final String data;
16431628
try
16441629
{
1645-
int insertAt = dl.getRow();
1646-
final List list;
1647-
list = (List)t.getTransferData(flavors[i]);
1648-
for (int j = 0; j < list.size(); j++)
1649-
{
1650-
final File tempFile = (File)list.get(j);
1651-
if (tempFile instanceof File)
1652-
{
1653-
if (Playlist.isPlaylist(tempFile))
1654-
{
1655-
final String[] libraryFiles;
1656-
if (GUIDriver.getInstance().getAppOptions().getAutoLocateEntriesOnPlaylistLoad())
1657-
{
1658-
libraryFiles = GUIDriver.getInstance().getMediaLibraryFileList();
1659-
}
1660-
else
1661-
{
1662-
libraryFiles = null;
1663-
}
1664-
ProgressWorker<Playlist, Void> worker = new ProgressWorker<Playlist, Void>()
1665-
{
1666-
@Override
1667-
protected Playlist doInBackground() throws Exception
1668-
{
1669-
Playlist list = new Playlist(tempFile, this);
1670-
if (libraryFiles != null)
1671-
{
1672-
list.repair(libraryFiles, this);
1673-
}
1674-
return list;
1675-
}
1676-
1677-
@Override
1678-
protected void done()
1679-
{
1680-
Playlist list;
1681-
try
1682-
{
1683-
list = get();
1684-
_playlist.addAll(dl.getRow(), list.getEntries());
1685-
}
1686-
catch (CancellationException ex)
1687-
{
1688-
return;
1689-
}
1690-
catch (Exception ex)
1691-
{
1692-
JOptionPane.showMessageDialog(PlaylistEditCtrl.this.getParentFrame(), ex, "Open Playlist Error", JOptionPane.ERROR_MESSAGE);
1693-
return;
1694-
}
1695-
}
1696-
};
1697-
ProgressDialog pd = new ProgressDialog((GUIScreen) getParentFrame(), true, worker, "Loading...");
1698-
int plistSize = _playlist.size();
1699-
pd.setVisible(true);
1700-
insertAt += _playlist.size() - plistSize;
1701-
}
1702-
else
1703-
{
1704-
// add it to the playlist!
1705-
_playlist.add(insertAt, new File[] {tempFile}, null);
1706-
insertAt++;
1707-
}
1708-
}
1709-
}
1710-
resizeAllColumns();
1711-
return true;
1712-
}
1713-
catch (UnsupportedFlavorException ex)
1714-
{
1715-
Logger.getLogger(PlaylistEditCtrl.class.getName()).log(Level.SEVERE, null, ex);
1716-
}
1717-
catch (IOException ex)
1718-
{
1719-
Logger.getLogger(PlaylistEditCtrl.class.getName()).log(Level.SEVERE, null, ex);
1720-
}
1721-
}
1722-
return false;
1723-
}
1630+
data = (String) t.getTransferData(DataFlavor.stringFlavor);
17241631

1725-
private boolean HandleStringFlavor(TransferSupport info, final JTable.DropLocation dl)
1726-
{
1727-
Transferable t = info.getTransferable();
1728-
DataFlavor[] flavors = t.getTransferDataFlavors();
1729-
for (int i = 0; i < flavors.length; i++)
1730-
{
1731-
try
1732-
{
1733-
final String data;
1734-
data = (String) t.getTransferData(flavors[i]);
17351632
final String[] libraryFiles;
17361633
if (GUIDriver.getInstance().getAppOptions().getAutoLocateEntriesOnPlaylistLoad())
17371634
{
@@ -1741,6 +1638,7 @@ private boolean HandleStringFlavor(TransferSupport info, final JTable.DropLocati
17411638
{
17421639
libraryFiles = null;
17431640
}
1641+
17441642
ProgressWorker<Playlist, Void> worker = new ProgressWorker<Playlist, Void>()
17451643
{
17461644
@Override
@@ -1762,6 +1660,7 @@ protected void done()
17621660
{
17631661
list = get();
17641662
_playlist.addAll(dl.getRow(), list.getEntries());
1663+
17651664
if (_playlist.size() == list.size())
17661665
{
17671666
resizeAllColumns();
@@ -1790,10 +1689,9 @@ protected void done()
17901689
{
17911690
Logger.getLogger(PlaylistEditCtrl.class.getName()).log(Level.SEVERE, null, ex);
17921691
}
1692+
return false;
17931693
}
1794-
return false;
1795-
}
1796-
;
1694+
};
17971695

17981696
@Override
17991697
public int getSourceActions(JComponent c)

0 commit comments

Comments
 (0)