Bunch of minor style improvements

git-svn-id: http://svn.dmdirc.com/trunk@3626 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ChannelEventHandler.java

@@ -59,7 +59,7 @@ public final class ChannelEventHandler extends EventHandler implements
     @Override
     protected void addCallback(final CallbackManager cbm, final String name)
             throws CallbackNotFoundException {
-        if (name.equals("onAwayStateOther")) {
+        if ("onAwayStateOther".equals(name)) {
             cbm.addCallback(name, this);
         } else {
             cbm.addCallback(name, this, owner.getChannelInfo().getName());

src/com/dmdirc/Server.java

@@ -122,7 +122,7 @@ public final class Server extends WritableFrameContainer implements Serializable
     private final List<Invite> invites = new ArrayList<Invite>();
     
     /** Our ignore list. */
-    private IgnoreList ignoreList = new IgnoreList();
+    private final IgnoreList ignoreList = new IgnoreList();
     
     /** Our string convertor. */
     private IRCStringConverter converter = new IRCStringConverter();
@@ -941,7 +941,7 @@ public final class Server extends WritableFrameContainer implements Serializable
      * @param channelName The name of the channel to test
      * @return True if the channel name is valid, false otherwise
      */
-    public boolean isValidChannelName(String channelName) {
+    public boolean isValidChannelName(final String channelName) {
         return hasChannel(channelName) ||
                 (parser != null && parser.isValidChannelName(channelName));
     }

src/com/dmdirc/ServerEventHandler.java

@@ -196,7 +196,7 @@ public final class ServerEventHandler extends EventHandler
     
     /** {@inheritDoc} */
     @Override
-    public void onPingSent(IRCParser tParser) {
+    public void onPingSent(final IRCParser tParser) {
         checkParser(tParser);
         
         ActionManager.processEvent(CoreActionType.SERVER_PINGSENT, null, owner);

src/com/dmdirc/actions/ActionCondition.java

@@ -199,7 +199,7 @@ public class ActionCondition {
     /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
-        if (obj == null || !(obj instanceof ActionCondition)) {
+        if (!(obj instanceof ActionCondition)) {
             return false;
         }
         

src/com/dmdirc/actions/ActionGroup.java

@@ -41,7 +41,7 @@ public class ActionGroup extends ArrayList<Action> {
     private static final long serialVersionUID = 1;    
     
     /** The name of this action group. */
-    private String name = null;
+    private final String name;
     
     /** The description of this action group. */
     private String description = null;

src/com/dmdirc/actions/ConditionTree.java

@@ -46,7 +46,7 @@ public class ConditionTree {
         /** Doesn't do anything (an empty tree). */
         NOOP
     }
-       
+
     /** The left subtree of this tree. */
     private ConditionTree leftArg = null;
 
@@ -57,11 +57,11 @@ public class ConditionTree {
     private int argument = -1;
 
     /** The operation that this tree performs. */
-    private OPERATION op;
-    
+    private final OPERATION op;
+
     /**
      * Creates a new ConditionTree for a binary operation.
-     * 
+     *
      * @param op The binary operation to perform
      * @param leftArg The left argument/subtree
      * @param rightArg The right argument/subtree
@@ -72,46 +72,46 @@ public class ConditionTree {
         assert(op != OPERATION.NOT);
         assert(leftArg != null);
         assert(rightArg != null);
-        
+
         this.op = op;
         this.leftArg = leftArg;
         this.rightArg = rightArg;
     }
-    
+
     /**
      * Creates a new ConditionTree for a unary operation.
-     * 
+     *
      * @param op
      * @param argument
      */
     private ConditionTree(final OPERATION op, final ConditionTree argument) {
         assert(op == OPERATION.NOT);
-        
+
         this.op = op;
         this.leftArg = argument;
-    }    
-    
+    }
+
     /**
      * Creates a new ConditionTree for a VAR operation with the specified
      * argument number.
-     * 
+     *
      * @param argument The number of the argument that's to be tested.
      */
     private ConditionTree(final int argument) {
         this.op = OPERATION.VAR;
         this.argument = argument;
     }
-    
+
     /**
      * Creates a new ConditionTree for a NOOP operation.
      */
     private ConditionTree() {
         this.op = OPERATION.NOOP;
     }
-    
+
     /**
      * Retrieves the highest argument number that is used in this condition tree.
-     * 
+     *
      * @return The highest argument number used in this tree
      */
     public int getMaximumArgument() {
@@ -129,7 +129,7 @@ public class ConditionTree {
     /**
      * Evaluates this tree with the specified conditions. Returns the result
      * of the evaluation.
-     * 
+     *
      * @param conditions The binary values of each of the conditions used in
      * this three
      * @return The result of the evaluation of this tree
@@ -148,13 +148,13 @@ public class ConditionTree {
                 return true;
         }
     }
-    
+
     /**
      * Retrieves a String representation of this ConditionTree. The string
      * representation is a normalised formula describing this tree and all of
      * its children. The output of this method will generate an identical tree
      * if passed to parseString.
-     * 
+     *
      * @return A string representation of this tree
      */
     @Override
@@ -173,42 +173,42 @@ public class ConditionTree {
         default:
             return "<unknown>";
         }
-    }    
-    
+    }
+
     /**
      * Parses the specified string into a condition tree.
-     * 
+     *
      * @param string The string to be parsed
      * @return The corresponding condition tree, or null if there was an error
      * while parsing the data
      */
     public static ConditionTree parseString(final String string) {
         final Deque<Object> stack = new ArrayDeque<Object>();
-        
+
         for (int i = 0; i < string.length(); i++) {
             final char m = string.charAt(i);
-            
+
             if (isInt(m)) {
-                String temp = "" + m;
-                
+                String temp = String.valueOf(m);
+
                 while (i + 1 < string.length() && isInt(string.charAt(i + 1))) {
                     temp = temp + string.charAt(i + 1);
                     i++;
                 }
-                
+
                 stack.add(new ConditionTree(Integer.parseInt(temp)));
             } else if (m != ' ' && m != '\t' && m != '\n' && m != '\r') {
                 stack.add(m);
             }
         }
-        
+
         return parseStack(stack);
     }
-    
+
     /**
      * Parses the specified stack of elements, and returns a corresponding
      * ConditionTree.
-     * 
+     *
      * @param stack The stack to be read.
      * @return The corresponding condition tree, or null if there was an error
      * while parsing the data.
@@ -216,10 +216,10 @@ public class ConditionTree {
     @SuppressWarnings("fallthrough")
     private static ConditionTree parseStack(final Deque<Object> stack) {
         final Deque<Object> myStack = new ArrayDeque<Object>();
-        
+
         while (!stack.isEmpty()) {
             final Object object = stack.poll();
-            
+
             if (object instanceof Character && ((Character) object) == ')') {
                 final ConditionTree bracket = readBracket(myStack);
 
@@ -232,34 +232,36 @@ public class ConditionTree {
                 myStack.add(object);
             }
         }
-        
+
         while (!myStack.isEmpty()) {
             switch (myStack.size()) {
                 case 1:
                     final Object first = myStack.pollFirst();
                     if (first instanceof ConditionTree) {
                         return (ConditionTree) first;
-                    }            
+                    }
                 case 0:
                     return null;
             }
-            
+
             final ConditionTree first = readTerm(myStack);
-            
+
             if (first == null) {
                 return null;
             } else if (myStack.isEmpty()) {
                 return first;
             }
-            
+
             final Object second = myStack.pollFirst();
-            
-            if (!myStack.isEmpty()) {
+
+            if (myStack.isEmpty()) {
+                return null;
+            } else {
                 final ConditionTree third = readTerm(myStack);
-                
+
                 if (first != null && third != null && second instanceof Character) {
                     OPERATION op;
-                    
+
                     if ((Character) second == '&') {
                         op = OPERATION.AND;
                     } else if ((Character) second == '|') {
@@ -267,48 +269,46 @@ public class ConditionTree {
                     } else {
                         return null;
                     }
-                    
+
                     myStack.addFirst(new ConditionTree(op, first, third));
                 } else {
                     return null;
                 }
-            } else {
-                return null;
             }
         }
-        
+
         return new ConditionTree();
     }
-    
+
     /**
      * Reads and returns a single term from the specified stack.
-     * 
+     *
      * @param stack The stack to be read
      * @return The ConditionTree representing the last element on the stack,
      * or null if it was not possible to create one.
      */
     private static ConditionTree readTerm(final Deque<Object> stack) {
         final Object first = stack.pollFirst();
-        
+
         if (first instanceof Character && (Character) first == '!') {
             if (stack.isEmpty()) {
                 return null;
             }
-            
+
             return new ConditionTree(OPERATION.NOT, readTerm(stack));
         } else {
             if (!(first instanceof ConditionTree)) {
                 return null;
             }
-            
+
             return (ConditionTree) first;
         }
     }
-    
+
     /**
      * Pops elements off of the end of the specified stack until an opening
      * bracket is reached, and then returns the parsed content of the bracket.
-     * 
+     *
      * @param stack The stack to be read for the bracket
      * @return The parsed contents of the bracket, or null if the brackets were
      * mismatched.
@@ -316,74 +316,74 @@ public class ConditionTree {
     private static ConditionTree readBracket(final Deque<Object> stack) {
         final Deque<Object> tempStack = new ArrayDeque<Object>();
         boolean found = false;
-        
+
         while (!found && !stack.isEmpty()) {
             final Object object = stack.pollLast();
-            
+
             if (object instanceof Character && ((Character) object) == '(') {
                 found = true;
             } else {
                 tempStack.addFirst(object);
             }
         }
-        
-        if (!found) {
-            return null;
-        } else {
+
+        if (found) {
             return parseStack(tempStack);
+        } else {
+            return null;
         }
     }
-    
+
     /**
      * Determines if the specified character represents a single digit.
-     * 
+     *
      * @param target The character to be tested
      * @return True if the character is a digit, false otherwise
      */
     private static boolean isInt(final char target) {
         return target >= '0' && target <= '9';
     }
-    
+
     /**
      * Creates a condition tree by disjoining the specified number of arguments
      * together.
-     * 
+     *
      * @param numArgs The number of arguments to be disjoined
      * @return The corresponding condition tree
      */
     public static ConditionTree createDisjunction(final int numArgs) {
         final StringBuilder builder = new StringBuilder();
-        
+
         for (int i = 0; i < numArgs; i++) {
             if (builder.length() != 0) {
                 builder.append('|');
             }
-            
+
             builder.append(i);
         }
-        
-        return parseString(builder.toString());        
+
+        return parseString(builder.toString());
     }
 
     /**
      * Creates a condition tree by conjoining the specified number of arguments
      * together.
-     * 
+     *
      * @param numArgs The number of arguments to be conjoined
      * @return The corresponding condition tree
-     */    
+     */
     public static ConditionTree createConjunction(final int numArgs) {
         final StringBuilder builder = new StringBuilder();
-        
+
         for (int i = 0; i < numArgs; i++) {
             if (builder.length() != 0) {
                 builder.append('&');
             }
-            
+
             builder.append(i);
         }
-        
+
         return parseString(builder.toString());
     }
-       
+
 }

src/com/dmdirc/addons/audio/AudioPlayer.java

@@ -22,15 +22,15 @@
 
 package com.dmdirc.addons.audio;
 
+import java.io.File;
+import java.applet.AudioClip;
+import java.applet.Applet;
+
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.SourceDataLine;
 import javax.sound.sampled.DataLine;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.applet.AudioClip;
-import java.applet.Applet;
 
 /**
  * The AudioPlayer handles the playing of the audio

src/com/dmdirc/addons/nowplaying/ConfigPanel.java

@@ -86,10 +86,10 @@ public class ConfigPanel extends JPanel implements PreferencesInterface, KeyList
     public ConfigPanel(final NowPlayingPlugin plugin, final List<String> sources) {
         super();
 
-        if (sources != null) {
-            this.sources = new LinkedList<String>(sources);
-        } else {
+        if (sources == null) {
             this.sources = new LinkedList<String>();
+        } else {
+            this.sources = new LinkedList<String>(sources);
         }
         this.plugin = plugin;
 
@@ -202,19 +202,19 @@ public class ConfigPanel extends JPanel implements PreferencesInterface, KeyList
 
     /** {@inheritDoc} */
     @Override
-    public void keyTyped(KeyEvent e) {
+    public void keyTyped(final KeyEvent e) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public void keyPressed(KeyEvent e) {
+    public void keyPressed(final KeyEvent e) {
         // Do nothing
     }
 
     /** {@inheritDoc} */
     @Override
-    public void keyReleased(KeyEvent e) {
+    public void keyReleased(final KeyEvent e) {
         if (updateTimer != null) {
             updateTimer.cancel();
         }

src/com/dmdirc/addons/nowplaying/MediaSource.java

@@ -35,69 +35,69 @@ public interface MediaSource {
      * 
      * @return True if this source is running, false otherwise
      */
-    public abstract boolean isRunning();
+    boolean isRunning();
     
     /**
      * Determine if this source is currently playing or not.
      * 
      * @return True if this source is playing, false otherwise
      */
-    public abstract boolean isPlaying();
+    boolean isPlaying();
     
     /**
      * Retrieves the name of the application that this source is for.
      * 
      * @return This source's application name
      */
-    public abstract String getAppName();
+    String getAppName();
     
     /**
      * Retrieves the artist of the curently loaded track.
      *
      * @return Current track artist
      */
-    public abstract String getArtist();
+    String getArtist();
     
     /**
      * Retrieves the title of the currently loaded track.
      *
      * @return Current track title
      */
-    public abstract String getTitle();
+    String getTitle();
     
     /**
      * Retrieves the album of the currently loaded track.
      *
      * @return Current track album
      */
-    public abstract String getAlbum();
+    String getAlbum();
     
     /**
      * Retrieves the length of the currently loaded track ([h:]mm:ss).
      *
      * @return Current track length
      */
-    public abstract String getLength();
+    String getLength();
     
     /**
      * Retrieves the time of the currently loaded track ([h:]mm:ss).
      *
      * @return Current track time
      */
-    public abstract String getTime();
+    String getTime();
     
     /**
      * Retrives the format of the currently loaded track.
      *
      * @return Current track format
      */
-    public abstract String getFormat();
+    String getFormat();
     
     /**
      * Retrieves the bitrate of the currently loaded track.
      *
      * @return Current track bitrate
      */
-    public abstract String getBitrate();
+    String getBitrate();
 
 }

src/com/dmdirc/addons/nowplaying/MediaSourceComparator.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.addons.nowplaying;
 
-import com.dmdirc.addons.nowplaying.MediaSource;
-
 import java.io.Serializable;
 import java.util.Comparator;
 import java.util.List;

src/com/dmdirc/addons/nowplaying/MediaSourceManager.java

@@ -37,6 +37,6 @@ public interface MediaSourceManager {
      * 
      * @return A list of sources that this manager manages
      */
-    public List<MediaSource> getSources();
+    List<MediaSource> getSources();
     
 }

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

@@ -38,6 +38,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+/**
+ * Plugin that allows users to advertise what they're currently playing or
+ * listening to.
+ * 
+ * @author chris
+ */
 public class NowPlayingPlugin extends Plugin implements ActionListener  {
     
     /** Config domain. */
@@ -49,12 +55,12 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
     /** The now playing command we're registering. */
     private NowPlayingCommand command;
     
-    /** Config panel. */
-    private ConfigPanel configPanel;
-    
     /** The user's preferred order for source usage. */
     private List<String> order;
     
+    /**
+     * Creates a new instance of NowPlayingPlugin.
+     */
     public NowPlayingPlugin() {
         super();
     }
@@ -89,7 +95,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesManager manager) {
-        configPanel = new ConfigPanel(this, order);
+        final ConfigPanel configPanel = new ConfigPanel(this, order);
         
         final PreferencesCategory category = new PreferencesCategory("Now Playing",
                 "", configPanel);

src/com/dmdirc/addons/redirectplugin/RedirectPlugin.java

@@ -34,7 +34,7 @@ import com.dmdirc.plugins.Plugin;
  */
 public final class RedirectPlugin extends Plugin {
     
-    private RedirectCommand command;
+    private final RedirectCommand command;
     
     /** Creates a new system tray plugin. */
     public RedirectPlugin() {

src/com/dmdirc/addons/systray/PopupCommand.java

@@ -35,7 +35,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
 public final class PopupCommand extends ServerCommand {
     
     /** The SystrayPlugin that we belong to. */
-    private SystrayPlugin parent;
+    private final SystrayPlugin parent;
     
     /**
      * Creates a new instance of PopupCommand.

src/com/dmdirc/addons/urlcatcher/UrlCatcherPlugin.java

@@ -78,10 +78,10 @@ public class UrlCatcherPlugin extends Plugin implements ActionListener {
      * @param url The URL to be added
      */
     private void addURL(final String url) {
-        if (!urls.containsKey(url)) {
-            urls.put(url, 1);
-        } else {
+        if (urls.containsKey(url)) {
             urls.put(url, urls.get(url) + 1);
+        } else {
+            urls.put(url, 1);
         }
     }
     

src/com/dmdirc/commandline/RemoteServer.java

@@ -49,7 +49,7 @@ public class RemoteServer implements RemoteInterface {
     
     /** {@inheritDoc} */
     @Override
-    public void connect(List<IrcAddress> addresses) throws RemoteException {
+    public void connect(final List<IrcAddress> addresses) throws RemoteException {
         for (IrcAddress address : addresses) {
             address.connect();
         }

src/com/dmdirc/commandparser/commands/global/AliasCommand.java

@@ -122,7 +122,7 @@ public final class AliasCommand extends GlobalCommand implements IntelligentComm
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
-        AdditionalTabTargets res = new AdditionalTabTargets();
+        final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {
             res.add("--remove");

src/com/dmdirc/commandparser/commands/global/Debug.java

@@ -105,7 +105,7 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
     private void doError(final String ... args) {
         ErrorLevel el = ErrorLevel.HIGH;
         if (args.length > 2) {
-            String level = args[2];
+            final String level = args[2];
             
             if (level.equals("low")) {
                 el = ErrorLevel.LOW;