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/guitools/controlpanel/ui/NewAttributePanel.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index a8fe3a8..427e38c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -716,23 +716,15 @@
{
DefaultComboBoxModel model = (DefaultComboBoxModel)combos[i].getModel();
int index = combos[i].getSelectedIndex();
- if (rules[i] != null)
+ if (model.getSize() > 0)
{
- if (model.getSize() > 0)
- {
- model.removeElementAt(0);
- }
- model.insertElementAt(INFO_CTRL_PANEL_DEFAULT_DEFINED_IN_SYNTAX.get(
- rules[i].getNameOrOID()), 0);
+ model.removeElementAt(0);
}
- else
- {
- if (model.getSize() > 0)
- {
- model.removeElementAt(0);
- }
- model.insertElementAt(NO_MATCHING_RULE, 0);
- }
+
+ final LocalizableMessage msg = rules[i] != null
+ ? INFO_CTRL_PANEL_DEFAULT_DEFINED_IN_SYNTAX.get(rules[i].getNameOrOID())
+ : NO_MATCHING_RULE;
+ model.insertElementAt(msg, 0);
combos[i].setSelectedIndex(index);
}
}
--
Gitblit v1.10.0