Style fixes

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

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

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
+ * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- *
+ * 
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *
+ * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,22 +24,25 @@ package com.dmdirc.parser.common;
 
 /**
  * IRC Parser Callback Exception.
- *
- * @author            Shane Mc Cormack
+ * 
+ * @author Shane Mc Cormack
  */
 public class CallbackNotFoundException extends RuntimeException {
-	/**
-	 * A version number for this class. It should be changed whenever the class
-	 * structure is changed (or anything else that would prevent serialized
-	 * objects being unserialized with the new class).
-	 */
-	private static final long serialVersionUID = 1;
-	
-	/**
-	 * Create a new CallbackNotFound Exception.
-	 *
-	 * @param message Reason for exception
-	 */
-	public CallbackNotFoundException(final String message) { super(message); }
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+
+    /**
+     * Create a new CallbackNotFound Exception.
+     * 
+     * @param message
+     *            Reason for exception
+     */
+    public CallbackNotFoundException(final String message) {
+        super(message);
+    }
 
 }

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

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
+ * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- *
+ * 
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *
+ * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,6 +22,8 @@
 
 package com.dmdirc.parser.common;
 
+import com.dmdirc.parser.irc.IRCParser;
+
 /**
  * Contains Channel List Mode information.
  * 
@@ -31,63 +33,72 @@ package com.dmdirc.parser.common;
  */
 public final class ChannelListModeItem {
 
-	/** The Item itself. */
-	private final String myItem;
-	
-	/** The Time the item was created. */
-	private final long myTime;
-	
-	/** The Person who created the item. */
-	private final String myOwner;
-	
-	/**
-	 * Create a new Item.
-	 *
-	 * @param item The item (ie: test!joe@user.com)
-	 * @param owner The owner (ie: Dataforce)
-	 * @param time The Time (ie: 1173389295)
-	 */
-	public ChannelListModeItem(final String item, final String owner, final long time) {
-		myItem = item;
-		myTime = time;
+    /** The Item itself. */
+    private final String myItem;
 
-		if (!owner.isEmpty() && owner.charAt(0) == ':') {
-			myOwner = owner.substring(1);
-		} else {
-			myOwner = owner;
-		}
-	}
-	
-	/**
-	 * Get The Item itself.
-	 *
-	 * @return The Item itself.
-	 */
-	public String getItem() { return myItem; }
-	
-	/**
-	 * Get The Person who created the item.
-	 *
-	 * @return The Person who created the item.
-	 */
-	public String getOwner() { return myOwner; }
-	
-	/**
-	 * Get The Time the item was created.
-	 *
-	 * @return The Time the item was created.
-	 */
-	public long getTime() { return myTime; }
-	
-	/**
-	* Returns a String representation of this object.
-	*
-	* @return String representation of this object
-	*/
-	@Override
-	public String toString() {
-		return getItem();
-	}
+    /** The Time the item was created. */
+    private final long myTime;
 
-}
+    /** The Person who created the item. */
+    private final String myOwner;
+
+    /**
+     * Create a new Item.
+     * 
+     * @param item
+     *            The item (ie: test!joe@user.com)
+     * @param owner
+     *            The owner (ie: Dataforce)
+     * @param time
+     *            The Time (ie: 1173389295)
+     */
+    public ChannelListModeItem(final String item, final String owner,
+            final long time) {
+        myItem = item;
+        myTime = time;
 
+        if (!owner.isEmpty() && owner.charAt(0) == ':') {
+            myOwner = owner.substring(1);
+        } else {
+            myOwner = owner;
+        }
+    }
+
+    /**
+     * Get The Item itself.
+     * 
+     * @return The Item itself.
+     */
+    public String getItem() {
+        return myItem;
+    }
+
+    /**
+     * Get The Person who created the item.
+     * 
+     * @return The Person who created the item.
+     */
+    public String getOwner() {
+        return myOwner;
+    }
+
+    /**
+     * Get The Time the item was created.
+     * 
+     * @return The Time the item was created.
+     */
+    public long getTime() {
+        return myTime;
+    }
+
+    /**
+     * Returns a String representation of this object.
+     * 
+     * @return String representation of this object
+     */
+    @Override
+    public String toString() {
+        return getItem();
+    }
+
+}

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

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
+ * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- *
+ * 
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *
+ * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,6 +22,8 @@
 
 package com.dmdirc.parser.common;
 
+import com.dmdirc.parser.irc.IRCParser;
+
 /**
  * Contains User information.
  * 
@@ -52,23 +54,23 @@ public class MyInfo {
      * 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 + "-";
-	}
+        String result;
+        try {
+            result = System.getProperty("user.name");
+        } catch (final 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 + "-";
+        }
     }
 
     /**
@@ -78,9 +80,9 @@ public class MyInfo {
      *            Value to set to.
      */
     public void setNickname(final String newValue) {
-	if (newValue != null && !newValue.isEmpty()) {
-	    nickname = newValue;
-	}
+        if (newValue != null && !newValue.isEmpty()) {
+            nickname = newValue;
+        }
     }
 
     /**
@@ -89,7 +91,7 @@ public class MyInfo {
      * @return Current Nickname
      */
     public String getNickname() {
-	return nickname;
+        return nickname;
     }
 
     /**
@@ -99,9 +101,9 @@ public class MyInfo {
      *            Value to set to.
      */
     public void setAltNickname(final String newValue) {
-	if (newValue != null && !newValue.isEmpty()) {
-	    altNickname = newValue;
-	}
+        if (newValue != null && !newValue.isEmpty()) {
+            altNickname = newValue;
+        }
     }
 
     /**
@@ -110,7 +112,7 @@ public class MyInfo {
      * @return Current Nickname
      */
     public String getAltNickname() {
-	return altNickname;
+        return altNickname;
     }
 
     /**
@@ -120,9 +122,9 @@ public class MyInfo {
      *            Value to set to.
      */
     public void setRealname(final String newValue) {
-	if (newValue != null && !newValue.isEmpty()) {
-	    realname = newValue;
-	}
+        if (newValue != null && !newValue.isEmpty()) {
+            realname = newValue;
+        }
     }
 
     /**
@@ -131,7 +133,7 @@ public class MyInfo {
      * @return Current Realname
      */
     public String getRealname() {
-	return realname;
+        return realname;
     }
 
     /**
@@ -141,8 +143,8 @@ public class MyInfo {
      *            Value to set to.
      */
     public void setUsername(final String newValue) {
-	if (newValue != null && !newValue.isEmpty()) {
-	    username = newValue;
+        if (newValue != null && !newValue.isEmpty()) {
+            username = newValue;
         }
     }
 
@@ -152,7 +154,7 @@ public class MyInfo {
      * @return Current Username
      */
     public String getUsername() {
-	return username;
+        return username;
     }
 
     /**
@@ -162,7 +164,7 @@ public class MyInfo {
      *            Value to set to.
      */
     public void setPrependChar(final char newValue) {
-	prependChar = newValue;
+        prependChar = newValue;
     }
 
     /**
@@ -171,7 +173,7 @@ public class MyInfo {
      * @return Current Prepend Character
      */
     public char getPrependChar() {
-	return prependChar;
+        return prependChar;
     }
 
 }

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

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
+ * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- *
+ * 
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *
+ * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,154 +24,165 @@ package com.dmdirc.parser.common;
 
 /**
  * IRC Parser Error.
- *
+ * 
  * @author Shane Mc Cormack
  */
 public final class ParserError {
-	/** Error is potentially Fatal, Desync 99% Guaranteed! */
-	public static final int ERROR_FATAL = 1;
-	/** Error is not fatal, but is more severe than a warning. */
-	public static final int ERROR_ERROR = 2;
-	/** Error was an unexpected occurance, but shouldn't be anything to worry about. */
-	public static final int ERROR_WARNING = 4;
-	/** Error is a user-error rather than a server error. */
-	public static final int ERROR_USER = 8;
-	/** Error was an exception from elsewhere. */
-	public static final int ERROR_EXCEPTION = 16;
-	
-	/** Store the Error level. */
-	private int errorLevel;
-	/** Store the Error Information. */
-	private String errorData;
-	/** Store the Exception object. */
-	private Exception exceptionInfo;
-	
-	/** Last line of server input before this exception was triggered. */
-	private String lastLine = "";
-	
-	/**
-	 * Create a new Error.
-	 *
-	 * @param level Set the error level.
-	 * @param data String containing information about the error.
-	 * @param line The last line of data recieved from the server before this exception.
-	 */
-	public ParserError(final int level, final String data, final String line) {
-		errorData = data;
-		errorLevel = level;
-		lastLine = line;
-	}
-	
-	/**
-	 * Check if this error is considered Fatal.
-	 *
-	 * @return Returns true for a fatal error, false for a non-fatal error
-	 */
-	public boolean isFatal() {
-		return (errorLevel & ERROR_FATAL) == ERROR_FATAL;
-	}
-	
-	/**
-	 * Check if this error is considered an error (less severe than fatal, worse than warning).
-	 *
-	 * @return Returns true for an "Error" level error, else false.
-	 */
-	public boolean isError() {
-		return (errorLevel & ERROR_ERROR) == ERROR_ERROR;
-	}
-	
-	/**
-	 * Check if this error is considered a warning.
-	 *
-	 * @return Returns true for a warning, else false.
-	 */
-	public boolean isWarning() {
-		return (errorLevel & ERROR_WARNING) == ERROR_WARNING;
-	}
-	
-	/**
-	 * Check if this error is considered a user-error rather than a server error.
-	 * For DMDirc this will cause the error not to be reported to the developers
-	 *
-	 * @return Returns true for a user error, else false.
-	 */
-	public boolean isUserError() {
-		return (errorLevel & ERROR_USER) == ERROR_USER;
-	}
-	
-	/**
-	 * Check if this error was generated from an exception.
-	 *
-	 * @return Returns true if getException will return an exception.
-	 */
-	public boolean isException() {
-		return (errorLevel & ERROR_EXCEPTION) == ERROR_EXCEPTION;
-	}
-	
-	/**
-	 * Check if this error has a lastLine parameter.
-	 *
-	 * @return Returns true if getLastLine returns anything non null, non empty.
-	 */
-	public boolean hasLastLine() {
-		return (lastLine != null && !lastLine.isEmpty());
-	}
-	
-	/**
-	 * Set the Exception object.
-	 *
-	 * @param newException The exception object to store
-	 */
-	public void setException(final Exception newException) {
-		exceptionInfo = newException;
-		if (!this.isException()) {
-			this.errorLevel = this.errorLevel + ERROR_EXCEPTION;
-		}
-	}
-	
-	/**
-	 * Get the Exception object.
-	 *
-	 * @return Returns the exception object
-	 */
-	public Exception getException() {
-		return exceptionInfo;
-	}
-	
-	/**
-	 * Get the full ErrorLevel.
-	 *
-	 * @return Returns the error level
-	 */
-	public int getLevel() {
-		return errorLevel;
-	}
-	
-	/**
-	 * Get the Error information.
-	 *
-	 * @return Returns the error data
-	 */
-	public String getData() {
-		return errorData;
-	}
-	
-	/**
-	 * Add to the error information.
-	 *
-	 * @param data Information to add to the end of the existing Data
-	 */
-	public void appendData(final String data) {
-		errorData = errorData + '[' + data + ']';
-	}
-	
-	/**
-	 * Get the last line recieved from the server before this exception.
-	 *
-	 * @return Returns the error data
-	 */
-	public String getLastLine() {
-		return lastLine;
-	}	
+    /** Error is potentially Fatal, Desync 99% Guaranteed! */
+    public static final int ERROR_FATAL = 1;
+    /** Error is not fatal, but is more severe than a warning. */
+    public static final int ERROR_ERROR = 2;
+    /**
+     * Error was an unexpected occurance, but shouldn't be anything to worry
+     * about.
+     */
+    public static final int ERROR_WARNING = 4;
+    /** Error is a user-error rather than a server error. */
+    public static final int ERROR_USER = 8;
+    /** Error was an exception from elsewhere. */
+    public static final int ERROR_EXCEPTION = 16;
+
+    /** Store the Error level. */
+    private int errorLevel;
+    /** Store the Error Information. */
+    private String errorData;
+    /** Store the Exception object. */
+    private Exception exceptionInfo;
+
+    /** Last line of server input before this exception was triggered. */
+    private String lastLine = "";
+
+    /**
+     * Create a new Error.
+     * 
+     * @param level
+     *            Set the error level.
+     * @param data
+     *            String containing information about the error.
+     * @param line
+     *            The last line of data recieved from the server before this
+     *            exception.
+     */
+    public ParserError(final int level, final String data, final String line) {
+        errorData = data;
+        errorLevel = level;
+        lastLine = line;
+    }
+
+    /**
+     * Check if this error is considered Fatal.
+     * 
+     * @return Returns true for a fatal error, false for a non-fatal error
+     */
+    public boolean isFatal() {
+        return (errorLevel & ERROR_FATAL) == ERROR_FATAL;
+    }
+
+    /**
+     * Check if this error is considered an error (less severe than fatal, worse
+     * than warning).
+     * 
+     * @return Returns true for an "Error" level error, else false.
+     */
+    public boolean isError() {
+        return (errorLevel & ERROR_ERROR) == ERROR_ERROR;
+    }
+
+    /**
+     * Check if this error is considered a warning.
+     * 
+     * @return Returns true for a warning, else false.
+     */
+    public boolean isWarning() {
+        return (errorLevel & ERROR_WARNING) == ERROR_WARNING;
+    }
+
+    /**
+     * Check if this error is considered a user-error rather than a server
+     * error.
+     * For DMDirc this will cause the error not to be reported to the developers
+     * 
+     * @return Returns true for a user error, else false.
+     */
+    public boolean isUserError() {
+        return (errorLevel & ERROR_USER) == ERROR_USER;
+    }
+
+    /**
+     * Check if this error was generated from an exception.
+     * 
+     * @return Returns true if getException will return an exception.
+     */
+    public boolean isException() {
+        return (errorLevel & ERROR_EXCEPTION) == ERROR_EXCEPTION;
+    }
+
+    /**
+     * Check if this error has a lastLine parameter.
+     * 
+     * @return Returns true if getLastLine returns anything non null, non empty.
+     */
+    public boolean hasLastLine() {
+        return lastLine != null && !lastLine.isEmpty();
+    }
+
+    /**
+     * Set the Exception object.
+     * 
+     * @param newException
+     *            The exception object to store
+     */
+    public void setException(final Exception newException) {
+        exceptionInfo = newException;
+        if (!isException()) {
+            errorLevel += ERROR_EXCEPTION;
+        }
+    }
+
+    /**
+     * Get the Exception object.
+     * 
+     * @return Returns the exception object
+     */
+    public Exception getException() {
+        return exceptionInfo;
+    }
+
+    /**
+     * Get the full ErrorLevel.
+     * 
+     * @return Returns the error level
+     */
+    public int getLevel() {
+        return errorLevel;
+    }
+
+    /**
+     * Get the Error information.
+     * 
+     * @return Returns the error data
+     */
+    public String getData() {
+        return errorData;
+    }
+
+    /**
+     * Add to the error information.
+     * 
+     * @param data
+     *            Information to add to the end of the existing Data
+     */
+    public void appendData(final String data) {
+        errorData += '[' + data + ']';
+    }
+
+    /**
+     * Get the last line recieved from the server before this exception.
+     * 
+     * @return Returns the error data
+     */
+    public String getLastLine() {
+        return lastLine;
+    }
 
 }