From ef171d1e8556bc183ee08e9f79c24e41c99a8976 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 15 Jul 2015 09:44:44 +0000
Subject: [PATCH] Autorefactor'ed Map usage
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
index 3322fc0..932f4fe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
@@ -24,7 +24,6 @@
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
@@ -35,6 +34,7 @@
import javax.swing.SwingUtilities;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.guitools.controlpanel.browser.BrowserController;
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.task.NewEntryTask;
@@ -42,7 +42,6 @@
import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.util.LDIFException;
@@ -51,21 +50,14 @@
/**
* Abstract class used to re-factor some code among the different panels that
* are used to create a new entry.
- *
*/
public abstract class AbstractNewEntryPanel extends StatusGenericPanel
{
private static final long serialVersionUID = 6894546787832469213L;
- /**
- * The parent node that was selected when the user clicked on the new entry
- * action.
- */
+ /** The parent node that was selected when the user clicked on the new entry action. */
protected BasicNode parentNode;
-
- /**
- * The browser controller.
- */
+ /** The browser controller. */
protected BrowserController controller;
/**
@@ -243,12 +235,10 @@
*/
protected Entry getEntry() throws LDIFException, IOException
{
- Entry entry;
LDIFImportConfig ldifImportConfig = null;
try
{
String ldif = getLDIF();
-
if (ldif.trim().length() == 0)
{
throw new LDIFException(ERR_LDIF_REPRESENTATION_REQUIRED.get());
@@ -256,18 +246,16 @@
ldifImportConfig = new LDIFImportConfig(new StringReader(ldif));
LDIFReader reader = new LDIFReader(ldifImportConfig);
- entry = reader.readEntry(checkSchema());
+ Entry entry = reader.readEntry(checkSchema());
if (entry == null)
{
throw new LDIFException(ERR_LDIF_REPRESENTATION_REQUIRED.get());
}
- else
+ if (entry.getObjectClasses().isEmpty())
{
- if (entry.getObjectClasses().size() == 0)
- {
- throw new LDIFException(ERR_OBJECTCLASS_FOR_ENTRY_REQUIRED.get());
- }
+ throw new LDIFException(ERR_OBJECTCLASS_FOR_ENTRY_REQUIRED.get());
}
+ return entry;
}
finally
{
@@ -276,7 +264,6 @@
ldifImportConfig.close();
}
}
- return entry;
}
/**
--
Gitblit v1.10.0