Author: chris.laprun(a)jboss.com Date: 2008-12-18 11:10:45 -0500 (Thu, 18 Dec 2008) New Revision: 12404 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/util/JSFFunctor.java Log: - JBPORTAL-2264, JBPORTAL-2259: Improved performance of functor. Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-12-18 11:13:47 UTC (rev 12403) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-12-18 16:10:45 UTC (rev 12404) @@ -110,20 +110,6 @@ /** . */ private AuthorizationBean auth = new InstanceAuthorizationBean(); - /** Removes white spaces from identifiers so that we can assign them to HTML id attributes. */ - private JSFFunctor idSanitizer = new JSFFunctor() - { - public Object get(Object parameter) - { - if (parameter instanceof String) - { - String id = (String)parameter; - return id.replaceAll("\\W|\\.", "_"); - } - return null; - } - }; - // Services accessors public RoleModule getRoleModule() @@ -163,7 +149,7 @@ */ public JSFFunctor getIdSanitizer() { - return idSanitizer; + return JSFFunctor.ID_SANITIZER; } // Navigational state accessor Modified: branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/util/JSFFunctor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/util/JSFFunctor.java 2008-12-18 11:13:47 UTC (rev 12403) +++ branches/JBoss_Portal_Branch_2_6/faces/src/main/org/jboss/portal/faces/util/JSFFunctor.java 2008-12-18 16:10:45 UTC (rev 12404) @@ -36,6 +36,30 @@ */ public abstract class JSFFunctor implements Map { + /** Removes white spaces and periods from identifiers so that we can assign them to HTML id attributes. */ + public static final JSFFunctor ID_SANITIZER = new JSFFunctor() + { + private String recent; + private String recentSanitized; + + public Object get(Object parameter) + { + if (parameter instanceof String) + { + if(parameter.equals(recent)) + { + return recentSanitized; + } + + String id = (String) parameter; + recent = id; + recentSanitized = id.replace(' ', '_').replace('.', '_'); + return recentSanitized; + } + return null; + } + }; + public int size() { return 0;