You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2007/05/29 00:10:13 UTC
svn commit: r542345 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core:
./ authz/ configuration/ jndi/ normalization/ partition/impl/btree/
partition/impl/btree/gui/ schema/
Author: erodriguez
Date: Mon May 28 15:10:11 2007
New Revision: 542345
URL: http://svn.apache.org/viewvc?view=rev&rev=542345
Log:
Warnings clean-up, unnecessary casts.
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DirectoryService.java Mon May 28 15:10:11 2007
@@ -63,7 +63,7 @@
public synchronized static DirectoryService getInstance( String instanceId )
{
instanceId = instanceId.trim();
- DirectoryService service = ( DirectoryService ) instances.get( instanceId );
+ DirectoryService service = instances.get( instanceId );
if ( service == null )
{
service = new DefaultDirectoryService( instanceId );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Mon May 28 15:10:11 2007
@@ -148,7 +148,7 @@
while ( results.hasMore() )
{
- SearchResult result = ( SearchResult ) results.next();
+ SearchResult result = results.next();
LdapDN groupDn = parseNormalized( result.getName() );
Attribute members = getMemberAttribute( result.getAttributes() );
@@ -470,7 +470,7 @@
return true;
}
- Set members = ( Set ) groups.get( administratorsGroupDn.getNormName() );
+ Set members = groups.get( administratorsGroupDn.getNormName() );
if ( members == null )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Mon May 28 15:10:11 2007
@@ -144,7 +144,7 @@
while ( results.hasMore() )
{
- SearchResult result = ( SearchResult ) results.next();
+ SearchResult result = results.next();
String subentryDn = result.getName();
Attribute aci = AttributeUtils.getAttribute( result.getAttributes(), prescriptiveAciAT );
@@ -281,7 +281,7 @@
@SuppressWarnings("unchecked")
public List<ACITuple> getACITuples( String subentryDn )
{
- List aciTuples = ( List ) tuples.get( subentryDn );
+ List aciTuples = tuples.get( subentryDn );
if ( aciTuples == null )
{
return Collections.EMPTY_LIST;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java Mon May 28 15:10:11 2007
@@ -187,7 +187,7 @@
try
{
- while ( ( line = ( (BufferedReader) in ).readLine() ) != null )
+ while ( ( line = in.readLine() ) != null )
{
if ( line.length() == 0 )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Mon May 28 15:10:11 2007
@@ -638,7 +638,7 @@
if ( null != controls )
{
- ctx.setRequestControls( ( Control[] ) controls.clone() );
+ ctx.setRequestControls( controls.clone() );
}
return ctx;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizingVisitor.java Mon May 28 15:10:11 2007
@@ -181,7 +181,7 @@
{
// before visiting each node let's check to make sure non-branch children use
// attributes that are defined in the system, if undefined nodes are removed
- ExprNode child = ( ExprNode ) bnode.getChildren().get( ii );
+ ExprNode child = bnode.getChildren().get( ii );
if ( child.isLeaf() )
{
LeafNode ln = ( LeafNode ) child;
@@ -249,7 +249,7 @@
// their single child if other branch nodes do not remain.
for ( int ii = 0; ii < bnode.getChildren().size(); ii++ )
{
- ExprNode unknown = ( ExprNode ) bnode.getChildren().get( ii );
+ ExprNode unknown = bnode.getChildren().get( ii );
if ( !unknown.isLeaf() )
{
BranchNode child = ( BranchNode ) unknown;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java Mon May 28 15:10:11 2007
@@ -191,7 +191,7 @@
for ( int ii = 0; ii < children.size(); ii++ )
{
- ExprNode child = ( ExprNode ) children.get( ii );
+ ExprNode child = children.get( ii );
annotate( child );
count = Math.min( ( ( Long ) child.get( "count" ) ), count );
}
@@ -216,7 +216,7 @@
*/
private Long getNegationScan( BranchNode node ) throws NamingException
{
- ExprNode onlyChild = ( ExprNode ) node.getChildren().get( 0 );
+ ExprNode onlyChild = node.getChildren().get( 0 );
annotate( onlyChild );
@@ -254,7 +254,7 @@
for ( int ii = 0; ii < children.size(); ii++ )
{
- ExprNode child = ( ExprNode ) children.get( ii );
+ ExprNode child = children.get( ii );
annotate( child );
total += ( Long ) child.get( "count" );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java Mon May 28 15:10:11 2007
@@ -53,14 +53,14 @@
if ( bnode.getChildren().size() == 1 )
{
- ( ( ExprNode ) bnode.getChildren().get( 0 ) ).set( "count", MAX );
+ bnode.getChildren().get( 0 ).set( "count", MAX );
return;
}
final int limit = bnode.getChildren().size();
for ( int ii = 0; ii < limit; ii++ )
{
- ExprNode child = ( ExprNode ) bnode.getChildren().get( ii );
+ ExprNode child = bnode.getChildren().get( ii );
if ( child.isLeaf() )
{
child.set( "count", MAX );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java Mon May 28 15:10:11 2007
@@ -73,7 +73,7 @@
List<ExprNode> exprNodes = branch.getChildren();
for ( int ii = 0; ii < exprNodes.size(); ii++ )
{
- ExprNode child = ( ExprNode ) exprNodes.get( ii );
+ ExprNode child = exprNodes.get( ii );
children.add( new ASTNode( this, child ) );
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaComparatorHandler.java Mon May 28 15:10:11 2007
@@ -179,7 +179,7 @@
if ( comparatorDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA ) != null )
{
- schemaName = ( String ) comparatorDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA ).get( 0 );
+ schemaName = comparatorDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA ).get( 0 );
}
Schema schema = loader.getSchema( schemaName );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNormalizerHandler.java Mon May 28 15:10:11 2007
@@ -178,7 +178,7 @@
if ( normalizerDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA ) != null )
{
- schemaName = ( String ) normalizerDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA ).get( 0 );
+ schemaName = normalizerDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA ).get( 0 );
}
Schema schema = loader.getSchema( schemaName );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandler.java Mon May 28 15:10:11 2007
@@ -181,7 +181,7 @@
if ( syntaxCheckerDescription.getExtensions().get( MetaSchemaConstants.X_SCHEMA ) != null )
{
- schemaName = ( String ) syntaxCheckerDescription.getExtensions()
+ schemaName = syntaxCheckerDescription.getExtensions()
.get( MetaSchemaConstants.X_SCHEMA ).get( 0 );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?view=diff&rev=542345&r1=542344&r2=542345
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Mon May 28 15:10:11 2007
@@ -319,7 +319,7 @@
list = notLoaded.values().iterator();
while ( list.hasNext() )
{
- Schema schema = ( Schema ) list.next();
+ Schema schema = list.next();
loadDepsFirst( schema, new Stack<String>(), notLoaded, schema, targetRegistries, null );
list = notLoaded.values().iterator();
}