svn commit: r1057344 - in /ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement: ImageManagementServices.java ReplaceImage.java RotateImage.java WatermarkImage.java

[mrisaliti]

Author: mrisaliti
Date: Mon Jan 10 20:22:56 2011
New Revision: 1057344

URL: http://svn.apache.org/viewvc?rev=1057344&view=rev
Log:
Remove most of the java compilation warning (generics markup, unused code/import) (OFBIZ-4102)

Modified:
    ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java
    ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java
    ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java
    ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java?rev=1057344&r1=1057343&r2=1057344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java Mon Jan 10 20:22:56 2011
@@ -46,7 +46,6 @@ import javax.servlet.http.HttpSession;
 
 import javolution.util.FastList;
 import javolution.util.FastMap;
-
 import net.sf.json.JSONObject;
 
 import org.apache.commons.fileupload.FileItem;
@@ -58,7 +57,6 @@ import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.FileUtil;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilGenerics;
-import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
@@ -102,8 +100,6 @@ public class ImageManagementServices {
         if (UtilValidate.isNotEmpty(uploadFileName)) {
             String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
             String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
-            String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix");
-            
             String rootTargetDirectory = imageServerPath + "/products/management";
             File rootTargetDir = new File(rootTargetDirectory);
             if (!rootTargetDir.exists()) {
@@ -161,10 +157,8 @@ public class ImageManagementServices {
             // File to use for image original
             FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);
             String fileLocation = filenameExpander.expandString(UtilMisc.toMap("location", "products", "type", sizeType, "id", contentId));
-            String filePathPrefix = "";
             String filenameToUse = fileLocation;
             if (fileLocation.lastIndexOf("/") != -1) {
-                filePathPrefix = fileLocation.substring(0, fileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash
                 filenameToUse = fileLocation.substring(fileLocation.lastIndexOf("/") + 1);
             }
             
@@ -298,9 +292,6 @@ public class ImageManagementServices {
     }
 
     public static Map<String, Object> removeImageFileForImageManagement(DispatchContext dctx, Map<String, ? extends Object> context){
-        LocalDispatcher dispatcher = dctx.getDispatcher();
-        Delegator delegator = dctx.getDelegator();
-        GenericValue userLogin = (GenericValue) context.get("userLogin");
         String contentId = (String) context.get("contentId");
         String dataResourceName = (String) context.get("dataResourceName");
         String productId = (String) context.get("productId");
@@ -311,11 +302,9 @@ public class ImageManagementServices {
                 String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
                 FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);
                 String fileLocation = filenameExpander.expandString(UtilMisc.toMap("location", "products", "type", "management/" + productId , "id", contentId));
-                String filePathPrefix = "";
                 String filenameToUse = fileLocation;
             
                 if (fileLocation.lastIndexOf("/") != -1) {
-                    filePathPrefix = fileLocation.substring(0, fileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash
                     filenameToUse = fileLocation.substring(fileLocation.lastIndexOf("/") + 1);
                 }
             
@@ -408,9 +397,6 @@ public class ImageManagementServices {
                 return result;
             }
     
-            // new Filename Format
-            FlexibleStringExpander addFilenameExpander = mainFilenameExpander;
-    
             /* scale Image for each Size Type */
             Iterator<String> sizeIter = sizeTypeList.iterator();
             while (sizeIter.hasNext()) {
@@ -551,7 +537,6 @@ public class ImageManagementServices {
         Locale locale = (Locale) context.get("locale");
         String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
         String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
-        String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix");
         
         // Create content for thumbnail
         Map<String, Object> contentThumb = FastMap.newInstance();
@@ -571,10 +556,8 @@ public class ImageManagementServices {
         // File to use for image thumbnail
         FlexibleStringExpander filenameExpanderThumb = FlexibleStringExpander.getInstance(imageFilenameFormat);
         String fileLocationThumb = filenameExpanderThumb.expandString(UtilMisc.toMap("location", "products", "type", "small", "id", contentIdThumb));
-        String filePathPrefixThumb = "";
         String filenameToUseThumb = fileLocationThumb;
         if (fileLocationThumb.lastIndexOf("/") != -1) {
-            filePathPrefixThumb = fileLocationThumb.substring(0, fileLocationThumb.lastIndexOf("/") + 1); // adding 1 to include the trailing slash
             filenameToUseThumb = fileLocationThumb.substring(fileLocationThumb.lastIndexOf("/") + 1);
         }
     
@@ -678,18 +661,15 @@ public class ImageManagementServices {
     }
     
     public static String multipleUploadImage(HttpServletRequest request, HttpServletResponse response) throws IOException, JDOMException {
-        Locale locale = UtilHttp.getLocale(request);
         HttpSession session = request.getSession(true);
         GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
-        Delegator delegator = (Delegator) request.getAttribute("delegator");
         LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
         
-        Map formInput = FastMap.newInstance();
-        Map<String, Object> results = FastMap.newInstance();
+        Map<String, String> formInput = FastMap.newInstance();
         ServletFileUpload fu = new ServletFileUpload(new DiskFileItemFactory(10240, FileUtil.getFile("runtime/tmp")));
-        java.util.List lst = null;
+        List<FileItem> lst = null;
         try {
-           lst = fu.parseRequest(request);
+           lst = UtilGenerics.checkList(fu.parseRequest(request));
         } catch (FileUploadException e4) {
             return e4.getMessage();
         }
@@ -699,7 +679,6 @@ public class ImageManagementServices {
         byte[] imageBytes = {};
         for (int i=0; i < lst.size(); i++) {
             fi = (FileItem)lst.get(i);
-            String fn = fi.getName();
             String fieldName = fi.getFieldName();
             if (fi.isFormField()) {
                 String fieldStr = fi.getString();
@@ -806,7 +785,6 @@ public class ImageManagementServices {
     }
     
     public static Map<String, Object> setThumbnail(DispatchContext dctx, Map<String, ? extends Object> context) {
-        Map<String, Object> result = FastMap.newInstance();
         LocalDispatcher dispatcher = dctx.getDispatcher();
         Delegator delegator = dctx.getDelegator();
         GenericValue userLogin = (GenericValue) context.get("userLogin");

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java?rev=1057344&r1=1057343&r2=1057344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java Mon Jan 10 20:22:56 2011
@@ -26,11 +26,14 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import javolution.util.FastMap;
+
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
@@ -41,7 +44,6 @@ import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.util.EntityUtil;
 import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.LocalDispatcher;
-import org.ofbiz.service.ServiceUtil;
 
 import watermarker.exception.WatermarkerException;
 import watermarker.impl.DefaultWatermarker;
@@ -53,7 +55,7 @@ public class ReplaceImage{
     public static final String resource = "ProductErrorUiLabels";
 
     public static String replaceImageToExistImage(HttpServletRequest request, HttpServletResponse response) throws MalformedURLException, FileNotFoundException, WatermarkerException, GenericEntityException, GenericServiceException {
-        Map<String, ? extends Object> context = request.getParameterMap();
+        Map<String, ? extends Object> context = UtilGenerics.checkMap(request.getParameterMap());
         String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
         LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
         Delegator delegator = (Delegator) request.getAttribute("delegator");

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java?rev=1057344&r1=1057343&r2=1057344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java Mon Jan 10 20:22:56 2011
@@ -23,7 +23,7 @@ import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.Map;
 
 import javax.imageio.ImageIO;
 
@@ -32,12 +32,9 @@ import javolution.util.FastMap;
 import org.jdom.JDOMException;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilDateTime;
-import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.Delegator;
-import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.GenericServiceException;
@@ -53,7 +50,6 @@ public class RotateImage {
     public static Map<String, Object> imageRotate(DispatchContext dctx, Map<String, ? extends Object> context)
     throws IOException, JDOMException {
         LocalDispatcher dispatcher = dctx.getDispatcher();
-        Delegator delegator = dctx.getDelegator();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         
         String productId = (String) context.get("productId");

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java?rev=1057344&r1=1057343&r2=1057344&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java Mon Jan 10 20:22:56 2011
@@ -40,6 +40,7 @@ import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
@@ -55,16 +56,16 @@ import watermarker.exception.Watermarker
 import watermarker.impl.DefaultWatermarker;
 import watermarker.model.WatermarkSettings;
 import watermarker.model.WatermarkerSettings;
+
 public class WatermarkImage{
     
     public static final String module = WatermarkImage.class.getName();
     public static final String resource = "ProductErrorUiLabels";
     
     public static String createWatermarkImage(HttpServletRequest request, HttpServletResponse response) throws WatermarkerException, IOException {
-        Map<String, ? extends Object> context = request.getParameterMap();
+        Map<String, ? extends Object> context = UtilGenerics.checkMap(request.getParameterMap());
         String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
         LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
-        Delegator delegator = (Delegator) request.getAttribute("delegator");
         GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
         String watermarkText = null;
         URL imageUrl = null;
@@ -304,7 +305,7 @@ public class WatermarkImage{
         return result;
     }
     public static String setPreviewWaterMark(HttpServletRequest request, HttpServletResponse response) {
-        Map<String, ? extends Object> context = request.getParameterMap();
+        Map<String, ? extends Object> context = UtilGenerics.checkMap(request.getParameterMap());
         String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
         String productId = request.getParameter("productId");
         String imageName = request.getParameter("imageName");
@@ -354,7 +355,7 @@ public class WatermarkImage{
         return "success";
     }
     public static String deletePreviewWatermarkImage(HttpServletRequest request, HttpServletResponse response) {
-        Map<String, ? extends Object> context = request.getParameterMap();
+        Map<String, ? extends Object> context = UtilGenerics.checkMap(request.getParameterMap());
         String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
         String count = request.getParameter("count");
         File file = new File(imageServerPath + "/products/management/previewImage" + count  + ".jpg");