Rename ContainsValueCondition to ContainsCondition to align it with the fac...

matthew_swift

27.00.2007 a9dddc41f04c566bcdd673ee1fc2c061548c4953

Rename ContainsValueCondition to ContainsCondition to align it with the factory method name in Conditions and the element name in the XML schema.

 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);
  }



 opends/src/server/org/opends/server/admin/condition/ContainsCondition.java

File was renamed from opends/src/server/org/opends/server/admin/condition/ContainsValueCondition.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;

 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,

 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,