Add new DMDirc plugins repo

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "externals/util"]
 	path = externals/util
 	url = ssh://renji/home/chris/git/util
+[submodule "externals/dmdirc-plugins"]
+	path = externals/dmdirc-plugins
+	url = git://dmdirc.com/plugins

externals/dmdirc-plugins

@@ -0,0 +1 @@
+Subproject commit 0522ef4a6e123591ec97460bc0fe0d33fda6aeb1

nbproject/build-impl.xml

@@ -134,9 +134,8 @@ is divided into following sections:
         <condition property="have.sources">
             <or>
                 <available file="${src.src4.dir}"/>
-                <available file="${src.java.dir}"/>
-                <available file="${src.src3.dir}"/>
                 <available file="${src.src2.dir}"/>
+                <available file="${src.src3.dir}"/>
                 <available file="${src.src.dir}"/>
                 <available file="${src.dir}"/>
             </or>
@@ -195,9 +194,8 @@ is divided into following sections:
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.src4.dir">Must set src.src4.dir</fail>
-        <fail unless="src.java.dir">Must set src.java.dir</fail>
-        <fail unless="src.src3.dir">Must set src.src3.dir</fail>
         <fail unless="src.src2.dir">Must set src.src2.dir</fail>
+        <fail unless="src.src3.dir">Must set src.src3.dir</fail>
         <fail unless="src.src.dir">Must set src.src.dir</fail>
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
@@ -221,7 +219,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src4.dir}:${src.java.dir}:${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -261,7 +259,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src4.dir}:${src.java.dir}:${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -293,7 +291,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.src4.dir}:${src.java.dir}:${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
+            <attribute default="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -587,15 +585,14 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.src4.dir}:${src.java.dir}:${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
             <fileset dir="${src.src4.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.java.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.src3.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.src2.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.src3.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -618,7 +615,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src4.dir}:${src.java.dir}:${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src4.dir}:${src.src2.dir}:${src.src3.dir}:${src.src.dir}:${src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -832,15 +829,12 @@ is divided into following sections:
             <fileset dir="${src.src4.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.java.dir}" excludes="${excludes}" includes="${includes}">
+            <fileset dir="${src.src2.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
             <fileset dir="${src.src3.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.src2.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
             <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -855,15 +849,12 @@ is divided into following sections:
             <fileset dir="${src.src4.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
-            <fileset dir="${src.java.dir}" excludes="${excludes}" includes="${includes}">
+            <fileset dir="${src.src2.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
             <fileset dir="${src.src3.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
-            <fileset dir="${src.src2.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
             <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=96efc3b9
+build.xml.data.CRC32=36c1f676
 build.xml.script.CRC32=d4296ee3
 build.xml.stylesheet.CRC32=28e38971@1.40.0.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=96efc3b9
-nbproject/build-impl.xml.script.CRC32=627b944c
+nbproject/build-impl.xml.data.CRC32=36c1f676
+nbproject/build-impl.xml.script.CRC32=1770fd45
 nbproject/build-impl.xml.stylesheet.CRC32=fce8b508@1.40.0.45

nbproject/project.properties

@@ -1,3 +1,6 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
 application.title=charliebravo
 application.vendor=chris
 build.classes.dir=${build.dir}/classes
@@ -20,6 +23,7 @@ debug.test.classpath=\
 dist.dir=dist
 dist.jar=${dist.dir}/charliebravo.jar
 dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
 excludes=com/dmdirc/addons/nowplaying/,com/dmdirc/addons/systray/,com/dmdirc/addons/nickcolours/,com/dmdirc/addons/lagdisplay/,com/dmdirc/addons/mediasource_*/,com/dmdirc/addons/ui_swing/,com/dmdirc/addons/dcc/,com/dmdirc/addons/windowstatus/,com/dmdirc/addons/osd/,com/dmdirc/addons/logging/,com/dmdirc/addons/addonbrowser/,uk/co/md87/evetool/ui/,uk/co/md87/evetool/Main.java
 file.reference.jaxen-core.jar=externals/evetool/lib/jaxen-core.jar
 file.reference.jaxen-jdom.jar=externals/evetool/lib/jaxen-jdom.jar
@@ -41,6 +45,8 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
 javac.source=1.5
 javac.target=1.5
 javac.test.classpath=\
@@ -75,9 +81,8 @@ run.test.classpath=\
     ${build.test.classes.dir}
 source.encoding=UTF-8
 src.dir=src
-src.java.dir=externals/twitter4j/src/main/java
 src.src.dir=externals/dmdirc/src
 src.src2.dir=externals/evetool/src
-src.src3.dir=externals/dmdirc-plugins/calc/src
+src.src3.dir=externals/dmdirc-plugins/src
 src.src4.dir=externals/util/src
 test.src.dir=test

nbproject/project.xml

@@ -7,9 +7,8 @@
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
                 <root id="src.src4.dir"/>
-                <root id="src.java.dir"/>
-                <root id="src.src3.dir"/>
                 <root id="src.src2.dir"/>
+                <root id="src.src3.dir"/>
                 <root id="src.src.dir"/>
                 <root id="src.dir"/>
             </source-roots>