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 Tue, 20 Oct 2020 09:13:15 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 f2ace1a  cosmetics
f2ace1a is described below

commit f2ace1a1288b52bc9d647f3f9a1eef3e5433ee8f
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Tue Oct 20 11:13:05 2020 +0200

    cosmetics
---
 .../apache/myfaces/application/ApplicationImpl.java   |  6 +++---
 .../myfaces/application/FlowNavigationCase.java       | 19 +++++++++----------
 .../resource/TempDirFileCacheResourceLoader.java      |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
index 9bf8b0f..ff047f8 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -2099,7 +2099,7 @@ public class ApplicationImpl extends Application
         List<ResourceDependency> dependencyList = null;
         boolean isCachedList = false;
         
-        if(isProduction)
+        if (isProduction)
         {
             dependencyList = _classToResourceDependencyMap.get(inspectedClass);
 
@@ -2114,14 +2114,14 @@ public class ApplicationImpl extends Application
             }
         }
         
-        if(dependencyList == null)  //not in production or the class hasn't been inspected
yet
+        if (dependencyList == null)  //not in production or the class hasn't been inspected
yet
         {   
             ResourceDependency dependency = inspectedClass.getAnnotation(ResourceDependency.class);
             ResourceDependencies dependencies = inspectedClass.getAnnotation(ResourceDependencies.class);
             if(dependency != null || dependencies != null)
             {
                 //resource dependencies were found using one or both annotations, create
and build a new list
-                dependencyList = new ArrayList<ResourceDependency>();
+                dependencyList = new ArrayList<>();
                 
                 if(dependency != null)
                 {
diff --git a/impl/src/main/java/org/apache/myfaces/application/FlowNavigationCase.java b/impl/src/main/java/org/apache/myfaces/application/FlowNavigationCase.java
index f7baa9d..7b5c63c 100644
--- a/impl/src/main/java/org/apache/myfaces/application/FlowNavigationCase.java
+++ b/impl/src/main/java/org/apache/myfaces/application/FlowNavigationCase.java
@@ -34,33 +34,32 @@ import javax.faces.application.NavigationCaseWrapper;
  */
 public class FlowNavigationCase extends NavigationCaseWrapper
 {
-    
-    private NavigationCase _delegate;
-    private String _fromOutcome;
-    private String _toFlowDocumentId;
+    private NavigationCase delegate;
+    private String fromOutcome;
+    private String toFlowDocumentId;
 
     public FlowNavigationCase(NavigationCase delegate, String fromOutcome, String toFlowDocumentId)
     {
-        this._delegate = delegate;
-        this._fromOutcome = fromOutcome;
-        this._toFlowDocumentId = toFlowDocumentId;
+        this.delegate = delegate;
+        this.fromOutcome = fromOutcome;
+        this.toFlowDocumentId = toFlowDocumentId;
     }
 
     @Override
     public NavigationCase getWrapped()
     {
-        return _delegate;
+        return delegate;
     }
     
     @Override
     public String getFromOutcome()
     {
-        return _fromOutcome;
+        return fromOutcome;
     }
     
     @Override
     public String getToFlowDocumentId()
     {
-        return _toFlowDocumentId;
+        return toFlowDocumentId;
     }
 }
diff --git a/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheResourceLoader.java
b/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheResourceLoader.java
index 1e868a0..b2b1274 100644
--- a/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheResourceLoader.java
+++ b/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheResourceLoader.java
@@ -133,7 +133,7 @@ public class TempDirFileCacheResourceLoader extends ResourceLoaderWrapper
         _tempDir = imagesDir;
 
         //2. Create map for register temporal resources
-        Map<String, FileProducer> temporalFilesLockMap = new ConcurrentHashMap<String,
FileProducer>();
+        Map<String, FileProducer> temporalFilesLockMap = new ConcurrentHashMap<>();
         facesContext.getExternalContext().getApplicationMap().put(TEMP_FILES_LOCK_MAP, temporalFilesLockMap);
     }
 


Mime
View raw message