Style fixes

Change-Id: I4a52807921e2c3082cd0650e222387f0dedbfd23
Reviewed-on: http://gerrit.dmdirc.com/1319
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/parser/common/CallbackManager.java

@@ -46,7 +46,7 @@ public abstract class CallbackManager<T extends Parser> {
         ChannelJoinListener.class, ChannelKickListener.class,
         ChannelMessageListener.class, ChannelModeChangeListener.class,
         ChannelNickChangeListener.class, ChannelNonUserModeChangeListener.class,
-	ChannelModeMessageListener.class, ChannelModeNoticeListener.class,
+        ChannelModeMessageListener.class, ChannelModeNoticeListener.class,
         ChannelNoticeListener.class, ChannelPartListener.class, ChannelQuitListener.class,
         ChannelSelfJoinListener.class, ChannelSingleModeChangeListener.class,
         ChannelTopicListener.class, ChannelUserModeChangeListener.class,
@@ -79,7 +79,7 @@ public abstract class CallbackManager<T extends Parser> {
      *
      * @param parser Parser that owns this callback manager.
      */
-    public CallbackManager(final T parser) {
+    protected CallbackManager(final T parser) {
         initialise(parser);
     }
 
@@ -190,14 +190,14 @@ public abstract class CallbackManager<T extends Parser> {
      * Add a callback.
      * This method will throw a CallbackNotFoundException if the callback does not exist.
      *
-     * @param <T> The type of callback
+     * @param <S> The type of callback
      * @param callback Type of callback object
      * @param o instance of ICallbackInterface to add.
      * @throws CallbackNotFoundException If callback is not found.
      * @throws NullPointerException If 'o' is null
      */
-    public <T extends CallbackInterface> void addCallback(
-            final Class<T> callback, final T o) throws CallbackNotFoundException {
+    public <S extends CallbackInterface> void addCallback(
+            final Class<S> callback, final S o) throws CallbackNotFoundException {
         if (o == null) {
             throw new NullPointerException("CallbackInterface is null");
         }
@@ -220,9 +220,9 @@ public abstract class CallbackManager<T extends Parser> {
      * @throws CallbackNotFoundException If callback is not found.
      * @throws NullPointerException If 'o' is null
      */
-    public <T extends CallbackInterface> void addCallback(
-            final Class<T> callback,
-            final T o, final String target) throws CallbackNotFoundException {
+    public <S extends CallbackInterface> void addCallback(
+            final Class<S> callback,
+            final S o, final String target) throws CallbackNotFoundException {
         if (o == null) {
             throw new NullPointerException("CallbackInterface is null");
         }
@@ -239,8 +239,8 @@ public abstract class CallbackManager<T extends Parser> {
      * @param o instance of ICallbackInterface to add.
      * @return true/false if the callback was added or not.
      */
-    public <T extends CallbackInterface> boolean addNonCriticalCallback(
-            final Class<T> callback, final T o) {
+    public <S extends CallbackInterface> boolean addNonCriticalCallback(
+            final Class<S> callback, final S o) {
         try {
             addCallback(callback, o);
             return true;
@@ -259,8 +259,8 @@ public abstract class CallbackManager<T extends Parser> {
      * @param target Parameter to specify that a callback should only fire for specific things
      * @return true/false if the callback was added or not.
      */
-    public <T extends CallbackInterface> boolean addNonCriticalCallback(
-            final Class<T> callback, final T o, final String target) {
+    public <S extends CallbackInterface> boolean addNonCriticalCallback(
+            final Class<S> callback, final S o, final String target) {
         try {
             addCallback(callback, o, target);
             return true;

src/com/dmdirc/parser/common/MyInfo.java

@@ -30,130 +30,148 @@ package com.dmdirc.parser.common;
  * @see IRCParser
  */
 public class MyInfo {
-    
-	/** Character to prepend to nickname if in use (Default "_"). */
-	private char prependChar = '_';	
-	/** Nickname to attempt to use on IRC. */
-	private String nickname;
-	/**
-	 * Alternative nickname to attempt to use on IRC.
-	 * If the first nickname is in use, and a NickInUse message is recieved before 001, we
-	 * will attempt to use this nickname instead.<br>
-	 * If this also fails, we will start prepending the prependChar character (_) to the main nickname
-	 */
-	private String altNickname;
-	/** Realname string to use */
-	private String realname;
-	/** Username to use, this doesn't matter when an ident server is running*/
-	private String username;
-	
-	/**
-	 * Create a new MyInfo object.
-	 */
-	public MyInfo() {
-		String result;
-		try {
-			result = System.getProperty("user.name");
-		} catch (SecurityException e) {
-			result = null;
-		}
-		if (result == null || result.isEmpty()) {
-			nickname = "IRCParser";
-			username = "IRCParser";
-			realname = "DMDIrc IRCParser";
-			altNickname = "IRC-Parser";
-		} else {
-			nickname = result;
-			username = nickname;
-			realname = nickname+" - DMDIrc";
-			altNickname = nickname+"-";
-		}
+
+    /** Character to prepend to nickname if in use (Default "_"). */
+    private char prependChar = '_';
+    /** Nickname to attempt to use on IRC. */
+    private String nickname;
+    /**
+     * Alternative nickname to attempt to use on IRC. If the first nickname is
+     * in use, and a NickInUse message is recieved before 001, we will attempt
+     * to use this nickname instead.<br>
+     * If this also fails, we will start prepending the prependChar character
+     * (_) to the main nickname
+     */
+    private String altNickname;
+    /** Realname string to use */
+    private String realname;
+    /** Username to use, this doesn't matter when an ident server is running */
+    private String username;
+
+    /**
+     * Create a new MyInfo object.
+     */
+    public MyInfo() {
+	String result;
+	try {
+	    result = System.getProperty("user.name");
+	} catch (SecurityException e) {
+	    result = null;
 	}
-	
-	/**
-	 * Set the Nickname.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setNickname(final String newValue) {
-		if (newValue != null && !newValue.isEmpty()) {
-			nickname = newValue;
-		}
+	if (result == null || result.isEmpty()) {
+	    nickname = "IRCParser";
+	    username = "IRCParser";
+	    realname = "DMDIrc IRCParser";
+	    altNickname = "IRC-Parser";
+	} else {
+	    nickname = result;
+	    username = nickname;
+	    realname = nickname + " - DMDIrc";
+	    altNickname = nickname + "-";
 	}
-	
-	/**
-	 * Get the Nickname.
-	 *
-	 * @return Current Nickname
-	 */
-	public String getNickname() { return nickname; }
-	
-	/**
-	 * Set the Alternative Nickname.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setAltNickname(final String newValue) {
-		if (newValue != null && !newValue.isEmpty()) {
-			altNickname = newValue;
-		}
+    }
+
+    /**
+     * Set the Nickname.
+     * 
+     * @param newValue
+     *            Value to set to.
+     */
+    public void setNickname(final String newValue) {
+	if (newValue != null && !newValue.isEmpty()) {
+	    nickname = newValue;
 	}
-	
-	/**
-	 * Get the Alternative Nickname.
-	 *
-	 * @return Current Nickname
-	 */
-	public String getAltNickname() { return altNickname; }
-	
-	/**
-	 * Set the Realname.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setRealname(final String newValue) {
-		if (newValue != null && !newValue.isEmpty()) {
-			realname = newValue;
-		}
+    }
+
+    /**
+     * Get the Nickname.
+     * 
+     * @return Current Nickname
+     */
+    public String getNickname() {
+	return nickname;
+    }
+
+    /**
+     * Set the Alternative Nickname.
+     * 
+     * @param newValue
+     *            Value to set to.
+     */
+    public void setAltNickname(final String newValue) {
+	if (newValue != null && !newValue.isEmpty()) {
+	    altNickname = newValue;
 	}
-	
-	/**
-	 * Get the Realname.
-	 *
-	 * @return Current Realname
-	 */
-	public String getRealname() { return realname; }
-	
-	/**
-	 * Set the Username.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setUsername(final String newValue) {
-		if (newValue != null && !newValue.isEmpty()) {
-			username = newValue;
-		}
+    }
+
+    /**
+     * Get the Alternative Nickname.
+     * 
+     * @return Current Nickname
+     */
+    public String getAltNickname() {
+	return altNickname;
+    }
+
+    /**
+     * Set the Realname.
+     * 
+     * @param newValue
+     *            Value to set to.
+     */
+    public void setRealname(final String newValue) {
+	if (newValue != null && !newValue.isEmpty()) {
+	    realname = newValue;
 	}
-	
-	/**
-	 * Get the Username.
-	 *
-	 * @return Current Username
-	 */
-	public String getUsername() { return username; }
-	
-	/**
-	 * Set the Prepend Character.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setPrependChar(final char newValue) { prependChar = newValue; }
-	
-	/**
-	 * Get the Prepend Character.
-	 *
-	 * @return Current Prepend Character
-	 */
-	public char getPrependChar() { return prependChar; }	
+    }
+
+    /**
+     * Get the Realname.
+     * 
+     * @return Current Realname
+     */
+    public String getRealname() {
+	return realname;
+    }
+
+    /**
+     * Set the Username.
+     * 
+     * @param newValue
+     *            Value to set to.
+     */
+    public void setUsername(final String newValue) {
+	if (newValue != null && !newValue.isEmpty()) {
+	    username = newValue;
+        }
+    }
+
+    /**
+     * Get the Username.
+     * 
+     * @return Current Username
+     */
+    public String getUsername() {
+	return username;
+    }
+
+    /**
+     * Set the Prepend Character.
+     * 
+     * @param newValue
+     *            Value to set to.
+     */
+    public void setPrependChar(final char newValue) {
+	prependChar = newValue;
+    }
+
+    /**
+     * Get the Prepend Character.
+     * 
+     * @return Current Prepend Character
+     */
+    public char getPrependChar() {
+	return prependChar;
+    }
 
 }