svn commit: r834461 - /tomcat/trunk/java/org/apache/catalina/startup/WebXml.java

[markt]

Author: markt
Date: Tue Nov 10 13:40:08 2009
New Revision: 834461

URL: http://svn.apache.org/viewvc?rev=834461&view=rev
Log:
Fix some minor Eclipse warnings

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/WebXml.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebXml.java?rev=834461&r1=834460&r2=834461&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Tue Nov 10 
13:40:08 2009
@@ -69,11 +69,11 @@
     // web.xml only elements
     // Absolute Ordering
     private Set<String> absoluteOrdering = null;
-    public void addAbsoluteOrdering(String name) {
+    public void addAbsoluteOrdering(String fragmentName) {
         if (absoluteOrdering == null) {
             absoluteOrdering = new LinkedHashSet<String>();
         }
-        absoluteOrdering.add(name);
+        absoluteOrdering.add(fragmentName);
     }
     public void addAbsoluteOrderingOthers() {
         if (absoluteOrdering == null) {
@@ -88,8 +88,8 @@
     // web-fragment.xml only elements
     // Relative ordering
     private Set<String> after = new LinkedHashSet<String>();
-    public void addAfterOrdering(String name) {
-        after.add(name);
+    public void addAfterOrdering(String fragmentName) {
+        after.add(fragmentName);
     }
     public void addAfterOrderingOthers() {
         if (before.contains(ORDER_OTHERS)) {
@@ -99,8 +99,8 @@
         after.add(ORDER_OTHERS);
     }
     private Set<String> before = new LinkedHashSet<String>();
-    public void addBeforeOrdering(String name) {
-        before.add(name);
+    public void addBeforeOrdering(String fragmentName) {
+        before.add(fragmentName);
     }
     public void addBeforeOrderingOthers() {
         if (after.contains(ORDER_OTHERS)) {
@@ -162,8 +162,8 @@
     // context-param
     // TODO: description (multiple with language) is ignored
     private Map<String,String> contextParams = new HashMap<String,String>();
-    public void addContextParam(String name, String value) {
-        contextParams.put(name, value);
+    public void addContextParam(String param, String value) {
+        contextParams.put(param, value);
     }
     public Map<String,String> getContextParams() { return contextParams; }
     
@@ -708,10 +708,11 @@
         if (getLoginConfig() == null) {
             LoginConfig tempLoginConfig = null;
             for (WebXml fragment : fragments) {
-                LoginConfig loginConfig = fragment.loginConfig;
-                if (loginConfig != null) {
-                    if (tempLoginConfig == null || 
loginConfig.equals(tempLoginConfig)) {
-                        tempLoginConfig = loginConfig;
+                LoginConfig fragmentLoginConfig = fragment.loginConfig;
+                if (fragmentLoginConfig != null) {
+                    if (tempLoginConfig == null ||
+                            fragmentLoginConfig.equals(tempLoginConfig)) {
+                        tempLoginConfig = fragmentLoginConfig;
                     } else {
                         log.error(sm.getString(
                                 "webXml.mergeConflictLoginConfig",
@@ -860,36 +861,35 @@
             Map<String, T> tempResources,
             Map<String,Boolean> mergeInjectionFlags, WebXml fragment) {
         for (T resource : fragmentResources.values()) {
-            String name = resource.getName();
+            String resourceName = resource.getName();
             boolean mergeInjectionFlag = false;
-            if (mainResources.containsKey(name)) {
-                if (mergeInjectionFlags.containsKey(name)) {
+            if (mainResources.containsKey(resourceName)) {
+                if (mergeInjectionFlags.containsKey(resourceName)) {
                     mergeInjectionFlag =
-                        mergeInjectionFlags.get(name).booleanValue(); 
+                        mergeInjectionFlags.get(resourceName).booleanValue(); 
                 } else {
                     if (mainResources.get(
-                            name).getInjectionTargets().size() == 0) {
+                            resourceName).getInjectionTargets().size() == 0) {
                         mergeInjectionFlag = true;
                     }
-                    mergeInjectionFlags.put(name,
+                    mergeInjectionFlags.put(resourceName,
                             Boolean.valueOf(mergeInjectionFlag));
                 }
                 if (mergeInjectionFlag) {
-                    mainResources.get(name).getInjectionTargets().addAll(
+                    
mainResources.get(resourceName).getInjectionTargets().addAll(
                             resource.getInjectionTargets());
                 }
             } else {
                 // Not defined in main web.xml
-                if (tempResources.containsKey(name)) {
+                if (tempResources.containsKey(resourceName)) {
                     log.error(sm.getString(
                             "webXml.mergeConflictResource",
-                            name,
+                            resourceName,
                             fragment.getName(),
                             fragment.getURL()));
                     return false;
-                } else {
-                    tempResources.put(name, resource);
-                }
+                } 
+                tempResources.put(resourceName, resource);
             }
         }
         return true;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org