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

[Gavin King]

  User: gavin   
  Date: 06/10/17 08:34:39

  Modified:    src/main/org/jboss/seam/util  EnumerationEnumeration.java
  Log:
  minor
  
  Revision  Changes    Path
  1.3       +18 -3     jboss-seam/src/main/org/jboss/seam/util/EnumerationEnumeration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EnumerationEnumeration.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/util/EnumerationEnumeration.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EnumerationEnumeration.java	17 Oct 2006 12:30:25 -0000	1.2
  +++ EnumerationEnumeration.java	17 Oct 2006 12:34:39 -0000	1.3
  @@ -15,12 +15,12 @@
   
      public boolean hasMoreElements()
      {
  -      return loc < enumerations.length-1 || currentHasMoreElements();
  +      return isNextEnumerationAvailable() || currentHasMoreElements();
      }
   
      public T nextElement()
      {
  -      while ( loc < enumerations.length )
  +      while ( isCurrentEnumerationAvailable() )
         {
            if ( currentHasMoreElements() )
            {
  @@ -28,12 +28,27 @@
            }
            else
            {
  -            loc++;
  +            nextEnumeration();
            }
         }
         throw new NoSuchElementException();
      }
   
  +   private void nextEnumeration()
  +   {
  +      loc++;
  +   }
  +
  +   private boolean isNextEnumerationAvailable()
  +   {
  +      return loc < enumerations.length-1;
  +   }
  +
  +   private boolean isCurrentEnumerationAvailable()
  +   {
  +      return loc < enumerations.length;
  +   }
  +
      private T currentNextElement()
      {
         return enumerations[loc].nextElement();