From 1ef65104c4113a1c6fad7ee93bc9862218a4bc68 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 16 Feb 2015 14:10:23 +0000
Subject: [PATCH] AutoRefactor: common code in if else statements
---
opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
index 17c73ca..78af6f4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -652,18 +652,18 @@
boolean isAcceptable = true;
for (ManagedObject<?> mo : findReferences(context,
getManagedObjectDefinition(), path.getName())) {
+ LocalizableMessage msg;
String name = mo.getManagedObjectPath().getName();
if (name == null) {
- LocalizableMessage msg = ERR_CLIENT_REFINT_CANNOT_DELETE_WITHOUT_NAME.get(
+ msg = ERR_CLIENT_REFINT_CANNOT_DELETE_WITHOUT_NAME.get(
getName(), mo.getManagedObjectDefinition().getUserFriendlyName(),
getManagedObjectDefinition().getUserFriendlyName());
- unacceptableReasons.add(msg);
} else {
- LocalizableMessage msg = ERR_CLIENT_REFINT_CANNOT_DELETE_WITH_NAME.get(
+ msg = ERR_CLIENT_REFINT_CANNOT_DELETE_WITH_NAME.get(
getName(), mo.getManagedObjectDefinition().getUserFriendlyName(),
name, getManagedObjectDefinition().getUserFriendlyName());
- unacceptableReasons.add(msg);
}
+ unacceptableReasons.add(msg);
isAcceptable = false;
}
return isAcceptable;
@@ -691,20 +691,18 @@
getManagedObjectDefinition(), managedObject.getManagedObjectPath()
.getName())) {
if (targetNeedsEnablingCondition.evaluate(context, mo)) {
+ LocalizableMessage msg;
String name = mo.getManagedObjectPath().getName();
if (name == null) {
- LocalizableMessage msg = ERR_CLIENT_REFINT_CANNOT_DISABLE_WITHOUT_NAME.get(
- managedObject.getManagedObjectDefinition()
- .getUserFriendlyName(), getName(), mo
- .getManagedObjectDefinition().getUserFriendlyName());
- unacceptableReasons.add(msg);
+ msg = ERR_CLIENT_REFINT_CANNOT_DISABLE_WITHOUT_NAME.get(
+ managedObject.getManagedObjectDefinition().getUserFriendlyName(),
+ getName(), mo.getManagedObjectDefinition().getUserFriendlyName());
} else {
- LocalizableMessage msg = ERR_CLIENT_REFINT_CANNOT_DISABLE_WITH_NAME.get(
- managedObject.getManagedObjectDefinition()
- .getUserFriendlyName(), getName(), mo
- .getManagedObjectDefinition().getUserFriendlyName(), name);
- unacceptableReasons.add(msg);
+ msg = ERR_CLIENT_REFINT_CANNOT_DISABLE_WITH_NAME.get(
+ managedObject.getManagedObjectDefinition().getUserFriendlyName(),
+ getName(), mo.getManagedObjectDefinition().getUserFriendlyName(), name);
}
+ unacceptableReasons.add(msg);
isAcceptable = false;
}
}
--
Gitblit v1.10.0