[MMBASE SCM] r38053 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository: . forms

[raintang]

Author: raintang
Date: 2009-08-20 04:54:26 +0200 (Thu, 20 Aug 2009)
New Revision: 38053

Modified:
   
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
   
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
Log:
CMSC-1472  Improve bulk image and attachment upload to show failed files in 
branch1.6 and trunk

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
  2009-08-20 01:52:13 UTC (rev 38052)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/AssetElementUtil.java
  2009-08-20 02:54:26 UTC (rev 38053)
@@ -282,7 +282,7 @@
       return nodes;
    }
 
-   protected static void initSupportedImages() {
+   public static void initSupportedImages() {
       supportedImages = new HashSet<String>();
       Properties properties = new Properties();
       String images = ".bmp,.jpg,.jpeg,.gif,.png,.svg,.tiff,.tif";
@@ -303,7 +303,7 @@
     * @param fileName
     * @return
     */
-   protected static boolean isImage(String fileName) {
+   public static boolean isImage(String fileName) {
       if (StringUtils.isBlank(fileName)) {
          return false;
       }
@@ -318,7 +318,7 @@
     * @param fileName
     * @return
     */
-   protected static String getFilenameExtension(String fileName) {
+   public static String getFilenameExtension(String fileName) {
       if (StringUtils.isBlank(fileName)) {
          return null;
       }

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
   2009-08-20 01:52:13 UTC (rev 38052)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java
   2009-08-20 02:54:26 UTC (rev 38053)
@@ -62,13 +62,9 @@
             && file.getFileSize() != 0 && 
StringUtils.isNotEmpty(file.getFileName());
    }
 
-   public static void addToSession(HttpServletRequest request, String name, 
List<String> value) {
+   private void addToSession(HttpServletRequest request, String name, Object 
value) {
       if (value != null) {
          request.getSession().setAttribute(name, value);
       }
    }
-
-   public static void addToSession(HttpServletRequest request, String name, 
String value) {
-      request.getSession().setAttribute(name, value);
-   }
 }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs