Some changes to the IntelliJ Project

Remove some stuff, change some versions etc.

.idea/activewindow.iml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:activewindow" external.linked.project.path="$MODULE_DIR$/plugins/activewindow" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/activewindow/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/activewindow/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/activewindow">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/activewindow/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/activewindow/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/client.iml

@@ -20,17 +20,14 @@
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.el:el-api:2.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="module" module-name="common" exported="" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:6.0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
@@ -38,5 +35,7 @@
     <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
     <orderEntry type="library" exported="" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
   </component>
 </module>

.idea/codeStyleSettings.xml

@@ -3,7 +3,6 @@
   <component name="ProjectCodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS">
       <value>
-        <option name="USE_FQ_CLASS_NAMES_IN_JAVADOC" value="false" />
         <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" />
         <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" />
         <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
@@ -39,6 +38,9 @@
         <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
         <option name="JD_KEEP_EMPTY_RETURN" value="false" />
         <option name="WRAP_COMMENTS" value="true" />
+        <JavaCodeStyleSettings>
+          <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
+        </JavaCodeStyleSettings>
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>

.idea/common.iml

@@ -24,14 +24,13 @@
     <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.el:el-api:2.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
     <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
     <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
   </component>
 </module>

.idea/encodings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.idea/irc.iml

@@ -25,14 +25,13 @@
     <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.el:el-api:2.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
     <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
     <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
   </component>
 </module>

.idea/modules.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/activewindow.iml" filepath="$PROJECT_DIR$/.idea/activewindow.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/audio.iml" filepath="$PROJECT_DIR$/.idea/audio.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/awaycolours.iml" filepath="$PROJECT_DIR$/.idea/awaycolours.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/calc.iml" filepath="$PROJECT_DIR$/.idea/calc.iml" />
@@ -50,6 +49,7 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/tabcompletion_mirc.iml" filepath="$PROJECT_DIR$/.idea/tabcompletion_mirc.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/time.iml" filepath="$PROJECT_DIR$/.idea/time.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/ui_swing.iml" filepath="$PROJECT_DIR$/.idea/ui_swing.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Plugins/ui_web2/ui_web2.iml" filepath="$PROJECT_DIR$/Plugins/ui_web2/ui_web2.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/util.iml" filepath="$PROJECT_DIR$/.idea/util.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/whoisonquery.iml" filepath="$PROJECT_DIR$/.idea/whoisonquery.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/windowflashing.iml" filepath="$PROJECT_DIR$/.idea/windowflashing.iml" />

.idea/xmpp.iml

@@ -25,14 +25,13 @@
     <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.el:el-api:2.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
     <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
     <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
   </component>
 </module>