Index: lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java	9 Apr 2010 18:02:27 -0000	1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java	12 Apr 2010 01:06:38 -0000	1.1.2.2
@@ -47,12 +47,10 @@
     private static final String GET_LOG_EVENTS_OCCURED_AFTER_DATE = "from " + LogEvent.class.getName()
 	    + " where occurred_date_time > ? order by occurred_date_time asc";    
     
-    @Override
     public void save(LogEvent logEvent) {
 	super.insert(logEvent);
     }    
 
-    @Override
     public LogEvent getById(Long logEventId) {
 	List list = getHibernateTemplate().find(GET_LOG_EVENT_BY_ID, logEventId);
 	if (list.size() > 0) {
@@ -62,12 +60,10 @@
 	}
     }  
 
-    @Override
     public List<LogEvent> getByUser(Integer userId) {
 	return getHibernateTemplate().find(GET_LOG_EVENT_BY_USER, userId);
     }
     
-    @Override
     public List<LogEvent> getEventsOccurredAfter(Date date) {
 	return getHibernateTemplate().find(GET_LOG_EVENTS_OCCURED_AFTER_DATE, date);
     }
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java	9 Apr 2010 18:02:27 -0000	1.1.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java	12 Apr 2010 01:06:38 -0000	1.1.2.2
@@ -31,9 +31,7 @@
 import org.lamsfoundation.lams.logevent.dao.ILogEventDAO;
 import org.lamsfoundation.lams.logevent.dao.hibernate.LogEventDAO;
 import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.usermanagement.exception.UserException;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
 
 /**
  * Class implements <code>ILogEventService</code>.
@@ -49,7 +47,6 @@
     private IUserManagementService userManagementService;
     
     
-    @Override
     public void logEvent(Integer logEventTypeId, Integer userId) {
 	User user = (userId != null) ? (User) userManagementService.findById(User.class, userId) : null;
 	if (user == null) {
@@ -61,17 +58,14 @@
 	logEventDAO.save(logEvent);
     }    
 
-    @Override
     public LogEvent getLogEventById(Long logEventId) {
 	return logEventDAO.getById(logEventId);
     }  
 
-    @Override
     public List<LogEvent> getLogEventByUser(Integer userId) {
 	return logEventDAO.getByUser(userId);
     }
     
-    @Override
     public List<LogEvent> getEventsOccurredAfter(Date date) {
 	return logEventDAO.getEventsOccurredAfter(date);
     }
Index: lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java	1 Apr 2010 20:13:48 -0000	1.1.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/timezone/dao/hibernate/TimezoneDAO.java	12 Apr 2010 01:06:38 -0000	1.1.2.3
@@ -25,14 +25,9 @@
 
 import java.util.List;
 
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.lamsfoundation.lams.config.ConfigurationItem;
-import org.lamsfoundation.lams.config.dao.IConfigurationDAO;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.timezone.Timezone;
 import org.lamsfoundation.lams.timezone.dao.ITimezoneDAO;
-import org.springframework.orm.hibernate3.HibernateCallback;
 
 /**
  * Hibernate implementation of <code>ITimezoneDAO</code>.
@@ -42,17 +37,14 @@
  */
 public class TimezoneDAO extends BaseDAO implements ITimezoneDAO {
 
-    @Override
     public List<Timezone> getAllTimezones() {
 	return super.findAll(Timezone.class);
     }
 
-    @Override
     public void addTimezone(Timezone timezone) {
 	super.insert(timezone);
     }
 
-    @Override
     public void removeTimezone(Timezone timezone) {
 	super.delete(timezone);
     }
Index: lams_common/src/java/org/lamsfoundation/lams/timezone/service/TimezoneService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/timezone/service/TimezoneService.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_common/src/java/org/lamsfoundation/lams/timezone/service/TimezoneService.java	1 Apr 2010 20:13:48 -0000	1.1.2.2
+++ lams_common/src/java/org/lamsfoundation/lams/timezone/service/TimezoneService.java	12 Apr 2010 01:06:38 -0000	1.1.2.3
@@ -28,8 +28,6 @@
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.themes.dao.ICSSThemeDAO;
-import org.lamsfoundation.lams.themes.service.ThemeService;
 import org.lamsfoundation.lams.timezone.Timezone;
 import org.lamsfoundation.lams.timezone.dao.hibernate.TimezoneDAO;
 
@@ -46,12 +44,10 @@
     /** Required DAO's */
     protected TimezoneDAO timezoneDAO;    
     
-    @Override
     public List<Timezone> getAllTimezones() {
 	return timezoneDAO.getAllTimezones();
     }
     
-    @Override
     public void updateTimezones(Collection<Timezone> newTimezones) {
 	log.debug("Updating list of available timezones.");