From 34a9d1734d80b8b9906a9e14692a7fa0eb3f1f1c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:35 +0000
Subject: [PATCH] Remove @Activate/RemoveOnceNewConfigFrameworkIsUsed
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
index a6f3746..8a1fc96 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
@@ -24,6 +24,7 @@
import java.util.TreeSet;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;;
/**
* The class used to describe the index configuration (the normal index: the one
@@ -35,7 +36,7 @@
private static final String[] DATABASE_INDEXES = new String[] {
DN2ID_INDEX_NAME, ID2CHILDREN_COUNT_NAME, ID2CHILDREN_INDEX_NAME, ID2SUBTREE_INDEX_NAME };
- private final SortedSet<IndexTypeDescriptor> types = new TreeSet<>();
+ private final SortedSet<IndexType> types = new TreeSet<>();
private final boolean isDatabaseIndex;
private final int entryLimit;
private final AttributeType attr;
@@ -67,7 +68,7 @@
* the entry limit for the index.
*/
public IndexDescriptor(
- String name, AttributeType attr, BackendDescriptor backend, Set<IndexTypeDescriptor> types, int entryLimit)
+ String name, AttributeType attr, BackendDescriptor backend, Set<IndexType> types, int entryLimit)
{
super(name, backend);
this.attr = attr;
@@ -104,7 +105,7 @@
*
* @return the type of indexes (equality, substring, etc.).
*/
- public SortedSet<IndexTypeDescriptor> getTypes()
+ public SortedSet<IndexType> getTypes()
{
return new TreeSet<>(types);
}
@@ -180,7 +181,7 @@
protected void recalculateHashCode()
{
final StringBuilder sb = new StringBuilder();
- for (final IndexTypeDescriptor t : types)
+ for (final IndexType t : types)
{
sb.append(t).append(",");
}
--
Gitblit v1.10.0