Changeset 28995

Show
Ignore:
Timestamp:
01/13/08 20:11:14 (11 months ago)
Author:
sfermigier
Message:

Misc forward ports.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/directory/DirectoryFunctions.java

    r28492 r28995  
    3737    /** 
    3838     * 
    39      * @param data commma sepparated values that will be used to create a list 
     39     * @param data comma separated values that will be used to create a list 
    4040     *            of structures containing an index also 
    4141     * @param type 

  • org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/directory/UIDirectorySelectItem.java

    r28569 r28995  
    7676        if (dirName != null) { 
    7777            try { 
    78                 DirectoryService service = (DirectoryService) Framework.getService(DirectoryService.class); 
     78                DirectoryService service = Framework.getService(DirectoryService.class); 
    7979                directorySession = service.open(dirName); 
    8080            } catch (Exception e) { 
    …… 
    8686    } 
    8787 
    88     protected void closeDirectorySession(Session directorySession) { 
     88    protected static void closeDirectorySession(Session directorySession) { 
    8989        if (directorySession != null) { 
    9090            try { 

  • org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/rest/FancyURLFilter.java

    r22535 r28995  
    5858                    conf.getServletContext()); 
    5959        } catch (Exception e) { 
    60             log.error("Could not retrieve the URLPolicyService"); 
     60            log.error("Could not retrieve the URLPolicyService",e); 
    6161        } 
    6262    } 

  • org.nuxeo.ecm.platform/trunk/nuxeo-platform-ui-web/src/main/java/org/nuxeo/ecm/platform/ui/web/util/files/FileUtils.java

    r28475 r28995  
    3131public class FileUtils { 
    3232 
    33        /** 
     33    private static final Log log = LogFactory.getLog(FileUtils.class); 
     34 
     35    private FileUtils() { 
     36    } 
     37 
     38    /** 
    3439     * Creates a Blob with content and mime/type. 
    3540     * 
    …… 
    3843     * @throws MimetypeDetectionException 
    3944     */ 
    40     private static final Log log = LogFactory.getLog(FileUtils.class); 
    41  
    4245    public static Blob fetchContent(UploadedFile file) { 
    4346 
    …… 
    6164     * To be used to create a serializable blob from a UploadedFile creates a 
    6265     * in-memory blob if data is under 64K otherwise constructs a serializable 
    63      * FileBlob which stores data in a temporary file on the harddisk. 
     66     * FileBlob which stores data in a temporary file on the hard disk. 
    6467     * 
    6568     * @param uf 
    …… 
    7376     * To be used to create a serializable blob from a UploadedFile creates a 
    7477     * in-memory blob if data is under 64K otherwise constructs a serializable 
    75      * FileBlob which stores data in a temporary file on the harddisk. 
     78     * FileBlob which stores data in a temporary file on the hard disk. 
    7679     * <p> 
    7780     * If mime type is null or too generic, get it from the uploaded file.