readInitialEventedStateVariableValues()
LastChange lc = new LastChange(getLastChangeParser());
// Get the current "logical" instances of the service
- UnsignedIntegerFourBytes[] ids = getImplementation().getCurrentInstanceIds();
+ UnsignedIntegerEightBytes[] ids = getImplementation().getCurrentInstanceIds();
if (ids.length > 0) {
- for (UnsignedIntegerFourBytes instanceId : ids) {
+ for (UnsignedIntegerEightBytes instanceId : ids) {
// Iterate through all "logical" instances and ask them what their state is
getImplementation().appendCurrentState(lc, instanceId);
}
} else {
// Use the default "logical" instance with ID 0
- getImplementation().appendCurrentState(lc, new UnsignedIntegerFourBytes(0));
+ getImplementation().appendCurrentState(lc, new UnsignedIntegerEightBytes(0));
}
// Sum it all up and return it in the initial event to the GENA subscriber
diff --git a/support/src/main/java/org/fourthline/cling/support/lastchange/LastChangeDelegator.java b/support/src/main/java/org/fourthline/cling/support/lastchange/LastChangeDelegator.java
index 8503c346d..eb3dbcac8 100644
--- a/support/src/main/java/org/fourthline/cling/support/lastchange/LastChangeDelegator.java
+++ b/support/src/main/java/org/fourthline/cling/support/lastchange/LastChangeDelegator.java
@@ -15,7 +15,7 @@
package org.fourthline.cling.support.lastchange;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
/**
* Any service implementation using the "LastChange" mechanism.
@@ -30,11 +30,11 @@
*/
public interface LastChangeDelegator {
- public LastChange getLastChange();
+ LastChange getLastChange();
- public void appendCurrentState(LastChange lc, UnsignedIntegerFourBytes instanceId) throws Exception;
+ void appendCurrentState(LastChange lc, UnsignedIntegerEightBytes instanceId) throws Exception;
- public abstract UnsignedIntegerFourBytes[] getCurrentInstanceIds();
+ UnsignedIntegerEightBytes[] getCurrentInstanceIds();
}
diff --git a/support/src/main/java/org/fourthline/cling/support/lastchange/LastChangeParser.java b/support/src/main/java/org/fourthline/cling/support/lastchange/LastChangeParser.java
index a62e2fd7e..ddbb7899e 100644
--- a/support/src/main/java/org/fourthline/cling/support/lastchange/LastChangeParser.java
+++ b/support/src/main/java/org/fourthline/cling/support/lastchange/LastChangeParser.java
@@ -15,24 +15,11 @@
package org.fourthline.cling.support.lastchange;
-import static org.fourthline.cling.model.XMLUtil.appendNewElement;
-
-import java.io.InputStream;
-import java.io.StringReader;
-import java.lang.reflect.Constructor;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
import org.fourthline.cling.model.XMLUtil;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.support.shared.AbstractMap;
-import org.seamless.util.io.IO;
import org.seamless.util.Exceptions;
+import org.seamless.util.io.IO;
import org.seamless.xml.DOMParser;
import org.seamless.xml.SAXParser;
import org.w3c.dom.Document;
@@ -41,6 +28,18 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.lang.reflect.Constructor;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static org.fourthline.cling.model.XMLUtil.appendNewElement;
+
/**
* Reads and writes the "LastChange" XML content.
*
@@ -148,7 +147,7 @@ public void startElement(String uri, String localName, String qName, Attributes
if (CONSTANTS.InstanceID.equals(localName)) {
String valAttr = attributes.getValue(CONSTANTS.val.name());
if (valAttr != null) {
- InstanceID instanceID = new InstanceID(new UnsignedIntegerFourBytes(valAttr));
+ InstanceID instanceID = new InstanceID(new UnsignedIntegerEightBytes(valAttr));
getInstance().getInstanceIDs().add(instanceID);
new InstanceIDHandler(instanceID, this);
}
diff --git a/support/src/main/java/org/fourthline/cling/support/model/AVTransport.java b/support/src/main/java/org/fourthline/cling/support/model/AVTransport.java
index e3e953cd7..f1127f303 100644
--- a/support/src/main/java/org/fourthline/cling/support/model/AVTransport.java
+++ b/support/src/main/java/org/fourthline/cling/support/model/AVTransport.java
@@ -15,7 +15,7 @@
package org.fourthline.cling.support.model;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.support.lastchange.LastChange;
/**
@@ -25,19 +25,19 @@
*/
public class AVTransport {
- final protected UnsignedIntegerFourBytes instanceID;
- final protected LastChange lastChange;
- protected MediaInfo mediaInfo;
- protected TransportInfo transportInfo;
- protected PositionInfo positionInfo;
- protected DeviceCapabilities deviceCapabilities;
- protected TransportSettings transportSettings;
+ final protected UnsignedIntegerEightBytes instanceID;
+ final protected LastChange lastChange;
+ protected MediaInfo mediaInfo;
+ protected TransportInfo transportInfo;
+ protected PositionInfo positionInfo;
+ protected DeviceCapabilities deviceCapabilities;
+ protected TransportSettings transportSettings;
- public AVTransport(UnsignedIntegerFourBytes instanceID, LastChange lastChange, StorageMedium possiblePlayMedium) {
+ public AVTransport(UnsignedIntegerEightBytes instanceID, LastChange lastChange, StorageMedium possiblePlayMedium) {
this(instanceID, lastChange, new StorageMedium[]{possiblePlayMedium});
}
- public AVTransport(UnsignedIntegerFourBytes instanceID, LastChange lastChange, StorageMedium[] possiblePlayMedia) {
+ public AVTransport(UnsignedIntegerEightBytes instanceID, LastChange lastChange, StorageMedium[] possiblePlayMedia) {
this.instanceID = instanceID;
this.lastChange = lastChange;
setDeviceCapabilities(new DeviceCapabilities(possiblePlayMedia));
@@ -47,7 +47,7 @@ public AVTransport(UnsignedIntegerFourBytes instanceID, LastChange lastChange, S
setTransportSettings(new TransportSettings());
}
- public UnsignedIntegerFourBytes getInstanceId() {
+ public UnsignedIntegerEightBytes getInstanceId() {
return instanceID;
}
diff --git a/support/src/main/java/org/fourthline/cling/support/model/BrowseResult.java b/support/src/main/java/org/fourthline/cling/support/model/BrowseResult.java
index 825fccece..ab8912e17 100644
--- a/support/src/main/java/org/fourthline/cling/support/model/BrowseResult.java
+++ b/support/src/main/java/org/fourthline/cling/support/model/BrowseResult.java
@@ -15,7 +15,7 @@
package org.fourthline.cling.support.model;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
/**
* @author Alessio Gaeta
@@ -23,14 +23,14 @@
*/
public class BrowseResult {
- protected String result;
- protected UnsignedIntegerFourBytes count;
- protected UnsignedIntegerFourBytes totalMatches;
- protected UnsignedIntegerFourBytes containerUpdateID;
+ protected String result;
+ protected UnsignedIntegerEightBytes count;
+ protected UnsignedIntegerEightBytes totalMatches;
+ protected UnsignedIntegerEightBytes containerUpdateID;
- public BrowseResult(String result, UnsignedIntegerFourBytes count,
- UnsignedIntegerFourBytes totalMatches,
- UnsignedIntegerFourBytes containerUpdateID) {
+ public BrowseResult(String result, UnsignedIntegerEightBytes count,
+ UnsignedIntegerEightBytes totalMatches,
+ UnsignedIntegerEightBytes containerUpdateID) {
this.result = result;
this.count = count;
this.totalMatches = totalMatches;
@@ -44,9 +44,9 @@ public BrowseResult(String result, long count, long totalMatches) {
public BrowseResult(String result, long count, long totalMatches, long updatedId) {
this(
result,
- new UnsignedIntegerFourBytes(count),
- new UnsignedIntegerFourBytes(totalMatches),
- new UnsignedIntegerFourBytes(updatedId)
+ new UnsignedIntegerEightBytes(count),
+ new UnsignedIntegerEightBytes(totalMatches),
+ new UnsignedIntegerEightBytes(updatedId)
);
}
@@ -54,7 +54,7 @@ public String getResult() {
return result;
}
- public UnsignedIntegerFourBytes getCount() {
+ public UnsignedIntegerEightBytes getCount() {
return count;
}
@@ -62,7 +62,7 @@ public long getCountLong() {
return count.getValue();
}
- public UnsignedIntegerFourBytes getTotalMatches() {
+ public UnsignedIntegerEightBytes getTotalMatches() {
return totalMatches;
}
@@ -70,7 +70,7 @@ public long getTotalMatchesLong() {
return totalMatches.getValue();
}
- public UnsignedIntegerFourBytes getContainerUpdateID() {
+ public UnsignedIntegerEightBytes getContainerUpdateID() {
return containerUpdateID;
}
diff --git a/support/src/main/java/org/fourthline/cling/support/model/Connection.java b/support/src/main/java/org/fourthline/cling/support/model/Connection.java
index 3f7cc7a52..909eea596 100644
--- a/support/src/main/java/org/fourthline/cling/support/model/Connection.java
+++ b/support/src/main/java/org/fourthline/cling/support/model/Connection.java
@@ -15,7 +15,7 @@
package org.fourthline.cling.support.model;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
/**
* @author Christian Bauer
@@ -28,7 +28,7 @@ static public class StatusInfo {
private long uptimeSeconds;
private Error lastError;
- public StatusInfo(Status status, UnsignedIntegerFourBytes uptime, Error lastError) {
+ public StatusInfo(Status status, UnsignedIntegerEightBytes uptime, Error lastError) {
this(status, uptime.getValue(), lastError);
}
@@ -46,8 +46,8 @@ public long getUptimeSeconds() {
return uptimeSeconds;
}
- public UnsignedIntegerFourBytes getUptime() {
- return new UnsignedIntegerFourBytes(getUptimeSeconds());
+ public UnsignedIntegerEightBytes getUptime() {
+ return new UnsignedIntegerEightBytes(getUptimeSeconds());
}
public Error getLastError() {
@@ -63,9 +63,8 @@ public boolean equals(Object o) {
if (uptimeSeconds != that.uptimeSeconds) return false;
if (lastError != that.lastError) return false;
- if (status != that.status) return false;
+ return status == that.status;
- return true;
}
@Override
diff --git a/support/src/main/java/org/fourthline/cling/support/model/MediaInfo.java b/support/src/main/java/org/fourthline/cling/support/model/MediaInfo.java
index 50a90e44a..bb4596322 100644
--- a/support/src/main/java/org/fourthline/cling/support/model/MediaInfo.java
+++ b/support/src/main/java/org/fourthline/cling/support/model/MediaInfo.java
@@ -15,8 +15,8 @@
package org.fourthline.cling.support.model;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
import org.fourthline.cling.model.action.ActionArgumentValue;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import java.util.Map;
@@ -30,11 +30,11 @@ public class MediaInfo {
private String nextURI = "NOT_IMPLEMENTED";
private String nextURIMetaData = "NOT_IMPLEMENTED";
- private UnsignedIntegerFourBytes numberOfTracks = new UnsignedIntegerFourBytes(0);
- private String mediaDuration = "00:00:00";
- private StorageMedium playMedium = StorageMedium.NONE;
- private StorageMedium recordMedium = StorageMedium.NOT_IMPLEMENTED;
- private RecordMediumWriteStatus writeStatus = RecordMediumWriteStatus.NOT_IMPLEMENTED;
+ private UnsignedIntegerEightBytes numberOfTracks = new UnsignedIntegerEightBytes(0);
+ private String mediaDuration = "00:00:00";
+ private StorageMedium playMedium = StorageMedium.NONE;
+ private StorageMedium recordMedium = StorageMedium.NOT_IMPLEMENTED;
+ private RecordMediumWriteStatus writeStatus = RecordMediumWriteStatus.NOT_IMPLEMENTED;
public MediaInfo() {
}
@@ -46,7 +46,7 @@ public MediaInfo(Map args) {
(String) args.get("NextURI").getValue(),
(String) args.get("NextURIMetaData").getValue(),
- (UnsignedIntegerFourBytes) args.get("NrTracks").getValue(),
+ (UnsignedIntegerEightBytes) args.get("NrTracks").getValue(),
(String) args.get("MediaDuration").getValue(),
StorageMedium.valueOrVendorSpecificOf((String) args.get("PlayMedium").getValue()),
StorageMedium.valueOrVendorSpecificOf((String) args.get("RecordMedium").getValue()),
@@ -60,7 +60,7 @@ public MediaInfo(String currentURI, String currentURIMetaData) {
}
public MediaInfo(String currentURI, String currentURIMetaData,
- UnsignedIntegerFourBytes numberOfTracks, String mediaDuration,
+ UnsignedIntegerEightBytes numberOfTracks, String mediaDuration,
StorageMedium playMedium) {
this.currentURI = currentURI;
this.currentURIMetaData = currentURIMetaData;
@@ -70,7 +70,7 @@ public MediaInfo(String currentURI, String currentURIMetaData,
}
public MediaInfo(String currentURI, String currentURIMetaData,
- UnsignedIntegerFourBytes numberOfTracks, String mediaDuration,
+ UnsignedIntegerEightBytes numberOfTracks, String mediaDuration,
StorageMedium playMedium,
StorageMedium recordMedium, RecordMediumWriteStatus writeStatus) {
this.currentURI = currentURI;
@@ -84,7 +84,7 @@ public MediaInfo(String currentURI, String currentURIMetaData,
public MediaInfo(String currentURI, String currentURIMetaData,
String nextURI, String nextURIMetaData,
- UnsignedIntegerFourBytes numberOfTracks, String mediaDuration,
+ UnsignedIntegerEightBytes numberOfTracks, String mediaDuration,
StorageMedium playMedium) {
this.currentURI = currentURI;
this.currentURIMetaData = currentURIMetaData;
@@ -97,7 +97,7 @@ public MediaInfo(String currentURI, String currentURIMetaData,
public MediaInfo(String currentURI, String currentURIMetaData,
String nextURI, String nextURIMetaData,
- UnsignedIntegerFourBytes numberOfTracks, String mediaDuration,
+ UnsignedIntegerEightBytes numberOfTracks, String mediaDuration,
StorageMedium playMedium,
StorageMedium recordMedium, RecordMediumWriteStatus writeStatus) {
this.currentURI = currentURI;
@@ -127,7 +127,7 @@ public String getNextURIMetaData() {
return nextURIMetaData;
}
- public UnsignedIntegerFourBytes getNumberOfTracks() {
+ public UnsignedIntegerEightBytes getNumberOfTracks() {
return numberOfTracks;
}
diff --git a/support/src/main/java/org/fourthline/cling/support/model/PortMapping.java b/support/src/main/java/org/fourthline/cling/support/model/PortMapping.java
index ac00fef09..1784f9652 100644
--- a/support/src/main/java/org/fourthline/cling/support/model/PortMapping.java
+++ b/support/src/main/java/org/fourthline/cling/support/model/PortMapping.java
@@ -17,7 +17,7 @@
import org.fourthline.cling.model.action.ActionArgumentValue;
import org.fourthline.cling.model.meta.Service;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.model.types.UnsignedIntegerTwoBytes;
import java.util.Map;
@@ -32,14 +32,14 @@ public enum Protocol {
TCP
}
- private boolean enabled;
- private UnsignedIntegerFourBytes leaseDurationSeconds;
- private String remoteHost;
- private UnsignedIntegerTwoBytes externalPort;
- private UnsignedIntegerTwoBytes internalPort;
- private String internalClient;
- private Protocol protocol;
- private String description;
+ private boolean enabled;
+ private UnsignedIntegerEightBytes leaseDurationSeconds;
+ private String remoteHost;
+ private UnsignedIntegerTwoBytes externalPort;
+ private UnsignedIntegerTwoBytes internalPort;
+ private String internalClient;
+ private Protocol protocol;
+ private String description;
public PortMapping() {
}
@@ -48,7 +48,7 @@ public PortMapping() {
public PortMapping(Map> map) {
this(
(Boolean) map.get("NewEnabled").getValue(),
- (UnsignedIntegerFourBytes) map.get("NewLeaseDuration").getValue(),
+ (UnsignedIntegerEightBytes) map.get("NewLeaseDuration").getValue(),
(String) map.get("NewRemoteHost").getValue(),
(UnsignedIntegerTwoBytes) map.get("NewExternalPort").getValue(),
(UnsignedIntegerTwoBytes) map.get("NewInternalPort").getValue(),
@@ -61,7 +61,7 @@ public PortMapping(Map> map) {
public PortMapping(int port, String internalClient, Protocol protocol) {
this(
true,
- new UnsignedIntegerFourBytes(0),
+ new UnsignedIntegerEightBytes(0),
null,
new UnsignedIntegerTwoBytes(port),
new UnsignedIntegerTwoBytes(port),
@@ -74,7 +74,7 @@ public PortMapping(int port, String internalClient, Protocol protocol) {
public PortMapping(int port, String internalClient, Protocol protocol, String description) {
this(
true,
- new UnsignedIntegerFourBytes(0),
+ new UnsignedIntegerEightBytes(0),
null,
new UnsignedIntegerTwoBytes(port),
new UnsignedIntegerTwoBytes(port),
@@ -87,7 +87,7 @@ public PortMapping(int port, String internalClient, Protocol protocol, String de
public PortMapping(String remoteHost, UnsignedIntegerTwoBytes externalPort, Protocol protocol) {
this(
true,
- new UnsignedIntegerFourBytes(0),
+ new UnsignedIntegerEightBytes(0),
remoteHost,
externalPort,
null,
@@ -97,7 +97,7 @@ public PortMapping(String remoteHost, UnsignedIntegerTwoBytes externalPort, Prot
);
}
- public PortMapping(boolean enabled, UnsignedIntegerFourBytes leaseDurationSeconds, String remoteHost, UnsignedIntegerTwoBytes externalPort,
+ public PortMapping(boolean enabled, UnsignedIntegerEightBytes leaseDurationSeconds, String remoteHost, UnsignedIntegerTwoBytes externalPort,
UnsignedIntegerTwoBytes internalPort, String internalClient, Protocol protocol, String description) {
this.enabled = enabled;
this.leaseDurationSeconds = leaseDurationSeconds;
@@ -117,11 +117,11 @@ public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
- public UnsignedIntegerFourBytes getLeaseDurationSeconds() {
+ public UnsignedIntegerEightBytes getLeaseDurationSeconds() {
return leaseDurationSeconds;
}
- public void setLeaseDurationSeconds(UnsignedIntegerFourBytes leaseDurationSeconds) {
+ public void setLeaseDurationSeconds(UnsignedIntegerEightBytes leaseDurationSeconds) {
this.leaseDurationSeconds = leaseDurationSeconds;
}
diff --git a/support/src/main/java/org/fourthline/cling/support/model/PositionInfo.java b/support/src/main/java/org/fourthline/cling/support/model/PositionInfo.java
index b97172e3c..bb68b5c1d 100644
--- a/support/src/main/java/org/fourthline/cling/support/model/PositionInfo.java
+++ b/support/src/main/java/org/fourthline/cling/support/model/PositionInfo.java
@@ -17,7 +17,7 @@
import org.fourthline.cling.model.ModelUtil;
import org.fourthline.cling.model.action.ActionArgumentValue;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import java.util.Map;
@@ -26,21 +26,21 @@
*/
public class PositionInfo {
- private UnsignedIntegerFourBytes track = new UnsignedIntegerFourBytes(0);
- private String trackDuration = "00:00:00";
- private String trackMetaData = "NOT_IMPLEMENTED";
- private String trackURI = "";
- private String relTime = "00:00:00";
- private String absTime = "00:00:00"; // TODO: MORE VALUES IN DOMAIN!
- private int relCount = Integer.MAX_VALUE; // Indicates that we don't support this
- private int absCount = Integer.MAX_VALUE;
+ private UnsignedIntegerEightBytes track = new UnsignedIntegerEightBytes(0);
+ private String trackDuration = "00:00:00";
+ private String trackMetaData = "NOT_IMPLEMENTED";
+ private String trackURI = "";
+ private String relTime = "00:00:00";
+ private String absTime = "00:00:00"; // TODO: MORE VALUES IN DOMAIN!
+ private int relCount = Integer.MAX_VALUE; // Indicates that we don't support this
+ private int absCount = Integer.MAX_VALUE;
public PositionInfo() {
}
public PositionInfo(Map args) {
this(
- ((UnsignedIntegerFourBytes) args.get("Track").getValue()).getValue(),
+ ((UnsignedIntegerEightBytes) args.get("Track").getValue()).getValue(),
(String) args.get("TrackDuration").getValue(),
(String) args.get("TrackMetaData").getValue(),
(String) args.get("TrackURI").getValue(),
@@ -75,7 +75,7 @@ public PositionInfo(PositionInfo copy, long relTimeSeconds, long absTimeSeconds)
public PositionInfo(long track, String trackDuration, String trackURI,
String relTime, String absTime) {
- this.track = new UnsignedIntegerFourBytes(track);
+ this.track = new UnsignedIntegerEightBytes(track);
this.trackDuration = trackDuration;
this.trackURI = trackURI;
this.relTime = relTime;
@@ -85,7 +85,7 @@ public PositionInfo(long track, String trackDuration, String trackURI,
public PositionInfo(long track, String trackDuration,
String trackMetaData, String trackURI,
String relTime, String absTime, int relCount, int absCount) {
- this.track = new UnsignedIntegerFourBytes(track);
+ this.track = new UnsignedIntegerEightBytes(track);
this.trackDuration = trackDuration;
this.trackMetaData = trackMetaData;
this.trackURI = trackURI;
@@ -96,12 +96,12 @@ public PositionInfo(long track, String trackDuration,
}
public PositionInfo(long track, String trackMetaData, String trackURI) {
- this.track = new UnsignedIntegerFourBytes(track);
+ this.track = new UnsignedIntegerEightBytes(track);
this.trackMetaData = trackMetaData;
this.trackURI = trackURI;
}
- public UnsignedIntegerFourBytes getTrack() {
+ public UnsignedIntegerEightBytes getTrack() {
return track;
}
diff --git a/support/src/main/java/org/fourthline/cling/support/model/SearchResult.java b/support/src/main/java/org/fourthline/cling/support/model/SearchResult.java
index f2ff19bd2..a63518219 100644
--- a/support/src/main/java/org/fourthline/cling/support/model/SearchResult.java
+++ b/support/src/main/java/org/fourthline/cling/support/model/SearchResult.java
@@ -15,7 +15,7 @@
package org.fourthline.cling.support.model;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
/**
* @author TK Kocheran <rfkrocktk@gmail.com>
@@ -24,15 +24,15 @@ public class SearchResult {
protected String result;
- protected UnsignedIntegerFourBytes count;
+ protected UnsignedIntegerEightBytes count;
- protected UnsignedIntegerFourBytes totalMatches;
+ protected UnsignedIntegerEightBytes totalMatches;
- protected UnsignedIntegerFourBytes containerUpdateID;
+ protected UnsignedIntegerEightBytes containerUpdateID;
- public SearchResult(String result, UnsignedIntegerFourBytes count,
- UnsignedIntegerFourBytes totalMatches,
- UnsignedIntegerFourBytes containerUpdateID) {
+ public SearchResult(String result, UnsignedIntegerEightBytes count,
+ UnsignedIntegerEightBytes totalMatches,
+ UnsignedIntegerEightBytes containerUpdateID) {
this.result = result;
this.count = count;
this.totalMatches = totalMatches;
@@ -46,9 +46,9 @@ public SearchResult(String result, long count, long totalMatches) {
public SearchResult(String result, long count, long totalMatches, long updateID) {
this(
result,
- new UnsignedIntegerFourBytes(count),
- new UnsignedIntegerFourBytes(totalMatches),
- new UnsignedIntegerFourBytes(updateID)
+ new UnsignedIntegerEightBytes(count),
+ new UnsignedIntegerEightBytes(totalMatches),
+ new UnsignedIntegerEightBytes(updateID)
);
}
@@ -56,7 +56,7 @@ public String getResult() {
return result;
}
- public UnsignedIntegerFourBytes getCount() {
+ public UnsignedIntegerEightBytes getCount() {
return count;
}
@@ -64,7 +64,7 @@ public long getCountLong() {
return count.getValue();
}
- public UnsignedIntegerFourBytes getTotalMatches() {
+ public UnsignedIntegerEightBytes getTotalMatches() {
return totalMatches;
}
@@ -72,7 +72,7 @@ public long getTotalMatchesLong() {
return totalMatches.getValue();
}
- public UnsignedIntegerFourBytes getContainerUpdateID() {
+ public UnsignedIntegerEightBytes getContainerUpdateID() {
return containerUpdateID;
}
diff --git a/support/src/main/java/org/fourthline/cling/support/model/dlna/message/header/BufferBytesHeader.java b/support/src/main/java/org/fourthline/cling/support/model/dlna/message/header/BufferBytesHeader.java
index 284d1ab12..c52f6d42f 100644
--- a/support/src/main/java/org/fourthline/cling/support/model/dlna/message/header/BufferBytesHeader.java
+++ b/support/src/main/java/org/fourthline/cling/support/model/dlna/message/header/BufferBytesHeader.java
@@ -15,21 +15,21 @@
package org.fourthline.cling.support.model.dlna.message.header;
import org.fourthline.cling.model.message.header.InvalidHeaderException;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
/**
* @author Mario Franco
*/
-public class BufferBytesHeader extends DLNAHeader {
+public class BufferBytesHeader extends DLNAHeader {
public BufferBytesHeader() {
- setValue(new UnsignedIntegerFourBytes(0L));
+ setValue(new UnsignedIntegerEightBytes(0L));
}
@Override
public void setString(String s) throws InvalidHeaderException {
try {
- setValue(new UnsignedIntegerFourBytes(s));
+ setValue(new UnsignedIntegerEightBytes(s));
return;
} catch (NumberFormatException numberFormatException) {
}
diff --git a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/AbstractAudioRenderingControl.java b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/AbstractAudioRenderingControl.java
index a1f52e881..ea56ff3e2 100644
--- a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/AbstractAudioRenderingControl.java
+++ b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/AbstractAudioRenderingControl.java
@@ -15,28 +15,16 @@
package org.fourthline.cling.support.renderingcontrol;
-import org.fourthline.cling.binding.annotations.UpnpAction;
-import org.fourthline.cling.binding.annotations.UpnpInputArgument;
-import org.fourthline.cling.binding.annotations.UpnpOutputArgument;
-import org.fourthline.cling.binding.annotations.UpnpService;
-import org.fourthline.cling.binding.annotations.UpnpServiceId;
-import org.fourthline.cling.binding.annotations.UpnpServiceType;
-import org.fourthline.cling.binding.annotations.UpnpStateVariable;
-import org.fourthline.cling.binding.annotations.UpnpStateVariables;
+import org.fourthline.cling.binding.annotations.*;
import org.fourthline.cling.model.types.ErrorCode;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.model.types.UnsignedIntegerTwoBytes;
import org.fourthline.cling.support.lastchange.LastChange;
import org.fourthline.cling.support.lastchange.LastChangeDelegator;
import org.fourthline.cling.support.model.Channel;
import org.fourthline.cling.support.model.PresetName;
import org.fourthline.cling.support.model.VolumeDBRange;
-import org.fourthline.cling.support.renderingcontrol.lastchange.ChannelLoudness;
-import org.fourthline.cling.support.renderingcontrol.lastchange.ChannelMute;
-import org.fourthline.cling.support.renderingcontrol.lastchange.ChannelVolume;
-import org.fourthline.cling.support.renderingcontrol.lastchange.ChannelVolumeDB;
-import org.fourthline.cling.support.renderingcontrol.lastchange.RenderingControlLastChangeParser;
-import org.fourthline.cling.support.renderingcontrol.lastchange.RenderingControlVariable;
+import org.fourthline.cling.support.renderingcontrol.lastchange.*;
import java.beans.PropertyChangeSupport;
@@ -120,7 +108,7 @@ public LastChange getLastChange() {
}
@Override
- public void appendCurrentState(LastChange lc, UnsignedIntegerFourBytes instanceId) throws Exception {
+ public void appendCurrentState(LastChange lc, UnsignedIntegerEightBytes instanceId) throws Exception {
for (Channel channel : getCurrentChannels()) {
String channelString = channel.name();
lc.setEventedValue(
@@ -138,46 +126,46 @@ public PropertyChangeSupport getPropertyChangeSupport() {
return propertyChangeSupport;
}
- public static UnsignedIntegerFourBytes getDefaultInstanceID() {
- return new UnsignedIntegerFourBytes(0);
+ public static UnsignedIntegerEightBytes getDefaultInstanceID() {
+ return new UnsignedIntegerEightBytes(0);
}
@UpnpAction(out = @UpnpOutputArgument(name = "CurrentPresetNameList", stateVariable = "PresetNameList"))
- public String listPresets(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId) throws RenderingControlException {
+ public String listPresets(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId) throws RenderingControlException {
return PresetName.FactoryDefaults.toString();
}
@UpnpAction
- public void selectPreset(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public void selectPreset(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "PresetName") String presetName) throws RenderingControlException {
}
@UpnpAction(out = @UpnpOutputArgument(name = "CurrentMute", stateVariable = "Mute"))
- public abstract boolean getMute(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public abstract boolean getMute(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "Channel") String channelName) throws RenderingControlException;
@UpnpAction
- public abstract void setMute(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public abstract void setMute(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "Channel") String channelName,
@UpnpInputArgument(name = "DesiredMute", stateVariable = "Mute") boolean desiredMute) throws RenderingControlException;
@UpnpAction(out = @UpnpOutputArgument(name = "CurrentVolume", stateVariable = "Volume"))
- public abstract UnsignedIntegerTwoBytes getVolume(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public abstract UnsignedIntegerTwoBytes getVolume(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "Channel") String channelName) throws RenderingControlException;
@UpnpAction
- public abstract void setVolume(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public abstract void setVolume(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "Channel") String channelName,
@UpnpInputArgument(name = "DesiredVolume", stateVariable = "Volume") UnsignedIntegerTwoBytes desiredVolume) throws RenderingControlException;
@UpnpAction(out = @UpnpOutputArgument(name = "CurrentVolume", stateVariable = "VolumeDB"))
- public Integer getVolumeDB(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public Integer getVolumeDB(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "Channel") String channelName) throws RenderingControlException {
return 0;
}
@UpnpAction
- public void setVolumeDB(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public void setVolumeDB(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "Channel") String channelName,
@UpnpInputArgument(name = "DesiredVolume", stateVariable = "VolumeDB") Integer desiredVolumeDB) throws RenderingControlException {
/*
@@ -191,19 +179,19 @@ public void setVolumeDB(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerF
@UpnpOutputArgument(name = "MinValue", stateVariable = "VolumeDB", getterName = "getMinValue"),
@UpnpOutputArgument(name = "MaxValue", stateVariable = "VolumeDB", getterName = "getMaxValue")
})
- public VolumeDBRange getVolumeDBRange(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public VolumeDBRange getVolumeDBRange(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "Channel") String channelName) throws RenderingControlException {
return new VolumeDBRange(0, 0);
}
@UpnpAction(out = @UpnpOutputArgument(name = "CurrentLoudness", stateVariable = "Loudness"))
- public boolean getLoudness(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public boolean getLoudness(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "Channel") String channelName) throws RenderingControlException {
return false;
}
@UpnpAction
- public void setLoudness(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerFourBytes instanceId,
+ public void setLoudness(@UpnpInputArgument(name = "InstanceID") UnsignedIntegerEightBytes instanceId,
@UpnpInputArgument(name = "Channel") String channelName,
@UpnpInputArgument(name = "DesiredLoudness", stateVariable = "Loudness") boolean desiredLoudness) throws RenderingControlException {
/*
diff --git a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/GetMute.java b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/GetMute.java
index 3f0bc9a7f..9b18eaafe 100644
--- a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/GetMute.java
+++ b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/GetMute.java
@@ -18,7 +18,7 @@
import org.fourthline.cling.controlpoint.ActionCallback;
import org.fourthline.cling.model.action.ActionInvocation;
import org.fourthline.cling.model.meta.Service;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.support.model.Channel;
import java.util.logging.Logger;
@@ -32,9 +32,9 @@ public abstract class GetMute extends ActionCallback {
private static Logger log = Logger.getLogger(GetMute.class.getName());
public GetMute(Service service) {
- this(new UnsignedIntegerFourBytes(0), service);
+ this(new UnsignedIntegerEightBytes(0), service);
}
- public GetMute(UnsignedIntegerFourBytes instanceId, Service service) {
+ public GetMute(UnsignedIntegerEightBytes instanceId, Service service) {
super(new ActionInvocation(service.getAction("GetMute")));
getActionInvocation().setInput("InstanceID", instanceId);
getActionInvocation().setInput("Channel", Channel.Master.toString());
diff --git a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/GetVolume.java b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/GetVolume.java
index 405905730..ad8802984 100644
--- a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/GetVolume.java
+++ b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/GetVolume.java
@@ -20,7 +20,7 @@
import org.fourthline.cling.model.action.ActionInvocation;
import org.fourthline.cling.model.meta.Service;
import org.fourthline.cling.model.types.ErrorCode;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.support.model.Channel;
import java.util.logging.Logger;
@@ -34,10 +34,10 @@ public abstract class GetVolume extends ActionCallback {
private static Logger log = Logger.getLogger(GetVolume.class.getName());
public GetVolume(Service service) {
- this(new UnsignedIntegerFourBytes(0), service);
+ this(new UnsignedIntegerEightBytes(0), service);
}
- public GetVolume(UnsignedIntegerFourBytes instanceId, Service service) {
+ public GetVolume(UnsignedIntegerEightBytes instanceId, Service service) {
super(new ActionInvocation(service.getAction("GetVolume")));
getActionInvocation().setInput("InstanceID", instanceId);
getActionInvocation().setInput("Channel", Channel.Master.toString());
diff --git a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/SetMute.java b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/SetMute.java
index 0ea6ff2ef..89fe38445 100644
--- a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/SetMute.java
+++ b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/SetMute.java
@@ -18,7 +18,7 @@
import org.fourthline.cling.controlpoint.ActionCallback;
import org.fourthline.cling.model.action.ActionInvocation;
import org.fourthline.cling.model.meta.Service;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.support.model.Channel;
import java.util.logging.Logger;
@@ -32,10 +32,10 @@ public abstract class SetMute extends ActionCallback {
private static Logger log = Logger.getLogger(SetMute.class.getName());
public SetMute(Service service, boolean desiredMute) {
- this(new UnsignedIntegerFourBytes(0), service, desiredMute);
+ this(new UnsignedIntegerEightBytes(0), service, desiredMute);
}
- public SetMute(UnsignedIntegerFourBytes instanceId, Service service, boolean desiredMute) {
+ public SetMute(UnsignedIntegerEightBytes instanceId, Service service, boolean desiredMute) {
super(new ActionInvocation(service.getAction("SetMute")));
getActionInvocation().setInput("InstanceID", instanceId);
getActionInvocation().setInput("Channel", Channel.Master.toString());
diff --git a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/SetVolume.java b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/SetVolume.java
index ef6afb932..2b7db91b3 100644
--- a/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/SetVolume.java
+++ b/support/src/main/java/org/fourthline/cling/support/renderingcontrol/callback/SetVolume.java
@@ -18,7 +18,7 @@
import org.fourthline.cling.controlpoint.ActionCallback;
import org.fourthline.cling.model.action.ActionInvocation;
import org.fourthline.cling.model.meta.Service;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.model.types.UnsignedIntegerTwoBytes;
import org.fourthline.cling.support.model.Channel;
@@ -33,10 +33,10 @@ public abstract class SetVolume extends ActionCallback {
private static Logger log = Logger.getLogger(SetVolume.class.getName());
public SetVolume(Service service, long newVolume) {
- this(new UnsignedIntegerFourBytes(0), service, newVolume);
+ this(new UnsignedIntegerEightBytes(0), service, newVolume);
}
- public SetVolume(UnsignedIntegerFourBytes instanceId, Service service, long newVolume) {
+ public SetVolume(UnsignedIntegerEightBytes instanceId, Service service, long newVolume) {
super(new ActionInvocation(service.getAction("SetVolume")));
getActionInvocation().setInput("InstanceID", instanceId);
getActionInvocation().setInput("Channel", Channel.Master.toString());
diff --git a/support/src/main/java/org/fourthline/cling/support/xmicrosoft/AbstractMediaReceiverRegistrarService.java b/support/src/main/java/org/fourthline/cling/support/xmicrosoft/AbstractMediaReceiverRegistrarService.java
index a635dcf74..150aac0ec 100644
--- a/support/src/main/java/org/fourthline/cling/support/xmicrosoft/AbstractMediaReceiverRegistrarService.java
+++ b/support/src/main/java/org/fourthline/cling/support/xmicrosoft/AbstractMediaReceiverRegistrarService.java
@@ -15,15 +15,8 @@
package org.fourthline.cling.support.xmicrosoft;
-import org.fourthline.cling.binding.annotations.UpnpAction;
-import org.fourthline.cling.binding.annotations.UpnpInputArgument;
-import org.fourthline.cling.binding.annotations.UpnpOutputArgument;
-import org.fourthline.cling.binding.annotations.UpnpService;
-import org.fourthline.cling.binding.annotations.UpnpServiceId;
-import org.fourthline.cling.binding.annotations.UpnpServiceType;
-import org.fourthline.cling.binding.annotations.UpnpStateVariable;
-import org.fourthline.cling.binding.annotations.UpnpStateVariables;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.binding.annotations.*;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import java.beans.PropertyChangeSupport;
@@ -64,16 +57,16 @@ public abstract class AbstractMediaReceiverRegistrarService {
final protected PropertyChangeSupport propertyChangeSupport;
@UpnpStateVariable(eventMinimumDelta = 1)
- private UnsignedIntegerFourBytes authorizationGrantedUpdateID = new UnsignedIntegerFourBytes(0);
+ private UnsignedIntegerEightBytes authorizationGrantedUpdateID = new UnsignedIntegerEightBytes(0);
@UpnpStateVariable(eventMinimumDelta = 1)
- private UnsignedIntegerFourBytes authorizationDeniedUpdateID = new UnsignedIntegerFourBytes(0);
+ private UnsignedIntegerEightBytes authorizationDeniedUpdateID = new UnsignedIntegerEightBytes(0);
@UpnpStateVariable
- private UnsignedIntegerFourBytes validationSucceededUpdateID = new UnsignedIntegerFourBytes(0);
+ private UnsignedIntegerEightBytes validationSucceededUpdateID = new UnsignedIntegerEightBytes(0);
@UpnpStateVariable
- private UnsignedIntegerFourBytes validationRevokedUpdateID = new UnsignedIntegerFourBytes(0);
+ private UnsignedIntegerEightBytes validationRevokedUpdateID = new UnsignedIntegerEightBytes(0);
protected AbstractMediaReceiverRegistrarService() {
this(null);
@@ -89,22 +82,22 @@ public PropertyChangeSupport getPropertyChangeSupport() {
@UpnpAction(out = @UpnpOutputArgument(name = "AuthorizationGrantedUpdateID"))
- public UnsignedIntegerFourBytes getAuthorizationGrantedUpdateID() {
+ public UnsignedIntegerEightBytes getAuthorizationGrantedUpdateID() {
return authorizationGrantedUpdateID;
}
@UpnpAction(out = @UpnpOutputArgument(name = "AuthorizationDeniedUpdateID"))
- public UnsignedIntegerFourBytes getAuthorizationDeniedUpdateID() {
+ public UnsignedIntegerEightBytes getAuthorizationDeniedUpdateID() {
return authorizationDeniedUpdateID;
}
@UpnpAction(out = @UpnpOutputArgument(name = "ValidationSucceededUpdateID"))
- public UnsignedIntegerFourBytes getValidationSucceededUpdateID() {
+ public UnsignedIntegerEightBytes getValidationSucceededUpdateID() {
return validationSucceededUpdateID;
}
@UpnpAction(out = @UpnpOutputArgument(name = "ValidationRevokedUpdateID"))
- public UnsignedIntegerFourBytes getValidationRevokedUpdateID() {
+ public UnsignedIntegerEightBytes getValidationRevokedUpdateID() {
return validationRevokedUpdateID;
}
diff --git a/support/src/test/java/example/igd/IGDSampleData.java b/support/src/test/java/example/igd/IGDSampleData.java
index 2f4d374de..6910a2754 100644
--- a/support/src/test/java/example/igd/IGDSampleData.java
+++ b/support/src/test/java/example/igd/IGDSampleData.java
@@ -14,26 +14,14 @@
*/
package example.igd;
-import org.fourthline.cling.binding.annotations.AnnotationLocalServiceBinder;
-import org.fourthline.cling.binding.annotations.UpnpAction;
-import org.fourthline.cling.binding.annotations.UpnpInputArgument;
-import org.fourthline.cling.binding.annotations.UpnpOutputArgument;
-import org.fourthline.cling.binding.annotations.UpnpService;
-import org.fourthline.cling.binding.annotations.UpnpServiceId;
-import org.fourthline.cling.binding.annotations.UpnpServiceType;
-import org.fourthline.cling.binding.annotations.UpnpStateVariable;
-import org.fourthline.cling.binding.annotations.UpnpStateVariables;
+import org.fourthline.cling.binding.annotations.*;
import org.fourthline.cling.model.DefaultServiceManager;
import org.fourthline.cling.model.action.ActionException;
import org.fourthline.cling.model.meta.DeviceDetails;
import org.fourthline.cling.model.meta.DeviceIdentity;
import org.fourthline.cling.model.meta.LocalDevice;
import org.fourthline.cling.model.meta.LocalService;
-import org.fourthline.cling.model.types.ErrorCode;
-import org.fourthline.cling.model.types.UDADeviceType;
-import org.fourthline.cling.model.types.UDN;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
-import org.fourthline.cling.model.types.UnsignedIntegerTwoBytes;
+import org.fourthline.cling.model.types.*;
import org.fourthline.cling.support.model.Connection;
import org.fourthline.cling.support.model.PortMapping;
@@ -124,7 +112,7 @@ public void addPortMapping(
@UpnpInputArgument(name = "NewInternalClient", stateVariable = "InternalClient") String internalClient,
@UpnpInputArgument(name = "NewEnabled", stateVariable = "PortMappingEnabled") Boolean enabled,
@UpnpInputArgument(name = "NewPortMappingDescription", stateVariable = "PortMappingDescription") String description,
- @UpnpInputArgument(name = "NewLeaseDuration", stateVariable = "PortMappingLeaseDuration") UnsignedIntegerFourBytes leaseDuration
+ @UpnpInputArgument(name = "NewLeaseDuration", stateVariable = "PortMappingLeaseDuration") UnsignedIntegerEightBytes leaseDuration
) throws ActionException {
try {
addPortMapping(new PortMapping(
diff --git a/support/src/test/java/example/mediarenderer/LastChangeTest.java b/support/src/test/java/example/mediarenderer/LastChangeTest.java
index 3554e7e07..d25eaead5 100644
--- a/support/src/test/java/example/mediarenderer/LastChangeTest.java
+++ b/support/src/test/java/example/mediarenderer/LastChangeTest.java
@@ -22,7 +22,7 @@
import org.fourthline.cling.model.meta.LocalDevice;
import org.fourthline.cling.model.meta.LocalService;
import org.fourthline.cling.model.state.StateVariableValue;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.model.types.UnsignedIntegerTwoBytes;
import org.fourthline.cling.support.avtransport.lastchange.AVTransportLastChangeParser;
import org.fourthline.cling.support.avtransport.lastchange.AVTransportVariable;
@@ -30,15 +30,7 @@
import org.fourthline.cling.support.lastchange.Event;
import org.fourthline.cling.support.lastchange.LastChange;
import org.fourthline.cling.support.lastchange.LastChangeParser;
-import org.fourthline.cling.support.model.Channel;
-import org.fourthline.cling.support.model.DIDLContent;
-import org.fourthline.cling.support.model.PlayMode;
-import org.fourthline.cling.support.model.RecordMediumWriteStatus;
-import org.fourthline.cling.support.model.RecordQualityMode;
-import org.fourthline.cling.support.model.StorageMedium;
-import org.fourthline.cling.support.model.TransportAction;
-import org.fourthline.cling.support.model.TransportState;
-import org.fourthline.cling.support.model.TransportStatus;
+import org.fourthline.cling.support.model.*;
import org.fourthline.cling.support.renderingcontrol.lastchange.ChannelVolume;
import org.fourthline.cling.support.renderingcontrol.lastchange.RenderingControlLastChangeParser;
import org.fourthline.cling.support.renderingcontrol.lastchange.RenderingControlVariable;
@@ -123,7 +115,7 @@ public void parseLastChangeXML() throws Exception {
Event event = avTransportParser.parseResource("org/fourthline/cling/test/support/lastchange/samples/avtransport-roku.xml");
assertEquals(event.getInstanceIDs().size(), 1);
- UnsignedIntegerFourBytes instanceId = new UnsignedIntegerFourBytes(0);
+ UnsignedIntegerEightBytes instanceId = new UnsignedIntegerEightBytes(0);
assertEquals(
event.getEventedValue(instanceId, AVTransportVariable.TransportState.class).getValue(),
TransportState.STOPPED
@@ -183,13 +175,13 @@ public void eventReceived(GENASubscription sub) {
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.CurrentMediaDuration.class).getValue(), "00:00:00");
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.CurrentPlayMode.class).getValue(), PlayMode.NORMAL);
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.CurrentRecordQualityMode.class).getValue(), RecordQualityMode.NOT_IMPLEMENTED);
- assertEquals(lastChange.getEventedValue(0, AVTransportVariable.CurrentTrack.class).getValue(), new UnsignedIntegerFourBytes(0));
+ assertEquals(lastChange.getEventedValue(0, AVTransportVariable.CurrentTrack.class).getValue(), new UnsignedIntegerEightBytes(0));
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.CurrentTrackDuration.class).getValue(), "00:00:00");
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.CurrentTrackMetaData.class).getValue(), "NOT_IMPLEMENTED");
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.CurrentTrackURI.class).getValue(), null);
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.CurrentTransportActions.class).getValue(), new TransportAction[]{TransportAction.Stop});
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.NextAVTransportURI.class).getValue().toString(), "NOT_IMPLEMENTED"); // TODO: That's weird
- assertEquals(lastChange.getEventedValue(0, AVTransportVariable.NumberOfTracks.class).getValue(), new UnsignedIntegerFourBytes(0));
+ assertEquals(lastChange.getEventedValue(0, AVTransportVariable.NumberOfTracks.class).getValue(), new UnsignedIntegerEightBytes(0));
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.PossiblePlaybackStorageMedia.class).getValue(), new StorageMedium[]{StorageMedium.NETWORK});
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.PossibleRecordQualityModes.class).getValue(), new RecordQualityMode[]{RecordQualityMode.NOT_IMPLEMENTED});
assertEquals(lastChange.getEventedValue(0, AVTransportVariable.PossibleRecordStorageMedia.class).getValue(), new StorageMedium[]{StorageMedium.NOT_IMPLEMENTED});
diff --git a/support/src/test/java/example/mediarenderer/MediaRendererSampleData.java b/support/src/test/java/example/mediarenderer/MediaRendererSampleData.java
index 135ddaeed..27d61335d 100644
--- a/support/src/test/java/example/mediarenderer/MediaRendererSampleData.java
+++ b/support/src/test/java/example/mediarenderer/MediaRendererSampleData.java
@@ -21,7 +21,7 @@
import org.fourthline.cling.model.meta.LocalService;
import org.fourthline.cling.model.types.UDADeviceType;
import org.fourthline.cling.model.types.UDN;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.model.types.UnsignedIntegerTwoBytes;
import org.fourthline.cling.support.avtransport.impl.AVTransportService;
import org.fourthline.cling.support.avtransport.lastchange.AVTransportLastChangeParser;
@@ -92,22 +92,22 @@ public static LocalDevice createDevice() throws Exception {
public static class AudioRenderingControlService extends AbstractAudioRenderingControl {
@Override
- public boolean getMute(UnsignedIntegerFourBytes instanceId, String channelName) throws RenderingControlException {
+ public boolean getMute(UnsignedIntegerEightBytes instanceId, String channelName) throws RenderingControlException {
return false;
}
@Override
- public void setMute(UnsignedIntegerFourBytes instanceId, String channelName, boolean desiredMute) throws RenderingControlException {
+ public void setMute(UnsignedIntegerEightBytes instanceId, String channelName, boolean desiredMute) throws RenderingControlException {
}
@Override
- public UnsignedIntegerTwoBytes getVolume(UnsignedIntegerFourBytes instanceId, String channelName) throws RenderingControlException {
+ public UnsignedIntegerTwoBytes getVolume(UnsignedIntegerEightBytes instanceId, String channelName) throws RenderingControlException {
return new UnsignedIntegerTwoBytes(50);
}
@Override
- public void setVolume(UnsignedIntegerFourBytes instanceId, String channelName, UnsignedIntegerTwoBytes desiredVolume) throws RenderingControlException {
+ public void setVolume(UnsignedIntegerEightBytes instanceId, String channelName, UnsignedIntegerTwoBytes desiredVolume) throws RenderingControlException {
}
@@ -119,8 +119,8 @@ protected Channel[] getCurrentChannels() {
}
@Override
- public UnsignedIntegerFourBytes[] getCurrentInstanceIds() {
- return new UnsignedIntegerFourBytes[0];
+ public UnsignedIntegerEightBytes[] getCurrentInstanceIds() {
+ return new UnsignedIntegerEightBytes[0];
}
}
diff --git a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/avtransport/impl/AVTransportCallback.java b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/avtransport/impl/AVTransportCallback.java
index 8bb24de83..4a0f2631f 100644
--- a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/avtransport/impl/AVTransportCallback.java
+++ b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/avtransport/impl/AVTransportCallback.java
@@ -20,7 +20,7 @@
import org.fourthline.cling.model.gena.GENASubscription;
import org.fourthline.cling.model.message.UpnpResponse;
import org.fourthline.cling.model.meta.Service;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.support.avtransport.lastchange.AVTransportLastChangeParser;
import org.fourthline.cling.support.avtransport.lastchange.AVTransportVariable;
import org.fourthline.cling.support.lastchange.LastChange;
@@ -86,7 +86,7 @@ protected void eventReceived(GENASubscription subscription) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
- for (UnsignedIntegerFourBytes instanceId : lastChange.getInstanceIDs()) {
+ for (UnsignedIntegerEightBytes instanceId : lastChange.getInstanceIDs()) {
AVTransportControlPoint.LOGGER.fine(
"Processing LastChange event values for instance: " + instanceId
diff --git a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/avtransport/impl/AVTransportPresenter.java b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/avtransport/impl/AVTransportPresenter.java
index ff542153e..35199e02e 100644
--- a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/avtransport/impl/AVTransportPresenter.java
+++ b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/avtransport/impl/AVTransportPresenter.java
@@ -21,23 +21,9 @@
import org.fourthline.cling.model.gena.CancelReason;
import org.fourthline.cling.model.message.UpnpResponse;
import org.fourthline.cling.model.meta.Service;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
-import org.fourthline.cling.support.avtransport.callback.GetMediaInfo;
-import org.fourthline.cling.support.avtransport.callback.GetPositionInfo;
-import org.fourthline.cling.support.avtransport.callback.GetTransportInfo;
-import org.fourthline.cling.support.avtransport.callback.Next;
-import org.fourthline.cling.support.avtransport.callback.Pause;
-import org.fourthline.cling.support.avtransport.callback.Play;
-import org.fourthline.cling.support.avtransport.callback.Previous;
-import org.fourthline.cling.support.avtransport.callback.Seek;
-import org.fourthline.cling.support.avtransport.callback.SetAVTransportURI;
-import org.fourthline.cling.support.avtransport.callback.SetPlayMode;
-import org.fourthline.cling.support.avtransport.callback.Stop;
-import org.fourthline.cling.support.model.MediaInfo;
-import org.fourthline.cling.support.model.PlayMode;
-import org.fourthline.cling.support.model.PositionInfo;
-import org.fourthline.cling.support.model.TransportInfo;
-import org.fourthline.cling.support.model.TransportState;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
+import org.fourthline.cling.support.avtransport.callback.*;
+import org.fourthline.cling.support.model.*;
import org.fourthline.cling.workbench.plugins.avtransport.AVTransportControlPoint;
import org.fourthline.cling.workbench.plugins.avtransport.AVTransportView;
@@ -129,7 +115,7 @@ public void run() {
@Override
public void onSetAVTransportURISelected(int instanceId, final String uri) {
controlPoint.execute(
- new SetAVTransportURI(new UnsignedIntegerFourBytes(instanceId), service, uri) {
+ new SetAVTransportURI(new UnsignedIntegerEightBytes(instanceId), service, uri) {
@Override
public void success(ActionInvocation invocation) {
AVTransportControlPoint.LOGGER.info("New transport URI set: " + uri);
@@ -149,7 +135,7 @@ public void failure(ActionInvocation invocation,
@Override
public void onPauseSelected(int instanceId) {
controlPoint.execute(
- new Pause(new UnsignedIntegerFourBytes(instanceId), service) {
+ new Pause(new UnsignedIntegerEightBytes(instanceId), service) {
@Override
public void success(ActionInvocation invocation) {
AVTransportControlPoint.LOGGER.info(
@@ -170,7 +156,7 @@ public void failure(ActionInvocation invocation,
@Override
public void onPlaySelected(int instanceId) {
controlPoint.execute(
- new Play(new UnsignedIntegerFourBytes(instanceId), service) {
+ new Play(new UnsignedIntegerEightBytes(instanceId), service) {
@Override
public void success(ActionInvocation invocation) {
AVTransportControlPoint.LOGGER.info(
@@ -191,7 +177,7 @@ public void failure(ActionInvocation invocation,
@Override
public void onStopSelected(int instanceId) {
controlPoint.execute(
- new Stop(new UnsignedIntegerFourBytes(instanceId), service) {
+ new Stop(new UnsignedIntegerEightBytes(instanceId), service) {
@Override
public void success(ActionInvocation invocation) {
AVTransportControlPoint.LOGGER.info(
@@ -223,7 +209,7 @@ public void onSeekSelected(int instanceId, String target) {
// Now do the asynchronous remote seek
controlPoint.execute(
- new Seek(new UnsignedIntegerFourBytes(instanceId), service, target) {
+ new Seek(new UnsignedIntegerEightBytes(instanceId), service, target) {
@Override
public void success(final ActionInvocation invocation) {
AVTransportControlPoint.LOGGER.info(
@@ -259,7 +245,7 @@ public void onSeekSelected(int instanceId, int deltaSeconds, boolean forwards) {
@Override
public void onPreviousSelected(int instanceId) {
controlPoint.execute(
- new Previous(new UnsignedIntegerFourBytes(instanceId), service) {
+ new Previous(new UnsignedIntegerEightBytes(instanceId), service) {
@Override
public void success(ActionInvocation invocation) {
AVTransportControlPoint.LOGGER.info(
@@ -280,7 +266,7 @@ public void failure(ActionInvocation invocation,
@Override
public void onNextSelected(int instanceId) {
controlPoint.execute(
- new Next(new UnsignedIntegerFourBytes(instanceId), service) {
+ new Next(new UnsignedIntegerEightBytes(instanceId), service) {
@Override
public void success(ActionInvocation invocation) {
AVTransportControlPoint.LOGGER.info(
@@ -301,7 +287,7 @@ public void failure(ActionInvocation invocation,
@Override
public void onUpdatePositionInfo(final int instanceId) {
controlPoint.execute(
- new GetPositionInfo(new UnsignedIntegerFourBytes(instanceId), service) {
+ new GetPositionInfo(new UnsignedIntegerEightBytes(instanceId), service) {
@Override
public void received(ActionInvocation actionInvocation, final PositionInfo positionInfo) {
SwingUtilities.invokeLater(new Runnable() {
@@ -326,7 +312,7 @@ public void failure(ActionInvocation invocation,
@Override
public void onSetPlayModeSelected(final int instanceId, PlayMode playMode) {
controlPoint.execute(
- new SetPlayMode(new UnsignedIntegerFourBytes(instanceId), service, playMode) {
+ new SetPlayMode(new UnsignedIntegerEightBytes(instanceId), service, playMode) {
@Override
public void success(ActionInvocation invocation) {
AVTransportControlPoint.LOGGER.info(
@@ -347,7 +333,7 @@ public void failure(ActionInvocation invocation,
public void updateTransportInfo(final int instanceId) {
controlPoint.execute(
- new GetTransportInfo(new UnsignedIntegerFourBytes(instanceId), service) {
+ new GetTransportInfo(new UnsignedIntegerEightBytes(instanceId), service) {
@Override
public void received(ActionInvocation actionInvocation, final TransportInfo transportInfo) {
SwingUtilities.invokeLater(new Runnable() {
@@ -372,7 +358,7 @@ public void failure(ActionInvocation invocation,
public void updateMediaInfo(final int instanceId) {
controlPoint.execute(
- new GetMediaInfo(new UnsignedIntegerFourBytes(instanceId), service) {
+ new GetMediaInfo(new UnsignedIntegerEightBytes(instanceId), service) {
@Override
public void received(ActionInvocation actionInvocation, final MediaInfo mediaInfo) {
SwingUtilities.invokeLater(new Runnable() {
diff --git a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/contentdirectory/impl/DetailPresenter.java b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/contentdirectory/impl/DetailPresenter.java
index 34c9e3a8f..c87daa4c6 100644
--- a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/contentdirectory/impl/DetailPresenter.java
+++ b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/contentdirectory/impl/DetailPresenter.java
@@ -20,11 +20,7 @@
import org.fourthline.cling.model.message.UpnpResponse;
import org.fourthline.cling.model.meta.Device;
import org.fourthline.cling.model.meta.Service;
-import org.fourthline.cling.model.types.DeviceType;
-import org.fourthline.cling.model.types.ServiceType;
-import org.fourthline.cling.model.types.UDADeviceType;
-import org.fourthline.cling.model.types.UDAServiceType;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.*;
import org.fourthline.cling.support.avtransport.callback.SetAVTransportURI;
import org.fourthline.cling.support.connectionmanager.callback.GetProtocolInfo;
import org.fourthline.cling.support.model.Protocol;
@@ -38,12 +34,7 @@
import org.seamless.util.MimeType;
import javax.inject.Inject;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author Christian Bauer
@@ -203,7 +194,7 @@ protected boolean isProtocolInfoMatch(List supportedProtocols, Res
protected void sendToMediaRenderer(final int instanceId, final Service avTransportService, String uri) {
SetAVTransportURI setAVTransportURIActionCallback =
- new SetAVTransportURI(new UnsignedIntegerFourBytes(instanceId), avTransportService, uri) {
+ new SetAVTransportURI(new UnsignedIntegerEightBytes(instanceId), avTransportService, uri) {
@Override
public void success(ActionInvocation invocation) {
diff --git a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/igd/impl/PortMappingEditViewImpl.java b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/igd/impl/PortMappingEditViewImpl.java
index ede889900..ac19ac309 100644
--- a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/igd/impl/PortMappingEditViewImpl.java
+++ b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/igd/impl/PortMappingEditViewImpl.java
@@ -15,7 +15,7 @@
package org.fourthline.cling.workbench.plugins.igd.impl;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.model.types.UnsignedIntegerTwoBytes;
import org.fourthline.cling.support.model.PortMapping;
import org.fourthline.cling.workbench.Workbench;
@@ -134,7 +134,7 @@ public PortMapping getPortMapping() {
try {
PortMapping pm = new PortMapping();
pm.setEnabled(enabledField.isSelected());
- pm.setLeaseDurationSeconds(new UnsignedIntegerFourBytes(leaseDurationField.getText()));
+ pm.setLeaseDurationSeconds(new UnsignedIntegerEightBytes(leaseDurationField.getText()));
pm.setRemoteHost(remoteHostField.getText());
pm.setExternalPort(new UnsignedIntegerTwoBytes(externalPortField.getText()));
pm.setProtocol((PortMapping.Protocol) protocolField.getSelectedItem());
diff --git a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/renderingcontrol/impl/RenderingControlCallback.java b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/renderingcontrol/impl/RenderingControlCallback.java
index 274a64c2c..66b00b5fc 100644
--- a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/renderingcontrol/impl/RenderingControlCallback.java
+++ b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/renderingcontrol/impl/RenderingControlCallback.java
@@ -20,18 +20,15 @@
import org.fourthline.cling.model.gena.GENASubscription;
import org.fourthline.cling.model.message.UpnpResponse;
import org.fourthline.cling.model.meta.Service;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.support.lastchange.LastChange;
import org.fourthline.cling.support.model.Channel;
import org.fourthline.cling.support.renderingcontrol.lastchange.RenderingControlLastChangeParser;
import org.fourthline.cling.support.renderingcontrol.lastchange.RenderingControlVariable;
-import org.fourthline.cling.workbench.Workbench;
import org.fourthline.cling.workbench.plugins.renderingcontrol.RenderingControlPoint;
-import org.seamless.swing.logging.LogMessage;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import java.util.logging.Level;
-import java.util.logging.Logger;
/**
* @author Christian Bauer
@@ -84,7 +81,7 @@ public void eventReceived(GENASubscription subscription) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
- for (UnsignedIntegerFourBytes instanceId : lastChange.getInstanceIDs()) {
+ for (UnsignedIntegerEightBytes instanceId : lastChange.getInstanceIDs()) {
RenderingControlPoint.LOGGER.fine(
"Processing LastChange event values for instance: " + instanceId
diff --git a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/renderingcontrol/impl/RenderingControlPresenter.java b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/renderingcontrol/impl/RenderingControlPresenter.java
index 470bb1bff..4f1aee4f2 100644
--- a/workbench/src/main/java/org/fourthline/cling/workbench/plugins/renderingcontrol/impl/RenderingControlPresenter.java
+++ b/workbench/src/main/java/org/fourthline/cling/workbench/plugins/renderingcontrol/impl/RenderingControlPresenter.java
@@ -21,7 +21,7 @@
import org.fourthline.cling.model.message.UpnpResponse;
import org.fourthline.cling.model.meta.Service;
import org.fourthline.cling.model.meta.StateVariableAllowedValueRange;
-import org.fourthline.cling.model.types.UnsignedIntegerFourBytes;
+import org.fourthline.cling.model.types.UnsignedIntegerEightBytes;
import org.fourthline.cling.support.renderingcontrol.callback.GetVolume;
import org.fourthline.cling.support.renderingcontrol.callback.SetMute;
import org.fourthline.cling.support.renderingcontrol.callback.SetVolume;
@@ -113,7 +113,7 @@ public void run() {
@Override
public void onMuteSelected(int instanceId, final boolean desiredMute) {
- controlPoint.execute(new SetMute(new UnsignedIntegerFourBytes(instanceId), service, desiredMute) {
+ controlPoint.execute(new SetMute(new UnsignedIntegerEightBytes(instanceId), service, desiredMute) {
@Override
public void success(ActionInvocation invocation) {
@@ -135,7 +135,7 @@ public void failure(ActionInvocation invocation,
@Override
public void onVolumeSelected(int instanceId, final int newVolume) {
- controlPoint.execute(new SetVolume(new UnsignedIntegerFourBytes(instanceId), service, newVolume) {
+ controlPoint.execute(new SetVolume(new UnsignedIntegerEightBytes(instanceId), service, newVolume) {
@Override
public void success(ActionInvocation invocation) {
RenderingControlPoint.LOGGER.info(
@@ -155,7 +155,7 @@ public void failure(ActionInvocation invocation,
}
protected void updateVolume(final int instanceId) {
- controlPoint.execute(new GetVolume(new UnsignedIntegerFourBytes(instanceId), service) {
+ controlPoint.execute(new GetVolume(new UnsignedIntegerEightBytes(instanceId), service) {
@Override
public void received(ActionInvocation actionInvocation, final int currentVolume) {
SwingUtilities.invokeLater(new Runnable() {