You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2007/05/21 22:27:51 UTC

svn commit: r540265 - /beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlChecker.java

Author: cschoett
Date: Mon May 21 13:27:50 2007
New Revision: 540265

URL: http://svn.apache.org/viewvc?view=rev&rev=540265
Log:
Minor fix for the JdbcControlChecker - it seems that a bug in the Eclipse APT implementation was causing an improper check result for a JDBC control method which returns an Java Iterator type.

DRTs: system control DRTs


Modified:
    beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlChecker.java

Modified: beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlChecker.java
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlChecker.java?view=diff&rev=540265&r1=540264&r2=540265
==============================================================================
--- beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlChecker.java (original)
+++ beehive/trunk/system-controls/src/jdbc/org/apache/beehive/controls/system/jdbc/JdbcControlChecker.java Mon May 21 13:27:50 2007
@@ -210,6 +210,16 @@
                     iteratorClassName = mte.getQualifiedName();
                 }
 
+                // todo: remove workaround once bug has been resolved.
+                /* Workaround default iterator name may contain a '$' seperator between the
+                   outer class and inner class. Should be a '.' seperator. Only applies to
+                   Eclipse APT.
+                 */
+                if (returnType.getClass().getName().startsWith("org.eclipse.")) {
+                    iteratorClassName = iteratorClassName.replace('$', '.');
+                }
+                // end of workaround
+
                 if ("org.apache.beehive.controls.system.jdbc.JdbcControl.UndefinedIteratorType".equals(iteratorClassName)) {
                     env.getMessager().printError(method.getPosition(),
                                                  getResourceString("jdbccontrol.iterator.returntype",