From 9e82f3d205d5756d6cc6a400dc92e07c078862d6 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 17 Apr 2015 08:54:20 +0000
Subject: [PATCH] OPENDJ-1929 Remove max block size in control panel
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java | 49 -------------------------------------------------
1 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
index dd36296..6e81f24 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
@@ -76,8 +76,6 @@
import org.opends.guitools.controlpanel.ui.renderer.VLVSortOrderRenderer;
import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.admin.DefinedDefaultBehaviorProvider;
-import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
@@ -137,8 +135,6 @@
/** Filter text field. */
protected final JTextField filter = Utilities.createLongTextField();
- /** Max block size text field. */
- protected final JTextField maxBlockSize = Utilities.createShortTextField();
/** Attributes combo box. */
protected final JComboBox attributes = Utilities.createComboBox();
@@ -188,22 +184,6 @@
/** The list of custom attribute names. */
private final TreeSet<String> customAttrNames = new TreeSet<String>(new LowerCaseComparator());
- private final int defaultVLVEntryLimitValue;
- {
- DefinedDefaultBehaviorProvider<Integer> provider =
- (DefinedDefaultBehaviorProvider<Integer>) LocalDBVLVIndexCfgDefn.getInstance()
- .getMaxBlockSizePropertyDefinition().getDefaultBehaviorProvider();
- defaultVLVEntryLimitValue = Integer.parseInt(provider.getDefaultValues().iterator().next());
- }
-
- /** Minimum value for max block size. */
- private final int MIN_MAX_BLOCK_SIZE = LocalDBVLVIndexCfgDefn.getInstance().getMaxBlockSizePropertyDefinition()
- .getLowerLimit();
- /** Maximum value for max block size. */
- private final int MAX_MAX_BLOCK_SIZE = 2147483647;
- /** Default value for max block size. */
- private final int DEFAULT_MAX_BLOCK_SIZE = defaultVLVEntryLimitValue;
-
/**
* Constructor.
*
@@ -252,7 +232,6 @@
lines.add("ds-cfg-sort-order: " + getSortOrderStringValue(getSortOrder()));
lines.add("ds-cfg-base-dn: " + getBaseDN());
lines.add("ds-cfg-scope: " + VLVIndexDescriptor.getLocalDBVLVIndexScope(getScope()));
- lines.add("ds-cfg-max-block-size: " + maxBlockSize.getText().trim());
StringBuilder sb = new StringBuilder();
for (String line : lines)
{
@@ -701,22 +680,6 @@
setPrimaryInvalid(lSortOrder);
}
- String v = maxBlockSize.getText();
- try
- {
- int n = Integer.parseInt(v);
- if (n < MIN_MAX_BLOCK_SIZE || n > MAX_MAX_BLOCK_SIZE)
- {
- errors.add(ERR_CTRL_PANEL_INVALID_MAX_BLOCK_SIZE_FOR_VLV_PROVIDED.get(MIN_MAX_BLOCK_SIZE, MAX_MAX_BLOCK_SIZE));
- setPrimaryInvalid(lMaxBlockSize);
- }
- }
- catch (Throwable t)
- {
- errors.add(ERR_CTRL_PANEL_INVALID_MAX_BLOCK_SIZE_FOR_VLV_PROVIDED.get(MIN_MAX_BLOCK_SIZE, MAX_MAX_BLOCK_SIZE));
- setPrimaryInvalid(lMaxBlockSize);
- }
-
return errors;
}
@@ -907,18 +870,6 @@
gbc.insets.left = 0;
gbc.gridx = 0;
gbc.gridwidth = 1;
- c.add(lMaxBlockSize, gbc);
- gbc.insets.left = 10;
- gbc.gridx = 1;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- c.add(maxBlockSize, gbc);
- maxBlockSize.setText(String.valueOf(DEFAULT_MAX_BLOCK_SIZE));
- gbc.gridy++;
-
- gbc.insets.top = 10;
- gbc.insets.left = 0;
- gbc.gridx = 0;
- gbc.gridwidth = 1;
c.add(lSortOrder, gbc);
gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.insets.left = 10;
--
Gitblit v1.10.0