Return-Path: Delivered-To: apmail-velocity-commits-archive@locus.apache.org Received: (qmail 62608 invoked from network); 28 Apr 2007 03:29:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Apr 2007 03:29:05 -0000 Received: (qmail 76165 invoked by uid 500); 28 Apr 2007 03:29:12 -0000 Delivered-To: apmail-velocity-commits-archive@velocity.apache.org Received: (qmail 76141 invoked by uid 500); 28 Apr 2007 03:29:12 -0000 Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@velocity.apache.org Delivered-To: mailing list commits@velocity.apache.org Received: (qmail 76132 invoked by uid 99); 28 Apr 2007 03:29:12 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2007 20:29:12 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2007 20:29:05 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1EDDA1A9838; Fri, 27 Apr 2007 20:28:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r533282 - /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java Date: Sat, 28 Apr 2007 03:28:45 -0000 To: commits@velocity.apache.org From: nbubna@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070428032845.1EDDA1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nbubna Date: Fri Apr 27 20:28:44 2007 New Revision: 533282 URL: http://svn.apache.org/viewvc?view=rev&rev=533282 Log: change setClass() to take Class and don't try to look up annotations when the class is null Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java?view=diff&rev=533282&r1=533281&r2=533282 ============================================================================== --- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java (original) +++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/ToolConfiguration.java Fri Apr 27 20:28:44 2007 @@ -43,14 +43,14 @@ * This doesn't take a {@link Class} parameter because * this class was not created for all-java configuration. */ - public void setClass(String classname) + public void setClass(Class clazz) { - this.classname = classname; + this.classname = clazz.getName(); } public void setClassname(String classname) { - setClass(classname); + this.classname = classname; } public void setRestrictTo(String path) @@ -65,11 +65,14 @@ return this.key; } - DefaultKey defaultKey = - (DefaultKey)getToolClass().getAnnotation(DefaultKey.class); - if (defaultKey != null) + if (getClassname() != null) { - return defaultKey.value(); + DefaultKey defaultKey = + (DefaultKey)getToolClass().getAnnotation(DefaultKey.class); + if (defaultKey != null) + { + return defaultKey.value(); + } } return null; }