You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fu...@apache.org on 2009/04/10 20:01:42 UTC
svn commit: r763994 - in /felix/trunk/upnp/samples:
clock/src/main/java/org/apache/felix/upnp/sample/clock/
tv/src/main/java/org/apache/felix/upnp/sample/tv/
Author: furfari
Date: Fri Apr 10 18:01:42 2009
New Revision: 763994
URL: http://svn.apache.org/viewvc?rev=763994&view=rev
Log:
Fixed bug related to the erroneous date presentation when the TV device is linked to a remote UPnP Clock. Changed state variable from time to DateTime. The sample devices are not interoperable with the original Cyberlink devices anymore.
Modified:
felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java
felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java
felix/trunk/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java
Modified: felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java?rev=763994&r1=763993&r2=763994&view=diff
==============================================================================
--- felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java (original)
+++ felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java Fri Apr 10 18:01:42 2009
@@ -22,6 +22,7 @@
import java.beans.PropertyChangeEvent;
import java.util.Calendar;
+import java.util.Date;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.HashSet;
@@ -143,9 +144,9 @@
public void update() {
Clock clock = Clock.getInstance();
Calendar cal = clock.getCalendar();
- long time = cal.getTime().getTime();
+ Date date = cal.getTime();
UPnPStateVariable variable = timerService.getStateVariable("Time");
- notifier.propertyChange(new PropertyChangeEvent(variable,"Time",new Long(time-1000),new Long(time)));
+ notifier.propertyChange(new PropertyChangeEvent(variable,"Time",null,date));
}
}
Modified: felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java?rev=763994&r1=763993&r2=763994&view=diff
==============================================================================
--- felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java (original)
+++ felix/trunk/upnp/samples/clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java Fri Apr 10 18:01:42 2009
@@ -44,14 +44,14 @@
* @see org.osgi.service.upnp.UPnPStateVariable#getJavaDataType()
*/
public Class getJavaDataType() {
- return Long.class;
+ return Date.class;
}
/* (non-Javadoc)
* @see org.osgi.service.upnp.UPnPStateVariable#getUPnPDataType()
*/
public String getUPnPDataType() {
- return TYPE_TIME;
+ return TYPE_DATETIME;
}
/* (non-Javadoc)
@@ -105,6 +105,6 @@
}
public Object getCurrentValue() {
- return new Long(clock.getCalendar().getTime().getTime());
+ return clock.getCalendar().getTime();
}
}
Modified: felix/trunk/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java?rev=763994&r1=763993&r2=763994&view=diff
==============================================================================
--- felix/trunk/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java (original)
+++ felix/trunk/upnp/samples/tv/src/main/java/org/apache/felix/upnp/sample/tv/TvDevice.java Fri Apr 10 18:01:42 2009
@@ -260,8 +260,8 @@
if( !LinkedDevices.contains(deviceId))
LinkedDevices.add(deviceId);
if (deviceId.indexOf("Clock") != -1){
- Long time = (Long) events.get("Time");
- clockTime = new Date(time.longValue()).toString();
+ Date date = (Date) events.get("Time");
+ clockTime = date.toString();
}
else if (deviceId.indexOf("AirCon") != -1)
airconTemp = (String) events.get("Temp");