Return-Path: 
 <jetspeed-dev-return-35566-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 54718 invoked from network); 10 Feb 2010 16:29:17 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 10 Feb 2010 16:29:17 -0000
Received: (qmail 90215 invoked by uid 500); 10 Feb 2010 16:29:17 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 90163 invoked by uid 500); 10 Feb 2010 16:29:16 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 90153 invoked by uid 99); 10 Feb 2010 16:29:16 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Feb 2010 16:29:16 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Feb 2010 16:29:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4165B2388962; Wed, 10 Feb 2010 16:28:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r908570 - in
 /portals/jetspeed-2/applications/j2-admin/trunk/src/main:
 java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
 webapp/WEB-INF/portlet.xml webapp/WEB-INF/view/toolbox/toolbox.jsp
Date: Wed, 10 Feb 2010 16:28:55 -0000
To: jetspeed-dev@portals.apache.org
From: woonsan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100210162855.4165B2388962@eris.apache.org>

Author: woonsan
Date: Wed Feb 10 16:28:54 2010
New Revision: 908570

URL: http://svn.apache.org/viewvc?rev=908570&view=rev
Log:
JS2-1057: Adding preference for default category selection.

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=908570&r1=908569&r2=908570&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java Wed Feb 10 16:28:54 2010
@@ -105,6 +105,7 @@
     public void doView(RenderRequest request, RenderResponse response)
             throws PortletException, IOException
     {
+        request.setAttribute("defaultCategory", getDefaultCategory(request, ""));
         List<String> categories = retrieveCategories(request);
         request.setAttribute("categories", categories);
         Map<String, String> categoryKeywordsMap = retrieveCategoryKeywordsMap(categories, request);
@@ -169,10 +170,15 @@
                 log.error("Page has not been updated.", e);
             }            
         }
-    }    
+    }
+    
+    protected String getDefaultCategory(PortletRequest request, String defaultValue) throws PortletException
+    {
+        return request.getPreferences().getValue("DefaultCategory", defaultValue);
+    }
     
     @SuppressWarnings("unchecked")
-    public List<String> retrieveCategories(PortletRequest request) throws PortletException
+    protected List<String> retrieveCategories(PortletRequest request) throws PortletException
     {
         List<String> categories = (List) request.getPortletSession().getAttribute("categories");
         
@@ -195,7 +201,7 @@
         return categories;
     }
     
-    public Map<String, String> retrieveCategoryKeywordsMap(List<String> categories, PortletRequest request) throws PortletException
+    protected Map<String, String> retrieveCategoryKeywordsMap(List<String> categories, PortletRequest request) throws PortletException
     {
         Map<String, String> keywordsMap = new HashMap<String, String>();
         PortletPreferences prefs = request.getPreferences();

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=908570&r1=908569&r2=908570&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Wed Feb 10 16:28:54 2010
@@ -2256,6 +2256,10 @@
     </portlet-info>
     <portlet-preferences>
       <preference>
+        <name>DefaultCategory</name>
+        <value>News</value>
+      </preference>
+      <preference>
         <name>Categories</name>
         <value>Administration,Finance,Fun,News,Security,Sports,Technology,Tools,Tutorial</value>
       </preference>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=908570&r1=908569&r2=908570&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp Wed Feb 10 16:28:54 2010
@@ -355,16 +355,18 @@
         if (tabId == "portlets") {
 	        var category = Y.Cookie.get("toolboxcat");
 	        if (!category) {
-		        category = "News";
+		        category = "${defaultCategory}";
+	        }
+	        if (category) {
+	            var categories = Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>categories"));
+	            for (var i = 0; i < categories.options.length; i++) {
+	                if (category == categories.options[i].value && i != categories.selectedIndex) {
+	                    categories.options[i].selected = true;
+	                    loadPortletsInCategory(category);
+	                    break;
+	                }
+	            }
 	        }
-            var categories = Y.Node.getDOMNode(Y.Node.one("#<portlet:namespace/>categories"));
-            for (var i = 0; i < categories.options.length; i++) {
-                if (category == categories.options[i].value && i != categories.selectedIndex) {
-                    categories.options[i].selected = true;
-                    loadPortletsInCategory(category);
-                    break;
-                }
-            }
         }
 
         if ('string' != typeof(e)) {



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org