From 8e398549fb76484e922d6ebfb8519d8dd3c1c2ac Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 10 Apr 2015 10:30:37 +0000
Subject: [PATCH] OPENDJ-1932 Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java | 13 ++----
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 15 +++++--
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java | 34 ++++++++++------
3 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
index 446a6c8..4b54b11 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
@@ -377,14 +377,11 @@
addScheduleErrors(getSchedule(), errors, lExportOptions);
if (wrapText.isSelected())
{
- String cols = wrapColumn.getText();
- int minValue = 1;
- int maxValue = 1000;
- LocalizableMessage errMsg = ERR_CTRL_PANEL_INVALID_WRAP_COLUMN.get(minValue,
- maxValue);
- int size1 = errors.size();
- checkIntValue(errors, cols, minValue, maxValue, errMsg);
- if (errors.size() > size1)
+ final String cols = wrapColumn.getText();
+ final int minValue = 1;
+ final int maxValue = 1000;
+ final LocalizableMessage errMsg = ERR_CTRL_PANEL_INVALID_WRAP_COLUMN.get(minValue, maxValue);
+ if (!checkIntValue(errors, cols, minValue, maxValue, errMsg))
{
setPrimaryInvalid(lExportOptions);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index 4c8786b..c47f7a3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -118,6 +118,8 @@
*/
public class NewBaseDNPanel extends StatusGenericPanel
{
+ private static final int MAX_ENTRIES_NUMBER_GENERATED = 1000;
+ private static final int MAX_ENTRIES_NUMBER_GENERATED_LOCAL = 20000;
private static final long serialVersionUID = -2680821576362341119L;
private static final LocalizableMessage NEW_BACKEND_TEXT = INFO_CTRL_PANEL_NEW_BACKEND_LABEL.get();
@@ -635,11 +637,14 @@
{
if (importAutomaticallyGenerated.isSelected())
{
- String nEntries = numberOfEntries.getText();
- int minValue = 1;
- int maxValue = isLocal() ? 20000 : 1000;
- LocalizableMessage errMsg = ERR_NUMBER_OF_ENTRIES_INVALID.get(minValue, maxValue);
- checkIntValue(errors, nEntries, minValue, maxValue, errMsg);
+ final int minValue = 1;
+ final int maxValue = isLocal() ? MAX_ENTRIES_NUMBER_GENERATED_LOCAL
+ : MAX_ENTRIES_NUMBER_GENERATED;
+ final LocalizableMessage errorMsg = ERR_NUMBER_OF_ENTRIES_INVALID.get(minValue, maxValue);
+ if (!checkIntValue(errors, numberOfEntries.getText(), minValue, maxValue, errorMsg))
+ {
+ setSecondaryInvalid(lNumberOfEntries);
+ }
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
index 3728876..982adbf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -1761,28 +1761,36 @@
/**
* Checks that the provided string value is a valid integer and if it is not
* updates a list of error messages with an error.
- * @param errors the list of error messages to be updated.
- * @param stringValue the string value to analyze.
- * @param minValue the minimum integer value accepted.
- * @param maxValue the maximum integer value accepted.
- * @param errMsg the error message to use to update the error list if the
- * provided value is not valid.
+ *
+ * @param errors
+ * the list of error messages to be updated.
+ * @param stringValue
+ * the string value to analyze.
+ * @param minValue
+ * the minimum integer value accepted.
+ * @param maxValue
+ * the maximum integer value accepted.
+ * @param errMsg
+ * the error message to use to update the error list if the provided
+ * value is not valid.
+ * @return {@code true} if the provided string value is a valid integer and if
+ * it is not updates a list of error messages with an error.
*/
- protected void checkIntValue(Collection<LocalizableMessage> errors, String stringValue,
+ protected boolean checkIntValue(Collection<LocalizableMessage> errors, String stringValue,
int minValue, int maxValue, LocalizableMessage errMsg)
{
try
{
int n = Integer.parseInt(stringValue);
- if (n > maxValue || n < minValue)
+ if (minValue <= n && n <= maxValue)
{
- throw new RuntimeException("Invalid value");
+ return true;
}
}
- catch (Throwable t)
- {
- errors.add(errMsg);
- }
+ catch (NumberFormatException ignored) {}
+
+ errors.add(errMsg);
+ return false;
}
/**
--
Gitblit v1.10.0