Merge pull request #7 from chrisspelberg/master

Fixes for ArrayIndexOutOfBoundsException when a @CommandHandler annotated method has no parameters

Author: rinokadijk

pom.xml

@@ -179,7 +179,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.javadoc.skip>true</maven.javadoc.skip>
-        <idea.version>14.1.3</idea.version>
+        <idea.version>LOCAL</idea.version>
         <ij.plugin>true</ij.plugin>
     </properties>
 </project>

setup.sh

@@ -4,8 +4,22 @@ if [ ! -e "$IDEA" ]
 then
     export IDEA="/Applications/IntelliJ IDEA 14.app/Contents"
 fi
+if [ ! -e "$IDEA" ]
+then
+    export IDEA="/Applications/IntelliJ IDEA CE.app/Contents"
+fi
+if [ ! -e "$IDEA" ]
+then
+    echo "IDEA libraries not found!"
+    echo "Checked: /C/Program Files (x86)/JetBrains/IntelliJ IDEA 14.1"
+    echo "Checked: /Applications/IntelliJ IDEA 14.app/Contents"
+    echo "Checked: /Applications/IntelliJ IDEA CE.app/Contents"
+    echo ""
+    echo "Try installing the IDEA Community Edition"
+    exit 1
+fi
 
-export IDEA_VERSION=14.1.3
+export IDEA_VERSION=LOCAL
 mvn install:install-file -Dfile="$IDEA/lib/annotations.jar" -DgroupId=com.intellij.idea -DartifactId=annotations -Dversion=$IDEA_VERSION -Dpackaging=jar
 mvn install:install-file -Dfile="$IDEA/lib/idea.jar" -DgroupId=com.intellij.idea -DartifactId=idea -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=$IDEA_VERSION
 mvn install:install-file -Dfile="$IDEA/lib/openapi.jar" -DgroupId=com.intellij.idea -DartifactId=openapi -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=$IDEA_VERSION

src/main/java/org/axonframework/intellij/ide/plugin/handler/CommandEventHandler.java

@@ -44,15 +44,14 @@ public boolean isSagaEvent() {
 
     public static Handler createEventHandler(PsiMethod method) {
         PsiType[] methodArguments = getMethodArguments(method);
-        return new CommandEventHandler(methodArguments[0], method);
+        return methodArguments.length > 0 ? new CommandEventHandler(methodArguments[0], method) : null;
     }
 
     private static PsiType[] getMethodArguments(PsiMethod method) {
-        PsiParameterList list = method.getParameterList();
-        PsiType[] argument = new PsiType[list.getParametersCount()];
-        for (int i = 0; i < list.getParameters().length; i++) {
-            PsiParameter psiParameter = list.getParameters()[i];
-            argument[i] = psiParameter.getType();
+        PsiParameter[] listParameters = method.getParameterList().getParameters();
+        PsiType[] argument = new PsiType[listParameters.length];
+        for (int i = 0; i < listParameters.length; i++) {
+            argument[i] = listParameters[i].getType();
         }
         return argument;
     }