dmix: Code style.

Author: avuton

JMPDComm/src/main/java/org/a0z/mpd/Sticker.java

@@ -1,3 +1,30 @@
+/*
+ * Copyright (C) 2004 Felipe Gustavo de Almeida
+ * Copyright (C) 2010-2014 The MPDroid Project
+ *
+ * All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice,this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 package org.a0z.mpd;
 
 import org.a0z.mpd.connection.MPDConnection;
@@ -143,6 +170,22 @@ private static CommandQueue getMusicCommand(final Collection<String> response) {
         return commandQueue;
     }
 
+    /**
+     * Sanity check for the sticker manager methods.
+     *
+     * @param entry The entry to process.
+     */
+    private static void onlyMusicSupported(final FilesystemTreeEntry entry) {
+        if (entry == null) {
+            throw new IllegalArgumentException("Failed on a null argument.");
+        }
+
+        if (!(entry instanceof Music)) {
+            throw new IllegalArgumentException("Stickers are only supported with Music objects: " +
+                    "Class: " + entry.getClass() + " Entry: " + entry.getFullPath());
+        }
+    }
+
     /**
      * Deletes a sticker.
      *
@@ -278,22 +321,6 @@ private Map<String, Music> getMusicPair(final Collection<String> response)
         return musicPair;
     }
 
-    /**
-     * Sanity check for the sticker manager methods.
-     *
-     * @param entry The entry to process.
-     */
-    private static void onlyMusicSupported(final FilesystemTreeEntry entry) {
-        if (entry == null) {
-            throw new IllegalArgumentException("Failed on a null argument.");
-        }
-
-        if (!(entry instanceof Music)) {
-            throw new IllegalArgumentException("Stickers are only supported with Music objects: " +
-                    "Class: " + entry.getClass() + " Entry: " + entry.getFullPath());
-        }
-    }
-
     /**
      * Retrieves rating of a entry.
      *

JMPDComm/src/main/java/org/a0z/mpd/connection/MPDConnection.java

@@ -466,7 +466,7 @@ public final CommandResult call() {
          * Used after a server error, sleeps for a small time then tries to reconnect.
          *
          * @param result The {@code CommandResult} which stores the connection failure.
-         * @param e The exception to set.
+         * @param e      The exception to set.
          */
         private void handleFailure(final CommandResult result, final IOException e) {
             if (isFailureHandled(result)) {
@@ -478,7 +478,7 @@ private void handleFailure(final CommandResult result, final IOException e) {
          * Used after a server error, sleeps for a small time then tries to reconnect.
          *
          * @param result The {@code CommandResult} which stores the connection failure.
-         * @param e The exception to set.
+         * @param e      The exception to set.
          */
         private void handleFailure(final CommandResult result, final MPDException e) {
             if (isFailureHandled(result)) {

JMPDComm/src/main/java/org/a0z/mpd/item/Item.java

@@ -48,7 +48,7 @@ public static <T extends Item> List<T> merged(final List<T> albumArtists,
         for (int j = jStart; j >= 0; j--) { // album artists
             if (albumArtists.get(j).getName().equals("")) {
                 albumArtists.remove(j);
-                jStart --;
+                jStart--;
             }
         }
         for (int i = artists.size() - 1; i >= 0; i--) { // artists

MPDroid/src/main/res/layout-v21/notification.xml

@@ -45,8 +45,8 @@
             android:ellipsize="marquee"
             android:maxLines="1"
             android:singleLine="true"
-            android:textColor="@android:color/white"
-            android:textAppearance="?android:textAppearanceMedium" />
+            android:textAppearance="?android:textAppearanceMedium"
+            android:textColor="@android:color/white" />
 
         <TextView
             android:id="@+id/notificationArtist"