code cleanup and checkstyle fix to import

src/main/java/password/pwm/config/CustomLinkConfiguration.java

@@ -28,22 +28,24 @@ import password.pwm.util.java.JsonUtil;
 import password.pwm.util.java.StringUtil;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Map;
 
 /**
- * @author Jason D. Rivard
+ * @author Richard A. Keil
  */
 public class CustomLinkConfiguration implements Serializable {
 // ------------------------------ FIELDS ------------------------------
 
-    public enum Type {text, email, number, password, random, tel, hidden, date, datetime, time, week, month, url, select, userDN, checkbox, customLink}
+    public enum Type {text, url, select, checkbox, customLink}
 
     private String name;
-    private Type type = Type.text;
+    private Type type = Type.customLink;
     private Map<String,String> labels = Collections.singletonMap("", "");
     private Map<String,String> description = Collections.singletonMap("","");
     private String customLinkUrl = "";
-    private boolean customLinkNewWindow = true;
+    private boolean customLinkNewWindow;
     private Map<String,String> selectOptions = Collections.emptyMap();
 
 // -------------------------- STATIC METHODS --------------------------

src/main/java/password/pwm/config/value/CustomLinkValue.java

@@ -121,6 +121,8 @@ public class CustomLinkValue extends AbstractValue implements StoredValue {
                 sb.append(" Type:").append(formRow.getType());
                 sb.append("\n");
                 sb.append(" Description:").append(JsonUtil.serializeMap(formRow.getLabelDescriptionLocaleMap())).append("\n");
+                sb.append(" Name:").append(formRow.isCustomLinkNewWindow()).append("\n");
+                sb.append(" Name:").append(formRow.getcustomLinkUrl()).append("\n");
                 if (formRow.getSelectOptions() != null && !formRow.getSelectOptions().isEmpty()) {
                     sb.append(" Select Options: ").append(JsonUtil.serializeMap(formRow.getSelectOptions())).append("\n");
                 }

src/main/webapp/WEB-INF/jsp/fragment/form.jsp

@@ -47,9 +47,9 @@
     <% if (linkConfigurationList != null) { %>
         <% for (final CustomLinkConfiguration loopList : linkConfigurationList) { %>
            <% if (loopList.isCustomLinkNewWindow()) { %>
-                <a href=<%=loopList.getcustomLinkUrl()%> title=<%=loopList.getDescription(formLocale)%> target="_blank"><%=loopList.getLabel(formLocale)%></a>
+                <a href=<%=loopList.getcustomLinkUrl()%> title=<%=loopList.getDescription(formLocale)%> target="_blank"><%=loopList.getLabel(formLocale)%></a><br>
             <% } else { %>
-                <a href=<%=loopList.getcustomLinkUrl()%> title=<%=loopList.getDescription(formLocale)%>><%=loopList.getLabel(formLocale)%></a>
+                <a href=<%=loopList.getcustomLinkUrl()%> title=<%=loopList.getDescription(formLocale)%>><%=loopList.getLabel(formLocale)%></a><br>
             <% } %>
         <% } %>
     <% } %>
@@ -79,12 +79,6 @@
     <% if (loopConfiguration.getType().equals(FormConfiguration.Type.hidden)) { %>
     <input style="text-align: left;" id="<%=loopConfiguration.getName()%>" type="hidden" class="inputfield"
            name="<%=loopConfiguration.getName()%>" value="<%= currentValue %>"/>
-    <% } else if (loopConfiguration.getType().equals(FormConfiguration.Type.customLink)) { %>
-        <% if (loopConfiguration.isCustomLinkNewWindow()) { %>
-            <a href=<%=loopConfiguration.getcustomLinkUrl()%> title=<%=loopConfiguration.getDescription(formLocale)%> target="_blank"><%=loopConfiguration.getLabel(formLocale)%></a>
-        <% } else { %>
-            <a href=<%=loopConfiguration.getcustomLinkUrl()%> title=<%=loopConfiguration.getDescription(formLocale)%>><%=loopConfiguration.getLabel(formLocale)%></a>
-        <% } %>
     <% } else if (loopConfiguration.getType().equals(FormConfiguration.Type.checkbox)) { %>
     <% final boolean checked = FormUtility.checkboxValueIsChecked(formDataMap.get(loopConfiguration)); %>
     <label class="checkboxWrapper">

src/main/webapp/public/resources/js/configeditor-settings.js

@@ -3561,6 +3561,7 @@ CustomLinkHandler.showOptionsDialog = function(keyName, iteration) {
 
         var initDialogWidgets = function () {
 
+            PWM_MAIN.clearDijitWidget(inputID + "DescriptionValue");
             PWM_MAIN.addEventHandler(inputID + 'DescriptionValue', 'change', function () {
                 CustomLinkHandler.showDescriptionDialog(keyName, iteration);
             });
@@ -3569,42 +3570,19 @@ CustomLinkHandler.showOptionsDialog = function(keyName, iteration) {
                 CustomLinkHandler.showDescriptionDialog(keyName, iteration);
             });
 
+            PWM_MAIN.clearDijitWidget(inputID + "SiteURL");
             PWM_MAIN.addEventHandler(inputID + 'SiteURL', 'change', function () {
                 PWM_VAR['clientSettingCache'][keyName][iteration]['customLinkUrl'] = this.value;
                 CustomLinkHandler.write(keyName)
             });
 
+            PWM_MAIN.clearDijitWidget(inputID + "customLinkNewWindow");
             PWM_MAIN.addEventHandler(inputID + 'customLinkNewWindow', 'click', function () {
+                if(this.value === "on")
+                    this.value = "true";
                 PWM_VAR['clientSettingCache'][keyName][iteration]['customLinkNewWindow'] = this.value;
                 CustomLinkHandler.write(keyName)
             });
-
-            PWM_MAIN.clearDijitWidget(inputID + "DescriptionValue");
-            //new dijit.form.Textarea({
-            //    value: PWM_VAR['clientSettingCache'][keyName][iteration]['description'][''],
-            //    onChange: function () {
-            //        PWM_VAR['clientSettingCache'][keyName][iteration]['description'][''] = this.value;
-            //        CustomLinkHandler.write(keyName)
-            //    }
-            //}, inputID + "DescriptionValue");
-
-            PWM_MAIN.clearDijitWidget(inputID + "newWindow");
-            //new dijit.form.CheckBox({
-            //    checked: PWM_VAR['clientSettingCache'][keyName][iteration]['customLinkNewWindow'],
-            //    onChange: function () {
-            //        PWM_VAR['clientSettingCache'][keyName][iteration]['customLinkNewWindow'] = this.checked;
-            //        CustomLinkHandler.write(keyName)
-            //    }
-            //}, inputID + "newWindow");
-
-            PWM_MAIN.clearDijitWidget(inputID + "SiteURL");
-            //new dijit.form.Textarea({
-            //    value: PWM_VAR['clientSettingCache'][keyName][iteration]['customLinkUrl'],
-            //    onChange: function () {
-            //        PWM_VAR['clientSettingCache'][keyName][iteration]['customLinkUrl'] = this.value;
-            //        CustomLinkHandler.write(keyName)
-            //    }
-            //}, inputID + "SiteURL");
         };
 
         PWM_MAIN.showDialog({