[Registry-dev] svn commit r16846 - trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions

[svn at wso2.org]

Author: chanaka
Date: Mon May 12 01:26:30 2008
New Revision: 16846

Log:
Minor fix

Modified:
   trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
   trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ShowResourceTreeAction.java

Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java	(original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/RecentActivityAction.java	Mon May 12 01:26:30 2008
@@ -17,13 +17,9 @@
 package org.wso2.registry.web.actions;
 
 import org.wso2.registry.LogEntry;
-<<<<<<< .mine
 import org.wso2.registry.LogEntryCollection;
 import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.RegistryException;
-=======
 import org.wso2.registry.exceptions.RegistryException;
->>>>>>> .r16838
 import org.wso2.registry.session.UserRegistry;
 import org.wso2.registry.web.utils.CommonUtil;
 
@@ -100,7 +96,7 @@
         LogEntryCollection logsCollection = userRegistry.getLogCollection(resourcePath, filterValue, userName, computeDate(fromDate), computeDate(toDate), true);
         LogEntry[] totalLogs =userRegistry.getLogs(resourcePath, filterValue, userName, computeDate(fromDate), computeDate(toDate), true);
         totalCount = totalLogs.length;
-        
+
         LogEntry[] logs = logsCollection.getLogEntries(start, pageLen);
         for (int i = 0; i < logs.length; i++) {
 

Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ShowResourceTreeAction.java
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ShowResourceTreeAction.java	(original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ShowResourceTreeAction.java	Mon May 12 01:26:30 2008
@@ -1,11 +1,13 @@
 package org.wso2.registry.web.actions;
 
-import org.wso2.registry.*;
-import org.wso2.registry.web.UIConstants;
+import org.wso2.registry.Collection;
+import org.wso2.registry.Registry;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.Resource;
+import org.wso2.registry.exceptions.RegistryException;
 import org.wso2.registry.web.actions.utils.ResourceData;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
 import java.util.Map;
 
 /**