You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/12/09 19:26:18 UTC

svn commit: r1549635 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester: DigesterFacesConfigDispenserImpl.java elements/FacesConfigImpl.java

Author: lu4242
Date: Mon Dec  9 18:26:17 2013
New Revision: 1549635

URL: http://svn.apache.org/r1549635
Log:
MYFACES-3813 Cleanup org.apache.myfaces.config.impl.digester.elements package

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java?rev=1549635&r1=1549634&r2=1549635&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java Mon Dec  9 18:26:17 2013
@@ -414,7 +414,7 @@ public class DigesterFacesConfigDispense
         {
             umexceptionHandlerFactories = Collections.unmodifiableList(exceptionHandlerFactories);
         }
-        return exceptionHandlerFactories;
+        return umexceptionHandlerFactories;
     }
 
     public Collection<String> getExternalContextFactoryIterator()
@@ -423,7 +423,7 @@ public class DigesterFacesConfigDispense
         {
             umexternalContextFactories = Collections.unmodifiableList(externalContextFactories);
         }
-        return externalContextFactories;
+        return umexternalContextFactories;
     }
 
     /**
@@ -435,7 +435,7 @@ public class DigesterFacesConfigDispense
         {
             umfacesContextFactories = Collections.unmodifiableList(facesContextFactories);
         }
-        return facesContextFactories;
+        return umfacesContextFactories;
     }
 
     /**
@@ -447,7 +447,7 @@ public class DigesterFacesConfigDispense
         {
             umlifecycleFactories = Collections.unmodifiableList(lifecycleFactories);
         }
-        return lifecycleFactories;
+        return umlifecycleFactories;
     }
 
     public Collection<String> getViewDeclarationLanguageFactoryIterator()
@@ -456,7 +456,7 @@ public class DigesterFacesConfigDispense
         {
             umviewDeclarationLanguageFactories = Collections.unmodifiableList(viewDeclarationLanguageFactories);
         }
-        return viewDeclarationLanguageFactories;
+        return umviewDeclarationLanguageFactories;
     }
 
     public Collection<String> getPartialViewContextFactoryIterator()
@@ -465,7 +465,7 @@ public class DigesterFacesConfigDispense
         {
             umpartialViewContextFactories = Collections.unmodifiableList(partialViewContextFactories);
         }
-        return partialViewContextFactories;
+        return umpartialViewContextFactories;
     }
 
     /**
@@ -477,7 +477,7 @@ public class DigesterFacesConfigDispense
         {
             umrenderKitFactories = Collections.unmodifiableList(renderKitFactories);
         }
-        return renderKitFactories;
+        return umrenderKitFactories;
     }
 
     public Collection<String> getTagHandlerDelegateFactoryIterator()
@@ -486,7 +486,7 @@ public class DigesterFacesConfigDispense
         {
             umtagHandlerDelegateFactories = Collections.unmodifiableList(tagHandlerDelegateFactories);
         }
-        return tagHandlerDelegateFactories;
+        return umtagHandlerDelegateFactories;
     }
 
     public Collection<String> getVisitContextFactoryIterator()
@@ -495,7 +495,7 @@ public class DigesterFacesConfigDispense
         {
             umvisitContextFactories = Collections.unmodifiableList(visitContextFactories);
         }
-        return visitContextFactories;
+        return umvisitContextFactories;
     }
 
     /**
@@ -507,7 +507,7 @@ public class DigesterFacesConfigDispense
         {
             umactionListeners = Collections.unmodifiableList(actionListeners);
         }
-        return actionListeners;
+        return umactionListeners;
     }
 
     /**
@@ -535,7 +535,7 @@ public class DigesterFacesConfigDispense
         {
             umnavigationHandlers = Collections.unmodifiableList(navigationHandlers);
         }
-        return navigationHandlers;
+        return umnavigationHandlers;
     }
 
     /**
@@ -556,7 +556,7 @@ public class DigesterFacesConfigDispense
         {
             umresourceHandlers = Collections.unmodifiableList(resourceHandlers);
         }
-        return resourceHandlers;
+        return umresourceHandlers;
     }
 
     /**
@@ -569,7 +569,7 @@ public class DigesterFacesConfigDispense
         {
             umviewHandlers = Collections.unmodifiableList(viewHandlers);
         }
-        return viewHandlers;
+        return umviewHandlers;
     }
 
     /**
@@ -582,7 +582,7 @@ public class DigesterFacesConfigDispense
         {
             umstateManagers = Collections.unmodifiableList(stateManagers);
         }
-        return stateManagers;
+        return umstateManagers;
     }
 
     /**
@@ -595,7 +595,7 @@ public class DigesterFacesConfigDispense
         {
             umpropertyResolver = Collections.unmodifiableList(propertyResolver);
         }
-        return propertyResolver;
+        return umpropertyResolver;
     }
 
     /**
@@ -608,7 +608,7 @@ public class DigesterFacesConfigDispense
         {
             umvariableResolver = Collections.unmodifiableList(variableResolver);
         }
-        return variableResolver;
+        return umvariableResolver;
     }
 
     /**
@@ -773,7 +773,7 @@ public class DigesterFacesConfigDispense
         {
             ummanagedBeans = Collections.unmodifiableList(managedBeans);
         }
-        return managedBeans;
+        return ummanagedBeans;
     }
 
     /**
@@ -786,7 +786,7 @@ public class DigesterFacesConfigDispense
         {
             umnavigationRules = Collections.unmodifiableList(navigationRules);
         }
-        return navigationRules;
+        return umnavigationRules;
     }
 
     /**
@@ -837,7 +837,7 @@ public class DigesterFacesConfigDispense
         {
             umlifecyclePhaseListeners = Collections.unmodifiableList(lifecyclePhaseListeners);
         }
-        return lifecyclePhaseListeners;
+        return umlifecyclePhaseListeners;
     }
 
     @Override
@@ -847,7 +847,7 @@ public class DigesterFacesConfigDispense
         {
             umresourceBundles = Collections.unmodifiableList(resourceBundles);
         }
-        return resourceBundles;
+        return umresourceBundles;
     }
 
     @Override
@@ -857,7 +857,7 @@ public class DigesterFacesConfigDispense
         {
             umelResolvers = Collections.unmodifiableList(elResolvers);
         }
-        return elResolvers;
+        return umelResolvers;
     }
 
     @Override
@@ -867,7 +867,7 @@ public class DigesterFacesConfigDispense
         {
             umsystemEventListeners = Collections.unmodifiableList(systemEventListeners);
         }
-        return systemEventListeners;
+        return umsystemEventListeners;
     }
     
     @Override
@@ -877,7 +877,7 @@ public class DigesterFacesConfigDispense
         {
             umbehaviors = Collections.unmodifiableList(behaviors);
         }
-        return behaviors;
+        return umbehaviors;
     }
     
     @Override
@@ -893,7 +893,7 @@ public class DigesterFacesConfigDispense
         {
             umnamedEvents = Collections.unmodifiableList(namedEvents);
         }
-        return namedEvents;
+        return umnamedEvents;
     }
     
     @Override
@@ -921,7 +921,7 @@ public class DigesterFacesConfigDispense
         {
             umfaceletCacheFactories = Collections.unmodifiableList(faceletCacheFactories);
         }
-        return faceletCacheFactories;
+        return umfaceletCacheFactories;
     }
 
     @Override
@@ -937,7 +937,7 @@ public class DigesterFacesConfigDispense
         {
             umflashFactories = Collections.unmodifiableList(flashFactories);
         }
-        return flashFactories;
+        return umflashFactories;
     }
     
     @Override
@@ -947,7 +947,7 @@ public class DigesterFacesConfigDispense
         {
             umflowHandlerFactories = Collections.unmodifiableList(flowHandlerFactories);
         }
-        return flowHandlerFactories;
+        return umflowHandlerFactories;
     }
 
     @Override
@@ -963,7 +963,7 @@ public class DigesterFacesConfigDispense
         {
             umclientWindowFactories = Collections.unmodifiableList(clientWindowFactories);
         }
-        return clientWindowFactories;
+        return umclientWindowFactories;
     }
     
     @Override
@@ -973,7 +973,7 @@ public class DigesterFacesConfigDispense
         {
             umfacesFlowDefinitions = Collections.unmodifiableList(facesFlowDefinitions);
         }
-        return facesFlowDefinitions;
+        return umfacesFlowDefinitions;
     }
 
     @Override
@@ -983,7 +983,7 @@ public class DigesterFacesConfigDispense
         {
             umprotectedViewUrlPatterns = Collections.unmodifiableList(protectedViewUrlPatterns);
         }
-        return protectedViewUrlPatterns;
+        return umprotectedViewUrlPatterns;
     }
 
     @Override
@@ -993,7 +993,7 @@ public class DigesterFacesConfigDispense
         {
             umresourceLibraryContractMappings = Collections.unmodifiableList(resourceLibraryContractMappings);
         }
-        return resourceLibraryContractMappings;
+        return umresourceLibraryContractMappings;
     }
 
     @Override
@@ -1003,7 +1003,7 @@ public class DigesterFacesConfigDispense
         {
             umcomponentTagDeclarations = Collections.unmodifiableList(componentTagDeclarations);
         }
-        return componentTagDeclarations;
+        return umcomponentTagDeclarations;
     }
 
     @Override
@@ -1013,7 +1013,7 @@ public class DigesterFacesConfigDispense
         {
             umresourceResolvers = Collections.unmodifiableList(resourceResolvers);
         }
-        return resourceResolvers;
+        return umresourceResolvers;
     }
 
     @Override
@@ -1023,7 +1023,7 @@ public class DigesterFacesConfigDispense
         {
             umfaceletTagLibraries = Collections.unmodifiableList(faceletTagLibraries);
         }
-        return faceletTagLibraries;
+        return umfaceletTagLibraries;
     }
     
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java?rev=1549635&r1=1549634&r2=1549635&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/FacesConfigImpl.java Mon Dec  9 18:26:17 2013
@@ -255,7 +255,7 @@ public class FacesConfigImpl extends org
             unmodifiableApplications = 
                 Collections.unmodifiableList(applications);
         }
-        return applications;
+        return unmodifiableApplications;
     }
 
     public List<Factory> getFactories()
@@ -269,7 +269,7 @@ public class FacesConfigImpl extends org
             unmodifiableFactories = 
                 Collections.unmodifiableList(factories);
         }
-        return factories;
+        return unmodifiableFactories;
     }
 
     public Map<String, String> getComponents()
@@ -283,7 +283,7 @@ public class FacesConfigImpl extends org
             unmodifiableComponents = 
                 Collections.unmodifiableMap(components);
         }
-        return components;
+        return unmodifiableComponents;
     }
     
     public Map<String, ComponentTagDeclaration> getComponentTagDeclarations()
@@ -297,7 +297,7 @@ public class FacesConfigImpl extends org
             unmodifiableComponentTagDeclarations = 
                 Collections.unmodifiableMap(componentTagDeclarations);
         }
-        return componentTagDeclarations;
+        return unmodifiableComponentTagDeclarations;
     }
 
     public List<Converter> getConverters()
@@ -311,7 +311,7 @@ public class FacesConfigImpl extends org
             unmodifiableConverters = 
                 Collections.unmodifiableList(converters);
         }
-        return converters;
+        return unmodifiableConverters;
     }
 
     public List<ManagedBean> getManagedBeans()
@@ -325,7 +325,7 @@ public class FacesConfigImpl extends org
             unmodifiableManagedBeans = 
                 Collections.unmodifiableList(managedBeans);
         }
-        return managedBeans;
+        return unmodifiableManagedBeans;
     }
 
     public List<NavigationRule> getNavigationRules()
@@ -339,7 +339,7 @@ public class FacesConfigImpl extends org
             unmodifiableNavigationRules = 
                 Collections.unmodifiableList(navigationRules);
         }
-        return navigationRules;
+        return unmodifiableNavigationRules;
     }
 
     public List<RenderKit> getRenderKits()
@@ -353,7 +353,7 @@ public class FacesConfigImpl extends org
             unmodifiableRenderKits = 
                 Collections.unmodifiableList(renderKits);
         }
-        return renderKits;
+        return unmodifiableRenderKits;
     }
 
     public List<String> getLifecyclePhaseListener()
@@ -367,7 +367,7 @@ public class FacesConfigImpl extends org
             unmodifiableLifecyclePhaseListener = 
                 Collections.unmodifiableList(lifecyclePhaseListener);
         }
-        return lifecyclePhaseListener;
+        return unmodifiableLifecyclePhaseListener;
     }
 
     public Map<String, String> getValidators()
@@ -381,7 +381,7 @@ public class FacesConfigImpl extends org
             unmodifiableValidators = 
                 Collections.unmodifiableMap(validators);
         }
-        return validators;
+        return unmodifiableValidators;
     }
     
     public List<Behavior> getBehaviors ()
@@ -395,7 +395,7 @@ public class FacesConfigImpl extends org
             unmodifiableBehaviors = 
                 Collections.unmodifiableList(behaviors);
         }
-        return behaviors;
+        return unmodifiableBehaviors;
     }
     
     public List<NamedEvent> getNamedEvents ()
@@ -409,7 +409,7 @@ public class FacesConfigImpl extends org
             unmodifiableNamedEvents = 
                 Collections.unmodifiableList(namedEvents);
         }
-        return namedEvents;
+        return unmodifiableNamedEvents;
     }
     
     public RenderKit getRenderKit(String renderKitId)
@@ -490,7 +490,7 @@ public class FacesConfigImpl extends org
             unmodifiableFacesConfigExtensions = 
                 Collections.unmodifiableList(facesConfigExtensions);
         }
-        return facesConfigExtensions;
+        return unmodifiableFacesConfigExtensions;
     }
     
     @Override
@@ -505,7 +505,7 @@ public class FacesConfigImpl extends org
             unmodifiableFacesFlowDefinitions = 
                 Collections.unmodifiableList(facesFlowDefinitions);
         }
-        return facesFlowDefinitions;
+        return unmodifiableFacesFlowDefinitions;
     }
     
     public List<String> getProtectedViewsUrlPatternList()
@@ -519,7 +519,7 @@ public class FacesConfigImpl extends org
             unmodifiableProtectedViewsUrlPatternList = 
                 Collections.unmodifiableList(protectedViewsUrlPatternList);
         }
-        return protectedViewsUrlPatternList;
+        return unmodifiableProtectedViewsUrlPatternList;
     }
     
     public List<String> getResourceResolversList()
@@ -533,7 +533,7 @@ public class FacesConfigImpl extends org
             unmodifiableResourceResolvers = 
                 Collections.unmodifiableList(resourceResolvers);
         }
-        return resourceResolvers;
+        return unmodifiableResourceResolvers;
     }
     
     @Override