You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/10/20 17:41:17 UTC
svn commit: r1025619 -
/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
Author: pamarcelot
Date: Wed Oct 20 15:41:17 2010
New Revision: 1025619
URL: http://svn.apache.org/viewvc?rev=1025619&view=rev
Log:
Cleaned commented code.
Modified:
directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java?rev=1025619&r1=1025618&r2=1025619&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java Wed Oct 20 15:41:17 2010
@@ -316,114 +316,4 @@ public class CursorStudioNamingEnumerati
// TODO implement
return new Control[0];
}
-
- // private boolean checkReferral()
- // {
- // boolean done = false;
- //
- // // ignore exception if referrals handling method is IGNORE
- // // follow referral if referrals handling method is FOLLOW
- // // follow manually if referrals handling method is FOLLOW_MANUALLY
- // if ( referralsHandlingMethod == ReferralHandlingMethod.IGNORE )
- // {
- // done = true;
- // delegate = null;
- // }
- // else if ( referralsHandlingMethod == ReferralHandlingMethod.FOLLOW_MANUALLY )
- // {
- // delegate = new NamingEnumeration<SearchResult>()
- // {
- //
- // List<LdapURL> urls = new ArrayList<LdapURL>();
- // {
- // while ( referralsInfo.hasMoreReferrals() )
- // {
- // Referral referral = referralsInfo.getNextReferral();
- // for ( IJndiLogger logger : ConnectionCorePlugin.getDefault().getJndiLoggers() )
- // {
- // logger.logSearchResultReference( connection, referral, referralsInfo, requestNum, null );
- // }
- // urls.addAll( referral.getLdapURLs() );
- // }
- // }
- //
- //
- // public SearchResult nextElement()
- // {
- // throw new UnsupportedOperationException( "Call next() instead of nextElement() !" );
- // }
- //
- //
- // public boolean hasMoreElements()
- // {
- // throw new UnsupportedOperationException( "Call hasMore() instead of hasMoreElements() !" );
- // }
- //
- //
- // public SearchResult next() throws NamingException
- // {
- // LdapURL url = urls.remove( 0 );
- // SearchResult searchResult = new SearchResult( url.getDn().getName(), null, new BasicAttributes(),
- // false );
- // searchResult.setNameInNamespace( url.getDn().getName() );
- // StudioSearchResult ssr = new StudioSearchResult( searchResult, null, false, url );
- // return ssr;
- // }
- //
- //
- // public boolean hasMore() throws NamingException
- // {
- // return !urls.isEmpty();
- // }
- //
- //
- // public void close() throws NamingException
- // {
- // urls.clear();
- // referralsInfo = null;
- // }
- // };
- // }
- // else if ( referralsHandlingMethod == ReferralHandlingMethod.FOLLOW )
- // {
- // Referral referral = referralsInfo.getNextReferral();
- // for ( IJndiLogger logger : ConnectionCorePlugin.getDefault().getJndiLoggers() )
- // {
- // logger.logSearchResultReference( connection, referral, referralsInfo, requestNum, null );
- // }
- //
- // LdapURL url = referral.getLdapURLs().get( 0 );
- // Connection referralConnection = JNDIConnectionWrapper.getReferralConnection( referral, monitor, this );
- // if ( referralConnection != null )
- // {
- // done = false;
- // String referralSearchBase = url.getDn() != null && !url.getDn().isEmpty() ? url.getDn().getName()
- // : searchBase;
- // String referralFilter = url.getFilter() != null && url.getFilter().length() == 0 ? url.getFilter()
- // : filter;
- // SearchControls referralSearchControls = new SearchControls();
- // referralSearchControls.setSearchScope( url.getScope().getScope() > -1 ? url.getScope().getScope()
- // : searchControls
- // .getSearchScope() );
- // referralSearchControls.setReturningAttributes( url.getAttributes() != null
- // && url.getAttributes().size() > 0 ? url.getAttributes().toArray(
- // new String[url.getAttributes().size()] ) : searchControls.getReturningAttributes() );
- // referralSearchControls.setCountLimit( searchControls.getCountLimit() );
- // referralSearchControls.setTimeLimit( searchControls.getTimeLimit() );
- // referralSearchControls.setDerefLinkFlag( searchControls.getDerefLinkFlag() );
- // referralSearchControls.setReturningObjFlag( searchControls.getReturningObjFlag() );
- //
- // delegate = referralConnection.getConnectionWrapper().search( referralSearchBase, referralFilter,
- // referralSearchControls, aliasesDereferencingMethod, referralsHandlingMethod, controls, monitor,
- // referralsInfo );
- // }
- // else
- // {
- // done = true;
- // delegate = null;
- // }
- // }
- // return done;
- // }
-
}