Revision: 1795
          
http://spring-rich-c.svn.sourceforge.net/spring-rich-c/?rev=1795&view=rev
Author:   kevinstembridge
Date:     2007-07-31 15:41:46 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
Fix for RCP-211, logger shadows superclass logger.

Modified Paths:
--------------
    
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/factory/AbstractControlFactory.java

Modified: 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/factory/AbstractControlFactory.java
===================================================================
--- 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/factory/AbstractControlFactory.java
    2007-07-31 07:02:26 UTC (rev 1794)
+++ 
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/factory/AbstractControlFactory.java
    2007-07-31 22:41:46 UTC (rev 1795)
@@ -17,8 +17,6 @@
 
 import javax.swing.JComponent;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import 
org.springframework.richclient.application.support.ApplicationServicesAccessor;
 
 /**
@@ -36,9 +34,6 @@
  */
 public abstract class AbstractControlFactory extends 
ApplicationServicesAccessor implements ControlFactory {
 
-    /** Class logger, available to subclasses. */
-    protected Log logger = LogFactory.getLog(getClass());
-
     private boolean singleton = true;
 
     private JComponent control;
@@ -81,10 +76,10 @@
      */
     public final JComponent getControl() {
         if (isSingleton()) {
-            if (control == null) {
+            if (this.control == null) {
                 this.control = createControl();
             }
-            return control;
+            return this.control;
         }
 
         return createControl();
@@ -100,7 +95,7 @@
      */
     public final boolean isControlCreated() {
         if (isSingleton()) {
-            return control != null;
+            return this.control != null;
         }
 
         return false;
@@ -111,7 +106,7 @@
      * and the control instance has not already been created.
      */
     protected void createControlIfNecessary() {
-        if (isSingleton() && control == null) {
+        if (isSingleton() && this.control == null) {
             getControl();
         }
     }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
spring-rich-c-cvs mailing list
spring-rich-c-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs

Reply via email to