You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by an...@apache.org on 2006/10/04 04:51:50 UTC
svn commit: r452703 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/ java/org/apache/tapestry/resolver/
test/org/apache/tapestry/resolver/
Author: andyhot
Date: Tue Oct 3 19:51:49 2006
New Revision: 452703
URL: http://svn.apache.org/viewvc?view=rev&rev=452703
Log:
TAPESTRY-670: Add way to get the name of the requested page from a PageNotFoundException
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/PageNotFoundException.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/PageNotFoundException.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/PageNotFoundException.java?view=diff&rev=452703&r1=452702&r2=452703
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/PageNotFoundException.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/PageNotFoundException.java Tue Oct 3 19:51:49 2006
@@ -25,10 +25,26 @@
*/
public class PageNotFoundException extends ApplicationRuntimeException
{
- private static final long serialVersionUID = -4776430599632429708L;
+ private static final long serialVersionUID = -9123254357382597407L;
+
+ private final String _pageName;
public PageNotFoundException(String message)
{
+ this(null, message);
+ }
+
+ public PageNotFoundException(String pageName, String message)
+ {
super(message);
+ _pageName = pageName;
+ }
+
+ /**
+ * @since 4.1.1
+ */
+ public String getPageName()
+ {
+ return _pageName;
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java?view=diff&rev=452703&r1=452702&r2=452703
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java Tue Oct 3 19:51:49 2006
@@ -144,8 +144,8 @@
searchForPage(cycle);
if (getSpecification() == null)
- throw new PageNotFoundException(ResolverMessages.noSuchPage(
- _simpleName, namespace));
+ throw new PageNotFoundException(_simpleName,
+ ResolverMessages.noSuchPage(_simpleName, namespace));
}
public String getSimplePageName()
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java?view=diff&rev=452703&r1=452702&r2=452703
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/resolver/PageSpecificationResolverTest.java Tue Oct 3 19:51:49 2006
@@ -207,7 +207,7 @@
return source;
}
- public void testExplicitlyInApplicationNamespace()
+ public void test_Explicitly_In_Application_Namespace()
{
Resource contextRoot = newResource("context/");
IComponentSpecification spec = newSpecification();
@@ -240,7 +240,7 @@
}
- public void testExplicitlyInFrameworkNamespace()
+ public void test_Explicitly_In_Framework_Namespace()
{
Resource contextRoot = newResource("context/");
IComponentSpecification spec = newSpecification();
@@ -272,7 +272,7 @@
verify();
}
- public void testFoundAsTemplate()
+ public void test_Found_As_Template()
{
Log log = newLog();
@@ -352,7 +352,7 @@
verify();
}
- public void testFoundInApplicationNamespace()
+ public void test_Found_In_Application_Namespace()
{
Resource contextRoot = newResource("context/");
IComponentSpecification spec = newSpecification();
@@ -377,7 +377,7 @@
verify();
}
- public void testFoundInChildNamespace()
+ public void test_Found_In_Child_Namespace()
{
Resource contextRoot = newResource("context/");
IComponentSpecification spec = newSpecification();
@@ -407,7 +407,7 @@
verify();
}
- public void testFoundInContextRootFolder()
+ public void test_Found_In_ContextRoot_Folder()
{
Log log = newLog();
@@ -466,7 +466,7 @@
verify();
}
- public void testFoundInFramework()
+ public void test_Found_In_Framework()
{
Log log = newLog();
INamespace application = newNamespace();
@@ -525,7 +525,7 @@
verify();
}
- public void testFoundInNamespaceFolder()
+ public void test_Found_In_Namespace_Folder()
{
Log log = newLog();
@@ -571,7 +571,7 @@
verify();
}
- public void testFoundInWebInfAppFolder()
+ public void test_Found_In_WebInf_App_Folder()
{
Log log = newLog();
@@ -624,7 +624,7 @@
verify();
}
- public void testFoundInWebInfFolder()
+ public void test_Found_In_WebInf_Folder()
{
Log log = newLog();
@@ -682,7 +682,7 @@
verify();
}
- public void testWebInf()
+ public void test_WebInf()
{
Log log = newLog();
INamespace application = newNamespace();
@@ -742,7 +742,7 @@
}
- public void testNotFoundAnywhere()
+ public void test_NotFound_Anywhere()
{
Log log = newLog();
INamespace application = newNamespace();
@@ -792,12 +792,13 @@
{
assertEquals("Page 'MissingPage' not found in <application namespace>.", ex
.getMessage());
+ assertEquals("MissingPage", ex.getPageName());
}
verify();
}
- public void testProvidedByDelegate()
+ public void test_Provided_By_Delegate()
{
Log log = newLog();
INamespace application = newNamespace();