From fc11cb328f23d141ecfedd16d791e39fd4e1d299 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 18 Sep 2012 07:58:15 +0000
Subject: [PATCH] Fix OPENDJ-595: Merge ASN1Constants into ASN1
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java
index 7d113de..caa3c27 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Writer.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2012 ForgeRock AS
*/
package org.forgerock.opendj.asn1;
-import static org.forgerock.opendj.asn1.ASN1Constants.*;
-
import java.io.IOException;
import org.forgerock.opendj.ldap.ByteSequence;
@@ -49,35 +47,35 @@
* {@inheritDoc}
*/
public ASN1Writer writeBoolean(final boolean value) throws IOException {
- return writeBoolean(UNIVERSAL_BOOLEAN_TYPE, value);
+ return writeBoolean(ASN1.UNIVERSAL_BOOLEAN_TYPE, value);
}
/**
* {@inheritDoc}
*/
public ASN1Writer writeEnumerated(final int value) throws IOException {
- return writeEnumerated(UNIVERSAL_ENUMERATED_TYPE, value);
+ return writeEnumerated(ASN1.UNIVERSAL_ENUMERATED_TYPE, value);
}
/**
* {@inheritDoc}
*/
public ASN1Writer writeInteger(final int value) throws IOException {
- return writeInteger(UNIVERSAL_INTEGER_TYPE, value);
+ return writeInteger(ASN1.UNIVERSAL_INTEGER_TYPE, value);
}
/**
* {@inheritDoc}
*/
public ASN1Writer writeInteger(final long value) throws IOException {
- return writeInteger(UNIVERSAL_INTEGER_TYPE, value);
+ return writeInteger(ASN1.UNIVERSAL_INTEGER_TYPE, value);
}
/**
* {@inheritDoc}
*/
public ASN1Writer writeNull() throws IOException {
- return writeNull(UNIVERSAL_NULL_TYPE);
+ return writeNull(ASN1.UNIVERSAL_NULL_TYPE);
}
/**
@@ -99,35 +97,35 @@
*/
public ASN1Writer writeOctetString(final byte[] value, final int offset, final int length)
throws IOException {
- return writeOctetString(UNIVERSAL_OCTET_STRING_TYPE, value, offset, length);
+ return writeOctetString(ASN1.UNIVERSAL_OCTET_STRING_TYPE, value, offset, length);
}
/**
* {@inheritDoc}
*/
public ASN1Writer writeOctetString(final ByteSequence value) throws IOException {
- return writeOctetString(UNIVERSAL_OCTET_STRING_TYPE, value);
+ return writeOctetString(ASN1.UNIVERSAL_OCTET_STRING_TYPE, value);
}
/**
* {@inheritDoc}
*/
public ASN1Writer writeOctetString(final String value) throws IOException {
- return writeOctetString(UNIVERSAL_OCTET_STRING_TYPE, value);
+ return writeOctetString(ASN1.UNIVERSAL_OCTET_STRING_TYPE, value);
}
/**
* {@inheritDoc}
*/
public ASN1Writer writeStartSequence() throws IOException {
- return writeStartSequence(UNIVERSAL_SEQUENCE_TYPE);
+ return writeStartSequence(ASN1.UNIVERSAL_SEQUENCE_TYPE);
}
/**
* {@inheritDoc}
*/
public ASN1Writer writeStartSet() throws IOException {
- return writeStartSet(UNIVERSAL_SET_TYPE);
+ return writeStartSet(ASN1.UNIVERSAL_SET_TYPE);
}
}
--
Gitblit v1.10.0