aboutsummaryrefslogtreecommitdiffstats
path: root/Java/com/phidgets/event
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2013-03-03 19:30:43 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2013-03-03 19:30:43 +0000
commit477e8e9570cebe9152c011a76defd6e9ce21fac7 (patch)
tree257399dd5eb402a14de37452069e080662c5c1c3 /Java/com/phidgets/event
parent827093b9a63335655c696d4beb3134613c4414e6 (diff)
parent46bd2ba42d186a81d7ad7e4a55e03dd63b2d042f (diff)
downloadlibphidget21-477e8e9570cebe9152c011a76defd6e9ce21fac7.tar.gz
Merge tag 'upstream/2.1.8.20121218'
Upstream version 2.1.8.20121218
Diffstat (limited to '')
-rw-r--r--Java/com/phidgets/event/TagGainEvent.java18
-rw-r--r--Java/com/phidgets/event/TagLossEvent.java18
2 files changed, 34 insertions, 2 deletions
diff --git a/Java/com/phidgets/event/TagGainEvent.java b/Java/com/phidgets/event/TagGainEvent.java
index 6cb7a74..8639ae4 100644
--- a/Java/com/phidgets/event/TagGainEvent.java
+++ b/Java/com/phidgets/event/TagGainEvent.java
@@ -15,6 +15,7 @@ public class TagGainEvent
{
Phidget source;
String value;
+ int protocol;
/**
* Class constructor. This is called internally by the phidget library when creating this event.
@@ -26,6 +27,12 @@ public class TagGainEvent
this.source = source;
this.value = value;
}
+ public TagGainEvent(Phidget source, String value, int protocol)
+ {
+ this.source = source;
+ this.value = value;
+ this.protocol = protocol;
+ }
/**
* Returns the source Phidget of this event. This is a reference to the Phidget object from which this
@@ -39,7 +46,7 @@ public class TagGainEvent
}
/**
- * Returns the gained tag. The tag is a 10 digit hex number represented as a string.
+ * Returns the gained tag.
*
* @return the gained tag
*/
@@ -48,6 +55,15 @@ public class TagGainEvent
}
/**
+ * Returns the protocol of the Tag that was lost.
+ *
+ * @return the lost tag protocol
+ */
+ public int getProtocol() {
+ return protocol;
+ }
+
+ /**
* Returns a string containing information about the event.
*
* @return an informative event string
diff --git a/Java/com/phidgets/event/TagLossEvent.java b/Java/com/phidgets/event/TagLossEvent.java
index ccca4fe..8dcd723 100644
--- a/Java/com/phidgets/event/TagLossEvent.java
+++ b/Java/com/phidgets/event/TagLossEvent.java
@@ -15,6 +15,7 @@ public class TagLossEvent
{
Phidget source;
String value;
+ int protocol;
/**
* Class constructor. This is called internally by the phidget library when creating this event.
@@ -26,6 +27,12 @@ public class TagLossEvent
this.source = source;
this.value = value;
}
+ public TagLossEvent(Phidget source, String value, int protocol)
+ {
+ this.source = source;
+ this.value = value;
+ this.protocol = protocol;
+ }
/**
* Returns the source Phidget of this event. This is a reference to the Phidget object from which this
@@ -39,7 +46,7 @@ public class TagLossEvent
}
/**
- * Returns the Tag that was lost. This is a 10 digit hex number as a string.
+ * Returns the Tag that was lost.
*
* @return the lost tag
*/
@@ -48,6 +55,15 @@ public class TagLossEvent
}
/**
+ * Returns the protocol of the Tag that was lost.
+ *
+ * @return the lost tag protocol
+ */
+ public int getProtocol() {
+ return protocol;
+ }
+
+ /**
* Returns a string containing information about the event.
*
* @return an informative event string