From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/tools/LDAPToolOptions.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/LDAPToolOptions.java b/opends/src/server/org/opends/server/tools/LDAPToolOptions.java
index 51b03ec..763f99f 100644
--- a/opends/src/server/org/opends/server/tools/LDAPToolOptions.java
+++ b/opends/src/server/org/opends/server/tools/LDAPToolOptions.java
@@ -27,9 +27,7 @@
package org.opends.server.tools;
import java.util.ArrayList;
-import org.opends.server.protocols.ldap.LDAPControl;
-
-
+import org.opends.server.types.Control;
/**
@@ -43,7 +41,7 @@
private boolean verbose = false;
private boolean continueOnError = false;
private String encoding = System.getProperty("file.encoding");
- private ArrayList<LDAPControl> controls = new ArrayList<LDAPControl>();
+ private ArrayList<Control> controls = new ArrayList<Control>();
/**
* Creates a the tool options instance.
@@ -128,7 +126,7 @@
*
* @return The controls to apply to the operation.
*/
- public ArrayList<LDAPControl> getControls()
+ public ArrayList<Control> getControls()
{
return controls;
}
@@ -138,7 +136,7 @@
*
* @param controls The set of controls to apply to the operation.
*/
- public void setControls(ArrayList<LDAPControl> controls)
+ public void setControls(ArrayList<Control> controls)
{
this.controls = controls;
}
--
Gitblit v1.10.0