Drop util package: move ByteString hierarchy into top level sdk package and...

matthew_swift

04.49.2009 9fdb95ca9c3c8e3524845760b81a85c7a4c81a45

Drop util package: move ByteString hierarchy into top level sdk package and other "internal" classes to com.sun.*.
Move messages into their own package.
Clean up imports.

 sdk/build-tools/com/sun/opends/sdk/build/tools/CheckPrecommit.java

@@ -37,18 +37,10 @@
import java.util.LinkedList;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;

import org.tmatesoft.svn.core.SVNDepth;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.wc.SVNPropertyData;
import org.tmatesoft.svn.core.wc.SVNRevision;
import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
import org.tmatesoft.svn.core.wc.SVNClientManager;
import org.tmatesoft.svn.core.wc.SVNStatus;
import org.tmatesoft.svn.core.wc.SVNWCClient;
import org.tmatesoft.svn.core.wc.*;



@@ -176,7 +168,7 @@

    try
    {
      long status = ourClientManager.getStatusClient().doStatus(workspacePath, SVNRevision.WORKING, 
      ourClientManager.getStatusClient().doStatus(workspacePath, SVNRevision.WORKING,
              SVNDepth.INFINITY, false, false, false, false, this, null);
    }
    catch (Exception e)

 sdk/build-tools/com/sun/opends/sdk/build/tools/CoverageDiff.java

@@ -26,24 +26,25 @@
 */
package com.sun.opends.sdk.build.tools;

import com.vladium.emma.report.*;
import com.vladium.emma.report.html.doc.*;
import com.vladium.emma.data.*;
import com.vladium.util.IntObjectMap;

import java.io.*;
import java.util.*;

import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;

import org.apache.tools.ant.Task;
import org.tmatesoft.svn.core.SVNDepth;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
import org.tmatesoft.svn.core.wc.SVNClientManager;
import org.tmatesoft.svn.core.wc.SVNDiffClient;
import org.tmatesoft.svn.core.wc.SVNRevision;

import com.vladium.emma.data.DataFactory;
import com.vladium.emma.data.ICoverageData;
import com.vladium.emma.data.IMergeable;
import com.vladium.emma.data.IMetaData;
import com.vladium.emma.report.*;
import com.vladium.emma.report.html.doc.*;
import com.vladium.util.IntObjectMap;

public class CoverageDiff extends Task {

  private static SVNClientManager ourClientManager =
@@ -188,7 +189,7 @@

    // So we can go over http:// and https:// when diff'ing against previous versions
    DAVRepositoryFactory.setup();
    

    IReportDataView emmaDataView = null;
    try
    {
@@ -307,7 +308,7 @@
    SVNRevision baseRevision = SVNRevision.parse(fromRevision);
    System.out.println("Doing coverage diff from revision: " + baseRevision.toString());

    ourClientManager.getDiffClient().doDiff(workspaceRoot, baseRevision, 
    ourClientManager.getDiffClient().doDiff(workspaceRoot, baseRevision,
            workspaceRoot, SVNRevision.WORKING, SVNDepth.INFINITY, false,
            new FileOutputStream(diffFile), null);

@@ -650,7 +651,6 @@
    int workingCopyBegin;
    int workingCopyRange;
    int otherCopyBegin;
    int otherCopyRange;

    Double[] modCoverage = new Double[4];
    modCoverage[COVERED_MOD_EXE_LINES] = 0.0;
@@ -671,15 +671,12 @@
    int workingCopyEndIdx = chunkHeader.indexOf(" ", workingCopyCommaIdx);
    int otherCopyBeginIdx = chunkHeader.indexOf(otherCopyFlag);
    int otherCopyCommaIdx = chunkHeader.indexOf(",", otherCopyBeginIdx);
    int otherCopyEndIdx = chunkHeader.indexOf(" ", otherCopyCommaIdx);
    workingCopyBegin = Integer.parseInt(
        chunkHeader.substring(workingCopyBeginIdx + 1, workingCopyCommaIdx));
    workingCopyRange = Integer.parseInt(
        chunkHeader.substring(workingCopyCommaIdx + 1, workingCopyEndIdx));
    otherCopyBegin = Integer.parseInt(
        chunkHeader.substring(otherCopyBeginIdx + 1, otherCopyCommaIdx));
    otherCopyRange = Integer.parseInt(
        chunkHeader.substring(otherCopyCommaIdx + 1, otherCopyEndIdx));

    String chunkLine;
    SrcFileItem.LineCoverageData lCoverageData = null;
@@ -804,12 +801,12 @@
      return null;
    }

    for(Iterator packages = rootItem.getChildren(); packages.hasNext();)
    for(Iterator<?> packages = rootItem.getChildren(); packages.hasNext();)
    {
      IItem packageItem = (IItem)packages.next();
      if(packageItem.getName().equals(srcPackageName))
      {
        for(Iterator sources = packageItem.getChildren(); sources.hasNext();)
        for(Iterator<?> sources = packageItem.getChildren(); sources.hasNext();)
        {
          SrcFileItem sourceItem = (SrcFileItem)sources.next();
          if(sourceItem.getName().equals(srcFileName))

 sdk/build.xml

@@ -168,8 +168,8 @@
                </fileset>
            </classpath>
        </typedef>
        <genmsg sourceProps="${src.dir}/com/sun/opends/sdk/util/messages.properties"
                destJava="${srcgen.dir}/com/sun/opends/sdk/util/Messages.java">
        <genmsg sourceProps="${src.dir}/com/sun/opends/sdk/messages/messages.properties"
                destJava="${srcgen.dir}/com/sun/opends/sdk/messages/Messages.java">
        </genmsg>
    </target>


 sdk/src/com/sun/opends/sdk/messages/messages.properties

 sdk/src/com/sun/opends/sdk/messages/messages_de.properties

 sdk/src/com/sun/opends/sdk/messages/messages_es.properties

 sdk/src/com/sun/opends/sdk/messages/messages_fr.properties

 sdk/src/com/sun/opends/sdk/messages/messages_ja.properties

 sdk/src/com/sun/opends/sdk/messages/messages_ko.properties

 sdk/src/com/sun/opends/sdk/messages/messages_zh_CN.properties

 sdk/src/com/sun/opends/sdk/messages/messages_zh_TW.properties

 sdk/src/com/sun/opends/sdk/util/ASCIICharProp.java

File was renamed from sdk/src/org/opends/sdk/util/ASCIICharProp.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;




 sdk/src/com/sun/opends/sdk/util/Base64.java

File was renamed from sdk/src/org/opends/sdk/util/Base64.java
@@ -24,14 +24,17 @@
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.util;
package com.sun.opends.sdk.util;



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.Validator.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.Validator.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;





 sdk/src/com/sun/opends/sdk/util/ByteSequenceOutputStream.java

File was renamed from sdk/src/org/opends/sdk/util/ByteSequenceOutputStream.java
@@ -24,11 +24,13 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.sdk.util;
package com.sun.opends.sdk.util;

import java.io.IOException;
import java.io.OutputStream;

import org.opends.sdk.ByteStringBuilder;

/**
 * An adapter class that allows writing to an byte string builder
 * with the outputstream interface.

 sdk/src/com/sun/opends/sdk/util/Function.java

File was renamed from sdk/src/org/opends/sdk/util/Function.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;




 sdk/src/com/sun/opends/sdk/util/Functions.java

File was renamed from sdk/src/org/opends/sdk/util/Functions.java
@@ -25,11 +25,12 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;



import org.opends.sdk.AttributeDescription;
import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.schema.Schema;


 sdk/src/com/sun/opends/sdk/util/Iterables.java

File was renamed from sdk/src/org/opends/sdk/util/Iterables.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;




 sdk/src/com/sun/opends/sdk/util/Iterators.java

File was renamed from sdk/src/org/opends/sdk/util/Iterators.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;




 sdk/src/com/sun/opends/sdk/util/LocalizableException.java

File was renamed from sdk/src/org/opends/sdk/util/LocalizableException.java
@@ -24,11 +24,10 @@
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.util;
package com.sun.opends.sdk.util;



import com.sun.opends.sdk.util.Message;




 sdk/src/com/sun/opends/sdk/util/LocalizedIllegalArgumentException.java

File was renamed from sdk/src/org/opends/sdk/util/LocalizedIllegalArgumentException.java
@@ -25,11 +25,10 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;



import com.sun.opends.sdk.util.Message;




 sdk/src/com/sun/opends/sdk/util/Platform.java

File was renamed from sdk/src/org/opends/sdk/util/Platform.java
@@ -25,10 +25,10 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;


import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.io.*;
import java.lang.reflect.Constructor;
@@ -38,7 +38,6 @@
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;

import com.sun.opends.sdk.util.Message;

/**
 * Provides a wrapper class that collects all of the JVM vendor

 sdk/src/com/sun/opends/sdk/util/Predicate.java

File was renamed from sdk/src/org/opends/sdk/util/Predicate.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;




 sdk/src/com/sun/opends/sdk/util/SSLUtils.java

File was renamed from sdk/src/org/opends/sdk/util/SSLUtils.java
@@ -1,4 +1,4 @@
package org.opends.sdk.util;
package com.sun.opends.sdk.util;

import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
@@ -16,14 +16,6 @@
 */
public class SSLUtils
{
  private static String PROVIDER =
        System.getProperty("org.opends.security.provider");
  private static String KEY_STORE =
      System.getProperty("javax.net.ssl.keyStore");

  {

  }
  public static SSLContext getSSLContext(TrustManager trustManager,
                                         KeyManager keyManager)
      throws KeyManagementException, NoSuchAlgorithmException {

 sdk/src/com/sun/opends/sdk/util/SizeLimitInputStream.java

File was renamed from sdk/src/org/opends/sdk/util/SizeLimitInputStream.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.util;
package com.sun.opends.sdk.util;

import java.io.IOException;
import java.io.InputStream;

 sdk/src/com/sun/opends/sdk/util/StaticUtils.java

File was renamed from sdk/src/org/opends/sdk/util/StaticUtils.java
@@ -25,11 +25,11 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.lang.reflect.InvocationTargetException;
import java.text.ParseException;
@@ -40,11 +40,11 @@
import java.util.zip.Deflater;
import java.util.zip.Inflater;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import com.sun.opends.sdk.util.MessageDescriptor;



@@ -672,47 +672,21 @@
  public static boolean compress(ByteSequence input,
      ByteStringBuilder output)
  {
    // Avoid extra copies if possible.
    byte[] inputBuffer;
    int inputOffset;
    final int inputLength = input.length();
    byte[] inputBytes = input.toByteArray();
    byte[] outputBytes = new byte[inputBytes.length];

    if (input instanceof ByteString)
    {
      final ByteString byteString = (ByteString) input;
      inputBuffer = byteString.buffer;
      inputOffset = byteString.offset;
    }
    else if (input instanceof ByteStringBuilder)
    {
      final ByteStringBuilder builder = (ByteStringBuilder) input;
      inputBuffer = builder.buffer;
      inputOffset = 0;
    }
    else
    {
      inputBuffer = new byte[inputLength];
      inputOffset = 0;
      input.copyTo(inputBuffer);
    }

    // Make sure the free space in the destination buffer is at least
    // as big as this.
    output.ensureAdditionalCapacity(inputLength);

    final int compressedSize = compress(inputBuffer, inputOffset,
        inputLength, output.buffer, output.length, output.buffer.length
            - output.length);
    final int compressedSize = compress(inputBytes, 0,
        inputBytes.length, outputBytes, 0, outputBytes.length);

    if (compressedSize != -1)
    {
      if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINE))
      {
        StaticUtils.DEBUG_LOG.fine(String.format("Compression %d/%d%n",
            compressedSize, inputLength));
            compressedSize, inputBytes.length));
      }

      output.length += compressedSize;
      output.append(outputBytes, 0, compressedSize);
      return true;
    }

@@ -1752,53 +1726,24 @@
      ByteStringBuilder output, int uncompressedSize)
      throws DataFormatException
  {
    // Avoid extra copies if possible.
    byte[] inputBuffer;
    int inputOffset;
    final int inputLength = input.length();
    byte[] inputBytes = input.toByteArray();
    byte[] outputBytes = new byte[uncompressedSize > 0 ? uncompressedSize : 0];

    if (input instanceof ByteString)
    {
      final ByteString byteString = (ByteString) input;
      inputBuffer = byteString.buffer;
      inputOffset = byteString.offset;
    }
    else if (input instanceof ByteStringBuilder)
    {
      final ByteStringBuilder builder = (ByteStringBuilder) input;
      inputBuffer = builder.buffer;
      inputOffset = 0;
    }
    else
    {
      inputBuffer = new byte[inputLength];
      inputOffset = 0;
      input.copyTo(inputBuffer);
    }

    // Resize destination buffer if a uncompressed size was provided.
    if (uncompressedSize > 0)
    {
      output.ensureAdditionalCapacity(uncompressedSize);
    }

    int decompressResult = uncompress(inputBuffer, inputOffset,
        inputLength, output.buffer, output.length, output.buffer.length
            - output.length);
    int decompressResult = uncompress(inputBytes, 0,
        inputBytes.length, outputBytes, 0, outputBytes.length);

    if (decompressResult < 0)
    {
      // The destination buffer wasn't big enough. Resize and retry.
      output.ensureAdditionalCapacity(-decompressResult);
      decompressResult = uncompress(inputBuffer, inputOffset,
          inputLength, output.buffer, output.length,
          output.buffer.length - output.length);
      outputBytes = new byte[-decompressResult];
      decompressResult = uncompress(inputBytes, 0,
          inputBytes.length, outputBytes, 0, outputBytes.length);
    }

    if (decompressResult >= 0)
    {
      // It was successful.
      output.length += decompressResult;
      output.append(outputBytes, 0, decompressResult);
      return true;
    }


 sdk/src/com/sun/opends/sdk/util/StringPrepProfile.java

File was renamed from sdk/src/org/opends/sdk/util/StringPrepProfile.java
@@ -24,15 +24,17 @@
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.util;
package com.sun.opends.sdk.util;



import static org.opends.sdk.util.Validator.ensureNotNull;
import static com.sun.opends.sdk.util.Validator.*;

import java.util.HashMap;
import java.util.HashSet;

import org.opends.sdk.ByteSequence;



/**
@@ -571,7 +573,7 @@
   *          The buffer to which the prepared form of the string should
   *          be appended.
   * @param sequence
   *          The {@link org.opends.sdk.util.ByteSequence} that
   *          The {@link org.opends.sdk.ByteSequence} that
   *          needs preparation.
   * @param trim
   *          Indicates whether leading and trailing spaces should be

 sdk/src/com/sun/opends/sdk/util/SubstringReader.java

File was renamed from sdk/src/org/opends/sdk/util/SubstringReader.java
@@ -1,4 +1,4 @@
package org.opends.sdk.util;
package com.sun.opends.sdk.util;

/**
 * Created by IntelliJ IDEA.

 sdk/src/com/sun/opends/sdk/util/Validator.java

File was renamed from sdk/src/org/opends/sdk/util/Validator.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.util;
package com.sun.opends.sdk.util;




 sdk/src/org/opends/sdk/AbstractAttribute.java

@@ -33,9 +33,9 @@

import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.MatchingRule;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Function;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Function;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/AbstractConnection.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.Collection;
import java.util.LinkedList;
@@ -38,9 +38,9 @@
import org.opends.sdk.requests.Requests;
import org.opends.sdk.requests.SearchRequest;
import org.opends.sdk.responses.*;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/AbstractEntry.java

@@ -30,7 +30,8 @@


import org.opends.sdk.schema.ObjectClass;
import org.opends.sdk.util.*;

import com.sun.opends.sdk.util.*;




 sdk/src/org/opends/sdk/AbstractFilterVisitor.java

@@ -31,7 +31,6 @@

import java.util.List;

import org.opends.sdk.util.ByteSequence;


/**

 sdk/src/org/opends/sdk/Assertion.java

@@ -29,7 +29,6 @@



import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/Attribute.java

@@ -34,8 +34,7 @@
import java.util.NoSuchElementException;
import java.util.Set;

import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Function;
import com.sun.opends.sdk.util.Function;




 sdk/src/org/opends/sdk/AttributeDescription.java

@@ -29,19 +29,16 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
import org.opends.sdk.util.ASCIICharProp;
import org.opends.sdk.util.Iterators;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.*;




 sdk/src/org/opends/sdk/AuthenticatedConnectionFactory.java

@@ -38,7 +38,8 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.CompareResult;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ByteSequence.java

File was renamed from sdk/src/org/opends/sdk/util/ByteSequence.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.util;
package org.opends.sdk;



@@ -33,6 +33,7 @@




/**
 * A {@code ByteSequence} is a readable sequence of byte values. This
 * interface provides uniform, read-only access to many different kinds

 sdk/src/org/opends/sdk/ByteSequenceReader.java

File was renamed from sdk/src/org/opends/sdk/util/ByteSequenceReader.java
@@ -24,7 +24,8 @@
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.util;
package org.opends.sdk;





 sdk/src/org/opends/sdk/ByteString.java

File was renamed from sdk/src/org/opends/sdk/util/ByteString.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.util;
package org.opends.sdk;



@@ -32,6 +32,8 @@
import java.io.OutputStream;
import java.util.logging.Level;

import com.sun.opends.sdk.util.StaticUtils;



/**

 sdk/src/org/opends/sdk/ByteStringBuilder.java

File was renamed from sdk/src/org/opends/sdk/util/ByteStringBuilder.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.util;
package org.opends.sdk;



@@ -34,6 +34,8 @@
import java.nio.ByteBuffer;
import java.util.logging.Level;

import com.sun.opends.sdk.util.StaticUtils;



/**

 sdk/src/org/opends/sdk/CancelledException.java

@@ -27,15 +27,21 @@

package org.opends.sdk;



import org.opends.sdk.responses.Result;



/**
 * Created by IntelliJ IDEA. User: boli Date: Dec 2, 2009 Time: 12:25:31 PM To
 * change this template use File | Settings | File Templates.
 * Thrown when the result code returned in a Result indicates that the
 * Request was cancelled.
 */
@SuppressWarnings("serial")
public class CancelledException extends ErrorResultException
{
  public CancelledException(Result result) {
  public CancelledException(Result result)
  {
    super(result);
  }
}

 sdk/src/org/opends/sdk/Change.java

@@ -29,8 +29,8 @@



import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/Connection.java

@@ -35,8 +35,8 @@

import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/ConnectionException.java

@@ -30,9 +30,10 @@
import org.opends.sdk.responses.Result;

/**
 * Created by IntelliJ IDEA. User: boli Date: Dec 1, 2009 Time: 2:31:58 PM To
 * change this template use File | Settings | File Templates.
 * Thrown when the result code returned in a Result indicates that the
 * Request was unsuccessful because of a connection failure.
 */
@SuppressWarnings("serial")
public class ConnectionException extends ErrorResultException {
  public ConnectionException(Result result) {
    super(result);

 sdk/src/org/opends/sdk/DN.java

@@ -29,16 +29,17 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.SubstringReader;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/DecodeException.java

@@ -31,8 +31,8 @@

import java.io.IOException;

import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.LocalizableException;




 sdk/src/org/opends/sdk/Entry.java

@@ -32,8 +32,8 @@
import java.util.Collection;

import org.opends.sdk.schema.ObjectClass;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/ErrorResultIOException.java

@@ -31,7 +31,7 @@

import java.io.IOException;

import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/Filter.java

@@ -29,15 +29,17 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.util.*;

import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.*;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/FilterVisitor.java

@@ -31,7 +31,6 @@

import java.util.List;

import org.opends.sdk.util.ByteSequence;


/**

 sdk/src/org/opends/sdk/HeartBeatConnectionFactory.java

@@ -27,17 +27,21 @@

package org.opends.sdk;

import org.opends.sdk.responses.*;
import org.opends.sdk.requests.*;
import org.opends.sdk.util.Validator;

import java.util.List;
import java.util.LinkedList;
import java.util.concurrent.CountDownLatch;
import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import org.opends.sdk.requests.*;
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.CompareResult;
import org.opends.sdk.responses.GenericExtendedResult;
import org.opends.sdk.responses.Result;

import com.sun.opends.sdk.util.Validator;

/**
 * An heart beat connection factory can be used to create
 * connections that sends a periodic search request to a Directory Server.

 sdk/src/org/opends/sdk/LinkedAttribute.java

@@ -31,9 +31,8 @@

import java.util.*;

import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/Matcher.java

@@ -29,7 +29,7 @@



import static org.opends.sdk.util.StaticUtils.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.util.ArrayList;
import java.util.List;
@@ -39,10 +39,9 @@
import org.opends.sdk.schema.MatchingRuleUse;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.StaticUtils;


/**

 sdk/src/org/opends/sdk/OperationTimeoutException.java

@@ -27,15 +27,22 @@

package org.opends.sdk;



import org.opends.sdk.responses.Result;



/**
 * Created by IntelliJ IDEA. User: boli Date: Dec 2, 2009 Time: 1:28:13 PM To
 * change this template use File | Settings | File Templates.
 * Thrown when the result code returned in a Result indicates that the
 * Request was aborted because it did not complete in the required time
 * out period.
 */
@SuppressWarnings("serial")
public class OperationTimeoutException extends ErrorResultException
{
  public OperationTimeoutException(Result result) {
  public OperationTimeoutException(Result result)
  {
    super(result);
  }
}

 sdk/src/org/opends/sdk/RDN.java

@@ -29,14 +29,14 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.schema.*;
import org.opends.sdk.util.*;

import com.sun.opends.sdk.util.*;




 sdk/src/org/opends/sdk/ResultCode.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.Arrays;
import java.util.Collections;

 sdk/src/org/opends/sdk/RootDSE.java

@@ -34,10 +34,10 @@

import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.SchemaNotFoundException;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Functions;
import org.opends.sdk.util.Iterables;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Functions;
import com.sun.opends.sdk.util.Iterables;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/SortedEntry.java

@@ -34,9 +34,9 @@
import java.util.TreeMap;

import org.opends.sdk.requests.Requests;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/SynchronousConnection.java

@@ -33,7 +33,8 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.CompareResult;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/Types.java

@@ -35,7 +35,8 @@

import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.ObjectClass;
import org.opends.sdk.util.*;

import com.sun.opends.sdk.util.*;




 sdk/src/org/opends/sdk/asn1/ASN1.java

@@ -32,13 +32,18 @@
import java.io.InputStream;
import java.io.OutputStream;

import org.opends.sdk.util.*;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteSequenceReader;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;

import com.sun.opends.sdk.util.ByteSequenceOutputStream;


/**
 * This class contains various static factory methods for creating ASN.1
 * readers and writers.
 * 
 *
 * @see ASN1Reader
 * @see ASN1Writer
 */
@@ -48,7 +53,7 @@
  /**
   * Returns an ASN.1 reader whose source is the provided byte array and
   * having an unlimited maximum BER element size.
   * 
   *
   * @param array
   *          The byte array to use.
   * @return The new ASN.1 reader.
@@ -63,7 +68,7 @@
  /**
   * Returns an ASN.1 reader whose source is the provided byte array and
   * having a user defined maximum BER element size.
   * 
   *
   * @param array
   *          The byte array to use.
   * @param maxElementSize
@@ -81,7 +86,7 @@
  /**
   * Returns an ASN.1 reader whose source is the provided byte sequence
   * and having an unlimited maximum BER element size.
   * 
   *
   * @param sequence
   *          The byte sequence to use.
   * @return The new ASN.1 reader.
@@ -96,7 +101,7 @@
  /**
   * Returns an ASN.1 reader whose source is the provided byte sequence
   * and having a user defined maximum BER element size.
   * 
   *
   * @param sequence
   *          The byte sequence to use.
   * @param maxElementSize
@@ -116,7 +121,7 @@
  /**
   * Returns an ASN.1 reader whose source is the provided byte sequence
   * reader and having an unlimited maximum BER element size.
   * 
   *
   * @param reader
   *          The byte sequence reader to use.
   * @return The new ASN.1 reader.
@@ -131,7 +136,7 @@
  /**
   * Returns an ASN.1 reader whose source is the provided byte sequence
   * reader and having a user defined maximum BER element size.
   * 
   *
   * @param reader
   *          The byte sequence reader to use.
   * @param maxElementSize
@@ -150,7 +155,7 @@
  /**
   * Returns an ASN.1 reader whose source is the provided input stream
   * and having an unlimited maximum BER element size.
   * 
   *
   * @param stream
   *          The input stream to use.
   * @return The new ASN.1 reader.
@@ -165,7 +170,7 @@
  /**
   * Returns an ASN.1 reader whose source is the provided input stream
   * and having a user defined maximum BER element size.
   * 
   *
   * @param stream
   *          The input stream to use.
   * @param maxElementSize
@@ -184,7 +189,7 @@
  /**
   * Returns an ASN.1 writer whose destination is the provided byte
   * string builder.
   * 
   *
   * @param builder
   *          The byte string builder to use.
   * @return The new ASN.1 writer.
@@ -201,7 +206,7 @@
  /**
   * Returns an ASN.1 writer whose destination is the provided output
   * stream.
   * 
   *
   * @param stream
   *          The output stream to use.
   * @return The new ASN.1 writer.

 sdk/src/org/opends/sdk/asn1/ASN1ByteSequenceReader.java

@@ -29,20 +29,20 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;

import java.io.IOException;
import java.util.LinkedList;
import java.util.logging.Level;

import org.opends.sdk.ByteSequenceReader;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequenceReader;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/asn1/ASN1InputStreamReader.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;

import java.io.IOException;
@@ -37,13 +37,13 @@
import java.util.LinkedList;
import java.util.logging.Level;

import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.SizeLimitInputStream;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.SizeLimitInputStream;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/asn1/ASN1OutputStreamWriter.java

@@ -28,20 +28,20 @@



import static com.sun.opends.sdk.util.Messages.ERR_ASN1_SEQUENCE_WRITE_NOT_STARTED;
import static org.opends.sdk.asn1.ASN1Constants.BOOLEAN_VALUE_FALSE;
import static org.opends.sdk.asn1.ASN1Constants.BOOLEAN_VALUE_TRUE;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;

import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.logging.Level;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteStringBuilder;

import com.sun.opends.sdk.util.ByteSequenceOutputStream;
import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteSequenceOutputStream;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.StaticUtils;


/**

 sdk/src/org/opends/sdk/asn1/ASN1Reader.java

@@ -32,9 +32,9 @@
import java.io.Closeable;
import java.io.IOException;

import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;




 sdk/src/org/opends/sdk/asn1/ASN1Writer.java

@@ -32,7 +32,7 @@
import java.io.Flushable;
import java.io.IOException;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.ByteSequence;




 sdk/src/org/opends/sdk/asn1/AbstractASN1Reader.java

@@ -29,14 +29,14 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;

import java.io.IOException;

import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;

import com.sun.opends.sdk.util.Message;


 sdk/src/org/opends/sdk/asn1/AbstractASN1Writer.java

@@ -32,7 +32,7 @@

import java.io.IOException;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.ByteSequence;




 sdk/src/org/opends/sdk/controls/AccountUsabilityControl.java

@@ -2,24 +2,21 @@



import static com.sun.opends.sdk.util.Messages.ERR_ACCTUSABLEREQ_CONTROL_HAS_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ACCTUSABLERES_DECODE_ERROR;
import static com.sun.opends.sdk.util.Messages.ERR_ACCTUSABLERES_NO_CONTROL_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ACCTUSABLERES_UNKNOWN_VALUE_ELEMENT_TYPE;
import static org.opends.sdk.util.StaticUtils.byteToHex;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/controls/AssertionControl.java

@@ -29,13 +29,13 @@



import static com.sun.opends.sdk.util.Messages.ERR_LDAPASSERT_INVALID_CONTROL_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_LDAPASSERT_NO_CONTROL_VALUE;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.Filter;
import org.opends.sdk.asn1.ASN1;
@@ -43,9 +43,9 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.ldap.LDAPUtils;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/AuthorizationIdentityControl.java

@@ -2,15 +2,15 @@



import static com.sun.opends.sdk.util.Messages.ERR_AUTHZIDREQ_CONTROL_HAS_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_AUTHZIDRESP_NO_CONTROL_VALUE;
import static com.sun.opends.sdk.messages.Messages.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/Control.java

@@ -2,7 +2,7 @@



import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/controls/ControlDecoder.java

@@ -28,9 +28,9 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/controls/EntryChangeNotificationControl.java

@@ -2,26 +2,24 @@



import static com.sun.opends.sdk.util.Messages.ERR_ECN_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ECN_ILLEGAL_PREVIOUS_DN;
import static com.sun.opends.sdk.util.Messages.ERR_ECN_NO_CONTROL_VALUE;
import static org.opends.sdk.asn1.ASN1Constants.UNIVERSAL_INTEGER_TYPE;
import static org.opends.sdk.asn1.ASN1Constants.UNIVERSAL_OCTET_STRING_TYPE;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.asn1.ASN1Constants.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/GenericControl.java

@@ -29,8 +29,9 @@



import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java

@@ -2,13 +2,13 @@



import static com.sun.opends.sdk.util.Messages.INFO_GETEFFECTIVERIGHTS_DECODE_ERROR;
import static com.sun.opends.sdk.util.Messages.INFO_GETEFFECTIVERIGHTS_INVALID_AUTHZID;
import static com.sun.opends.sdk.messages.Messages.*;

import java.io.IOException;
import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
@@ -16,9 +16,9 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/MatchedValuesControl.java

@@ -29,24 +29,25 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.AbstractFilterVisitor;
import org.opends.sdk.DecodeException;
import org.opends.sdk.Filter;
import org.opends.sdk.*;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.ldap.LDAPUtils;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.*;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/PagedResultsControl.java

@@ -2,23 +2,21 @@



import static com.sun.opends.sdk.util.Messages.ERR_LDAP_PAGED_RESULTS_DECODE_COOKIE;
import static com.sun.opends.sdk.util.Messages.ERR_LDAP_PAGED_RESULTS_DECODE_NULL;
import static com.sun.opends.sdk.util.Messages.ERR_LDAP_PAGED_RESULTS_DECODE_SEQUENCE;
import static com.sun.opends.sdk.util.Messages.ERR_LDAP_PAGED_RESULTS_DECODE_SIZE;
import static com.sun.opends.sdk.messages.Messages.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/PasswordExpiredControl.java

@@ -2,12 +2,13 @@



import static com.sun.opends.sdk.util.Messages.ERR_PWEXPIRED_CONTROL_INVALID_VALUE;
import static com.sun.opends.sdk.messages.Messages.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;

import com.sun.opends.sdk.util.Message;




 sdk/src/org/opends/sdk/controls/PasswordExpiringControl.java

@@ -2,15 +2,15 @@



import static com.sun.opends.sdk.util.Messages.ERR_PWEXPIRING_CANNOT_DECODE_SECONDS_UNTIL_EXPIRATION;
import static com.sun.opends.sdk.util.Messages.ERR_PWEXPIRING_NO_CONTROL_VALUE;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/controls/PasswordPolicyControl.java

@@ -2,22 +2,22 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.byteToHex;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/PasswordPolicyErrorType.java

@@ -2,7 +2,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.Arrays;
import java.util.List;

 sdk/src/org/opends/sdk/controls/PasswordPolicyWarningType.java

@@ -2,8 +2,7 @@



import static com.sun.opends.sdk.util.Messages.INFO_PWPWARNTYPE_DESCRIPTION_GRACE_LOGINS_REMAINING;
import static com.sun.opends.sdk.util.Messages.INFO_PWPWARNTYPE_DESCRIPTION_TIME_BEFORE_EXPIRATION;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.Arrays;
import java.util.List;

 sdk/src/org/opends/sdk/controls/PersistentSearchControl.java

@@ -2,21 +2,21 @@



import static com.sun.opends.sdk.util.Messages.ERR_PSEARCH_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_PSEARCH_NO_CONTROL_VALUE;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/controls/PostReadControl.java

@@ -29,17 +29,15 @@



import static com.sun.opends.sdk.util.Messages.ERR_POSTREADREQ_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_POSTREADREQ_NO_CONTROL_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_POSTREADRESP_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_POSTREADRESP_NO_CONTROL_VALUE;
import static com.sun.opends.sdk.messages.Messages.*;

import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
@@ -47,10 +45,10 @@
import org.opends.sdk.ldap.LDAPUtils;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/PreReadControl.java

@@ -29,17 +29,15 @@



import static com.sun.opends.sdk.util.Messages.ERR_PREREADREQ_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_PREREADREQ_NO_CONTROL_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_PREREADRESP_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_PREREADRESP_NO_CONTROL_VALUE;
import static com.sun.opends.sdk.messages.Messages.*;

import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
@@ -47,10 +45,10 @@
import org.opends.sdk.ldap.LDAPUtils;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/ProxiedAuthV1Control.java

@@ -2,22 +2,21 @@



import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH1_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH1_CONTROL_NOT_CRITICAL;
import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH1_NO_CONTROL_VALUE;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/ProxiedAuthV2Control.java

@@ -2,22 +2,21 @@



import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH2_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH2_CONTROL_NOT_CRITICAL;
import static com.sun.opends.sdk.util.Messages.ERR_PROXYAUTH2_NO_CONTROL_VALUE;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/ServerSideSortControl.java

@@ -2,23 +2,24 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/SortKey.java

@@ -3,7 +3,8 @@


import org.opends.sdk.AttributeDescription;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/SubtreeDeleteControl.java

@@ -2,12 +2,13 @@



import static com.sun.opends.sdk.util.Messages.ERR_SUBTREE_DELETE_INVALID_CONTROL_VALUE;
import static com.sun.opends.sdk.messages.Messages.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;

import com.sun.opends.sdk.util.Message;




 sdk/src/org/opends/sdk/controls/VLVControl.java

@@ -2,23 +2,21 @@



import static com.sun.opends.sdk.util.Messages.INFO_VLVREQ_CONTROL_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.INFO_VLVREQ_CONTROL_NO_VALUE;
import static com.sun.opends.sdk.util.Messages.INFO_VLVRES_CONTROL_CANNOT_DECODE_VALUE;
import static com.sun.opends.sdk.util.Messages.INFO_VLVRES_CONTROL_NO_VALUE;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/controls/VLVTarget.java

@@ -2,17 +2,18 @@



import static com.sun.opends.sdk.util.Messages.INFO_VLVREQ_CONTROL_INVALID_TARGET_TYPE;
import static org.opends.sdk.util.StaticUtils.byteToHex;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/extensions/CancelRequest.java

@@ -2,13 +2,13 @@



import static com.sun.opends.sdk.util.Messages.ERR_EXTOP_CANCEL_CANNOT_DECODE_REQUEST_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_EXTOP_CANCEL_NO_REQUEST_VALUE;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
@@ -17,8 +17,8 @@
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;

import com.sun.opends.sdk.util.Message;




 sdk/src/org/opends/sdk/extensions/ExtendedOperation.java

@@ -2,11 +2,11 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.requests.ExtendedRequest;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/extensions/GetConnectionIDRequest.java

@@ -4,13 +4,14 @@

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.util.ByteString;

import com.sun.opends.sdk.util.Message;




 sdk/src/org/opends/sdk/extensions/GetConnectionIDResult.java

@@ -31,12 +31,12 @@

import java.io.IOException;

import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.responses.AbstractExtendedResult;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;




 sdk/src/org/opends/sdk/extensions/GetSymmetricKeyRequest.java

@@ -2,12 +2,12 @@



import static com.sun.opends.sdk.util.Messages.ERR_GET_SYMMETRIC_KEY_ASN1_DECODE_EXCEPTION;
import static com.sun.opends.sdk.util.Messages.ERR_GET_SYMMETRIC_KEY_NO_VALUE;
import static com.sun.opends.sdk.messages.Messages.*;

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
@@ -16,9 +16,9 @@
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/extensions/PasswordModifyRequest.java

@@ -2,19 +2,19 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;

import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;

import com.sun.opends.sdk.util.Message;


 sdk/src/org/opends/sdk/extensions/PasswordModifyResult.java

@@ -4,12 +4,12 @@

import java.io.IOException;

import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.ResultCode;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.responses.AbstractExtendedResult;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;




 sdk/src/org/opends/sdk/extensions/PasswordPolicyStateExtendedOperation.java

@@ -2,11 +2,8 @@



import static com.sun.opends.sdk.util.Messages.ERR_PWPSTATE_EXTOP_DECODE_FAILURE;
import static com.sun.opends.sdk.util.Messages.ERR_PWPSTATE_EXTOP_NO_REQUEST_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_PWPSTATE_EXTOP_UNKNOWN_OP_TYPE;
import static org.opends.sdk.util.StaticUtils.formatAsGeneralizedTime;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;
import java.util.ArrayList;
@@ -14,18 +11,15 @@
import java.util.Date;
import java.util.List;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DN;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.*;
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.responses.AbstractExtendedResult;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/extensions/StartTLSRequest.java

@@ -4,12 +4,12 @@

import javax.net.ssl.SSLContext;

import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/extensions/WhoAmIRequest.java

@@ -2,10 +2,10 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.requests.AbstractExtendedRequest;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/extensions/WhoAmIResult.java

@@ -29,9 +29,9 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.responses.AbstractExtendedResult;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java

@@ -28,23 +28,23 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.ldap.LDAPConstants.*;

import java.io.IOException;
import java.nio.BufferUnderflowException;
import java.util.logging.Level;

import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.AbstractASN1Reader;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;

import com.sun.grizzly.streams.StreamReader;
import com.sun.grizzly.utils.PoolableObject;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/ldap/ASN1StreamWriter.java

@@ -28,21 +28,21 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;

import java.io.IOException;
import java.util.logging.Level;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.asn1.AbstractASN1Writer;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteStringBuilder;
import org.opends.sdk.util.StaticUtils;

import com.sun.grizzly.streams.StreamWriter;
import com.sun.grizzly.utils.PoolableObject;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/ldap/AbstractLDAPMessageHandler.java

@@ -29,6 +29,7 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.GenericControl;
@@ -36,7 +37,6 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.sasl.SASLBindRequest;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java

@@ -37,9 +37,10 @@
import org.opends.sdk.ResultFuture;
import org.opends.sdk.ResultHandler;
import org.opends.sdk.requests.Requests;
import org.opends.sdk.responses.Result;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.responses.Result;

import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/ldap/ConnectionPool.java

@@ -27,18 +27,21 @@

package org.opends.sdk.ldap;

import java.util.Stack;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;

import org.opends.sdk.*;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.responses.Result;
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.CompareResult;
import org.opends.sdk.responses.GenericExtendedResult;
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.Result;

import java.util.concurrent.*;
import java.util.Queue;
import java.util.Stack;
import java.util.logging.Level;
import com.sun.opends.sdk.util.StaticUtils;

/**
 * Created by IntelliJ IDEA. User: digitalperk Date: Nov 25, 2009 Time: 11:12:29
@@ -50,7 +53,7 @@
  private volatile int numConnections;
  private final int poolSize;
  private final Stack<AsynchronousConnection> pool;
  private final ConcurrentLinkedQueue<PendingConnectionFuture> pendingFutures;
  private final ConcurrentLinkedQueue<PendingConnectionFuture<?>> pendingFutures;
  private final Object lock = new Object();

  private class PooledConnectionWapper
@@ -108,7 +111,7 @@
          }

          // See if there waiters pending
          PendingConnectionFuture future = pendingFutures.poll();
          PendingConnectionFuture<?> future = pendingFutures.poll();
          if (future != null) {
            PooledConnectionWapper pooledConnection =
                new PooledConnectionWapper(connection);
@@ -356,14 +359,14 @@
    this.connectionFactory = connectionFactory;
    this.poolSize = poolSize;
    this.pool = new Stack<AsynchronousConnection>();
    this.pendingFutures = new ConcurrentLinkedQueue<PendingConnectionFuture>();
    this.pendingFutures = new ConcurrentLinkedQueue<PendingConnectionFuture<?>>();
  }

  private class WrapConnectionResultHandler
      implements ConnectionResultHandler<AsynchronousConnection, Void> {
    private final PendingConnectionFuture future;
    private final PendingConnectionFuture<?> future;

    private WrapConnectionResultHandler(PendingConnectionFuture future) {
    private WrapConnectionResultHandler(PendingConnectionFuture<?> future) {
      this.future = future;
    }


 sdk/src/org/opends/sdk/ldap/ExtendedResultFutureImpl.java

@@ -31,13 +31,9 @@

import java.util.concurrent.ExecutorService;

import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.ResultFuture;
import org.opends.sdk.ResultHandler;
import org.opends.sdk.*;
import org.opends.sdk.requests.ExtendedRequest;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/ldap/LDAPConnection.java

@@ -29,16 +29,15 @@



import static org.opends.sdk.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
import static org.opends.sdk.ldap.LDAPConstants.*;

import java.io.EOFException;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger;

import javax.net.ssl.SSLContext;
@@ -53,15 +52,14 @@
import org.opends.sdk.sasl.SASLBindRequest;
import org.opends.sdk.sasl.SASLContext;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.grizzly.filterchain.Filter;
import com.sun.grizzly.filterchain.FilterChain;
import com.sun.grizzly.filterchain.StreamTransformerFilter;
import com.sun.grizzly.ssl.*;
import com.sun.grizzly.streams.StreamWriter;
import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ldap/LDAPConnectionFactoryImpl.java

@@ -42,7 +42,6 @@
import org.opends.sdk.extensions.StartTLSRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.Validator;

import com.sun.grizzly.TransportFactory;
import com.sun.grizzly.attributes.Attribute;
@@ -53,6 +52,7 @@
import com.sun.grizzly.ssl.SSLFilter;
import com.sun.grizzly.ssl.SSLHandshaker;
import com.sun.grizzly.streams.StreamWriter;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ldap/LDAPConnectionOptions.java

@@ -32,7 +32,8 @@
import javax.net.ssl.SSLContext;

import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ldap/LDAPDecoder.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.asn1.ASN1Constants.*;
import static org.opends.sdk.ldap.LDAPConstants.*;

@@ -43,9 +43,9 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.sasl.GenericSASLBindRequest;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/ldap/LDAPEncoder.java

@@ -35,6 +35,7 @@
import java.util.logging.Level;

import org.opends.sdk.Attribute;
import org.opends.sdk.ByteString;
import org.opends.sdk.Change;
import org.opends.sdk.DN;
import org.opends.sdk.asn1.ASN1Writer;
@@ -42,8 +43,8 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
import org.opends.sdk.sasl.SASLBindRequest;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/ldap/LDAPMessageHandler.java

@@ -29,13 +29,13 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.controls.Control;
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;
import org.opends.sdk.sasl.SASLBindRequest;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/ldap/LDAPUtils.java

@@ -36,13 +36,13 @@
import java.util.LinkedList;
import java.util.List;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.Filter;
import org.opends.sdk.FilterVisitor;
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/ldap/SearchResultFutureImpl.java

@@ -36,7 +36,10 @@
import org.opends.sdk.ResultHandler;
import org.opends.sdk.SearchResultHandler;
import org.opends.sdk.requests.SearchRequest;
import org.opends.sdk.responses.*;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.responses.SearchResultReference;




 sdk/src/org/opends/sdk/ldap/UnexpectedRequestException.java

@@ -31,9 +31,10 @@

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.requests.Request;

import com.sun.opends.sdk.util.Message;



/**

 sdk/src/org/opends/sdk/ldap/UnexpectedResponseException.java

@@ -31,9 +31,10 @@

import java.io.IOException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.responses.Response;

import com.sun.opends.sdk.util.Message;



/**

 sdk/src/org/opends/sdk/ldap/UnsupportedMessageException.java

@@ -31,7 +31,7 @@

import java.io.IOException;

import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/ldif/AbstractLDIFReader.java

@@ -29,8 +29,8 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.toLowerCase;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.BufferedReader;
import java.io.IOException;
@@ -41,10 +41,9 @@
import java.util.LinkedList;
import java.util.List;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.*;
import org.opends.sdk.util.*;

import com.sun.opends.sdk.util.*;




 sdk/src/org/opends/sdk/ldif/AbstractLDIFWriter.java

@@ -36,11 +36,12 @@
import java.util.List;
import java.util.regex.Pattern;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.Base64;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Base64;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java

@@ -39,7 +39,8 @@
import org.opends.sdk.requests.DeleteRequest;
import org.opends.sdk.requests.ModifyDNRequest;
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ldif/ConnectionEntryWriter.java

@@ -35,7 +35,8 @@
import org.opends.sdk.Entry;
import org.opends.sdk.ErrorResultException;
import org.opends.sdk.ErrorResultIOException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ldif/LDIFChangeRecordReader.java

@@ -29,8 +29,8 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.IOException;
import java.io.InputStream;
@@ -43,11 +43,10 @@
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.requests.Requests;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ldif/LDIFChangeRecordWriter.java

@@ -39,8 +39,8 @@
import org.opends.sdk.requests.ModifyDNRequest;
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.io.IOException;
import java.io.InputStream;
@@ -38,10 +38,10 @@

import org.opends.sdk.*;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/ldif/LDIFEntryWriter.java

@@ -35,8 +35,8 @@

import org.opends.sdk.*;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/AbstractExtendedRequest.java

@@ -29,9 +29,9 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.extensions.ExtendedOperation;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/requests/AbstractRequestImpl.java

@@ -34,7 +34,8 @@
import java.util.List;

import org.opends.sdk.controls.Control;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/AbstractUnmodifiableRequestImpl.java

@@ -30,7 +30,8 @@


import org.opends.sdk.controls.Control;
import org.opends.sdk.util.Iterables;

import com.sun.opends.sdk.util.Iterables;




 sdk/src/org/opends/sdk/requests/AddRequest.java

@@ -31,16 +31,13 @@

import java.util.Collection;

import org.opends.sdk.Attribute;
import org.opends.sdk.AttributeDescription;
import org.opends.sdk.DN;
import org.opends.sdk.Entry;
import org.opends.sdk.*;
import org.opends.sdk.controls.Control;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.schema.ObjectClass;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/requests/AddRequestImpl.java

@@ -31,14 +31,11 @@

import java.util.Collection;

import org.opends.sdk.Attribute;
import org.opends.sdk.AttributeDescription;
import org.opends.sdk.DN;
import org.opends.sdk.Entry;
import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.schema.ObjectClass;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/requests/CompareRequest.java

@@ -30,10 +30,11 @@


import org.opends.sdk.AttributeDescription;
import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/requests/CompareRequestImpl.java

@@ -30,10 +30,11 @@


import org.opends.sdk.AttributeDescription;
import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/DeleteRequest.java

@@ -33,7 +33,8 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/requests/DeleteRequestImpl.java

@@ -31,8 +31,9 @@

import org.opends.sdk.DN;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/ExtendedRequest.java

@@ -29,11 +29,11 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;
import org.opends.sdk.extensions.ExtendedOperation;
import org.opends.sdk.extensions.StartTLSRequest;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/requests/GenericBindRequest.java

@@ -29,11 +29,12 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/requests/GenericBindRequestImpl.java

@@ -29,10 +29,11 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/GenericExtendedRequest.java

@@ -29,11 +29,11 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
import org.opends.sdk.extensions.ExtendedOperation;
import org.opends.sdk.responses.GenericExtendedResult;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/requests/GenericExtendedRequestImpl.java

@@ -29,13 +29,14 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.extensions.ExtendedOperation;
import org.opends.sdk.responses.GenericExtendedResult;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/ModifyDNRequest.java

@@ -34,7 +34,8 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/requests/ModifyDNRequestImpl.java

@@ -32,8 +32,9 @@
import org.opends.sdk.DN;
import org.opends.sdk.RDN;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/ModifyRequest.java

@@ -29,14 +29,15 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.Change;
import org.opends.sdk.DN;
import org.opends.sdk.ModificationType;
import org.opends.sdk.controls.Control;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/requests/ModifyRequestImpl.java

@@ -32,13 +32,14 @@
import java.util.LinkedList;
import java.util.List;

import org.opends.sdk.LinkedAttribute;
import org.opends.sdk.Change;
import org.opends.sdk.DN;
import org.opends.sdk.LinkedAttribute;
import org.opends.sdk.ModificationType;
import org.opends.sdk.ldif.ChangeRecordVisitor;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/Requests.java

@@ -29,16 +29,15 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.LDIFChangeRecordReader;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/SearchRequest.java

@@ -36,7 +36,8 @@
import org.opends.sdk.Filter;
import org.opends.sdk.SearchScope;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/requests/SearchRequestImpl.java

@@ -37,8 +37,9 @@
import org.opends.sdk.DereferenceAliasesPolicy;
import org.opends.sdk.Filter;
import org.opends.sdk.SearchScope;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/requests/SimpleBindRequest.java

@@ -29,10 +29,11 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/requests/SimpleBindRequestImpl.java

@@ -29,10 +29,11 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/responses/AbstractExtendedResult.java

@@ -29,8 +29,8 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/responses/AbstractIntermediateResponse.java

@@ -29,7 +29,7 @@



import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/responses/AbstractResponseImpl.java

@@ -34,7 +34,8 @@
import java.util.List;

import org.opends.sdk.controls.Control;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/responses/AbstractResultImpl.java

@@ -33,7 +33,8 @@
import java.util.List;

import org.opends.sdk.ResultCode;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java

@@ -30,7 +30,8 @@


import org.opends.sdk.controls.Control;
import org.opends.sdk.util.Iterables;

import com.sun.opends.sdk.util.Iterables;




 sdk/src/org/opends/sdk/responses/BindResult.java

@@ -29,9 +29,9 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/responses/BindResultImpl.java

@@ -29,8 +29,8 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/responses/ExtendedResult.java

@@ -29,9 +29,9 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/responses/GenericExtendedResult.java

@@ -29,9 +29,9 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/responses/GenericExtendedResultImpl.java

@@ -29,8 +29,8 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/responses/GenericIntermediateResponse.java

@@ -29,8 +29,8 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/responses/GenericIntermediateResponseImpl.java

@@ -29,7 +29,7 @@



import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/responses/IntermediateResponse.java

@@ -29,8 +29,8 @@



import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/responses/Responses.java

@@ -29,13 +29,10 @@



import org.opends.sdk.DN;
import org.opends.sdk.Entry;
import org.opends.sdk.ResultCode;
import org.opends.sdk.SortedEntry;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.Validator;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/responses/SearchResultEntry.java

@@ -31,14 +31,11 @@

import java.util.Collection;

import org.opends.sdk.Attribute;
import org.opends.sdk.AttributeDescription;
import org.opends.sdk.DN;
import org.opends.sdk.Entry;
import org.opends.sdk.*;
import org.opends.sdk.controls.Control;
import org.opends.sdk.schema.ObjectClass;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/responses/SearchResultEntryImpl.java

@@ -31,13 +31,10 @@

import java.util.Collection;

import org.opends.sdk.Attribute;
import org.opends.sdk.AttributeDescription;
import org.opends.sdk.DN;
import org.opends.sdk.Entry;
import org.opends.sdk.*;
import org.opends.sdk.schema.ObjectClass;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/responses/SearchResultReferenceImpl.java

@@ -32,7 +32,7 @@
import java.util.LinkedList;
import java.util.List;

import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.io.IOException;


 sdk/src/org/opends/sdk/sasl/AnonymousSASLBindRequest.java

@@ -30,8 +30,9 @@

import javax.security.sasl.SaslException;

import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/sasl/CRAMMD5SASLBindRequest.java

@@ -34,9 +34,10 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;

import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/sasl/DigestMD5SASLBindRequest.java

@@ -38,9 +38,10 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;

import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/sasl/ExternalSASLBindRequest.java

@@ -31,9 +31,10 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;

import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/sasl/GSSAPISASLBindRequest.java

@@ -29,8 +29,8 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -43,11 +43,11 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;

import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;
import com.sun.security.auth.callback.TextCallbackHandler;
import com.sun.security.auth.module.Krb5LoginModule;


 sdk/src/org/opends/sdk/sasl/GenericSASLBindRequest.java

@@ -31,8 +31,9 @@

import javax.security.sasl.SaslException;

import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.Validator;


/**

 sdk/src/org/opends/sdk/sasl/PlainSASLBindRequest.java

@@ -34,9 +34,10 @@
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;

import org.opends.sdk.ByteString;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/sasl/SASLContext.java

@@ -31,7 +31,7 @@

import javax.security.sasl.SaslException;

import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/AbstractMatchingRuleImpl.java

@@ -32,9 +32,9 @@
import java.util.List;

import org.opends.sdk.Assertion;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ConditionResult;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/AbstractOrderingMatchingRuleImpl.java

@@ -28,11 +28,7 @@



import org.opends.sdk.Assertion;
import org.opends.sdk.ConditionResult;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.*;




 sdk/src/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java

@@ -28,18 +28,15 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.LinkedList;
import java.util.List;

import org.opends.sdk.Assertion;
import org.opends.sdk.ConditionResult;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/AttributeType.java

@@ -29,8 +29,8 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.SCHEMA_PROPERTY_APPROX_RULE;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.Collections;
import java.util.Iterator;
@@ -38,8 +38,8 @@
import java.util.Map;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java

@@ -29,19 +29,16 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ATTRTYPE_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ATTRTYPE_EXPECTED_OPEN_PARENTHESIS;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ATTRTYPE_INVALID_ATTRIBUTE_USAGE;
import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_ATTRIBUTE_TYPE_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/AuthPasswordExactEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/AuthPasswordSyntaxImpl.java

@@ -29,14 +29,14 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_AUTH_PASSWORD_EXACT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_AUTH_PASSWORD_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/BinarySyntaxImpl.java

@@ -29,12 +29,11 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_BINARY_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/BitStringEqualityMatchingRuleImpl.java

@@ -28,14 +28,13 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_INVALID_BIT;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/BitStringSyntaxImpl.java

@@ -29,14 +29,12 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_INVALID_BIT;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT;
import static org.opends.sdk.schema.SchemaConstants.EMR_BIT_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_BIT_STRING_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/BooleanEqualityMatchingRuleImpl.java

@@ -28,11 +28,11 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/BooleanSyntaxImpl.java

@@ -29,12 +29,12 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN;
import static org.opends.sdk.schema.SchemaConstants.EMR_BOOLEAN_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_BOOLEAN_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java

@@ -28,15 +28,14 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java

@@ -28,15 +28,14 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java

@@ -28,13 +28,11 @@



import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java

@@ -28,15 +28,14 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java

@@ -28,15 +28,14 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java

@@ -28,13 +28,13 @@



import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StringPrepProfile;

import com.sun.opends.sdk.util.StringPrepProfile;




 sdk/src/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java

@@ -28,13 +28,13 @@



import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StringPrepProfile;

import com.sun.opends.sdk.util.StringPrepProfile;




 sdk/src/org/opends/sdk/schema/CertificateListSyntaxImpl.java

@@ -29,12 +29,11 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_CERTLIST_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/CertificatePairSyntaxImpl.java

@@ -29,12 +29,11 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_CERTPAIR_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/CertificateSyntaxImpl.java

@@ -29,12 +29,11 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_CERTIFICATE_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/ConflictingSchemaElementException.java

@@ -29,8 +29,8 @@



import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/schema/CountryStringSyntaxImpl.java

@@ -29,13 +29,13 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_COUNTRY_STRING_NOT_PRINTABLE;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;
import static org.opends.sdk.util.StaticUtils.toLowerCase;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/DITContentRule.java

@@ -29,12 +29,12 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java

@@ -29,18 +29,16 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DCR_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DCR_EXPECTED_OPEN_PARENTHESIS;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_DIT_CONTENT_RULE_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/DITStructureRule.java

@@ -29,13 +29,12 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_UNKNOWN_NAME_FORM;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_UNKNOWN_RULE_ID;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java

@@ -29,19 +29,16 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_EXPECTED_OPEN_PARENTHESIS;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DSR_NO_NAME_FORM;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
import static org.opends.sdk.schema.SchemaConstants.EMR_INTEGER_FIRST_COMPONENT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_DIT_STRUCTURE_RULE_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java

@@ -29,16 +29,16 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;
import static org.opends.sdk.util.StaticUtils.toLowerCase;

import java.util.HashSet;
import java.util.StringTokenizer;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java

@@ -28,18 +28,16 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EXPECTED_OPEN_PARENTHESIS;
import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.Assertion;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.Assertion;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/DirectoryStringSyntaxImpl.java

@@ -29,11 +29,12 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_DIRECTORYSTRING_INVALID_ZEROLENGTH_VALUE;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java

@@ -33,9 +33,8 @@

import org.opends.sdk.*;
import org.opends.sdk.RDN.AVA;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/schema/DistinguishedNameSyntaxImpl.java

@@ -29,14 +29,13 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_DN_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_DN_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.MessageBuilder;




 sdk/src/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java

@@ -28,9 +28,10 @@



import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java

@@ -29,16 +29,15 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_ENHANCED_GUIDE_NAME;
import static org.opends.sdk.util.StaticUtils.toLowerCase;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/EnumOrderingMatchingRule.java

@@ -28,12 +28,13 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_INVALID_VALUE;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/EnumSyntaxImpl.java

@@ -29,24 +29,20 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_INVALID_VALUE;
import static org.opends.sdk.schema.SchemaConstants.AMR_DOUBLE_METAPHONE_OID;
import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OID_GENERIC_ENUM;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StringPrepProfile.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/EqualLengthApproximateMatchingRuleImpl.java

@@ -28,11 +28,7 @@



import org.opends.sdk.Assertion;
import org.opends.sdk.ConditionResult;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.*;




 sdk/src/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java

@@ -29,20 +29,15 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_FAXNUMBER_EMPTY;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_FAXNUMBER_END_WITH_DOLLAR;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_FAXNUMBER_ILLEGAL_PARAMETER;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_FAXNUMBER_NOT_PRINTABLE;
import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_FAXNUMBER_NAME;
import static org.opends.sdk.util.StaticUtils.toLowerCase;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.HashSet;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/FaxSyntaxImpl.java

@@ -29,12 +29,11 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_FAX_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/GeneralizedTimeEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/GeneralizedTimeOrderingMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java

@@ -29,18 +29,19 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/schema/GuideSyntaxImpl.java

@@ -29,16 +29,15 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_GUIDE_NAME;
import static org.opends.sdk.util.StaticUtils.toLowerCase;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/IA5StringSyntaxImpl.java

@@ -29,12 +29,13 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java

@@ -28,13 +28,14 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ILLEGAL_INTEGER;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java

@@ -28,18 +28,13 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EXPECTED_OPEN_PARENTHESIS;
import static com.sun.opends.sdk.util.Messages.ERR_EMR_INTFIRSTCOMP_FIRST_COMPONENT_NOT_INT;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.Assertion;
import org.opends.sdk.ConditionResult;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java

@@ -28,13 +28,14 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_ILLEGAL_INTEGER;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/schema/IntegerSyntaxImpl.java

@@ -29,17 +29,12 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_INTEGER_DASH_NEEDS_VALUE;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_INTEGER_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_INTEGER_INVALID_CHARACTER;
import static org.opends.sdk.schema.SchemaConstants.EMR_INTEGER_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_INTEGER_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_EXACT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_INTEGER_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/JPEGSyntaxImpl.java

@@ -29,12 +29,11 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_JPEG_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java

@@ -28,15 +28,9 @@



import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.Assertion;
import org.opends.sdk.ConditionResult;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.*;




 sdk/src/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java

@@ -29,19 +29,19 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_LDAP_SYNTAX_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.*;
import java.util.regex.Pattern;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/MatchingRule.java

@@ -29,20 +29,20 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MR_UNKNOWN_SYNTAX;
import static com.sun.opends.sdk.util.Messages.WARN_MATCHING_RULE_NOT_IMPLEMENTED;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.Assertion;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/MatchingRuleImpl.java

@@ -32,9 +32,9 @@
import java.util.List;

import org.opends.sdk.Assertion;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java

@@ -29,19 +29,16 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MR_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MR_EXPECTED_OPEN_PARENTHESIS;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MR_NO_SYNTAX;
import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_MATCHING_RULE_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/MatchingRuleUse.java

@@ -29,13 +29,12 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_MATCHING_RULE;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java

@@ -29,21 +29,18 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_EXPECTED_OPEN_PARENTHESIS;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_MRUSE_NO_ATTR;
import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_MATCHING_RULE_USE_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.Set;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/NameAndOptionalUIDSyntaxImpl.java

@@ -29,16 +29,14 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAMEANDUID_ILLEGAL_BINARY_DIGIT;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAMEANDUID_INVALID_DN;
import static org.opends.sdk.schema.SchemaConstants.EMR_UNIQUE_MEMBER_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_NAME_AND_OPTIONAL_UID_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DN;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.MessageBuilder;




 sdk/src/org/opends/sdk/schema/NameForm.java

@@ -29,15 +29,12 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAME_FORM_STRUCTURAL_CLASS_NOT_STRUCTURAL;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_OPTIONAL_ATTR;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_REQUIRED_ATTR;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_STRUCTURAL_CLASS;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/NameFormSyntaxImpl.java

@@ -29,18 +29,18 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_NAME_FORM_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.Set;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/NumericStringSyntaxImpl.java

@@ -29,16 +29,13 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_NUMERIC_STRING_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR;
import static org.opends.sdk.schema.SchemaConstants.EMR_NUMERIC_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_NUMERIC_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_EXACT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_NUMERIC_STRING_NAME;
import static org.opends.sdk.util.StaticUtils.isDigit;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/OIDSyntaxImpl.java

@@ -29,14 +29,13 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_OID_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_OID_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/ObjectClass.java

@@ -29,15 +29,13 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.EXTENSIBLE_OBJECT_OBJECTCLASS_NAME;
import static org.opends.sdk.schema.SchemaConstants.EXTENSIBLE_OBJECT_OBJECTCLASS_OID;
import static org.opends.sdk.schema.SchemaConstants.TOP_OBJECTCLASS_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/ObjectClassSyntaxImpl.java

@@ -29,18 +29,16 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_ILLEGAL_TOKEN;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_OBJECTCLASS_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_OPEN_PARENTHESIS;
import static org.opends.sdk.schema.SchemaConstants.EMR_OID_FIRST_COMPONENT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_OBJECTCLASS_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java

@@ -28,13 +28,10 @@



import org.opends.sdk.Assertion;
import org.opends.sdk.ConditionResult;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java

@@ -28,15 +28,15 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_EXPECTED_OPEN_PARENTHESIS;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.Assertion;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.Assertion;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/OctetStringEqualityMatchingRuleImpl.java

@@ -28,8 +28,8 @@



import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/OctetStringOrderingMatchingRuleImpl.java

@@ -28,8 +28,8 @@



import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/OctetStringSubstringMatchingRuleImpl.java

@@ -28,8 +28,8 @@



import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/OctetStringSyntaxImpl.java

@@ -29,12 +29,11 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_OCTET_STRING_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/OtherMailboxSyntaxImpl.java

@@ -29,13 +29,12 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_LIST_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_LIST_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_OTHER_MAILBOX_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/PostalAddressSyntaxImpl.java

@@ -29,12 +29,11 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_POSTAL_ADDRESS_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/PresentationAddressSyntaxImpl.java

@@ -31,8 +31,9 @@

import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/PrintableStringSyntaxImpl.java

@@ -29,12 +29,12 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_PRINTABLE_STRING_EMPTY_VALUE;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_PRINTABLE_STRING_ILLEGAL_CHARACTER;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java

@@ -28,12 +28,10 @@



import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/ProtocolInformationSyntaxImpl.java

@@ -31,8 +31,9 @@

import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/RegexSyntaxImpl.java

@@ -29,18 +29,16 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_LDAPSYNTAX_REGEX_INVALID_VALUE;
import static org.opends.sdk.schema.SchemaConstants.AMR_DOUBLE_METAPHONE_OID;
import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.regex.Pattern;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/Schema.java

@@ -28,17 +28,20 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.*;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/SchemaBuilder.java

@@ -29,19 +29,15 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.*;
import java.util.regex.Pattern;

import org.opends.sdk.DecodeException;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.util.SubstringReader;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.*;




 sdk/src/org/opends/sdk/schema/SchemaConstants.java

@@ -28,7 +28,7 @@



import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/SchemaElement.java

@@ -33,7 +33,7 @@
import java.util.Map;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/SchemaException.java

@@ -29,8 +29,8 @@



import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.LocalizableException;




 sdk/src/org/opends/sdk/schema/SchemaNotFoundException.java

@@ -29,8 +29,8 @@



import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.LocalizableException;




 sdk/src/org/opends/sdk/schema/SchemaUtils.java

@@ -28,15 +28,15 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.isAlpha;
import static org.opends.sdk.util.StaticUtils.isDigit;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.util.*;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.SubstringReader;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.SubstringReader;




 sdk/src/org/opends/sdk/schema/SubstringAssertionSyntaxImpl.java

@@ -29,14 +29,12 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_SUBSTRING_ASSERTION_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.messages.Messages;
import com.sun.opends.sdk.util.MessageBuilder;
import com.sun.opends.sdk.util.Messages;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/SupportedAlgorithmSyntaxImpl.java

@@ -29,12 +29,11 @@



import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_SUPPORTED_ALGORITHM_NAME;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/Syntax.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.Collections;
import java.util.Iterator;
@@ -37,10 +37,11 @@
import java.util.Map;
import java.util.regex.Pattern;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/schema/SyntaxImpl.java

@@ -29,8 +29,9 @@



import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java

@@ -28,9 +28,10 @@



import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java

@@ -28,9 +28,10 @@



import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java

@@ -29,18 +29,14 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEPHONE_EMPTY;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEPHONE_ILLEGAL_CHAR;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEPHONE_NO_DIGITS;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEPHONE_NO_PLUS;
import static org.opends.sdk.schema.SchemaConstants.EMR_TELEPHONE_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_TELEPHONE_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_TELEPHONE_NAME;
import static org.opends.sdk.util.StaticUtils.isDigit;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/TeletexTerminalIdentifierSyntaxImpl.java

@@ -29,16 +29,14 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_TELETEX_TERM_ID_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.util.HashSet;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/TelexNumberSyntaxImpl.java

@@ -29,17 +29,12 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEX_TOO_SHORT;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_TELEX_TRUNCATED;
import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SMR_CASE_IGNORE_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_TELEX_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/UTCTimeSyntaxImpl.java

@@ -29,18 +29,19 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/schema/UUIDEqualityMatchingRuleImpl.java

@@ -28,14 +28,13 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/UUIDOrderingMatchingRuleImpl.java

@@ -28,14 +28,13 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH;
import static com.sun.opends.sdk.messages.Messages.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;




 sdk/src/org/opends/sdk/schema/UUIDSyntaxImpl.java

@@ -29,13 +29,12 @@



import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX;
import static com.sun.opends.sdk.util.Messages.WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_UUID_NAME;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/UniqueMemberEqualityMatchingRuleImpl.java

@@ -28,8 +28,8 @@



import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;




 sdk/src/org/opends/sdk/schema/UnknownSchemaElementException.java

@@ -29,8 +29,8 @@



import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.LocalizedIllegalArgumentException;




 sdk/src/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java

@@ -28,10 +28,11 @@



import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/schema/UserPasswordSyntaxImpl.java

@@ -29,18 +29,15 @@



import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_USERPW_NO_CLOSING_BRACE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_USERPW_NO_OPENING_BRACE;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_USERPW_NO_SCHEME;
import static com.sun.opends.sdk.util.Messages.ERR_ATTR_SYNTAX_USERPW_NO_VALUE;
import static org.opends.sdk.schema.SchemaConstants.EMR_USER_PASSWORD_EXACT_OID;
import static org.opends.sdk.schema.SchemaConstants.SYNTAX_USER_PASSWORD_NAME;
import static org.opends.sdk.util.StaticUtils.toLowerCase;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.schema.SchemaConstants.*;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;




 sdk/src/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java

@@ -28,15 +28,9 @@



import static org.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static org.opends.sdk.util.StringPrepProfile.TRIM;
import static org.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.sun.opends.sdk.util.StringPrepProfile.*;

import org.opends.sdk.Assertion;
import org.opends.sdk.ConditionResult;
import org.opends.sdk.DecodeException;
import org.opends.sdk.util.ByteSequence;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.*;




 sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java

@@ -31,13 +31,7 @@


import java.net.Socket;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.Principal;
import java.security.PrivateKey;
import java.security.UnrecoverableKeyException;
import java.security.*;
import java.security.cert.X509Certificate;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -47,7 +41,7 @@
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509KeyManager;

import org.opends.sdk.util.Platform;
import com.sun.opends.sdk.util.Platform;




 sdk/src/org/opends/sdk/tools/Argument.java

@@ -28,8 +28,8 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.util.Iterator;
import java.util.LinkedList;

 sdk/src/org/opends/sdk/tools/ArgumentException.java

@@ -28,8 +28,8 @@



import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
import org.opends.sdk.util.LocalizableException;




 sdk/src/org/opends/sdk/tools/ArgumentParser.java

@@ -28,10 +28,10 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
import static org.opends.sdk.util.StaticUtils.*;

import java.io.File;
import java.io.FileInputStream;

 sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;

import java.io.File;
@@ -55,12 +55,11 @@
import org.opends.sdk.requests.BindRequest;
import org.opends.sdk.requests.Requests;
import org.opends.sdk.sasl.*;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.SSLUtils;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.SSLUtils;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/tools/BooleanArgument.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.Messages.ERR_BOOLEANARG_NO_VALUE_ALLOWED;
import static com.sun.opends.sdk.messages.Messages.*;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;

 sdk/src/org/opends/sdk/tools/CLIException.java

@@ -28,10 +28,10 @@



import org.opends.sdk.util.LocalizableException;

import com.sun.opends.sdk.messages.Messages;
import com.sun.opends.sdk.util.LocalizableException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Messages;




 sdk/src/org/opends/sdk/tools/ConsoleApplication.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.Utils.*;

import java.io.*;

 sdk/src/org/opends/sdk/tools/DataSource.java

@@ -34,7 +34,7 @@
import java.io.IOException;
import java.util.*;

import org.opends.sdk.util.Validator;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/tools/FileBasedArgument.java

@@ -28,8 +28,8 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.BufferedReader;
import java.io.File;

 sdk/src/org/opends/sdk/tools/IntegerArgument.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;

 sdk/src/org/opends/sdk/tools/LDAPCompare.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;

@@ -44,10 +44,9 @@
import org.opends.sdk.requests.Requests;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.Base64;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.Base64;
import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;



 sdk/src/org/opends/sdk/tools/LDAPModify.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;

@@ -50,8 +50,8 @@
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;
import org.opends.sdk.util.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;



 sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java

@@ -1,20 +1,16 @@
package org.opends.sdk.tools;

import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;

import java.io.InputStream;
import java.io.OutputStream;

import org.opends.sdk.Connection;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ErrorResultException;
import org.opends.sdk.ResultCode;
import org.opends.sdk.*;
import org.opends.sdk.controls.Control;
import org.opends.sdk.extensions.PasswordModifyRequest;
import org.opends.sdk.extensions.PasswordModifyResult;
import org.opends.sdk.util.ByteString;

import com.sun.opends.sdk.util.Message;


 sdk/src/org/opends/sdk/tools/LDAPSearch.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;

import java.io.*;
@@ -48,11 +48,10 @@
import org.opends.sdk.responses.Result;
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.responses.SearchResultReference;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;




 sdk/src/org/opends/sdk/tools/ModRate.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;


 sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.Messages.ERR_MCARG_VALUE_NOT_ALLOWED;
import static com.sun.opends.sdk.messages.Messages.*;

import java.util.Collection;


 sdk/src/org/opends/sdk/tools/PromptingTrustManager.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;

import java.io.File;
import java.io.FileInputStream;
@@ -49,10 +49,9 @@
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;

import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.MessageBuilder;
import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/tools/SearchRate.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.Messages.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;


 sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java

@@ -50,7 +50,8 @@

import org.opends.sdk.DN;
import org.opends.sdk.schema.Schema;
import org.opends.sdk.util.Validator;

import com.sun.opends.sdk.util.Validator;




 sdk/src/org/opends/sdk/tools/Utils.java

@@ -28,24 +28,24 @@



import static com.sun.opends.sdk.util.Messages.*;
import static org.opends.sdk.util.StaticUtils.*;
import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.util.StaticUtils.*;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.StringTokenizer;

import org.opends.sdk.ByteString;
import org.opends.sdk.Connection;
import org.opends.sdk.DecodeException;
import org.opends.sdk.ErrorResultException;
import org.opends.sdk.AuthenticatedConnectionFactory.AuthenticatedConnection;
import org.opends.sdk.controls.*;
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.StaticUtils;

import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.StaticUtils;