You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/09/10 21:44:14 UTC
svn commit: r574345 - in
/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra:
conversation/annotations/ConversationRequire.java
viewController/AbstractAnnotationsViewControllerManager.java
Author: imario
Date: Mon Sep 10 12:44:14 2007
New Revision: 574345
URL: http://svn.apache.org/viewvc?rev=574345&view=rev
Log:
made entryPointViewIds optional
Modified:
myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/conversation/annotations/ConversationRequire.java
myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java
Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/conversation/annotations/ConversationRequire.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/conversation/annotations/ConversationRequire.java?rev=574345&r1=574344&r2=574345&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/conversation/annotations/ConversationRequire.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/conversation/annotations/ConversationRequire.java Mon Sep 10 12:44:14 2007
@@ -40,7 +40,7 @@
* </p>
* TODO: Is there a way to avoid this configuration option?
*/
- String[] entryPointViewIds();
+ String[] entryPointViewIds() default "";
/**
* One or many conversation names the view require as prerequesite.
Modified: myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java?rev=574345&r1=574344&r2=574345&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java (original)
+++ myfaces/orchestra/trunk/core15/src/main/java/org/apache/myfaces/orchestra/viewController/AbstractAnnotationsViewControllerManager.java Mon Sep 10 12:44:14 2007
@@ -86,7 +86,7 @@
for (int i = 0; i < entryPoints.length; i++)
{
String entryPoint = entryPoints[i];
- if (entryPoint.equals(viewId))
+ if (!StringUtils.isEmpty(entryPoint) && entryPoint.equals(viewId))
{
// yes ... no need to check
return;