svn commit: r615215 - in /struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser: ActionNamesAction.java ShowConfigAction.java

[mrdon]

Author: mrdon
Date: Fri Jan 25 05:18:36 2008
New Revision: 615215

URL: http://svn.apache.org/viewvc?rev=615215&view=rev
Log:
Fixed NPE for show config action
WW-2439

Modified:
    
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
    
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java

Modified: 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java?rev=615215&r1=615214&r2=615215&view=diff
==============================================================================
--- 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
 (original)
+++ 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ActionNamesAction.java
 Fri Jan 25 05:18:36 2008
@@ -44,7 +44,7 @@
     private Set namespaces;
     private String extension;
     
-    ConfigurationHelper configHelper;
+    protected ConfigurationHelper configHelper;
 
     @Inject
     public void setConfigurationHelper(ConfigurationHelper cfg) {

Modified: 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java?rev=615215&r1=615214&r2=615215&view=diff
==============================================================================
--- 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
 (original)
+++ 
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/ShowConfigAction.java
 Fri Jan 25 05:18:36 2008
@@ -69,11 +69,6 @@
     }
     
     @Inject
-    public void setConfigurationHelper(ConfigurationHelper cfg) {
-        this.configHelper = cfg;
-    }
-    
-    @Inject
     public void setObjectFactory(ObjectFactory fac) {
         this.objectFactory = fac;
     }