Merge pull request #98 from csmith/master

iml file updates

.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/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/gradle.xml

@@ -56,6 +56,65 @@
             <option value="$PROJECT_DIR$/plugins/tabcompletion_mirc" />
             <option value="$PROJECT_DIR$/plugins/time" />
             <option value="$PROJECT_DIR$/plugins/ui_swing" />
+            <option value="$PROJECT_DIR$/plugins/ui_web2" />
+            <option value="$PROJECT_DIR$/plugins/whoisonquery" />
+            <option value="$PROJECT_DIR$/plugins/windowflashing" />
+            <option value="$PROJECT_DIR$/plugins/windowstatus" />
+            <option value="$PROJECT_DIR$/util" />
+          </set>
+        </option>
+        <option name="myModules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/client" />
+            <option value="$PROJECT_DIR$/parser" />
+            <option value="$PROJECT_DIR$/parser/common" />
+            <option value="$PROJECT_DIR$/parser/irc" />
+            <option value="$PROJECT_DIR$/parser/xmpp" />
+            <option value="$PROJECT_DIR$/plugins" />
+            <option value="$PROJECT_DIR$/plugins/activewindow" />
+            <option value="$PROJECT_DIR$/plugins/audio" />
+            <option value="$PROJECT_DIR$/plugins/awaycolours" />
+            <option value="$PROJECT_DIR$/plugins/calc" />
+            <option value="$PROJECT_DIR$/plugins/channelwho" />
+            <option value="$PROJECT_DIR$/plugins/conditional_execute" />
+            <option value="$PROJECT_DIR$/plugins/contactlist" />
+            <option value="$PROJECT_DIR$/plugins/dcc" />
+            <option value="$PROJECT_DIR$/plugins/dcop" />
+            <option value="$PROJECT_DIR$/plugins/debug" />
+            <option value="$PROJECT_DIR$/plugins/dns" />
+            <option value="$PROJECT_DIR$/plugins/exec" />
+            <option value="$PROJECT_DIR$/plugins/freedesktop_notifications" />
+            <option value="$PROJECT_DIR$/plugins/identd" />
+            <option value="$PROJECT_DIR$/plugins/jpq" />
+            <option value="$PROJECT_DIR$/plugins/lagdisplay" />
+            <option value="$PROJECT_DIR$/plugins/logging" />
+            <option value="$PROJECT_DIR$/plugins/mediasource_dbus" />
+            <option value="$PROJECT_DIR$/plugins/mediasource_dcop" />
+            <option value="$PROJECT_DIR$/plugins/mediasource_linux_title" />
+            <option value="$PROJECT_DIR$/plugins/mediasource_mplayer" />
+            <option value="$PROJECT_DIR$/plugins/mediasource_vlc" />
+            <option value="$PROJECT_DIR$/plugins/mediasource_windows" />
+            <option value="$PROJECT_DIR$/plugins/nickcolours" />
+            <option value="$PROJECT_DIR$/plugins/nickkeep" />
+            <option value="$PROJECT_DIR$/plugins/nma" />
+            <option value="$PROJECT_DIR$/plugins/notifications" />
+            <option value="$PROJECT_DIR$/plugins/nowplaying" />
+            <option value="$PROJECT_DIR$/plugins/osd" />
+            <option value="$PROJECT_DIR$/plugins/osx_integration" />
+            <option value="$PROJECT_DIR$/plugins/parser_irc" />
+            <option value="$PROJECT_DIR$/plugins/parser_xmpp" />
+            <option value="$PROJECT_DIR$/plugins/parserdebug" />
+            <option value="$PROJECT_DIR$/plugins/qauth" />
+            <option value="$PROJECT_DIR$/plugins/redirect" />
+            <option value="$PROJECT_DIR$/plugins/scriptplugin" />
+            <option value="$PROJECT_DIR$/plugins/sessionlock" />
+            <option value="$PROJECT_DIR$/plugins/systray" />
+            <option value="$PROJECT_DIR$/plugins/tabcompletion_bash" />
+            <option value="$PROJECT_DIR$/plugins/tabcompletion_mirc" />
+            <option value="$PROJECT_DIR$/plugins/time" />
+            <option value="$PROJECT_DIR$/plugins/ui_swing" />
+            <option value="$PROJECT_DIR$/plugins/ui_web2" />
             <option value="$PROJECT_DIR$/plugins/whoisonquery" />
             <option value="$PROJECT_DIR$/plugins/windowflashing" />
             <option value="$PROJECT_DIR$/plugins/windowstatus" />

.idea/modules.xml

@@ -50,6 +50,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$/.idea/ui_web2.iml" filepath="$PROJECT_DIR$/.idea/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" />
@@ -57,4 +58,4 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/xmpp.iml" filepath="$PROJECT_DIR$/.idea/xmpp.iml" />
     </modules>
   </component>
-</project>
+</project>

.idea/parser.iml

@@ -10,11 +10,5 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="module" module-name="common" />
-    <orderEntry type="module" module-name="irc" />
-    <orderEntry type="module" module-name="xmpp" />
-    <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" />
   </component>
 </module>

.idea/plugins.iml

@@ -10,50 +10,5 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="activewindow" />
-    <orderEntry type="module" module-name="audio" />
-    <orderEntry type="module" module-name="calc" />
-    <orderEntry type="module" module-name="conditional_execute" />
-    <orderEntry type="module" module-name="contactlist" />
-    <orderEntry type="module" module-name="dcc" />
-    <orderEntry type="module" module-name="dcop" />
-    <orderEntry type="module" module-name="debug" />
-    <orderEntry type="module" module-name="dns" />
-    <orderEntry type="module" module-name="exec" />
-    <orderEntry type="module" module-name="freedesktop_notifications" />
-    <orderEntry type="module" module-name="identd" />
-    <orderEntry type="module" module-name="lagdisplay" />
-    <orderEntry type="module" module-name="logging" />
-    <orderEntry type="module" module-name="mediasource_dbus" />
-    <orderEntry type="module" module-name="mediasource_dcop" />
-    <orderEntry type="module" module-name="mediasource_linux_title" />
-    <orderEntry type="module" module-name="mediasource_mplayer" />
-    <orderEntry type="module" module-name="mediasource_vlc" />
-    <orderEntry type="module" module-name="mediasource_windows" />
-    <orderEntry type="module" module-name="nickcolours" />
-    <orderEntry type="module" module-name="nma" />
-    <orderEntry type="module" module-name="notifications" />
-    <orderEntry type="module" module-name="nowplaying" />
-    <orderEntry type="module" module-name="osd" />
-    <orderEntry type="module" module-name="osx_integration" />
-    <orderEntry type="module" module-name="parser_irc" />
-    <orderEntry type="module" module-name="parser_xmpp" />
-    <orderEntry type="module" module-name="parserdebug" />
-    <orderEntry type="module" module-name="qauth" />
-    <orderEntry type="module" module-name="redirect" />
-    <orderEntry type="module" module-name="scriptplugin" />
-    <orderEntry type="module" module-name="sessionlock" />
-    <orderEntry type="module" module-name="systray" />
-    <orderEntry type="module" module-name="tabcompletion_bash" />
-    <orderEntry type="module" module-name="tabcompletion_mirc" />
-    <orderEntry type="module" module-name="time" />
-    <orderEntry type="module" module-name="ui_swing" />
-    <orderEntry type="module" module-name="windowflashing" />
-    <orderEntry type="module" module-name="windowstatus" />
-    <orderEntry type="module" module-name="awaycolours" />
-    <orderEntry type="module" module-name="channelwho" />
-    <orderEntry type="module" module-name="jpq" />
-    <orderEntry type="module" module-name="nickkeep" />
-    <orderEntry type="module" module-name="whoisonquery" />
   </component>
 </module>

.idea/ui_web2.iml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":plugins:ui_web2" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="0.8-1237-gb1e5c13-SNAPSHOT" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/test-res" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <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: 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: com.google.guava:guava:18.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.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
+  </component>
+</module>

.idea/vcs.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/client" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/installers" vcs="Git" />

README.md

@@ -133,3 +133,13 @@ repository.
 The meta repository includes a gradle build script that finds these dependencies
 and replaces them with project links instead. This ensures that while developing
 the client your changes are reflected across modules properly.
+
+### Adding new projects
+
+To ensure all IDE configuration files are kept together in this repository,
+a few manual steps are required when adding a new project:
+
+After creating a new gradle project, refresh the root project in IDEA to create
+the .iml file in the project's base directory (e.g. `plugins/yourplugin/`).
+Then manually move the .iml file into `.idea` in this repository, and edit
+`.idea/modules.xml` to update the path.