svn commit: r926853 - /ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java

[lektran]

Author: lektran
Date: Tue Mar 23 23:38:55 2010
New Revision: 926853

URL: http://svn.apache.org/viewvc?rev=926853&view=rev
Log:
The following deprecated classes, constructors or methods have been removed:
org.ofbiz.product.category.CategoryWorker.getCatalogTopCategory(PageContext, String)
- Use CategoryWorker.getCatalogTopCategory(ServletRequest, String) instead
org.ofbiz.product.category.CategoryWorker.getCategoriesWithNoParent(PageContext, String)
- Use CategoryWorker.getCategoriesWithNoParent(ServletRequest, String) instead
org.ofbiz.product.category.CategoryWorker.getRelatedCategories(PageContext, String, boolean)
- Use CategoryWorker.getRelatedCategories(ServletRequest, String, boolean) instead
org.ofbiz.product.category.CategoryWorker.getRelatedCategories(PageContext, String, String, boolean)
- Use CategoryWorker.getRelatedCategories(ServletRequest, String, String, boolean) instead
org.ofbiz.product.category.CategoryWorker.getRelatedCategoriesRet(PageContext, String, String, boolean)
- Use CategoryWorker.getRelatedCategoriesRet(ServletRequest, String, String, boolean) instead
org.ofbiz.product.category.CategoryWorker.setTrail(PageContext, String)
- Use CategoryWorker.setTrail(ServletRequest, String) instead
org.ofbiz.product.category.CategoryWorker.getTrail(PageContext)
- Use CategoryWorker.getTrail(ServletRequest) instead
org.ofbiz.product.category.CategoryWorker.setTrail(PageContext, List<String>)
- Use CategoryWorker.setTrail(ServletRequest, List<String>) instead
org.ofbiz.product.category.CategoryWorker.checkTrailItem(PageContext, String)
- Use CategoryWorker.checkTrailItem(ServletRequest, String) instead
org.ofbiz.product.category.CategoryWorker.lastTrailItem(PageContext)
- Use CategoryWorker.lastTrailItem(ServletRequest) instead

Modified:
    ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java?rev=926853&r1=926852&r2=926853&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java Tue Mar 23 23:38:55 2010
@@ -51,12 +51,6 @@ public class CategoryWorker {
 
     public static final String module = CategoryWorker.class.getName();
 
-    /** @deprecated */
-    @Deprecated
-    public static String getCatalogTopCategory(PageContext pageContext, String defaultTopCategory) {
-        return getCatalogTopCategory(pageContext.getRequest(), defaultTopCategory);
-    }
-
     public static String getCatalogTopCategory(ServletRequest request, String defaultTopCategory) {
         HttpServletRequest httpRequest = (HttpServletRequest) request;
         Map<String, Object> requestParameters = UtilHttp.getParameterMap(httpRequest);
@@ -84,12 +78,6 @@ public class CategoryWorker {
         return topCatName;
     }
 
-    /** @deprecated */
-    @Deprecated
-    public static void getCategoriesWithNoParent(PageContext pageContext, String attributeName) {
-        getCategoriesWithNoParent(pageContext.getRequest(), attributeName);
-    }
-
     public static void getCategoriesWithNoParent(ServletRequest request, String attributeName) {
         Delegator delegator = (Delegator) request.getAttribute("delegator");
         Collection<GenericValue> results = FastList.newInstance();
@@ -111,12 +99,6 @@ public class CategoryWorker {
         request.setAttribute(attributeName, results);
     }
 
-    /** @deprecated */
-    @Deprecated
-    public static void getRelatedCategories(PageContext pageContext, String attributeName, boolean limitView) {
-            getRelatedCategories(pageContext.getRequest(), attributeName, limitView);
-    }
-
     public static void getRelatedCategories(ServletRequest request, String attributeName, boolean limitView) {
         Map<String, Object> requestParameters = UtilHttp.getParameterMap((HttpServletRequest) request);
         String requestId = null;
@@ -130,12 +112,6 @@ public class CategoryWorker {
         getRelatedCategories(request, attributeName, requestId, limitView);
     }
 
-    /** @deprecated */
-    @Deprecated
-    public static void getRelatedCategories(PageContext pageContext, String attributeName, String parentId, boolean limitView) {
-        getRelatedCategories(pageContext.getRequest(), attributeName, parentId, limitView);
-    }
-
     public static void getRelatedCategories(ServletRequest request, String attributeName, String parentId, boolean limitView) {
         getRelatedCategories(request, attributeName, parentId, limitView, false);
     }
@@ -147,12 +123,6 @@ public class CategoryWorker {
             request.setAttribute(attributeName, categories);
     }
 
-    /** @deprecated */
-    @Deprecated
-    public static List<GenericValue> getRelatedCategoriesRet(PageContext pageContext, String attributeName, String parentId, boolean limitView) {
-        return getRelatedCategoriesRet(pageContext.getRequest(), attributeName, parentId, limitView);
-    }
-
     public static List<GenericValue> getRelatedCategoriesRet(ServletRequest request, String attributeName, String parentId, boolean limitView) {
         return getRelatedCategoriesRet(request, attributeName, parentId, limitView, false);
     }
@@ -271,12 +241,6 @@ public class CategoryWorker {
         return andCond;
     }
 
-    /** @deprecated */
-    @Deprecated
-    public static void setTrail(PageContext pageContext, String currentCategory) {
-        setTrail(pageContext.getRequest(), currentCategory);
-    }
-
     public static void setTrail(ServletRequest request, String currentCategory) {
         Map<String, Object> requestParameters = UtilHttp.getParameterMap((HttpServletRequest) request);
         String previousCategory = (String) requestParameters.get("pcategory");
@@ -354,36 +318,18 @@ public class CategoryWorker {
         return trail;
     }
 
-    /** @deprecated */
-    @Deprecated
-    public static List<String> getTrail(PageContext pageContext) {
-        return getTrail(pageContext.getRequest());
-    }
-
     public static List<String> getTrail(ServletRequest request) {
         HttpSession session = ((HttpServletRequest) request).getSession();
         List<String> crumb = UtilGenerics.checkList(session.getAttribute("_BREAD_CRUMB_TRAIL_"));
         return crumb;
     }
 
-    /** @deprecated */
-    @Deprecated
-    public static List<String> setTrail(PageContext pageContext, List<String> crumb) {
-        return setTrail(pageContext.getRequest(), crumb);
-    }
-
     public static List<String> setTrail(ServletRequest request, List<String> crumb) {
         HttpSession session = ((HttpServletRequest) request).getSession();
         session.setAttribute("_BREAD_CRUMB_TRAIL_", crumb);
         return crumb;
     }
 
-    /** @deprecated */
-    @Deprecated
-    public static boolean checkTrailItem(PageContext pageContext, String category) {
-        return checkTrailItem(pageContext.getRequest(), category);
-    }
-
     public static boolean checkTrailItem(ServletRequest request, String category) {
         List<String> crumb = getTrail(request);
 
@@ -394,12 +340,6 @@ public class CategoryWorker {
         }
     }
 
-    /** @deprecated */
-    @Deprecated
-    public static String lastTrailItem(PageContext pageContext) {
-        return lastTrailItem(pageContext.getRequest());
-    }
-
     public static String lastTrailItem(ServletRequest request) {
         List<String> crumb = getTrail(request);