From adffaces-commits-return-102-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Thu Jul 06 18:54:25 2006 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 96832 invoked from network); 6 Jul 2006 18:54:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Jul 2006 18:54:24 -0000 Received: (qmail 75798 invoked by uid 500); 6 Jul 2006 18:54:24 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 75726 invoked by uid 500); 6 Jul 2006 18:54:24 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 75714 invoked by uid 99); 6 Jul 2006 18:54:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 11:54:23 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 11:54:23 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 76C511A981D; Thu, 6 Jul 2006 11:54:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r419655 - in /incubator/adffaces/trunk/adf-faces: adf-faces-demo/src/main/webapp/WEB-INF/web.xml adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/NavigationHandlerImpl.java Date: Thu, 06 Jul 2006 18:54:01 -0000 To: adffaces-commits@incubator.apache.org From: matzew@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060706185402.76C511A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: matzew Date: Thu Jul 6 11:54:01 2006 New Revision: 419655 URL: http://svn.apache.org/viewvc?rev=419655&view=rev Log: ADFFACES-2 (thx Pierre) Modified: incubator/adffaces/trunk/adf-faces/adf-faces-demo/src/main/webapp/WEB-INF/web.xml incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/NavigationHandlerImpl.java Modified: incubator/adffaces/trunk/adf-faces/adf-faces-demo/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-demo/src/main/webapp/WEB-INF/web.xml?rev=419655&r1=419654&r2=419655&view=diff ============================================================================== --- incubator/adffaces/trunk/adf-faces/adf-faces-demo/src/main/webapp/WEB-INF/web.xml (original) +++ incubator/adffaces/trunk/adf-faces/adf-faces-demo/src/main/webapp/WEB-INF/web.xml Thu Jul 6 11:54:01 2006 @@ -67,6 +67,14 @@ session + + + adfFaces org.apache.myfaces.adf.webapp.AdfFacesFilter Modified: incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/NavigationHandlerImpl.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/NavigationHandlerImpl.java?rev=419655&r1=419654&r2=419655&view=diff ============================================================================== --- incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/NavigationHandlerImpl.java (original) +++ incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/application/NavigationHandlerImpl.java Thu Jul 6 11:54:01 2006 @@ -20,13 +20,13 @@ import javax.faces.context.FacesContext; import org.apache.myfaces.adf.context.AdfFacesContext; -import org.apache.myfaces.adf.context.DialogService; public class NavigationHandlerImpl extends NavigationHandler { public NavigationHandlerImpl(NavigationHandler delegate) { _delegate = delegate; + _dialogPrefix = null; } public void handleNavigation( @@ -35,14 +35,14 @@ String outcome) { UIViewRoot oldRoot = context.getViewRoot(); - + _delegate.handleNavigation(context, fromAction, outcome); UIViewRoot newRoot = context.getViewRoot(); if ((outcome != null) && (newRoot != oldRoot)) { // Handle "dialog:" URLs - if (outcome.startsWith("dialog:")) + if (outcome.startsWith(_getDialogPrefix(context))) { // Navigate back to the original root context.setViewRoot(oldRoot); @@ -56,6 +56,22 @@ } } } + + private String _getDialogPrefix(FacesContext context) { + if (_dialogPrefix == null) { + _dialogPrefix = context.getExternalContext().getInitParameter(DIALOG_NAVIGATION_PREFIX_PARAM_NAME); + + if(_dialogPrefix == null) { + _dialogPrefix = DEFAULT_DIALOG_NAVIGATION_PREFIX; + } + } + + return _dialogPrefix; + } + public static final String DEFAULT_DIALOG_NAVIGATION_PREFIX = "dialog:"; + public static final String DIALOG_NAVIGATION_PREFIX_PARAM_NAME = "org.apache.myfaces.adf.DIALOG_NAVIGATION_PREFIX"; + private NavigationHandler _delegate; -} + private static String _dialogPrefix; +} \ No newline at end of file