Merge branch 'master' of https://github.com/DMDirc/Parser

.gitignore

@@ -11,5 +11,8 @@ build-before-profiler.xml
 /etc/nexus-teamcity.properties
 /.gradle
 /*/build
-/*/generated
 /nexus-teamcity.gradle
+
+# Generated files created by IDEA
+/*/src/*/generated
+/*/src/*/generated_tests

build.gradle

@@ -1,15 +1,19 @@
 subprojects {
-    group = 'com.dmdirc.parser'
+    group = 'com.dmdirc'
 
     apply plugin: 'com.dmdirc.git-version'
     apply plugin: 'maven-publish'
     apply plugin: 'java'
+    apply plugin: 'idea'
 
     apply from: '../gradle/coverage.gradle'
 
-    sourceSets {
-        main.java.srcDirs = ['src']
-        test.java.srcDirs = ['test']
+    idea {
+        module {
+             sourceDirs += file('src/main/generated')
+             testSourceDirs += file('src/test/generated_tests')
+             generatedSourceDirs = [file('src/main/generated'), file('src/test/generated_tests')]
+        }
     }
 
     publishing {
@@ -86,21 +90,21 @@ subprojects {
     repositories.mavenCentral()
 
     dependencies {
-        compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0'
-        compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1'
-        compile group: 'com.google.auto.value', name: 'auto-value', version: '1.0'
+        compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
+        compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.5'
+        compile group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
 
-        compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.10'
-        compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.1'
-        compile group: 'com.google.guava', name:'guava', version: '18.0'
+        compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
+        compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.5'
+        compile group: 'com.google.guava', name:'guava', version: '19.0'
 
-        compile group: 'net.engio', name: 'mbassador', version: '1.2.4'
+        compile group: 'net.engio', name: 'mbassador', version: '1.2.4.2'
         compile group: 'de.odysseus.juel', name: 'juel-api', version: '2.2.7'
         compile group: 'de.odysseus.juel', name: 'juel-impl', version: '2.2.7'
         compile group: 'de.odysseus.juel', name: 'juel-spi', version: '2.2.7'
 
         testCompile group: 'junit', name: 'junit', version: '4.12'
-        testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.17'
+        testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
     }
 
     task publishSnapshot(dependsOn: 'publishMavenJavaPublicationToSnapshotsRepository') << {
@@ -122,12 +126,14 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.4'
+    gradleVersion = '2.13'
 }
 
 def find(name) {
     if (allprojects.find { it.name == name }) {
         project(name)
+    } else if (allprojects.find { it.name == 'parser-' + name }) {
+        project('parser-' + name)
     } else if (allprojects.find { it.name == 'parser:' + name }) {
         project('parser:' + name)
     } else if (allprojects.find { it.name == 'modules:parser:' + name }) {
@@ -145,7 +151,7 @@ buildscript {
 
     dependencies {
         classpath group: 'com.dmdirc', name: 'git-version', version: '1.0'
-        classpath group: 'org.kt3k.gradle.plugin', name: 'coveralls-gradle-plugin', version: '2.1.0'
+        classpath group: 'org.kt3k.gradle.plugin', name: 'coveralls-gradle-plugin', version: '2.6.3'
     }
 }
 

common/src/com/dmdirc/parser/common/BaseChannelInfo.java → common/src/main/java/com/dmdirc/parser/common/BaseChannelInfo.java

@@ -68,6 +68,11 @@ public abstract class BaseChannelInfo implements ChannelInfo {
         return parser;
     }
 
+    @Override
+    public String getPassword() {
+        return "";
+    }
+
     @Override
     public void sendMessage(final String message) {
         parser.sendMessage(name, message);

common/src/com/dmdirc/parser/common/QueuePriority.java → common/src/main/java/com/dmdirc/parser/common/QueuePriority.java

@@ -26,6 +26,8 @@ package com.dmdirc.parser.common;
  * Queue Priority.
  */
 public enum QueuePriority {
+    /** Immediate priority (Skip Queue). */
+    IMMEDIATE,
     /** High priority. */
     HIGH,
     /** Normal priority. */

common/src/main/java/com/dmdirc/parser/events/ChannelPasswordChangedEvent.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.parser.events;
+
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.Parser;
+
+import java.time.LocalDateTime;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Called when a channel password changes.
+ */
+public class ChannelPasswordChangedEvent extends ParserEvent {
+
+    private final ChannelInfo channel;
+
+    public ChannelPasswordChangedEvent(final Parser parser, final LocalDateTime date,
+                                  final ChannelInfo channel) {
+        super(parser, date);
+        this.channel = checkNotNull(channel);
+    }
+
+    public ChannelInfo getChannel() {
+        return channel;
+    }
+}

common/src/com/dmdirc/parser/events/DataInEvent.java → common/src/main/java/com/dmdirc/parser/events/DataInEvent.java

@@ -29,7 +29,7 @@ import java.time.LocalDateTime;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * Interface Used on every incoming line BEFORE parsing.
+ * Called on every incoming line BEFORE parsing.
  */
 public class DataInEvent extends ParserEvent {
 

common/src/com/dmdirc/parser/events/DataOutEvent.java → common/src/main/java/com/dmdirc/parser/events/DataOutEvent.java

@@ -29,7 +29,7 @@ import java.time.LocalDateTime;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * Called on every incoming line BEFORE being sent.
+ * Called on every outgoing line BEFORE being sent.
  */
 public class DataOutEvent extends ParserEvent {
 

common/src/com/dmdirc/parser/events/UserInfoEvent.java → common/src/main/java/com/dmdirc/parser/events/UserInfoEvent.java

@@ -81,6 +81,8 @@ public class UserInfoEvent extends ParserEvent {
 
         /** The user's full address. */
         ADDRESS,
+        /** The user's real address. */
+        REAL_ADDRESS,
         /** The user's real name. */
         REAL_NAME,
         /** The list of group chats the user is in. */

common/src/com/dmdirc/parser/interfaces/ChannelInfo.java → common/src/main/java/com/dmdirc/parser/interfaces/ChannelInfo.java

@@ -42,6 +42,13 @@ public interface ChannelInfo {
      */
     String getName();
 
+    /**
+     * Returns the password for this channel.
+     *
+     * @return The password for this channel
+     */
+    String getPassword();
+
     /**
      * Changes the topic of this channel.
      *