You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/06/04 18:48:12 UTC
svn commit: r951488 - in /directory:
apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
apacheds/trunk/jdbm/src/main/java/jdbm/helper/
apacheds/trunk/jdbm/src/main/java/jdbm/htree/ apacheds/trunk/kerbero...
Author: elecharny
Date: Fri Jun 4 16:48:12 2010
New Revision: 951488
URL: http://svn.apache.org/viewvc?rev=951488&view=rev
Log:
Replaced new Integer() with Integer.valueOf()
Modified:
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/IntegerSerializer.java
directory/apacheds/trunk/jdbm/src/main/java/jdbm/htree/HashDirectory.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKdcRepPartDecoder.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKrbPrivPartDecoder.java
directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java
directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java Fri Jun 4 16:48:12 2010
@@ -44,7 +44,7 @@ public class KeyTupleArrayCursorTest
Comparator<Integer> comparator;
KeyTupleArrayCursor<Integer, Integer> cursor;
- private static final Integer KEY = new Integer( 1 );
+ private static final Integer KEY = Integer.valueOf( 1 );
@Before
public void createTree()
Modified: directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/IntegerSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/IntegerSerializer.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/IntegerSerializer.java (original)
+++ directory/apacheds/trunk/jdbm/src/main/java/jdbm/helper/IntegerSerializer.java Fri Jun 4 16:48:12 2010
@@ -95,7 +95,7 @@ public class IntegerSerializer
throws IOException
{
int number = Conversion.convertToInt( serialized );
- return new Integer( number );
+ return Integer.valueOf( number );
}
}
Modified: directory/apacheds/trunk/jdbm/src/main/java/jdbm/htree/HashDirectory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/src/main/java/jdbm/htree/HashDirectory.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/src/main/java/jdbm/htree/HashDirectory.java (original)
+++ directory/apacheds/trunk/jdbm/src/main/java/jdbm/htree/HashDirectory.java Fri Jun 4 16:48:12 2010
@@ -46,19 +46,17 @@
package jdbm.htree;
-import jdbm.RecordManager;
-
-import jdbm.helper.FastIterator;
-import jdbm.helper.IterationException;
-
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-
import java.util.ArrayList;
import java.util.Iterator;
+import jdbm.RecordManager;
+import jdbm.helper.FastIterator;
+import jdbm.helper.IterationException;
+
import org.apache.directory.server.i18n.I18n;
/**
@@ -523,7 +521,7 @@ final class HashDirectory
if ( node instanceof HashDirectory ) {
// save current position
_dirStack.add( _dir );
- _childStack.add( new Integer( _child ) );
+ _childStack.add( Integer.valueOf( _child ) );
_dir = (HashDirectory)node;
_child = -1;
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncApRepPartDecoder.java Fri Jun 4 16:48:12 2010
@@ -90,7 +90,7 @@ public class EncApRepPartDecoder impleme
break;
case 1:
DERInteger tag1 = ( DERInteger ) derObject;
- modifier.setClientMicroSecond( new Integer( tag1.intValue() ) );
+ modifier.setClientMicroSecond( Integer.valueOf( tag1.intValue() ) );
break;
case 2:
DERSequence tag2 = ( DERSequence ) derObject;
@@ -98,7 +98,7 @@ public class EncApRepPartDecoder impleme
break;
case 3:
DERInteger tag3 = ( DERInteger ) derObject;
- modifier.setSequenceNumber( new Integer( tag3.intValue() ) );
+ modifier.setSequenceNumber( Integer.valueOf( tag3.intValue() ) );
break;
}
}
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKdcRepPartDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKdcRepPartDecoder.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKdcRepPartDecoder.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKdcRepPartDecoder.java Fri Jun 4 16:48:12 2010
@@ -101,7 +101,7 @@ public class EncKdcRepPartDecoder implem
break;
case 2:
DERInteger tag2 = ( DERInteger ) derObject;
- modifier.setNonce( new Integer( tag2.intValue() ) );
+ modifier.setNonce( Integer.valueOf( tag2.intValue() ) );
break;
case 3:
DERGeneralizedTime tag3 = ( DERGeneralizedTime ) derObject;
Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKrbPrivPartDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKrbPrivPartDecoder.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKrbPrivPartDecoder.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/EncKrbPrivPartDecoder.java Fri Jun 4 16:48:12 2010
@@ -82,11 +82,11 @@ public class EncKrbPrivPartDecoder imple
break;
case 2:
DERInteger tag2 = ( DERInteger ) derObject;
- modifier.setMicroSecond( new Integer( tag2.intValue() ) );
+ modifier.setMicroSecond( Integer.valueOf( tag2.intValue() ) );
break;
case 3:
DERInteger tag3 = ( DERInteger ) derObject;
- modifier.setSequenceNumber( new Integer( tag3.intValue() ) );
+ modifier.setSequenceNumber( Integer.valueOf( tag3.intValue() ) );
break;
case 4:
DERSequence tag4 = ( DERSequence ) derObject;
Modified: directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java (original)
+++ directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java Fri Jun 4 16:48:12 2010
@@ -385,7 +385,7 @@ public class ChangePasswordService
EncApRepPartModifier encApModifier = new EncApRepPartModifier();
encApModifier.setClientTime( authenticator.getClientTime() );
encApModifier.setClientMicroSecond( authenticator.getClientMicroSecond() );
- encApModifier.setSequenceNumber( new Integer( authenticator.getSequenceNumber() ) );
+ encApModifier.setSequenceNumber( Integer.valueOf( authenticator.getSequenceNumber() ) );
encApModifier.setSubSessionKey( authenticator.getSubSessionKey() );
EncApRepPart repPart = encApModifier.getEncApRepPart();
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/DhcpOption.java Fri Jun 4 16:48:12 2010
@@ -161,7 +161,7 @@ public abstract class DhcpOption
DhcpOption o = ( DhcpOption ) c.newInstance();
- Integer tagInt = new Integer( o.getTag() );
+ Integer tagInt = Integer.valueOf( o.getTag() );
classByCode.put( tagInt, c );
codeByClass.put( c, tagInt );
}
@@ -178,7 +178,7 @@ public abstract class DhcpOption
public static Class getClassByTag( int tag )
{
- return ( Class ) OPTION_CLASS_BY_CODE.get( new Integer( tag ) );
+ return ( Class ) OPTION_CLASS_BY_CODE.get( Integer.valueOf( tag ) );
}
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/OptionsField.java Fri Jun 4 16:48:12 2010
@@ -47,7 +47,7 @@ public class OptionsField
public void add( DhcpOption option )
{
- options.put( new Integer( option.getTag() ), option );
+ options.put( Integer.valueOf( option.getTag() ), option );
}
@@ -71,7 +71,7 @@ public class OptionsField
*/
public DhcpOption get( Class optionClass )
{
- Integer key = new Integer( DhcpOption.getTagByClass( optionClass ) );
+ Integer key = Integer.valueOf( DhcpOption.getTagByClass( optionClass ) );
return ( DhcpOption ) options.get( key );
}
@@ -84,7 +84,7 @@ public class OptionsField
*/
public DhcpOption get( int tag )
{
- Integer key = new Integer( tag );
+ Integer key = Integer.valueOf( tag );
return ( DhcpOption ) options.get( key );
}
@@ -103,7 +103,7 @@ public class OptionsField
for ( Iterator i = options.iterator(); i.hasNext(); )
{
DhcpOption option = ( DhcpOption ) i.next();
- this.options.put( new Integer( option.getTag() ), option );
+ this.options.put( Integer.valueOf( option.getTag() ), option );
}
}
@@ -115,7 +115,7 @@ public class OptionsField
*/
public void remove( Class c )
{
- Integer key = new Integer( DhcpOption.getTagByClass( c ) );
+ Integer key = Integer.valueOf( DhcpOption.getTagByClass( c ) );
options.remove( key );
}
@@ -127,7 +127,7 @@ public class OptionsField
*/
public void remove( int tag )
{
- Integer key = new Integer( tag );
+ Integer key = Integer.valueOf( tag );
options.remove( key );
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java Fri Jun 4 16:48:12 2010
@@ -85,7 +85,7 @@ public class OutstandingRequestsModel im
switch ( columnIndex )
{
case ( 0 ):
- return new Integer( req.getMessageId() );
+ return Integer.valueOf( req.getMessageId() );
case ( 1 ):
return req.getType().toString();
default:
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsModel.java Fri Jun 4 16:48:12 2010
@@ -89,11 +89,11 @@ public class SessionsModel implements Ta
case ( 0 ):
return ( ( InetSocketAddress ) session.getIoSession().getRemoteAddress() ).getHostName();
case ( 1 ):
- return new Integer( ( ( InetSocketAddress ) session.getIoSession().getRemoteAddress() ).getPort() );
+ return Integer.valueOf( ( ( InetSocketAddress ) session.getIoSession().getRemoteAddress() ).getPort() );
case ( 2 ):
return ( ( InetSocketAddress ) session.getIoSession().getLocalAddress() ).getHostName();
case ( 3 ):
- return new Integer( ( ( InetSocketAddress ) session.getIoSession().getLocalAddress() ).getPort() );
+ return Integer.valueOf( ( ( InetSocketAddress ) session.getIoSession().getLocalAddress() ).getPort() );
default:
throw new IndexOutOfBoundsException( I18n.err( I18n.ERR_658, ( columns.length - 1 ) ) );
}
Modified: directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java?rev=951488&r1=951487&r2=951488&view=diff
==============================================================================
--- directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java (original)
+++ directory/daemon/trunk/bootstrappers/src/main/java/org/apache/directory/daemon/AvailablePortFinder.java Fri Jun 4 16:48:12 2010
@@ -178,7 +178,7 @@ public class AvailablePortFinder
try
{
s = new ServerSocket( i );
- result.add( new Integer( i ) );
+ result.add( Integer.valueOf( i ) );
}
catch ( IOException e )
{