From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java | 54 +++++++++++++-----------------------------------------
1 files changed, 13 insertions(+), 41 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
index d6d4765..a319f50 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
@@ -283,17 +283,15 @@
/** {@inheritDoc} */
protected LocalizableMessage getTextForIcon(UIFactory.IconType iconType)
{
- LocalizableMessage text;
- if ((iconType == UIFactory.IconType.WAIT) &&
+ if (iconType == UIFactory.IconType.WAIT &&
rbReplicated.isSelected() && cbTopologyExists.isSelected())
{
- text = INFO_CONTACTING_SERVER_LABEL.get();
+ return INFO_CONTACTING_SERVER_LABEL.get();
}
else
{
- text = super.getTextForIcon(iconType);
+ return super.getTextForIcon(iconType);
}
- return text;
}
/**
@@ -304,41 +302,25 @@
*/
private Object getDefaultValue(FieldName fieldName)
{
- Object value;
AuthenticationData auth =
defaultUserData.getReplicationOptions().getAuthenticationData();
switch (fieldName)
{
case REPLICATION_PORT:
- value = defaultUserData.getReplicationOptions().getReplicationPort();
- break;
-
+ return defaultUserData.getReplicationOptions().getReplicationPort();
case REMOTE_SERVER_DN:
- value = auth.getDn();
- break;
-
+ return auth.getDn();
case REMOTE_SERVER_PWD:
- value = auth.getPwd();
- break;
-
+ return auth.getPwd();
case REMOTE_SERVER_HOST:
- value = auth.getHostName();
- break;
-
+ return auth.getHostName();
case REMOTE_SERVER_PORT:
- value = auth.getPort();
- break;
-
+ return auth.getPort();
case REPLICATION_OPTIONS:
- value = defaultUserData.getReplicationOptions().getType();
- break;
-
+ return defaultUserData.getReplicationOptions().getType();
default:
- throw new IllegalArgumentException("Unknown field name: " +
- fieldName);
+ throw new IllegalArgumentException("Unknown field name: " + fieldName);
}
-
- return value;
}
/**
@@ -349,20 +331,12 @@
*/
private String getDefaultStringValue(FieldName fieldName)
{
- String value = null;
-
Object v = getDefaultValue(fieldName);
if (v != null)
{
- if (v instanceof String)
- {
- value = (String) v;
- } else
- {
- value = String.valueOf(v);
- }
+ return String.valueOf(v);
}
- return value;
+ return null;
}
/**
@@ -408,16 +382,14 @@
for (FieldName fieldName : hm.keySet())
{
- JTextComponent field;
LabelFieldDescriptor desc = hm.get(fieldName);
String defaultValue = getDefaultStringValue(fieldName);
- field = UIFactory.makeJTextComponent(desc, defaultValue);
+ JTextComponent field = UIFactory.makeJTextComponent(desc, defaultValue);
hmFields.put(fieldName, field);
JLabel l = UIFactory.makeJLabel(desc);
-
l.setLabelFor(field);
hmLabels.put(fieldName, l);
--
Gitblit v1.10.0