Project

General

Profile

« Previous | Next » 

Revision 2447

Added by sgarg about 19 years ago

Removed occurence of enum which is a keyword in Java 1.5

View differences:

AuthLdap.java
449 449
      ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
450 450
      //ctls.setCountLimit(1000);
451 451
      String filter = "(objectClass=inetOrgPerson)";
452
      NamingEnumeration enum = ctx.search(ldapBase, filter, ctls);
452
      NamingEnumeration namingEnum = ctx.search(ldapBase, filter, ctls);
453 453

  
454 454
      // Store the users in a vector
455 455
      Vector uvec = new Vector();
......
459 459
      Vector umail = new Vector();
460 460
      Attributes tempAttr = null;
461 461
      try {
462
        while (enum.hasMore()) {
463
          SearchResult sr = (SearchResult) enum.next();
462
        while (namingEnum.hasMore()) {
463
          SearchResult sr = (SearchResult) namingEnum.next();
464 464
          tempAttr = sr.getAttributes();
465 465

  
466 466
          if ( (tempAttr.get("cn") + "").startsWith("cn: ")) {
......
646 646
        filter = "(& " + gfilter + "(uniqueMember=" + foruser + "))";
647 647
      }
648 648
      MetaCatUtil.debugMessage("searching for groups: " + filter, 35);
649
      NamingEnumeration enum = ctx.search(ldapBase, filter, ctls);
649
      NamingEnumeration namingEnum = ctx.search(ldapBase, filter, ctls);
650 650

  
651 651
      // Print the groups
652 652
      MetaCatUtil.debugMessage("getting group results.", 50);
653
      while (enum.hasMore()) {
654
        SearchResult sr = (SearchResult) enum.next();
653
      while (namingEnum.hasMore()) {
654
        SearchResult sr = (SearchResult) namingEnum.next();
655 655
        tempAttr = sr.getAttributes();
656 656

  
657 657
        if ( (tempAttr.get("description") + "").startsWith("description: ")) {
......
716 716
      }
717 717

  
718 718
      try {
719
        NamingEnumeration enum = dc.search(ldapBase, filter, ctls);
719
        NamingEnumeration namingEnum = dc.search(ldapBase, filter, ctls);
720 720
        // Print the groups
721
        while (enum.hasMore()) {
722
          SearchResult sr = (SearchResult) enum.next();
721
        while (namingEnum.hasMore()) {
722
          SearchResult sr = (SearchResult) namingEnum.next();
723 723
          tempAttr = sr.getAttributes();
724 724

  
725 725
          if ( (tempAttr.get("description") + "").startsWith("description: ")) {
......
871 871
      String filter = "(|(objectclass=organization)(objectclass=referral))";
872 872

  
873 873
      // Search for objects in the current context
874
      NamingEnumeration enum = ctx.search("", filter, ctls);
874
      NamingEnumeration namingEnum = ctx.search("", filter, ctls);
875 875

  
876 876
      // Print the subtrees' <ldapURL, baseDN>
877
      while (enum.hasMore()) {
877
      while (namingEnum.hasMore()) {
878 878

  
879
        SearchResult sr = (SearchResult) enum.next();
879
        SearchResult sr = (SearchResult) namingEnum.next();
880 880

  
881 881
        Attributes attrs = sr.getAttributes();
882 882
        NamingEnumeration enum1 = attrs.getAll(); // "dc" and "ref" attrs
......
962 962
    Hashtable subtrees = getSubtrees(user, password, this.ldapUrl,
963 963
                                     this.ldapBase);
964 964

  
965
    Enumeration enum = subtrees.keys();
966
    while (enum.hasMoreElements()) {
967
      this.ldapBase = (String) enum.nextElement();
965
    Enumeration keyEnum = subtrees.keys();
966
    while (keyEnum.hasMoreElements()) {
967
      this.ldapBase = (String) keyEnum.nextElement();
968 968
      this.ldapUrl = (String) subtrees.get(ldapBase);
969 969

  
970 970
      /*

Also available in: Unified diff