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 2017/03/08 02:27:31 UTC

svn commit: r1785913 - in /myfaces/core/branches/2.3.x: api/src/main/java/javax/faces/view/ViewDeclarationLanguageFactory.java impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java

Author: lu4242
Date: Wed Mar  8 02:27:31 2017
New Revision: 1785913

URL: http://svn.apache.org/viewvc?rev=1785913&view=rev
Log:
small fix add ViewDeclarationLanguageFactory.getAllViewDeclarationLanguages()

Modified:
    myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/ViewDeclarationLanguageFactory.java
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java

Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/ViewDeclarationLanguageFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/ViewDeclarationLanguageFactory.java?rev=1785913&r1=1785912&r2=1785913&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/ViewDeclarationLanguageFactory.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/view/ViewDeclarationLanguageFactory.java Wed Mar  8 02:27:31 2017
@@ -18,6 +18,7 @@
  */
 package javax.faces.view;
 
+import java.util.Collections;
 import javax.faces.FacesWrapper;
 
 /**
@@ -45,4 +46,20 @@ public abstract class ViewDeclarationLan
     {
         return delegate;
     }
+    
+    /**
+     * @since 2.3
+     * @return 
+     */
+    public java.util.List<ViewDeclarationLanguage> getAllViewDeclarationLanguages()
+    {
+        if (getWrapped() == null)
+        {
+            return Collections.emptyList();
+        }
+        else
+        {
+            return getWrapped().getAllViewDeclarationLanguages();
+        }
+    }
 }

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java?rev=1785913&r1=1785912&r2=1785913&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java Wed Mar  8 02:27:31 2017
@@ -18,6 +18,9 @@
  */
 package org.apache.myfaces.view;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -54,6 +57,8 @@ public class ViewDeclarationLanguageFact
     private volatile boolean _initialized;
     private volatile ViewDeclarationLanguageStrategy[] _supportedLanguages;
     
+    private volatile List<ViewDeclarationLanguage> _supportedVDLs = null;
+    
     /**
      * 
      */
@@ -83,6 +88,21 @@ public class ViewDeclarationLanguageFact
         
         return null;
     }
+
+    @Override
+    public List<ViewDeclarationLanguage> getAllViewDeclarationLanguages()
+    {
+        if (_supportedVDLs == null)
+        {
+            List<ViewDeclarationLanguage> list = new ArrayList<ViewDeclarationLanguage>();
+            for (ViewDeclarationLanguageStrategy strategy : _supportedLanguages)
+            {        
+                list.add(strategy.getViewDeclarationLanguage());
+            }
+            _supportedVDLs = Collections.unmodifiableList(list);
+        }
+        return _supportedVDLs;
+    }
     
     /**
      * Initialize the supported view declaration languages.