SAK-33539 TimeService => UserTimeService (sakaiproject#4941)

gexingfeiyang · Nov 1, 2017 · 8d649fc · 8d649fc
1 parent 7505c0e
commit 8d649fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/rsf/sakai-rsf-core/src/java/conf/sakai-requestContext.xml b/rsf/sakai-rsf-core/src/java/conf/sakai-requestContext.xml
@@ -21,7 +21,7 @@
 	<bean id="sakaiRequestParser" class="org.sakaiproject.rsf.servlet.SakaiRequestParser" init-method="init">
 		<property name="httpServletRequest" ref="httpServletRequest" />
 		<property name="siteService" ref="org.sakaiproject.site.api.SiteService" />
-		<property name="timeService" ref="org.sakaiproject.time.api.TimeService" />
+		<property name="userTimeService" ref="org.sakaiproject.time.api.UserTimeService" />
 		<property name="baseURLProvider" ref="sakai-BaseURLProvider" />
 	</bean>
 

diff --git a/rsf/sakai-rsf-core/src/java/org/sakaiproject/rsf/servlet/SakaiRequestParser.java b/rsf/sakai-rsf-core/src/java/org/sakaiproject/rsf/servlet/SakaiRequestParser.java
@@ -44,7 +44,7 @@
 import org.sakaiproject.site.api.SitePage;
 import org.sakaiproject.site.api.SiteService;
 import org.sakaiproject.site.api.ToolConfiguration;
-import org.sakaiproject.time.api.TimeService;
+import org.sakaiproject.time.api.UserTimeService;
 import org.sakaiproject.tool.api.Placement;
 import org.sakaiproject.tool.api.Tool;
 
@@ -83,7 +83,7 @@ public class SakaiRequestParser {
 
 	private BaseURLProvider bup;
 
-	private TimeService timeservice;
+	private UserTimeService userTimeService;
 
 	private String urlEntityReference;
 
@@ -95,8 +95,8 @@ public void setSiteService(SiteService siteservice) {
 		this.siteservice = siteservice;
 	}
 
-	public void setTimeService(TimeService timeservice) {
-		this.timeservice = timeservice;
+	public void setUserTimeService(UserTimeService userTimeservice) {
+		this.userTimeService = userTimeservice;
 	}
 
 	public void setBaseURLProvider(BaseURLProvider bup) {
@@ -185,7 +185,7 @@ public ConsumerInfo getConsumerInfo() {
 	}
 
 	public TimeZone getTimeZone() {
-		return timeservice.getLocalTimeZone();
+		return userTimeService.getLocalTimeZone();
 	}
 
 	public Placement getPlacement() {