Remove logger and tidy a bit.

Change-Id: I9e6c4009d3d6e1907713e80059c7166eb95a323f
Reviewed-on: http://gerrit.dmdirc.com/3714
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ArrayListTransferHandler.java

@@ -22,9 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.reorderablelist;
 
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
@@ -64,7 +61,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
             localArrayListFlavor = new DataFlavor(
                     DataFlavor.javaJVMLocalObjectMimeType + ";class=java.util.ArrayList");
         } catch (ClassNotFoundException e) {
-            Logger.userError(ErrorLevel.LOW, "unable to create data flavor: " + e.getMessage());
+            //This class will always exist
         }
         serialArrayListFlavor = new DataFlavor(ArrayList.class, "ArrayList");
     }
@@ -86,11 +83,8 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
             } else {
                 return false;
             }
-        } catch (UnsupportedFlavorException e) {
-            Logger.userError(ErrorLevel.LOW, "Unsupported data flavor: " + e.getMessage());
-            return false;
-        } catch (IOException e) {
-            Logger.userError(ErrorLevel.LOW, "Unable to import data: " + e.getMessage());
+        } catch (UnsupportedFlavorException | IOException e) {
+            //Don't transfer if this fails
             return false;
         }
     }
@@ -136,7 +130,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
     @Override
     protected void exportDone(final JComponent source, final Transferable data,
             final int action) {
-        if ((action == MOVE) && (indices != null)) {
+        if (action == MOVE && indices != null) {
             final DefaultListModel<T> model = (DefaultListModel<T>) sourceList.getModel();
 
             if (addCount > 0) {
@@ -163,7 +157,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
      *
      * @return whether the transferFlavors is supported
      */
-    private boolean hasLocalArrayListFlavor(final DataFlavor[] transferFlavors) {
+    private boolean hasLocalArrayListFlavor(final DataFlavor... transferFlavors) {
         if (localArrayListFlavor == null) {
             return false;
         }
@@ -183,7 +177,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
      *
      * @return whether the flavour is supported
      */
-    private boolean hasSerialArrayListFlavor(final DataFlavor[] transferFlavors) {
+    private boolean hasSerialArrayListFlavor(final DataFlavor... transferFlavors) {
         for (DataFlavor transferFlavor : transferFlavors) {
             if (transferFlavor.equals(serialArrayListFlavor)) {
                 return true;
@@ -195,7 +189,7 @@ public final class ArrayListTransferHandler<T> extends TransferHandler {
 
     @Override
     public boolean canImport(final JComponent comp, final DataFlavor[] transferFlavors) {
-        return comp instanceof JList && ((JList) comp).getModel() instanceof DefaultListModel
+        return comp instanceof JList && ((JList<?>) comp).getModel() instanceof DefaultListModel
                 && (hasLocalArrayListFlavor(transferFlavors)
                 || hasSerialArrayListFlavor(transferFlavors));
     }

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ListTransferable.java

@@ -22,9 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.reorderablelist;
 
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
@@ -47,18 +44,16 @@ public final class ListTransferable<T> implements Transferable {
     /**
      * Initialises the ListTransferable.
      *
-     * @param alist List to transfer
+     * @param list List to transfer
      */
-    public ListTransferable(final List<T> alist) {
-        super();
-
-        data = alist;
+    public ListTransferable(final List<T> list) {
+        data = list;
 
         try {
             localArrayListFlavor = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType
                     + ";class=java.util.List");
         } catch (ClassNotFoundException e) {
-            Logger.userError(ErrorLevel.LOW, "unable to create data flavor: " + e.getMessage());
+            //This class will always exist
         }
         serialArrayListFlavor = new DataFlavor(List.class, "List");
 

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ReorderableJList.java

@@ -23,8 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.reorderablelist;
 
 import com.dmdirc.addons.ui_swing.components.renderers.ReorderableJListCellRenderer;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 
 import java.awt.Cursor;
 import java.awt.Point;
@@ -103,9 +101,7 @@ public class ReorderableJList<T> extends JList<T> implements DragSourceListener,
             dataFlavor = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType
                     + ";class=java.util.List");
         } catch (ClassNotFoundException e) {
-            Logger.userError(ErrorLevel.LOW, "unable to create data flavor: "
-                    + e.getMessage());
-            dataFlavor = null;
+            //This class will always exist
         }
     }
 
@@ -229,7 +225,7 @@ public class ReorderableJList<T> extends JList<T> implements DragSourceListener,
         }
 
         //reject invalid drops
-        if ((index == -1) || (index == draggedIndex)) {
+        if (index == -1 || index == draggedIndex) {
             dtde.rejectDrop();
             return;
         }
@@ -238,10 +234,11 @@ public class ReorderableJList<T> extends JList<T> implements DragSourceListener,
         dtde.acceptDrop(DnDConstants.ACTION_MOVE);
 
         //get dropped item
-        Object dragged;
+        final Object dragged;
         try {
             dragged = dtde.getTransferable().getTransferData(dataFlavor);
         } catch (UnsupportedFlavorException | IOException e) {
+            //Don't transfer if this fails
             return;
         }
 
@@ -250,7 +247,7 @@ public class ReorderableJList<T> extends JList<T> implements DragSourceListener,
         final DefaultListModel<T> mod = getModel();
         final int newIndex = sourceBeforeTarget ? index - 1 : index;
         mod.remove(draggedIndex);
-        for (Object item : (ArrayList) dragged) {
+        for (Object item : (ArrayList<?>) dragged) {
             @SuppressWarnings("unchecked")
             final T genericItem = (T) item;
             mod.add(newIndex, genericItem);