You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ke...@apache.org on 2005/05/24 21:30:34 UTC

svn commit: r178253 - /incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java

Author: kentam
Date: Tue May 24 12:30:33 2005
New Revision: 178253

URL: http://svn.apache.org/viewcvs?rev=178253&view=rev
Log:
BEEHIVE-758: checker element of ControlInterface annotation does not work

Added support for "checker" element in addition to deprecated "checkerClass" element.

Patch submitted by Chad Schoettger.


Modified:
    incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java

Modified: incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java?rev=178253&r1=178252&r2=178253&view=diff
==============================================================================
--- incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java (original)
+++ incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/AptControlInterface.java Tue May 24 12:30:33 2005
@@ -930,7 +930,13 @@
         // dynamically load and run it.
         //
 
-        DeclaredType checkerMirror = (DeclaredType)controlAnnot.getObjectValue("checkerClass");
+        DeclaredType checkerMirror = (DeclaredType)controlAnnot.getObjectValue("checker");
+        if ( checkerMirror == null )
+        {
+            // try the deprecated 'checkerClass' attribute
+            checkerMirror = (DeclaredType)controlAnnot.getObjectValue("checkerClass");
+        }
+
         if ( checkerMirror != null && checkerMirror.getDeclaration() != null )
         {
             // TODO: optimize to not invoke default checker?