myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: cosmetics
Date Sun, 04 Aug 2019 17:48:36 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new e9e8767  cosmetics
e9e8767 is described below

commit e9e87671636abeb8edbc51bce955aabc6b194c14
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Sun Aug 4 19:48:22 2019 +0200

    cosmetics
---
 .../myfaces/application/ResourceHandlerImpl.java       | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
index 40d6763..ef14ff7 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -545,7 +545,6 @@ public class ResourceHandlerImpl extends ResourceHandler
         Resource resource = null;
         if (libraryName != null)
         {
-            //log.info("libraryName=" + libraryName);
             resource = facesContext.getApplication().getResourceHandler().createResource(resourceName,
libraryName);
         }
         else
@@ -1252,8 +1251,7 @@ public class ResourceHandlerImpl extends ResourceHandler
         resourceMeta = resourceLoader.createResourceMeta(
             localePrefix, libraryName, libraryVersion, resourceName, resourceVersion);
 
-        if (resourceMeta != null &&
-            !resourceLoader.resourceExists(resourceMeta))
+        if (resourceMeta != null && !resourceLoader.resourceExists(resourceMeta))
         {
             resourceMeta = null;
         }
@@ -1388,8 +1386,8 @@ public class ResourceHandlerImpl extends ResourceHandler
             return null;
         }
 
-        if (libraryName != null && !ResourceValidationUtils.isValidLibraryName(
-                libraryName, isAllowSlashesLibraryName()))
+        if (libraryName != null
+                && !ResourceValidationUtils.isValidLibraryName(libraryName, isAllowSlashesLibraryName()))
         {
             return null;
         }
@@ -1453,12 +1451,10 @@ public class ResourceHandlerImpl extends ResourceHandler
         //2. Try to localize resource in a non localized path
         if (resourceMeta == null)
         {
-            resourceVersion = resourceLoader
-                    .getResourceVersion(resourceName);
+            resourceVersion = resourceLoader.getResourceVersion(resourceName);
             if (!(resourceVersion != null && ResourceLoader.VERSION_INVALID.equals(resourceVersion)))
             {
-                resourceMeta = resourceLoader.createResourceMeta(null, null, null,
-                         resourceName, resourceVersion);
+                resourceMeta = resourceLoader.createResourceMeta(null, null, null, resourceName,
resourceVersion);
             }
 
             if (resourceMeta != null && !resourceLoader.resourceExists(resourceMeta))
@@ -1631,8 +1627,8 @@ public class ResourceHandlerImpl extends ResourceHandler
                             facesContext, loader, resourceName, localePrefix, contract);
                         if (resourceMeta != null)
                         {
-                            resource = new ResourceImpl(resourceMeta, loader, 
-                                getResourceHandlerSupport(), contentType);
+                            resource = new ResourceImpl(resourceMeta, loader,
+                                    getResourceHandlerSupport(), contentType);
 
                             // cache it
                             getResourceLoaderCache().putViewResource(


Mime
View raw message