geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r567081 - /geronimo/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
Date Fri, 17 Aug 2007 16:27:20 GMT
Author: pmcmahan
Date: Fri Aug 17 09:27:19 2007
New Revision: 567081

URL: http://svn.apache.org/viewvc?view=rev&rev=567081
Log:
GERONIMO-3390 merge 566694 from branches/2.0

Modified:
    geronimo/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java

Modified: geronimo/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java?view=diff&rev=567081&r1=567080&r2=567081
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
(original)
+++ geronimo/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
Fri Aug 17 09:27:19 2007
@@ -64,8 +64,6 @@
         helpView.include(renderRequest, renderRespose);
     }
 
-
-    
     protected void doView(RenderRequest renderRequest,
             RenderResponse renderRespose) throws PortletException, IOException {
         if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
@@ -166,9 +164,10 @@
         String toDateStr = criteria.toDate;
 
         Calendar cal1 = Calendar.getInstance(), cal2 = Calendar.getInstance();
-        // If not all dates were passed we assume than no fields were passed and just
-        // filter on the current date.
-        if(fromDateStr == null || toDateStr == null) {
+        // If not all dates were passed and ignoreDates is not enabled, filter on the current
date.
+        // Note: This happens only when the portlet is loaded for the first time. Subsequent
invocation (other than
+        // using "Refresh") will have either ignoreDates enabled or both the dates non null.
+        if((fromDateStr == null || toDateStr == null) && !criteria.ignoreDates) {
             // just keep the month date and year
             cal1.set(Calendar.MILLISECOND, 0);
             cal1.set(Calendar.MINUTE, 0);
@@ -270,9 +269,6 @@
         searchView.include(renderRequest, renderRespose);
     }
 
-
-    
-    @Override
     public void init(PortletConfig portletConfig) throws PortletException {
         PortletContext pc = portletConfig.getPortletContext();
         searchView = pc.getRequestDispatcher("/WEB-INF/view/webaccesslogmanager/view.jsp");
@@ -280,13 +276,9 @@
         super.init(portletConfig);
     }
 
-    @Override
     public void processAction(ActionRequest actionRequest,
             ActionResponse actionResponse) throws PortletException, IOException {
         //todo: according to portlet spec, all forms should submit to Action not Render
-
-        actionResponse.setRenderParameters(actionRequest.getParameterMap());
-        
     }
     private static class Criteria implements Serializable {
         Integer maxResult = new Integer(DEFAULT_MAX_RESULTS);



Mime
View raw message