svn commit: r1056931 - in /ofbiz/trunk/applications/order/src/org/ofbiz/order/task: TaskEvents.java TaskWorker.java

[mrisaliti]

Author: mrisaliti
Date: Sun Jan  9 13:44:35 2011
New Revision: 1056931

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

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskEvents.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskWorker.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskEvents.java?rev=1056931&r1=1056930&r2=1056931&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskEvents.java Sun Jan  9 13:44:35 2011
@@ -53,7 +53,7 @@ public class TaskEvents {
         LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
         GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
 
-        Map parameterMap = UtilHttp.getParameterMap(request);
+        Map<String, Object> parameterMap = UtilHttp.getParameterMap(request);
         String workEffortId = (String) parameterMap.remove("workEffortId");
         String partyId = (String) parameterMap.remove("partyId");
         String roleTypeId = (String) parameterMap.remove("roleTypeId");
@@ -68,9 +68,9 @@ public class TaskEvents {
             return "error";
         }
 
-        Map result = null;
+        Map<String, Object> result = null;
         try {
-            Map context = UtilMisc.toMap("workEffortId", workEffortId, "partyId", partyId, "roleTypeId", roleTypeId,
+            Map<String, ? extends Object> context = UtilMisc.toMap("workEffortId", workEffortId, "partyId", partyId, "roleTypeId", roleTypeId,
                     "fromDate", fromDate, "result", parameterMap, "userLogin", userLogin);
             result = dispatcher.runSync("wfCompleteAssignment", context);
             if (result.containsKey(ModelService.RESPOND_ERROR)) {
@@ -130,8 +130,8 @@ public class TaskEvents {
         String partyId = request.getParameter("partyId");
         String roleTypeId = request.getParameter("roleTypeId");
         String orderId = request.getParameter("orderId");
-        Map context = UtilMisc.toMap("orderId", orderId, "partyId", partyId, "roleTypeId", roleTypeId);
-        Map result = null;
+        Map<String, ? extends Object> context = UtilMisc.toMap("orderId", orderId, "partyId", partyId, "roleTypeId", roleTypeId);
+        Map<String, Object> result = null;
         try {
             result = dispatcher.runSync("addOrderRole", context);
             Debug.logInfo("Added user to order role " + result, module);

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskWorker.java?rev=1056931&r1=1056930&r2=1056931&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskWorker.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/task/TaskWorker.java Sun Jan  9 13:44:35 2011
@@ -49,7 +49,7 @@ public class TaskWorker {
         }
     }
 
-    static Map statusMapping = UtilMisc.toMap("WF_NOT_STARTED", "Waiting", "WF_RUNNING", "Active", "WF_COMPLETE", "Complete", "WF_SUSPENDED", "Hold");
+    static Map<String, String> statusMapping = UtilMisc.toMap("WF_NOT_STARTED", "Waiting", "WF_RUNNING", "Active", "WF_COMPLETE", "Complete", "WF_SUSPENDED", "Hold");
 
     public static String getPrettyStatus(GenericValue orderTaskList) {
         String statusId = orderTaskList.getString("currentStatusId");
@@ -63,7 +63,7 @@ public class TaskWorker {
     public static String getRoleDescription(GenericValue orderTaskList) {
         GenericValue role = null;
         try {
-            Map pkFields = UtilMisc.toMap("roleTypeId", orderTaskList.getString("roleTypeId"));
+            Map<String, ? extends Object> pkFields = UtilMisc.toMap("roleTypeId", orderTaskList.getString("roleTypeId"));
             role = orderTaskList.getDelegator().findByPrimaryKey("RoleType", pkFields);
         } catch (GenericEntityException e) {
             Debug.logError(e, "Cannot get RoleType entity value", module);