From d56976462ee0ecdd405e45e0154eb5fb48e4488b Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 27 Nov 2009 23:53:01 +0000
Subject: [PATCH] Consolidate some of the code used to display the equivalent command-line in the control panel.
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index c43a8cd..331cfbd 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -197,7 +197,8 @@
*/
public void configurationChanged(ConfigurationChangeEvent ev)
{
- ArrayList<AttributeSyntax> newSyntaxes = new ArrayList<AttributeSyntax>();
+ ArrayList<AttributeSyntax<?>> newSyntaxes =
+ new ArrayList<AttributeSyntax<?>>();
final ServerDescriptor desc = ev.getNewDescriptor();
Schema s = desc.getSchema();
@@ -210,11 +211,11 @@
{
schema = s;
- HashMap<String, AttributeSyntax> syntaxNameMap = new HashMap<String,
- AttributeSyntax>();
+ HashMap<String, AttributeSyntax<?>> syntaxNameMap = new HashMap<String,
+ AttributeSyntax<?>>();
for (String key : schema.getSyntaxes().keySet())
{
- AttributeSyntax syntax = schema.getSyntax(key);
+ AttributeSyntax<?> syntax = schema.getSyntax(key);
String name = syntax.getSyntaxName();
if (name == null)
{
@@ -332,8 +333,8 @@
{
for (int i=0; i<syntax.getModel().getSize(); i++)
{
- AttributeSyntax syn =
- (AttributeSyntax)syntax.getModel().getElementAt(i);
+ AttributeSyntax<?> syn =
+ (AttributeSyntax<?>)syntax.getModel().getElementAt(i);
if ("DirectoryString".equals(syn.getSyntaxName()))
{
syntax.setSelectedIndex(i);
@@ -504,7 +505,7 @@
return INFO_CTRL_PANEL_TYPE_MATCHING_RULE.get();
}
- for (AttributeSyntax attr : schema.getSyntaxes().values())
+ for (AttributeSyntax<?> attr : schema.getSyntaxes().values())
{
String n = attr.getSyntaxName();
if (n != null)
@@ -647,7 +648,6 @@
public void stateChanged(ChangeEvent e)
{
p.setVisible(expander.isSelected());
- packParentDialog();
}
};
expander.addChangeListener(changeListener);
@@ -681,7 +681,7 @@
private void updateDefaultMatchingRuleNames()
{
- AttributeSyntax syn = (AttributeSyntax)syntax.getSelectedItem();
+ AttributeSyntax<?> syn = (AttributeSyntax<?>)syntax.getSelectedItem();
if (syn != null)
{
MatchingRule[] rules = {syn.getApproximateMatchingRule(),
@@ -840,7 +840,7 @@
getAllNames(),
getOID(), description.getText().trim(),
getSuperior(),
- (AttributeSyntax)syntax.getSelectedItem(),
+ (AttributeSyntax<?>)syntax.getSelectedItem(),
getApproximateMatchingRule(),
getEqualityMatchingRule(),
getOrderingMatchingRule(),
--
Gitblit v1.10.0