[Openutils-svn] SF.net SVN: openutils:[2758] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java

[<die...@us...>]

Revision: 2758
          http://openutils.svn.sourceforge.net/openutils/?rev=2758&view=rev
Author:   diego_schivo
Date:     2010-06-30 12:35:10 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 refactoring

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 10:58:26 UTC (rev 2757)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2010-06-30 12:35:10 UTC (rev 2758)
@@ -19,27 +19,17 @@
 
 package net.sourceforge.openutils.mgnlmedia.media.pages;
 
-import info.magnolia.cms.core.Content;
 import info.magnolia.freemarker.FreemarkerUtil;
 
-import java.util.HashMap;
-import java.util.Iterator;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 
-import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 
-import com.google.common.base.Function;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterators;
 
-
 /**
  * Page that renders the folder view
  * @author molaschi
@@ -120,31 +110,29 @@
         }
 
         StringBuilder qs = new StringBuilder();
-        for (Object obj : request.getParameterMap().keySet())
+        for (Object objKey : request.getParameterMap().keySet())
         {
-            String key = (String) obj;
-            if (!"type".equals(key))
+            String key = (String) objKey;
+            if ("command".equals(key) || "type".equals(key))
             {
-                if (request.getParameterMap().get(key).getClass().isArray())
+                continue;
+            }
+            Object objValue = request.getParameterMap().get(key);
+            if (objValue.getClass().isArray())
+            {
+                for (String value : (String[]) objValue)
                 {
-                    for (String value : (String[]) request.getParameterMap().get(key))
+                    if (qs.length() > 0)
                     {
-                        if ("command".equals(key))
-                        {
-                            continue;
-                        }
-                        if (qs.length() > 0)
-                        {
-                            qs.append("&");
-                        }
-                        qs.append(key).append("=").append(value);
+                        qs.append("&");
                     }
+                    qs.append(key).append("=").append(value);
                 }
-                else
-                {
-                    qs.append(key).append("=").append(request.getParameter(key));
-                }
             }
+            else
+            {
+                qs.append(key).append("=").append(objValue);
+            }
         }
         queryString = qs.toString();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.