svn commit: r653897 - /tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java

[hlship]

Author: hlship
Date: Tue May  6 13:03:02 2008
New Revision: 653897

URL: http://svn.apache.org/viewvc?rev=653897&view=rev
Log:
Remove leading underscores from field names

Modified:
    
tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java

Modified: 
tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java?rev=653897&r1=653896&r2=653897&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java
 Tue May  6 13:03:02 2008
@@ -1,4 +1,4 @@
-// Copyright 2007 The Apache Software Foundation
+// Copyright 2007, 2008 The Apache Software Foundation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -38,26 +38,22 @@
 {
     private static final String CONTEXT_SERVICE_ID = 
WebApplicationContext.class.getSimpleName();
 
-    private final ApplicationContext context;
-
     private final Map<String, ServiceDef> serviceDefs = 
newCaseInsensitiveMap();
 
     public SpringModuleDef(final ApplicationContext context)
     {
-        this.context = context;
-
-        for (final String beanName : 
BeanFactoryUtils.beanNamesIncludingAncestors(this.context))
+        for (final String beanName : 
BeanFactoryUtils.beanNamesIncludingAncestors(context))
         {
             ServiceDef serviceDef = new ServiceDef()
             {
                 private Object getBean()
                 {
-                    return this.context.getBean(beanName);
+                    return context.getBean(beanName);
                 }
 
                 private Class getBeanType()
                 {
-                    return this.context.getType(beanName);
+                    return context.getType(beanName);
                 }
 
                 public ObjectCreator 
createServiceCreator(ServiceBuilderResources resources)
@@ -106,14 +102,13 @@
 
         ServiceDef serviceDef = new ServiceDef()
         {
-
             public ObjectCreator createServiceCreator(ServiceBuilderResources 
resources)
             {
                 return new ObjectCreator()
                 {
                     public Object createObject()
                     {
-                        return this.context;
+                        return context;
                     }
                 };
             }