[syncope] branch 2_1_X updated: [SYNCOPE-1607] Fixing inverted arguments call to StringUtils#substringAfter

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new 4b0db83  [SYNCOPE-1607] Fixing inverted arguments call to 
StringUtils#substringAfter
4b0db83 is described below

commit 4b0db83814181726d4c09470573e5b71a07023f8
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Fri Jan 8 16:09:01 2021 +0100

    [SYNCOPE-1607] Fixing inverted arguments call to StringUtils#substringAfter
---
 .../apache/syncope/client/console/SyncopeConsoleApplication.java    | 6 +++---
 .../main/java/org/apache/syncope/client/console/pages/Login.java    | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
index b0e457d..8650808 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
@@ -117,7 +117,7 @@ public class SyncopeConsoleApplication extends 
AuthenticatedWebApplication {
     private List<String> domains;
 
     private Map<String, Class<? extends BasePage>> pageClasses;
-    
+
     private String defaultAnyLayoutClass;
 
     @SuppressWarnings("unchecked")
@@ -130,7 +130,7 @@ public class SyncopeConsoleApplication extends 
AuthenticatedWebApplication {
                     Class<?> clazz = 
ClassUtils.getClass(props.getProperty(className));
                     if (BasePage.class.isAssignableFrom(clazz)) {
                         pageClasses.put(
-                                StringUtils.substringAfter("page.", 
className), (Class<? extends BasePage>) clazz);
+                                StringUtils.substringAfter(className, 
"page."), (Class<? extends BasePage>) clazz);
                     } else {
                         LOG.warn("{} does not extend {}, ignoring...", 
clazz.getName(), BasePage.class.getName());
                     }
@@ -191,7 +191,7 @@ public class SyncopeConsoleApplication extends 
AuthenticatedWebApplication {
         pageClasses = Collections.unmodifiableMap(pageClasses);
 
         defaultAnyLayoutClass = props.getProperty("default.any.panel.class", 
AnyPanel.class.getName());
-        
+
         // Application settings
         IBootstrapSettings settings = new BootstrapSettings();
 
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java
index f5fc731..6087579 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java
@@ -116,8 +116,9 @@ public class Login extends WebPage {
         form.add(languageSelect.setOutputMarkupId(true));
 
         DomainDropDown domainSelect = new DomainDropDown("domain");
+        domainSelect.setOutputMarkupPlaceholderTag(true);
         if (SyncopeConsoleApplication.get().getDomains().size() == 1) {
-            domainSelect.setOutputMarkupPlaceholderTag(true);
+            domainSelect.setVisible(false);
         }
         domainSelect.add(new 
AjaxFormComponentUpdatingBehavior(Constants.ON_BLUR) {
 
@@ -256,7 +257,7 @@ public class Login extends WebPage {
     /**
      * Inner class which implements (custom) Domain DropDownChoice component.
      */
-    private class DomainDropDown extends BootstrapSelect<String> {
+    private static class DomainDropDown extends BootstrapSelect<String> {
 
         private static final long serialVersionUID = -7401167913360133325L;