cvs commit: jahia/core/src/java/org/jahia/engines/rights ManageRights.java

[Thomas Draier]

tdraier     2005/10/12 16:40:53 CEST

  Modified files:
    core/src/java/org/jahia/engines/rights ManageRights.java 
  Log:
  nicer fix for non-utf8
  
  Revision  Changes    Path
  1.13      +4 -2      
jahia/core/src/java/org/jahia/engines/rights/ManageRights.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/rights/ManageRights.java.diff?r1=1.12&r2=1.13&f=h
  
  
  
  Index: ManageRights.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/rights/ManageRights.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ManageRights.java 12 Oct 2005 09:04:08 -0000      1.12
  +++ ManageRights.java 12 Oct 2005 14:40:53 -0000      1.13
  @@ -36,6 +36,8 @@
   import org.jahia.services.pages.JahiaPage;
   import org.jahia.services.usermanager.JahiaGroup;
   import org.jahia.services.usermanager.JahiaUser;
  +import org.jahia.bin.Jahia;
  +import org.jahia.utils.JahiaTools;
   
   import java.security.Principal;
   import java.util.*;
  @@ -471,8 +473,8 @@
               final boolean isUser; // Only used for clearer log messages
   
               // Very nice way to kill weird non breaking space when non-utf8
  -            if (submitedACLEntries[i].length() - userNameWidth.intValue() == 
21) {
  -                submitedACLEntries[i] = (new 
StringBuffer(submitedACLEntries[i]).deleteCharAt(11)).toString();
  +            if (!Jahia.getSettings().isUtf8Encoding()) {
  +                submitedACLEntries[i] = 
JahiaTools.replacePattern(submitedACLEntries[i], "\u00C2\u00A0", " ");
               }
   
               logger.debug("Submited ACL entry : " + submitedACLEntries[i]);