You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/02/06 08:02:27 UTC
svn commit: r151550 - in
incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi:
BaseInterceptor.java Invocation.java ibs/FilterServiceImpl.java
ibs/SchemaService.java
Author: trustin
Date: Sat Feb 5 23:02:25 2005
New Revision: 151550
URL: http://svn.apache.org/viewcvs?view=rev&rev=151550
Log:
Fixed: Replaced enum keywords into 'e' variable.
AspectJ doesn't seem to support Java 5 for now, so please note that ApacheDS still doesn't compile in Java 5.
Modified:
incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java
incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java
incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java
incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java
Modified: incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java
URL: http://svn.apache.org/viewcvs/incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java?view=diff&r1=151549&r2=151550
==============================================================================
--- incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java (original)
+++ incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java Sat Feb 5 23:02:25 2005
@@ -105,9 +105,9 @@
*/
public void invoke( Invocation invocation ) throws NamingException
{
- InvocationMethodEnum enum = invocation.getInvocationMethodEnum();
+ InvocationMethodEnum e = invocation.getInvocationMethodEnum();
- switch ( enum.getValue() )
+ switch ( e.getValue() )
{
case( InvocationMethodEnum.ADD_VAL ):
add( ( String ) invocation.getParameters()[0],
@@ -177,7 +177,7 @@
break;
default:
throw new IllegalStateException( "Unexpected invocation type "
- + enum );
+ + e );
}
}
Modified: incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java
URL: http://svn.apache.org/viewcvs/incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java?view=diff&r1=151549&r2=151550
==============================================================================
--- incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java (original)
+++ incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/Invocation.java Sat Feb 5 23:02:25 2005
@@ -124,9 +124,9 @@
*
* @param enum the new state to set
*/
- void setState( InvocationStateEnum enum )
+ void setState( InvocationStateEnum e )
{
- state = enum;
+ state = e;
}
Modified: incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java?view=diff&r1=151549&r2=151550
==============================================================================
--- incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java (original)
+++ incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/FilterServiceImpl.java Sat Feb 5 23:02:25 2005
@@ -100,11 +100,11 @@
if ( invocation.getState() == InvocationStateEnum.POSTINVOCATION )
{
- NamingEnumeration enum ;
+ NamingEnumeration e ;
ResultFilteringEnumeration retval;
LdapContext ctx = ( LdapContext ) invocation.getContextStack().peek();
- enum = ( NamingEnumeration ) invocation.getReturnValue();
- retval = new ResultFilteringEnumeration( enum, LIST_CONTROLS, ctx,
+ e = ( NamingEnumeration ) invocation.getReturnValue();
+ retval = new ResultFilteringEnumeration( e, LIST_CONTROLS, ctx,
new SearchResultFilter()
{
public boolean accept( LdapContext ctx, SearchResult result,
@@ -178,11 +178,11 @@
return;
}
- NamingEnumeration enum ;
+ NamingEnumeration e ;
ResultFilteringEnumeration retval;
LdapContext ctx = ( LdapContext ) invocation.getContextStack().peek();
- enum = ( NamingEnumeration ) invocation.getReturnValue();
- retval = new ResultFilteringEnumeration( enum, searchControls, ctx,
+ e = ( NamingEnumeration ) invocation.getReturnValue();
+ retval = new ResultFilteringEnumeration( e, searchControls, ctx,
new SearchResultFilter()
{
public boolean accept( LdapContext ctx, SearchResult result,
Modified: incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java
URL: http://svn.apache.org/viewcvs/incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java?view=diff&r1=151549&r2=151550
==============================================================================
--- incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java (original)
+++ incubator/directory/apacheds/branches/mina-port/core/src/main/java/org/apache/ldap/server/jndi/ibs/SchemaService.java Sat Feb 5 23:02:25 2005
@@ -254,8 +254,8 @@
invocation.setBypass( true );
Attributes attrs = getSubschemaEntry( searchControls.getReturningAttributes() );
SearchResult result = new SearchResult( base.toString(), null, attrs );
- SingletonEnumeration enum = new SingletonEnumeration( result );
- invocation.setReturnValue( enum );
+ SingletonEnumeration e = new SingletonEnumeration( result );
+ invocation.setReturnValue( e );
}
}
else if ( searchControls.getSearchScope() == SearchControls.OBJECT_SCOPE &&
@@ -268,8 +268,8 @@
invocation.setBypass( true );
Attributes attrs = getSubschemaEntry( searchControls.getReturningAttributes() );
SearchResult result = new SearchResult( base.toString(), null, attrs );
- SingletonEnumeration enum = new SingletonEnumeration( result );
- invocation.setReturnValue( enum );
+ SingletonEnumeration e = new SingletonEnumeration( result );
+ invocation.setReturnValue( e );
}
}
}