From 02d9dccf732357f76a9db0f0e2eef75c0371e7d3 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 09 Jun 2015 13:53:24 +0000
Subject: [PATCH] OPENDJ-2111 GUI Removes matching rules type
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java | 37 +------------------------------------
1 files changed, 1 insertions(+), 36 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
index 1a899d1..6dc84b1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
@@ -64,7 +64,6 @@
private JLabel oid = Utilities.createDefaultLabel();
private JLabel description = Utilities.createDefaultLabel();
private JLabel syntax = Utilities.createDefaultLabel();
- private JLabel type = Utilities.createDefaultLabel();
private JList usedByAttributes = new JList(new DefaultListModel());
/**
@@ -124,10 +123,9 @@
INFO_CTRL_PANEL_MATCHING_RULE_NAME.get(),
INFO_CTRL_PANEL_MATCHING_RULE_OID.get(),
INFO_CTRL_PANEL_MATCHING_RULE_DESCRIPTION.get(),
- INFO_CTRL_PANEL_MATCHING_RULE_TYPE.get(),
INFO_CTRL_PANEL_MATCHING_RULE_SYNTAX.get()
};
- JLabel[] values = {name, oid, description, type, syntax};
+ JLabel[] values = {name, oid, description, syntax};
gbc.gridy ++;
gbc.gridwidth = 1;
gbc.anchor = GridBagConstraints.WEST;
@@ -232,8 +230,6 @@
}
description.setText(n);
- type.setText(getTypeValue(matchingRule).toString());
-
Comparator<String> lowerCaseComparator = new LowerCaseComparator();
TreeSet<String> attributes = new TreeSet<>(lowerCaseComparator);
for (AttributeType attr : schema.getAttributeTypes().values())
@@ -254,37 +250,6 @@
}
}
- /**
- * Returns the message for the type of the provided matching rule.
- * @param matchingRule the matching rule.
- * @return the message for the type of the provided matching rule.
- */
- static LocalizableMessage getTypeValue(MatchingRule matchingRule)
- {
- LocalizableMessage text;
- if (Utilities.isEqualityMatchingRule(matchingRule))
- {
- text = INFO_CTRL_PANEL_INDEX_EQUALITY.get();
- }
- else if (Utilities.isOrderingMatchingRule(matchingRule))
- {
- text = INFO_CTRL_PANEL_INDEX_ORDERING.get();
- }
- else if (Utilities.isSubstringMatchingRule(matchingRule))
- {
- text = INFO_CTRL_PANEL_INDEX_SUBSTRING.get();
- }
- else if (Utilities.isApproximateMatchingRule(matchingRule))
- {
- text = INFO_CTRL_PANEL_INDEX_APPROXIMATE.get();
- }
- else
- {
- text = NOT_APPLICABLE;
- }
- return text;
- }
-
private void usedBySelected()
{
String o = (String)usedByAttributes.getSelectedValue();
--
Gitblit v1.10.0