From commits-return-70439-archive-asf-public=cust-asf.ponee.io@myfaces.apache.org Sat Nov 24 11:36:27 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id A02DD18062B for ; Sat, 24 Nov 2018 11:36:26 +0100 (CET) Received: (qmail 91148 invoked by uid 500); 24 Nov 2018 10:36:25 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 91139 invoked by uid 99); 24 Nov 2018 10:36:25 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Nov 2018 10:36:25 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id E21B582D65; Sat, 24 Nov 2018 10:36:24 +0000 (UTC) Date: Sat, 24 Nov 2018 10:36:24 +0000 To: "commits@myfaces.apache.org" Subject: [myfaces] branch master updated: refactored MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154305578487.7524.3495096724463051691@gitbox.apache.org> From: tandraschko@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: myfaces X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: b7bd95134c77378eca0584de9c261c531b76841e X-Git-Newrev: 32dc62862c22d2277e15db3114d6330ed0853dae X-Git-Rev: 32dc62862c22d2277e15db3114d6330ed0853dae X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 32dc628 refactored 32dc628 is described below commit 32dc62862c22d2277e15db3114d6330ed0853dae Author: Thomas Andraschko AuthorDate: Sat Nov 24 11:35:58 2018 +0100 refactored --- .../facelets/FaceletViewDeclarationLanguage.java | 30 ++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java index 56cb138..cd41763 100644 --- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java +++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java @@ -1558,8 +1558,8 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua if (mctx.isUsingPSSOnThisView()) { - valueChangeListener = new PartialMethodExpressionValueChangeListener( - methodExpression, methodExpression2); + valueChangeListener = new PartialMethodExpressionValueChangeListener(methodExpression, + methodExpression2); } else { @@ -1579,8 +1579,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua boolean ccAttrMeRedirection, String[] targetsArray) { - UIComponent topLevelComponentBase = topLevelComponent.getFacet( - UIComponent.COMPOSITE_FACET_NAME); + UIComponent topLevelComponentBase = topLevelComponent.getFacet(UIComponent.COMPOSITE_FACET_NAME); for (String target : targetsArray) { @@ -2051,13 +2050,14 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua //else if (!_buildBeforeRestore) //{ + Application application = context.getApplication(); + ViewHandler viewHandler = application.getViewHandler(); + // When partial state saving is not used, createView() is not called. To ensure // everything is in place it is necessary to calculate the resource library // contracts and set them into facesContext. - ViewDeclarationLanguage vdl = context.getApplication().getViewHandler(). - getViewDeclarationLanguage(context, viewId); - List contracts = vdl.calculateResourceLibraryContracts( - context, viewId); + ViewDeclarationLanguage vdl = viewHandler.getViewDeclarationLanguage(context, viewId); + List contracts = vdl.calculateResourceLibraryContracts(context, viewId); context.setResourceLibraryContracts(contracts); // JSF 2.2 stateless views @@ -2065,12 +2065,10 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua // note we cannot do this in DefaultFaceletsStateManagementStrategy because it is only used // when PSS is enabled, but stateless views can be used without PSS. If the view is stateless, // there is no need to ask to the StateManager. - Application application = context.getApplication(); - ViewHandler applicationViewHandler = application.getViewHandler(); - String renderKitId = applicationViewHandler.calculateRenderKitId(context); + String renderKitId = viewHandler.calculateRenderKitId(context); - ResponseStateManager manager = getRenderKitFactory().getRenderKit( - context, renderKitId).getResponseStateManager(); + ResponseStateManager manager = getRenderKitFactory().getRenderKit(context, renderKitId) + .getResponseStateManager(); if (manager.isStateless(context, viewId)) { @@ -2078,14 +2076,14 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua UIViewRoot view = null; try { - ViewMetadata metadata = vdl.getViewMetadata (context, viewId); + ViewMetadata metadata = vdl.getViewMetadata(context, viewId); if (metadata != null) { view = metadata.createMetadataView(context); } if (view == null) { - view = context.getApplication().getViewHandler().createView(context, viewId); + view = viewHandler.createView(context, viewId); } // If the view is not transient, then something is wrong. Throw an exception. if (!view.isTransient()) @@ -2103,7 +2101,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua } finally { - context.setProcessingEvents (oldContextEventState); + context.setProcessingEvents(oldContextEventState); } } }