[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Gavin King]

  User: gavin   
  Date: 06/12/18 10:38:49

  Modified:    src/main/org/jboss/seam   Component.java pages-1.1.dtd
  Log:
  new validation component,
  reworked navigation rules
  
  Revision  Changes    Path
  1.223     +2 -2      jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.222
  retrieving revision 1.223
  diff -u -b -r1.222 -r1.223
  --- Component.java	16 Dec 2006 14:06:57 -0000	1.222
  +++ Component.java	18 Dec 2006 15:38:48 -0000	1.223
  @@ -122,7 +122,7 @@
    *
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Gavin King
  - * @version $Revision: 1.222 $
  + * @version $Revision: 1.223 $
    */
   @Scope(ScopeType.APPLICATION)
   @SuppressWarnings("deprecation")
  @@ -1792,7 +1792,7 @@
         try
         {
            Method interfaceMethod = instance.getClass().getMethod(methodName, paramTypes);
  -         if ( paramTypes.length==0 )
  +         if ( paramTypes.length==0 || interfaceMethod.getParameterTypes().length==0 )
            {
               return Reflections.invokeAndWrap(interfaceMethod, instance);
            }
  
  
  
  1.11      +10 -7     jboss-seam/src/main/org/jboss/seam/pages-1.1.dtd
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: pages-1.1.dtd
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages-1.1.dtd,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- pages-1.1.dtd	17 Dec 2006 16:04:09 -0000	1.10
  +++ pages-1.1.dtd	18 Dec 2006 15:38:48 -0000	1.11
  @@ -9,7 +9,7 @@
   <!ELEMENT pages (page*)>
   <!ATTLIST pages no-conversation-view-id CDATA #IMPLIED>
   
  -<!ELEMENT page (#PCDATA|description|param|end-conversation|begin-conversation|action-navigation)*>
  +<!ELEMENT page (#PCDATA|description|param|end-conversation|begin-conversation|action|action-navigation)*>
   <!ATTLIST page action CDATA #IMPLIED>
   <!ATTLIST page view-id CDATA #IMPLIED>
   <!ATTLIST page switch (enabled|disabled) "enabled">
  @@ -24,14 +24,17 @@
   <!ATTLIST param converter CDATA #IMPLIED>
   <!ATTLIST param converterId CDATA #IMPLIED>
   
  -<!ELEMENT action-navigation (null-outcome?,outcome*,any-outcome?)>
  -<!ATTLIST action-navigation action CDATA #IMPLIED>
  -<!ATTLIST action-navigation outcome CDATA #IMPLIED>
  +<!ELEMENT action EMPTY>
  +<!ATTLIST action if CDATA #IMPLIED>
  +<!ATTLIST action execute CDATA #REQUIRED>
  +
  +<!ELEMENT action-navigation (((begin-conversation|end-conversation)?,(render|redirect))|(outcome*))>
  +<!ATTLIST action-navigation from-action CDATA #IMPLIED>
  +<!ATTLIST action-navigation evaluate CDATA #IMPLIED>
   
   <!ELEMENT outcome ((begin-conversation|end-conversation)?,(render|redirect))>
  -<!ATTLIST outcome value CDATA #REQUIRED>
  -<!ELEMENT any-outcome ((begin-conversation|end-conversation)?,(render|redirect))>
  -<!ELEMENT null-outcome ((begin-conversation|end-conversation)?,(render|redirect))>
  +<!ATTLIST outcome if-value CDATA #IMPLIED>
  +<!ATTLIST outcome if CDATA #IMPLIED>
   
   <!ELEMENT begin-conversation EMPTY>
   <!ATTLIST begin-conversation join (true|false) "false">