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

[Gavin King]

  User: gavin   
  Date: 07/02/22 09:49:32

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  JBSEAM-899
  
  Revision  Changes    Path
  1.91      +13 -2     jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -b -r1.90 -r1.91
  --- Pages.java	22 Feb 2007 14:37:46 -0000	1.90
  +++ Pages.java	22 Feb 2007 14:49:32 -0000	1.91
  @@ -984,11 +984,22 @@
         String expression = element.attributeValue("from-action");
         if (expression==null)
         {
  +         if (entry.getDefaultNavigation()==null)
  +         {
            entry.setDefaultNavigation(navigation);
         }
         else
         {
  -         entry.getNavigations().put(expression, navigation);
  +            throw new IllegalStateException("multiple catchall <navigation> elements");
  +         }
  +      }
  +      else
  +      {
  +         Object old = entry.getNavigations().put(expression, navigation);
  +         if (old!=null)
  +         {
  +            throw new IllegalStateException("multiple <navigation> elements for action: " + expression);
  +         }
         }
      }
      /**