|
@@ -22,9 +22,6 @@
|
22
|
22
|
|
23
|
23
|
package com.dmdirc.addons.ui_swing.components.reorderablelist;
|
24
|
24
|
|
25
|
|
-import com.dmdirc.logger.ErrorLevel;
|
26
|
|
-import com.dmdirc.logger.Logger;
|
27
|
|
-
|
28
|
25
|
import java.awt.datatransfer.DataFlavor;
|
29
|
26
|
import java.awt.datatransfer.Transferable;
|
30
|
27
|
import java.awt.datatransfer.UnsupportedFlavorException;
|
|
@@ -64,7 +61,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
|
64
|
61
|
localArrayListFlavor = new DataFlavor(
|
65
|
62
|
DataFlavor.javaJVMLocalObjectMimeType + ";class=java.util.ArrayList");
|
66
|
63
|
} catch (ClassNotFoundException e) {
|
67
|
|
- Logger.userError(ErrorLevel.LOW, "unable to create data flavor: " + e.getMessage());
|
|
64
|
+ //This class will always exist
|
68
|
65
|
}
|
69
|
66
|
serialArrayListFlavor = new DataFlavor(ArrayList.class, "ArrayList");
|
70
|
67
|
}
|
|
@@ -86,11 +83,8 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
|
86
|
83
|
} else {
|
87
|
84
|
return false;
|
88
|
85
|
}
|
89
|
|
- } catch (UnsupportedFlavorException e) {
|
90
|
|
- Logger.userError(ErrorLevel.LOW, "Unsupported data flavor: " + e.getMessage());
|
91
|
|
- return false;
|
92
|
|
- } catch (IOException e) {
|
93
|
|
- Logger.userError(ErrorLevel.LOW, "Unable to import data: " + e.getMessage());
|
|
86
|
+ } catch (UnsupportedFlavorException | IOException e) {
|
|
87
|
+ //Don't transfer if this fails
|
94
|
88
|
return false;
|
95
|
89
|
}
|
96
|
90
|
}
|
|
@@ -136,7 +130,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
|
136
|
130
|
@Override
|
137
|
131
|
protected void exportDone(final JComponent source, final Transferable data,
|
138
|
132
|
final int action) {
|
139
|
|
- if ((action == MOVE) && (indices != null)) {
|
|
133
|
+ if (action == MOVE && indices != null) {
|
140
|
134
|
final DefaultListModel<T> model = (DefaultListModel<T>) sourceList.getModel();
|
141
|
135
|
|
142
|
136
|
if (addCount > 0) {
|
|
@@ -163,7 +157,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
|
163
|
157
|
*
|
164
|
158
|
* @return whether the transferFlavors is supported
|
165
|
159
|
*/
|
166
|
|
- private boolean hasLocalArrayListFlavor(final DataFlavor[] transferFlavors) {
|
|
160
|
+ private boolean hasLocalArrayListFlavor(final DataFlavor... transferFlavors) {
|
167
|
161
|
if (localArrayListFlavor == null) {
|
168
|
162
|
return false;
|
169
|
163
|
}
|
|
@@ -183,7 +177,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
|
183
|
177
|
*
|
184
|
178
|
* @return whether the flavour is supported
|
185
|
179
|
*/
|
186
|
|
- private boolean hasSerialArrayListFlavor(final DataFlavor[] transferFlavors) {
|
|
180
|
+ private boolean hasSerialArrayListFlavor(final DataFlavor... transferFlavors) {
|
187
|
181
|
for (DataFlavor transferFlavor : transferFlavors) {
|
188
|
182
|
if (transferFlavor.equals(serialArrayListFlavor)) {
|
189
|
183
|
return true;
|
|
@@ -195,7 +189,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
|
195
|
189
|
|
196
|
190
|
@Override
|
197
|
191
|
public boolean canImport(final JComponent comp, final DataFlavor[] transferFlavors) {
|
198
|
|
- return comp instanceof JList && ((JList) comp).getModel() instanceof DefaultListModel
|
|
192
|
+ return comp instanceof JList && ((JList<?>) comp).getModel() instanceof DefaultListModel
|
199
|
193
|
&& (hasLocalArrayListFlavor(transferFlavors)
|
200
|
194
|
|| hasSerialArrayListFlavor(transferFlavors));
|
201
|
195
|
}
|