From a21bf04f4329e6c386345307814f9cc4a37a97f0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 27 Sep 2007 15:00:36 +0000
Subject: [PATCH] Rename ContainsValueCondition to ContainsCondition to align it with the factory method name in Conditions and the element name in the XML schema.
---
opendj-sdk/opends/src/server/org/opends/server/admin/condition/ContainsCondition.java | 4 ++--
opendj-sdk/opends/src/server/org/opends/server/admin/condition/Conditions.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java | 6 +++---
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/condition/Conditions.java b/opendj-sdk/opends/src/server/org/opends/server/admin/condition/Conditions.java
index c62df51..3e62f76 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/condition/Conditions.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/condition/Conditions.java
@@ -149,7 +149,7 @@
*/
public static Condition contains(String propertyName,
String propertyStringValue) {
- return new ContainsValueCondition(propertyName, propertyStringValue);
+ return new ContainsCondition(propertyName, propertyStringValue);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/condition/ContainsValueCondition.java b/opendj-sdk/opends/src/server/org/opends/server/admin/condition/ContainsCondition.java
similarity index 97%
rename from opendj-sdk/opends/src/server/org/opends/server/admin/condition/ContainsValueCondition.java
rename to opendj-sdk/opends/src/server/org/opends/server/admin/condition/ContainsCondition.java
index 1103c77..4f9f3ef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/condition/ContainsValueCondition.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/condition/ContainsCondition.java
@@ -47,7 +47,7 @@
* A condition which evaluates to <code>true</code> if and only if a
* property contains a particular value.
*/
-public final class ContainsValueCondition implements Condition {
+public final class ContainsCondition implements Condition {
/**
* The strongly typed underlying implementation.
@@ -134,7 +134,7 @@
* The string representation of the required property
* value.
*/
- public ContainsValueCondition(String propertyName, String stringValue) {
+ public ContainsCondition(String propertyName, String stringValue) {
Validator.ensureNotNull(propertyName, stringValue);
this.propertyName = propertyName;
this.propertyStringValue = stringValue;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index 9708b8b..537d0ef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -74,7 +74,7 @@
import org.opends.server.admin.client.MissingMandatoryPropertiesException;
import org.opends.server.admin.client.OperationRejectedException;
import org.opends.server.admin.condition.Condition;
-import org.opends.server.admin.condition.ContainsValueCondition;
+import org.opends.server.admin.condition.ContainsCondition;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.tools.ClientException;
import org.opends.server.util.args.ArgumentException;
@@ -495,9 +495,9 @@
while (!condition.evaluate(context, ref)) {
boolean isBadReference = true;
- if (condition instanceof ContainsValueCondition) {
+ if (condition instanceof ContainsCondition) {
// Attempt to automatically enable the managed object.
- ContainsValueCondition cvc = (ContainsValueCondition) condition;
+ ContainsCondition cvc = (ContainsCondition) condition;
app.println();
if (app.confirmAction(
INFO_EDITOR_PROMPT_ENABLED_REFERENCED_COMPONENT.get(rufn,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
index 216a4fb..f57a43f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
@@ -63,7 +63,7 @@
import org.opends.server.admin.client.MissingMandatoryPropertiesException;
import org.opends.server.admin.client.OperationRejectedException;
import org.opends.server.admin.condition.Condition;
-import org.opends.server.admin.condition.ContainsValueCondition;
+import org.opends.server.admin.condition.ContainsCondition;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.tools.ClientException;
import org.opends.server.util.args.ArgumentException;
@@ -381,9 +381,9 @@
while (!condition.evaluate(context, ref)) {
boolean isBadReference = true;
- if (condition instanceof ContainsValueCondition) {
+ if (condition instanceof ContainsCondition) {
// Attempt to automatically enable the managed object.
- ContainsValueCondition cvc = (ContainsValueCondition) condition;
+ ContainsCondition cvc = (ContainsCondition) condition;
app.println();
if (app.confirmAction(
INFO_EDITOR_PROMPT_ENABLED_REFERENCED_COMPONENT.get(rufn,
--
Gitblit v1.10.0