Browse files

updated to open-zwave r645

  • Loading branch information...
1 parent c6879d0 commit 9f1cd0cf17dc2f3eb2505f0fa7316cc1f110edc3 @ekarak ekarak committed Mar 9, 2013
Showing with 20,125 additions and 15,202 deletions.
  1. +42 −41 create_server.rb
  2. +27 −11 gen-cpp/RemoteManager_server.cpp.orig
  3. +1 −1 gen-csharp/OpenZWave/Bool_Bool.cs
  4. +1 −1 gen-csharp/OpenZWave/Bool_Float.cs
  5. +1 −1 gen-csharp/OpenZWave/Bool_GetNodeClassInformation.cs
  6. +1 −1 gen-csharp/OpenZWave/Bool_Int.cs
  7. +1 −1 gen-csharp/OpenZWave/Bool_Int16.cs
  8. +1 −1 gen-csharp/OpenZWave/Bool_ListString.cs
  9. +1 −1 gen-csharp/OpenZWave/Bool_String.cs
  10. +1 −1 gen-csharp/OpenZWave/Bool_UInt8.cs
  11. +1 −1 gen-csharp/OpenZWave/CommandClassData.cs
  12. +1 −1 gen-csharp/OpenZWave/DriverControllerCommand.cs
  13. +1 −1 gen-csharp/OpenZWave/DriverData.cs
  14. +8 −8 gen-csharp/OpenZWave/GetAllScenesReturnStruct.cs
  15. +8 −8 gen-csharp/OpenZWave/GetAssociationsReturnStruct.cs
  16. +1 −1 gen-csharp/OpenZWave/GetDriverStatisticsReturnStruct.cs
  17. +1 −1 gen-csharp/OpenZWave/GetNodeStatisticsReturnStruct.cs
  18. +1 −1 gen-csharp/OpenZWave/GetSwitchPointReturnStruct.cs
  19. +1 −1 gen-csharp/OpenZWave/NodeData.cs
  20. +934 −388 gen-csharp/OpenZWave/RemoteManager.cs
  21. +1 −1 gen-csharp/OpenZWave/RemoteValueGenre.cs
  22. +1 −4 gen-csharp/OpenZWave/RemoteValueID.cs
  23. +1 −2 gen-csharp/OpenZWave/RemoteValueType.cs
  24. +9 −9 gen-csharp/OpenZWave/SceneGetValuesReturnStruct.cs
  25. +8 −8 gen-csharp/OpenZWave/UInt32_ListByte.cs
  26. +1 −1 gen-erl/ozw_constants.hrl
  27. +11 −1 gen-erl/ozw_types.erl
  28. +9 −1 gen-erl/ozw_types.hrl
  29. +64 −45 gen-erl/remoteManager_thrift.erl
  30. +5,000 −4,154 gen-go/OpenZWave/RemoteManager.go
  31. +1,156 −1,107 gen-go/OpenZWave/RemoteManager/RemoteManager-remote.go
  32. +308 −70 gen-go/OpenZWave/ttypes.go
  33. +7 −7 gen-java/OpenZWave/Bool_Bool.java
  34. +7 −7 gen-java/OpenZWave/Bool_Float.java
  35. +9 −9 gen-java/OpenZWave/Bool_GetNodeClassInformation.java
  36. +7 −7 gen-java/OpenZWave/Bool_Int.java
  37. +7 −7 gen-java/OpenZWave/Bool_Int16.java
  38. +9 −9 gen-java/OpenZWave/Bool_ListString.java
  39. +7 −7 gen-java/OpenZWave/Bool_String.java
  40. +7 −7 gen-java/OpenZWave/Bool_UInt8.java
  41. +9 −9 gen-java/OpenZWave/CommandClassData.java
  42. +1 −1 gen-java/OpenZWave/DriverControllerCommand.java
  43. +31 −31 gen-java/OpenZWave/DriverData.java
  44. +23 −23 gen-java/OpenZWave/GetAllScenesReturnStruct.java
  45. +23 −23 gen-java/OpenZWave/GetAssociationsReturnStruct.java
  46. +5 −5 gen-java/OpenZWave/GetDriverStatisticsReturnStruct.java
  47. +5 −5 gen-java/OpenZWave/GetNodeStatisticsReturnStruct.java
  48. +11 −11 gen-java/OpenZWave/GetSwitchPointReturnStruct.java
  49. +33 −33 gen-java/OpenZWave/NodeData.java
  50. +9,507 −7,824 gen-java/OpenZWave/RemoteManager.java
  51. +1 −1 gen-java/OpenZWave/RemoteValueGenre.java
  52. +17 −20 gen-java/OpenZWave/RemoteValueID.java
  53. +2 −5 gen-java/OpenZWave/RemoteValueType.java
  54. +25 −25 gen-java/OpenZWave/SceneGetValuesReturnStruct.java
  55. +23 −23 gen-java/OpenZWave/UInt32_ListByte.java
  56. +505 −210 gen-js/RemoteManager.js
  57. +152 −60 gen-js/ozw_types.js
  58. +1 −1 gen-perl/OpenZWave/Constants.pm
  59. +693 −276 gen-perl/OpenZWave/RemoteManager.pm
  60. +142 −39 gen-perl/OpenZWave/Types.pm
  61. +61 −47 gen-py/OpenZWave/RemoteManager-remote
  62. +728 −376 gen-py/OpenZWave/RemoteManager.py
  63. +1 −1 gen-py/OpenZWave/constants.py
  64. +126 −31 gen-py/OpenZWave/ttypes.py
  65. +1 −1 gen-rb/ozw_constants.rb
  66. +29 −5 gen-rb/ozw_types.rb
  67. +276 −166 gen-rb/remote_manager.rb
  68. +31 −16 ozw.thrift
  69. BIN ozwd
View
83 create_server.rb
@@ -163,15 +163,16 @@ def abspath(path)
#~ end
boolean_map = []
node.arguments[-disambiguation_hints.length..-1].each_with_index { |arg, idx|
- do_they_match = arg.cpp_type.to_cpp.match(disambiguation_hints[idx].downcase)
+ do_they_match = arg.cpp_type.to_cpp.include?(disambiguation_hints[idx].downcase)
messages << " arg.cpp_type.to_cpp\t\t== #{arg.cpp_type.to_cpp }"
messages << " disambiguation_hints[#{idx}]\t== #{disambiguation_hints[idx]}"
messages << " matched? #{do_they_match ? 'YES' : 'NO'}"
boolean_map << do_they_match
}
if boolean_map.inject(:&) then
- messages << "Matched:\t#{target_method_name}\nto overloaded method:#{CGI.unescapeHTML node['demangled']}"
+ messages << "Matched: #{meth.name} => #{CGI.unescapeHTML node['demangled']}"
target_method = node
+ break
end
# FIXME:: ListString => list<string>
}
@@ -187,12 +188,12 @@ def abspath(path)
#
#Thrift transforms methods with complex return types (string, vector<...>, user-defined structs etc)
- # example 1:
+ # example 1: Basic 1-1 mapping
# (C++) string GetLibraryVersion( uint32 const _homeId );
# (thrift) string GetLibraryVersion( 1:i32 _homeId );
# (skeleton) void GetLibraryVersion(std::string& _return, const int32_t _homeId)
#
- # example 2:
+ # example 2: e
# (C++) uint32 GetNodeNeighbors( uint32 const _homeId, uint8 const _nodeId, uint8** _nodeNeighbors );
# (thrift) UInt32_NeighborMap GetNodeNeighbors( 1:i32 _homeId, 2:byte _nodeId);
# (skeleton) void GetNodeNeighbors(UInt32_ListByte& _return, const int32_t _homeId, const int8_t _nodeId)
@@ -220,42 +221,42 @@ def abspath(path)
# VALUE: hash with
# :descriptor => source argument DESCRIPTOR STRING (eg "_return._className")
# :node => the actual source argument node (Argument or Field)
- target_method.arguments.each {|a|
- # 1) match directly by name
- if (arg = meth.arguments.find(:name => a.name )).is_a?RbGCCXML::Argument then
- argmap[a] = {}
- argmap[a][:descriptor] = arg.name
- argmap[a][:node] = arg
- # 2) else, match as a member of Thrift's special "_return" argument (class struct)
- elsif (_ret = meth.arguments.find(:name => "_return" )) and
- (_ret.is_a?RbGCCXML::Node) and
- (_ret.cpp_type.base_type.is_a?RbGCCXML::Class) and
- (arg = _ret.cpp_type.base_type.variables.find(:name => a.name)).is_a?RbGCCXML::Field then
- argmap[a] = {}
- argmap[a][:descriptor] = "_return.#{a.name}"
- argmap[a][:node] = arg
- # 3) else, check if is a _callback or _context argument (callbacks)
- elsif (a.name =~ /callback/) then
- cb_fun = "#{target_method.name}_callback"
- messages << "defining #{cb_fun}"
- fntype = RbGCCXML::NodeCache.find(a['type']).base_type # => RbGCCXML::PointerType => RbGCCXML::FunctionType
- i = 0
- fntype_args = fntype.arguments.collect{ |arg| i=i+1; "#{arg.to_cpp} arg#{i}"}.join(', ')
- cb = []
- cb << fntype.base_type.return_type.to_cpp + " #{cb_fun}(#{fntype_args}) {"
- cb << "\t// FIXME: fill in the blanks (sorry!)"
- cb << "}"
- Callbacks[cb_fun] = cb.join("\n")
- argmap[a] = {}
- argmap[a][:descriptor] = "&#{target_method.name}_callback"
- #
- elsif (a.name =~ /context/) then
- # pass the Thrift server singleton instance as the callback context
- argmap[a] = {}
- argmap[a][:descriptor] = "(void*) this"
- else
- raise "Reverse argument mapping: couldn't resolve #{target_method.name}::#{a.name} in method (mapped to '#{meth.name}')!!!"
- end
+ target_method.arguments.each {|a|
+ # 1) match directly by name
+ if (arg = meth.arguments.find(:name => a.name )).is_a?RbGCCXML::Argument then
+ argmap[a] = {}
+ argmap[a][:descriptor] = arg.name
+ argmap[a][:node] = arg
+ # 2) else, match as a member of Thrift's special "_return" argument (class struct)
+ elsif (_ret = meth.arguments.find(:name => "_return" )) and
+ (_ret.is_a?RbGCCXML::Node) and
+ (_ret.cpp_type.base_type.is_a?RbGCCXML::Class) and
+ (arg = _ret.cpp_type.base_type.variables.find(:name => a.name)).is_a?RbGCCXML::Field then
+ argmap[a] = {}
+ argmap[a][:descriptor] = "_return.#{a.name}"
+ argmap[a][:node] = arg
+ # 3) else, check if is a _callback or _context argument (callbacks)
+ elsif (a.name =~ /callback/) then
+ cb_fun = "#{target_method.name}_callback"
+ messages << "defining #{cb_fun}"
+ fntype = RbGCCXML::NodeCache.find(a['type']).base_type # => RbGCCXML::PointerType => RbGCCXML::FunctionType
+ i = 0
+ fntype_args = fntype.arguments.collect{ |arg| i=i+1; "#{arg.to_cpp} arg#{i}"}.join(', ')
+ cb = []
+ cb << fntype.base_type.return_type.to_cpp + " #{cb_fun}(#{fntype_args}) {"
+ cb << "\t// FIXME: fill in the blanks (sorry!)"
+ cb << "}"
+ Callbacks[cb_fun] = cb.join("\n")
+ argmap[a] = {}
+ argmap[a][:descriptor] = "&#{target_method.name}_callback"
+ #
+ elsif (a.name =~ /context/) then
+ # pass the Thrift server singleton instance as the callback context
+ argmap[a] = {}
+ argmap[a][:descriptor] = "(void*) this"
+ else
+ raise "Reverse argument mapping: couldn't resolve #{a.name} in #{CGI.unescapeHTML meth['demangled']}"
+ end
}
#
@@ -341,6 +342,6 @@ def abspath(path)
puts "Done!"
rescue RuntimeError => err
- puts messages.join("\n\t")
+ puts messages.join("\n*ERR*=> ")
puts err.inspect
end
View
38 gen-cpp/RemoteManager_server.cpp.orig
@@ -102,6 +102,14 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
g_criticalSection.unlock();
}
+ int32_t GetControllerInterfaceType(const int32_t _homeId) {
+ Manager* mgr = Manager::Get();
+ g_criticalSection.lock();
+ ::int32_t function_result = mgr->GetControllerInterfaceType((::uint32 const) _homeId);
+ g_criticalSection.unlock();
+ return(function_result);
+ }
+
void GetControllerPath(std::string& _return, const int32_t _homeId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
@@ -549,14 +557,14 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
g_criticalSection.unlock();
}
- void GetValueListSelection_String(Bool_String& _return, const RemoteValueID& _id) {
+ void GetValueListSelection_string(Bool_String& _return, const RemoteValueID& _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
_return.retval = mgr->GetValueListSelection(_id.toValueID(), (std::string*) &_return.o_value);
g_criticalSection.unlock();
}
- void GetValueListSelection_Int32(Bool_Int& _return, const RemoteValueID& _id) {
+ void GetValueListSelection_int32(Bool_Int& _return, const RemoteValueID& _id) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
_return.retval = mgr->GetValueListSelection(_id.toValueID(), (::int32*) &_return.o_value);
@@ -577,47 +585,55 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
g_criticalSection.unlock();
}
- bool SetValue_Bool(const RemoteValueID& _id, const bool _value) {
+ bool SetValue_bool(const RemoteValueID& _id, const bool _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (bool const) _value);
g_criticalSection.unlock();
return(function_result);
}
- bool SetValue_UInt8(const RemoteValueID& _id, const int8_t _value, const int8_t _length) {
+ bool SetValue_uint8(const RemoteValueID& _id, const int8_t _value) {
+ Manager* mgr = Manager::Get();
+ g_criticalSection.lock();
+ bool function_result = mgr->SetValue(_id.toValueID(), (::uint8 const) _value);
+ g_criticalSection.unlock();
+ return(function_result);
+ }
+
+ bool SetValue_uint8_uint8(const RemoteValueID& _id, const int8_t _value, const int8_t _length) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (::uint8 const*) &_value, (::uint8 const) _length);
g_criticalSection.unlock();
return(function_result);
}
- bool SetValue_Float(const RemoteValueID& _id, const double _value) {
+ bool SetValue_float(const RemoteValueID& _id, const double _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (float const) _value);
g_criticalSection.unlock();
return(function_result);
}
- bool SetValue_Int32(const RemoteValueID& _id, const int32_t _value) {
+ bool SetValue_int32(const RemoteValueID& _id, const int32_t _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (::int32 const) _value);
g_criticalSection.unlock();
return(function_result);
}
- bool SetValue_Int16(const RemoteValueID& _id, const int16_t _value) {
+ bool SetValue_int16(const RemoteValueID& _id, const int16_t _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (::int16 const) _value);
g_criticalSection.unlock();
return(function_result);
}
- bool SetValue_String(const RemoteValueID& _id, const std::string& _value) {
+ bool SetValue_string(const RemoteValueID& _id, const std::string& _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetValue(_id.toValueID(), (const std::string&) _value);
@@ -999,7 +1015,7 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
g_criticalSection.unlock();
}
- void SceneGetValueListSelection_String(Bool_String& _return, const int8_t _sceneId, const RemoteValueID& _valueId) {
+ void SceneGetValueListSelection_string(Bool_String& _return, const int8_t _sceneId, const RemoteValueID& _valueId) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
_return.retval = mgr->SceneGetValueListSelection((::uint8 const) _sceneId, _valueId.toValueID(), (std::string*) &_return.o_value);
@@ -1053,15 +1069,15 @@ class RemoteManagerHandler : virtual public RemoteManagerIf {
return(function_result);
}
- bool SetSceneValue_String(const int8_t _sceneId, const RemoteValueID& _valueId, const std::string& _value) {
+ bool SetSceneValue_string(const int8_t _sceneId, const RemoteValueID& _valueId, const std::string& _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetSceneValue((::uint8 const) _sceneId, _valueId.toValueID(), (const std::string&) _value);
g_criticalSection.unlock();
return(function_result);
}
- bool SetSceneValueListSelection_String(const int8_t _sceneId, const RemoteValueID& _valueId, const std::string& _value) {
+ bool SetSceneValueListSelection_string(const int8_t _sceneId, const RemoteValueID& _valueId, const std::string& _value) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
bool function_result = mgr->SetSceneValueListSelection((::uint8 const) _sceneId, _valueId.toValueID(), (const std::string&) _value);
View
2 gen-csharp/OpenZWave/Bool_Bool.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/Bool_Float.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/Bool_GetNodeClassInformation.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/Bool_Int.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/Bool_Int16.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/Bool_ListString.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/Bool_String.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/Bool_UInt8.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/CommandClassData.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/DriverControllerCommand.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/DriverData.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
16 gen-csharp/OpenZWave/GetAllScenesReturnStruct.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -88,12 +88,12 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
_sceneIds = new List<byte>();
- TList _list20 = iprot.ReadListBegin();
- for( int _i21 = 0; _i21 < _list20.Count; ++_i21)
+ TList _list24 = iprot.ReadListBegin();
+ for( int _i25 = 0; _i25 < _list24.Count; ++_i25)
{
- byte _elem22 = 0;
- _elem22 = iprot.ReadByte();
- _sceneIds.Add(_elem22);
+ byte _elem26 = 0;
+ _elem26 = iprot.ReadByte();
+ _sceneIds.Add(_elem26);
}
iprot.ReadListEnd();
}
@@ -129,9 +129,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Byte, _sceneIds.Count));
- foreach (byte _iter23 in _sceneIds)
+ foreach (byte _iter27 in _sceneIds)
{
- oprot.WriteByte(_iter23);
+ oprot.WriteByte(_iter27);
}
oprot.WriteListEnd();
}
View
16 gen-csharp/OpenZWave/GetAssociationsReturnStruct.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -88,12 +88,12 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
O_associations = new List<byte>();
- TList _list16 = iprot.ReadListBegin();
- for( int _i17 = 0; _i17 < _list16.Count; ++_i17)
+ TList _list20 = iprot.ReadListBegin();
+ for( int _i21 = 0; _i21 < _list20.Count; ++_i21)
{
- byte _elem18 = 0;
- _elem18 = iprot.ReadByte();
- O_associations.Add(_elem18);
+ byte _elem22 = 0;
+ _elem22 = iprot.ReadByte();
+ O_associations.Add(_elem22);
}
iprot.ReadListEnd();
}
@@ -129,9 +129,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Byte, O_associations.Count));
- foreach (byte _iter19 in O_associations)
+ foreach (byte _iter23 in O_associations)
{
- oprot.WriteByte(_iter19);
+ oprot.WriteByte(_iter23);
}
oprot.WriteListEnd();
}
View
2 gen-csharp/OpenZWave/GetDriverStatisticsReturnStruct.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/GetNodeStatisticsReturnStruct.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/GetSwitchPointReturnStruct.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
2 gen-csharp/OpenZWave/NodeData.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
1,322 gen-csharp/OpenZWave/RemoteManager.cs
934 additions, 388 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 gen-csharp/OpenZWave/RemoteValueGenre.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
View
5 gen-csharp/OpenZWave/RemoteValueID.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -18,9 +18,6 @@
namespace OpenZWave
{
- /// <summary>
- /// Delete a handheld button id.
- /// </summary>
#if !SILVERLIGHT
[Serializable]
#endif
View
3 gen-csharp/OpenZWave/RemoteValueType.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -18,6 +18,5 @@ public enum RemoteValueType
ValueType_Short = 6,
ValueType_String = 7,
ValueType_Button = 8,
- ValueType_Max = 8,
}
}
View
18 gen-csharp/OpenZWave/SceneGetValuesReturnStruct.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -88,13 +88,13 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
O_value = new List<RemoteValueID>();
- TList _list24 = iprot.ReadListBegin();
- for( int _i25 = 0; _i25 < _list24.Count; ++_i25)
+ TList _list28 = iprot.ReadListBegin();
+ for( int _i29 = 0; _i29 < _list28.Count; ++_i29)
{
- RemoteValueID _elem26 = new RemoteValueID();
- _elem26 = new RemoteValueID();
- _elem26.Read(iprot);
- O_value.Add(_elem26);
+ RemoteValueID _elem30 = new RemoteValueID();
+ _elem30 = new RemoteValueID();
+ _elem30.Read(iprot);
+ O_value.Add(_elem30);
}
iprot.ReadListEnd();
}
@@ -130,9 +130,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Struct, O_value.Count));
- foreach (RemoteValueID _iter27 in O_value)
+ foreach (RemoteValueID _iter31 in O_value)
{
- _iter27.Write(oprot);
+ _iter31.Write(oprot);
}
oprot.WriteListEnd();
}
View
16 gen-csharp/OpenZWave/UInt32_ListByte.cs
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -88,12 +88,12 @@ public void Read (TProtocol iprot)
if (field.Type == TType.List) {
{
_nodeNeighbors = new List<byte>();
- TList _list12 = iprot.ReadListBegin();
- for( int _i13 = 0; _i13 < _list12.Count; ++_i13)
+ TList _list16 = iprot.ReadListBegin();
+ for( int _i17 = 0; _i17 < _list16.Count; ++_i17)
{
- byte _elem14 = 0;
- _elem14 = iprot.ReadByte();
- _nodeNeighbors.Add(_elem14);
+ byte _elem18 = 0;
+ _elem18 = iprot.ReadByte();
+ _nodeNeighbors.Add(_elem18);
}
iprot.ReadListEnd();
}
@@ -129,9 +129,9 @@ public void Read (TProtocol iprot)
oprot.WriteFieldBegin(field);
{
oprot.WriteListBegin(new TList(TType.Byte, _nodeNeighbors.Count));
- foreach (byte _iter15 in _nodeNeighbors)
+ foreach (byte _iter19 in _nodeNeighbors)
{
- oprot.WriteByte(_iter15);
+ oprot.WriteByte(_iter19);
}
oprot.WriteListEnd();
}
View
2 gen-erl/ozw_constants.hrl
@@ -1,5 +1,5 @@
%%
-%% Autogenerated by Thrift Compiler (0.9.0)
+%% Autogenerated by Thrift Compiler (1.0.0-dev)
%%
%% DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
%%
View
12 gen-erl/ozw_types.erl
@@ -1,5 +1,5 @@
%%
-%% Autogenerated by Thrift Compiler (0.9.0)
+%% Autogenerated by Thrift Compiler (1.0.0-dev)
%%
%% DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
%%
@@ -109,6 +109,11 @@ struct_info('bool_ListString') ->
{2, {list, string}}]}
;
+struct_info('listUInt8_Byte') ->
+ {struct, [{1, {list, byte}},
+ {2, byte}]}
+;
+
struct_info('uInt32_ListByte') ->
{struct, [{1, i32},
{2, {list, byte}}]}
@@ -236,6 +241,11 @@ struct_info_ext('bool_ListString') ->
{2, undefined, {list, string}, 'o_value', []}]}
;
+struct_info_ext('listUInt8_Byte') ->
+ {struct, [{1, undefined, {list, byte}, '_value', []},
+ {2, undefined, byte, '_length', undefined}]}
+;
+
struct_info_ext('uInt32_ListByte') ->
{struct, [{1, undefined, i32, 'retval', undefined},
{2, undefined, {list, byte}, '_nodeNeighbors', []}]}
View
10 gen-erl/ozw_types.hrl
@@ -16,7 +16,6 @@
-define(ozw_RemoteValueType_ValueType_Short, 6).
-define(ozw_RemoteValueType_ValueType_String, 7).
-define(ozw_RemoteValueType_ValueType_Button, 8).
--define(ozw_RemoteValueType_ValueType_Max, 8).
-define(ozw_DriverControllerCommand_ControllerCommand_None, 0).
-define(ozw_DriverControllerCommand_ControllerCommand_AddController, 1).
@@ -36,6 +35,10 @@
-define(ozw_DriverControllerCommand_ControllerCommand_CreateButton, 15).
-define(ozw_DriverControllerCommand_ControllerCommand_DeleteButton, 16).
+-define(ozw_DriverControllerInterface_ControllerInterface_Unknown, 0).
+-define(ozw_DriverControllerInterface_ControllerInterface_Serial, 1).
+-define(ozw_DriverControllerInterface_ControllerInterface_Hid, 2).
+
%% struct remoteValueID
-record(remoteValueID, {_homeId :: integer(),
@@ -135,6 +138,11 @@
-record(bool_ListString, {retval :: boolean(),
o_value :: list()}).
+%% struct listUInt8_Byte
+
+-record(listUInt8_Byte, {_value :: list(),
+ _length :: integer()}).
+
%% struct uInt32_ListByte
-record(uInt32_ListByte, {retval :: integer(),
View
109 gen-erl/remoteManager_thrift.erl
@@ -1,5 +1,5 @@
%%
-%% Autogenerated by Thrift Compiler (0.9.0)
+%% Autogenerated by Thrift Compiler (1.0.0-dev)
%%
%% DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
%%
@@ -104,6 +104,15 @@ function_info('LogDriverStatistics', reply_type) ->
function_info('LogDriverStatistics', exceptions) ->
{struct, []}
;
+% GetControllerInterfaceType(This, _homeId)
+function_info('GetControllerInterfaceType', params_type) ->
+ {struct, [{1, i32}]}
+;
+function_info('GetControllerInterfaceType', reply_type) ->
+ i32;
+function_info('GetControllerInterfaceType', exceptions) ->
+ {struct, []}
+;
% GetControllerPath(This, _homeId)
function_info('GetControllerPath', params_type) ->
{struct, [{1, i32}]}
@@ -691,22 +700,22 @@ function_info('GetValueAsString', reply_type) ->
function_info('GetValueAsString', exceptions) ->
{struct, []}
;
-% GetValueListSelection_String(This, _id)
-function_info('GetValueListSelection_String', params_type) ->
+% GetValueListSelection_string(This, _id)
+function_info('GetValueListSelection_string', params_type) ->
{struct, [{1, {struct, {'ozw_types', 'remoteValueID'}}}]}
;
-function_info('GetValueListSelection_String', reply_type) ->
+function_info('GetValueListSelection_string', reply_type) ->
{struct, {'ozw_types', 'bool_String'}};
-function_info('GetValueListSelection_String', exceptions) ->
+function_info('GetValueListSelection_string', exceptions) ->
{struct, []}
;
-% GetValueListSelection_Int32(This, _id)
-function_info('GetValueListSelection_Int32', params_type) ->
+% GetValueListSelection_int32(This, _id)
+function_info('GetValueListSelection_int32', params_type) ->
{struct, [{1, {struct, {'ozw_types', 'remoteValueID'}}}]}
;
-function_info('GetValueListSelection_Int32', reply_type) ->
+function_info('GetValueListSelection_int32', reply_type) ->
{struct, {'ozw_types', 'bool_Int'}};
-function_info('GetValueListSelection_Int32', exceptions) ->
+function_info('GetValueListSelection_int32', exceptions) ->
{struct, []}
;
% GetValueListItems(This, _id)
@@ -727,65 +736,75 @@ function_info('GetValueFloatPrecision', reply_type) ->
function_info('GetValueFloatPrecision', exceptions) ->
{struct, []}
;
-% SetValue_Bool(This, _id, _value)
-function_info('SetValue_Bool', params_type) ->
+% SetValue_bool(This, _id, _value)
+function_info('SetValue_bool', params_type) ->
{struct, [{1, {struct, {'ozw_types', 'remoteValueID'}}},
{2, bool}]}
;
-function_info('SetValue_Bool', reply_type) ->
+function_info('SetValue_bool', reply_type) ->
+ bool;
+function_info('SetValue_bool', exceptions) ->
+ {struct, []}
+;
+% SetValue_uint8(This, _id, _value)
+function_info('SetValue_uint8', params_type) ->
+ {struct, [{1, {struct, {'ozw_types', 'remoteValueID'}}},
+ {2, byte}]}
+;
+function_info('SetValue_uint8', reply_type) ->
bool;
-function_info('SetValue_Bool', exceptions) ->
+function_info('SetValue_uint8', exceptions) ->
{struct, []}
;
-% SetValue_UInt8(This, _id, _value, _length)
-function_info('SetValue_UInt8', params_type) ->
+% SetValue_uint8_uint8(This, _id, _value, _length)
+function_info('SetValue_uint8_uint8', params_type) ->
{struct, [{1, {struct, {'ozw_types', 'remoteValueID'}}},
{2, byte},
{3, byte}]}
;
-function_info('SetValue_UInt8', reply_type) ->
+function_info('SetValue_uint8_uint8', reply_type) ->
bool;
-function_info('SetValue_UInt8', exceptions) ->
+function_info('SetValue_uint8_uint8', exceptions) ->
{struct, []}
;
-% SetValue_Float(This, _id, _value)
-function_info('SetValue_Float', params_type) ->
+% SetValue_float(This, _id, _value)
+function_info('SetValue_float', params_type) ->
{struct, [{1, {struct, {'ozw_types', 'remoteValueID'}}},
{2, double}]}
;
-function_info('SetValue_Float', reply_type) ->
+function_info('SetValue_float', reply_type) ->
bool;
-function_info('SetValue_Float', exceptions) ->
+function_info('SetValue_float', exceptions) ->
{struct, []}
;
-% SetValue_Int32(This, _id, _value)
-function_info('SetValue_Int32', params_type) ->
+% SetValue_int32(This, _id, _value)
+function_info('SetValue_int32', params_type) ->
{struct, [{1, {struct, {'ozw_types', 'remoteValueID'}}},
{2, i32}]}
;
-function_info('SetValue_Int32', reply_type) ->
+function_info('SetValue_int32', reply_type) ->
bool;
-function_info('SetValue_Int32', exceptions) ->
+function_info('SetValue_int32', exceptions) ->
{struct, []}
;
-% SetValue_Int16(This, _id, _value)
-function_info('SetValue_Int16', params_type) ->
+% SetValue_int16(This, _id, _value)
+function_info('SetValue_int16', params_type) ->
{struct, [{1, {struct, {'ozw_types', 'remoteValueID'}}},
{2, i16}]}
;
-function_info('SetValue_Int16', reply_type) ->
+function_info('SetValue_int16', reply_type) ->
bool;
-function_info('SetValue_Int16', exceptions) ->
+function_info('SetValue_int16', exceptions) ->
{struct, []}
;
-% SetValue_String(This, _id, _value)
-function_info('SetValue_String', params_type) ->
+% SetValue_string(This, _id, _value)
+function_info('SetValue_string', params_type) ->
{struct, [{1, {struct, {'ozw_types', 'remoteValueID'}}},
{2, string}]}
;
-function_info('SetValue_String', reply_type) ->
+function_info('SetValue_string', reply_type) ->
bool;
-function_info('SetValue_String', exceptions) ->
+function_info('SetValue_string', exceptions) ->
{struct, []}
;
% SetValueListSelection(This, _id, _selectedItem)
@@ -1299,14 +1318,14 @@ function_info('SceneGetValueAsString', reply_type) ->
function_info('SceneGetValueAsString', exceptions) ->
{struct, []}
;
-% SceneGetValueListSelection_String(This, _sceneId, _valueId)
-function_info('SceneGetValueListSelection_String', params_type) ->
+% SceneGetValueListSelection_string(This, _sceneId, _valueId)
+function_info('SceneGetValueListSelection_string', params_type) ->
{struct, [{1, byte},
{2, {struct, {'ozw_types', 'remoteValueID'}}}]}
;
-function_info('SceneGetValueListSelection_String', reply_type) ->
+function_info('SceneGetValueListSelection_string', reply_type) ->
{struct, {'ozw_types', 'bool_String'}};
-function_info('SceneGetValueListSelection_String', exceptions) ->
+function_info('SceneGetValueListSelection_string', exceptions) ->
{struct, []}
;
% SceneGetValueListSelection_Int32(This, _sceneId, _valueId)
@@ -1374,26 +1393,26 @@ function_info('SetSceneValue_Int16', reply_type) ->
function_info('SetSceneValue_Int16', exceptions) ->
{struct, []}
;
-% SetSceneValue_String(This, _sceneId, _valueId, _value)
-function_info('SetSceneValue_String', params_type) ->
+% SetSceneValue_string(This, _sceneId, _valueId, _value)
+function_info('SetSceneValue_string', params_type) ->
{struct, [{1, byte},
{2, {struct, {'ozw_types', 'remoteValueID'}}},
{3, string}]}
;
-function_info('SetSceneValue_String', reply_type) ->
+function_info('SetSceneValue_string', reply_type) ->
bool;
-function_info('SetSceneValue_String', exceptions) ->
+function_info('SetSceneValue_string', exceptions) ->
{struct, []}
;
-% SetSceneValueListSelection_String(This, _sceneId, _valueId, _value)
-function_info('SetSceneValueListSelection_String', params_type) ->
+% SetSceneValueListSelection_string(This, _sceneId, _valueId, _value)
+function_info('SetSceneValueListSelection_string', params_type) ->
{struct, [{1, byte},
{2, {struct, {'ozw_types', 'remoteValueID'}}},
{3, string}]}
;
-function_info('SetSceneValueListSelection_String', reply_type) ->
+function_info('SetSceneValueListSelection_string', reply_type) ->
bool;
-function_info('SetSceneValueListSelection_String', exceptions) ->
+function_info('SetSceneValueListSelection_string', exceptions) ->
{struct, []}
;
% SetSceneValueListSelection_Int32(This, _sceneId, _valueId, _value)
View
9,154 gen-go/OpenZWave/RemoteManager.go
5,000 additions, 4,154 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2,263 gen-go/OpenZWave/RemoteManager/RemoteManager-remote.go
1,156 additions, 1,107 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
378 gen-go/OpenZWave/ttypes.go
@@ -1,4 +1,4 @@
-/* Autogenerated by Thrift Compiler (0.9.0)
+/* Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -60,7 +60,6 @@ const (
ValueType_Short RemoteValueType = 6
ValueType_String RemoteValueType = 7
ValueType_Button RemoteValueType = 8
- ValueType_Max RemoteValueType = 8
)
func (p RemoteValueType) String() string {
switch p {
@@ -73,7 +72,6 @@ func (p RemoteValueType) String() string {
case ValueType_Short: return "ValueType_Short"
case ValueType_String: return "ValueType_String"
case ValueType_Button: return "ValueType_Button"
- case ValueType_Max: return "ValueType_Max"
}
return ""
}
@@ -89,7 +87,6 @@ func FromRemoteValueTypeString(s string) RemoteValueType {
case "ValueType_Short": return ValueType_Short
case "ValueType_String": return ValueType_String
case "ValueType_Button": return ValueType_Button
- case "ValueType_Max": return ValueType_Max
}
return RemoteValueType(-10000)
}
@@ -177,8 +174,41 @@ func (p DriverControllerCommand) IsEnum() bool {
}
/**
- * Delete a handheld button id.
- *
+ *Delete a handheld button id.
+ */
+type DriverControllerInterface int
+const (
+ ControllerInterface_Unknown DriverControllerInterface = 0
+ ControllerInterface_Serial DriverControllerInterface = 1
+ ControllerInterface_Hid DriverControllerInterface = 2
+)
+func (p DriverControllerInterface) String() string {
+ switch p {
+ case ControllerInterface_Unknown: return "ControllerInterface_Unknown"
+ case ControllerInterface_Serial: return "ControllerInterface_Serial"
+ case ControllerInterface_Hid: return "ControllerInterface_Hid"
+ }
+ return ""
+}
+
+func FromDriverControllerInterfaceString(s string) DriverControllerInterface {
+ switch s {
+ case "ControllerInterface_Unknown": return ControllerInterface_Unknown
+ case "ControllerInterface_Serial": return ControllerInterface_Serial
+ case "ControllerInterface_Hid": return ControllerInterface_Hid
+ }
+ return DriverControllerInterface(-10000)
+}
+
+func (p DriverControllerInterface) Value() int {
+ return int(p)
+}
+
+func (p DriverControllerInterface) IsEnum() bool {
+ return true
+}
+
+/**
* Attributes:
* - _homeId
* - _nodeId
@@ -4308,6 +4338,214 @@ func (p *BoolListString) TStructFields() thrift.TFieldContainer {
/**
* Attributes:
+ * - _value
+ * - _length
+ */
+type ListUInt8Byte struct {
+ thrift.TStruct
+ _value thrift.TList "_value"; // 1
+ _length byte "_length"; // 2
+}
+
+func NewListUInt8Byte() *ListUInt8Byte {
+ output := &ListUInt8Byte{
+ TStruct:thrift.NewTStruct("ListUInt8_Byte", []thrift.TField{
+ thrift.NewTField("_value", thrift.LIST, 1),
+ thrift.NewTField("_length", thrift.BYTE, 2),
+ }),
+ }
+ {
+ }
+ return output
+}
+
+func (p *ListUInt8Byte) Read(iprot thrift.TProtocol) (err thrift.TProtocolException) {
+ _, err = iprot.ReadStructBegin()
+ if err != nil { return thrift.NewTProtocolExceptionReadStruct(p.ThriftName(), err); }
+ for {
+ fieldName, fieldTypeId, fieldId, err := iprot.ReadFieldBegin()
+ if fieldId < 0 {
+ fieldId = int16(p.FieldIdFromFieldName(fieldName))
+ } else if fieldName == "" {
+ fieldName = p.FieldNameFromFieldId(int(fieldId))
+ }
+ if fieldTypeId == thrift.GENERIC {
+ fieldTypeId = p.FieldFromFieldId(int(fieldId)).TypeId()
+ }
+ if err != nil {
+ return thrift.NewTProtocolExceptionReadField(int(fieldId), fieldName, p.ThriftName(), err)
+ }
+ if fieldTypeId == thrift.STOP { break; }
+ if fieldId == 1 || fieldName == "_value" {
+ if fieldTypeId == thrift.LIST {
+ err = p.ReadField1(iprot)
+ if err != nil { return thrift.NewTProtocolExceptionReadField(int(fieldId), fieldName, p.ThriftName(), err); }
+ } else if fieldTypeId == thrift.VOID {
+ err = iprot.Skip(fieldTypeId)
+ if err != nil { return thrift.NewTProtocolExceptionReadField(int(fieldId), fieldName, p.ThriftName(), err); }
+ } else {
+ err = p.ReadField1(iprot)
+ if err != nil { return thrift.NewTProtocolExceptionReadField(int(fieldId), fieldName, p.ThriftName(), err); }
+ }
+ } else if fieldId == 2 || fieldName == "_length" {
+ if fieldTypeId == thrift.BYTE {
+ err = p.ReadField2(iprot)
+ if err != nil { return thrift.NewTProtocolExceptionReadField(int(fieldId), fieldName, p.ThriftName(), err); }
+ } else if fieldTypeId == thrift.VOID {
+ err = iprot.Skip(fieldTypeId)
+ if err != nil { return thrift.NewTProtocolExceptionReadField(int(fieldId), fieldName, p.ThriftName(), err); }
+ } else {
+ err = p.ReadField2(iprot)
+ if err != nil { return thrift.NewTProtocolExceptionReadField(int(fieldId), fieldName, p.ThriftName(), err); }
+ }
+ } else {
+ err = iprot.Skip(fieldTypeId)
+ if err != nil { return thrift.NewTProtocolExceptionReadField(int(fieldId), fieldName, p.ThriftName(), err); }
+ }
+ err = iprot.ReadFieldEnd()
+ if err != nil { return thrift.NewTProtocolExceptionReadField(int(fieldId), fieldName, p.ThriftName(), err); }
+ }
+ err = iprot.ReadStructEnd()
+ if err != nil { return thrift.NewTProtocolExceptionReadStruct(p.ThriftName(), err); }
+ return err
+}
+
+func (p *ListUInt8Byte) ReadField1(iprot thrift.TProtocol) (err thrift.TProtocolException) {
+ _etype152, _size149, err := iprot.ReadListBegin()
+ if err != nil {
+ return thrift.NewTProtocolExceptionReadField(-1, "p._value", "", err)
+ }
+ p._value = thrift.NewTList(_etype152, _size149)
+ for _i153:= 0; _i153 < _size149; _i153++ {
+ v155, err156 := iprot.ReadByte()
+ if err156 != nil { return thrift.NewTProtocolExceptionReadField(0, "_elem154", "", err156); }
+ _elem154 := v155
+ p._value.Push(_elem154)
+ }
+ err = iprot.ReadListEnd()
+ if err != nil { return thrift.NewTProtocolExceptionReadField(-1, "", "list",err); }
+ return err
+}
+
+func (p *ListUInt8Byte) ReadField_value(iprot thrift.TProtocol) (thrift.TProtocolException) {
+ return p.ReadField1(iprot)
+}
+
+func (p *ListUInt8Byte) ReadField2(iprot thrift.TProtocol) (err thrift.TProtocolException) {
+ v157, err158 := iprot.ReadByte()
+ if err158 != nil { return thrift.NewTProtocolExceptionReadField(2, "_length", p.ThriftName(), err158); }
+ p._length = v157
+ return err
+}
+
+func (p *ListUInt8Byte) ReadField_length(iprot thrift.TProtocol) (thrift.TProtocolException) {
+ return p.ReadField2(iprot)
+}
+
+func (p *ListUInt8Byte) Write(oprot thrift.TProtocol) (err thrift.TProtocolException) {
+ err = oprot.WriteStructBegin("ListUInt8_Byte")
+ if err != nil { return thrift.NewTProtocolExceptionWriteStruct(p.ThriftName(), err); }
+ err = p.WriteField1(oprot)
+ if err != nil { return err }
+ err = p.WriteField2(oprot)
+ if err != nil { return err }
+ err = oprot.WriteFieldStop()
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "STOP", p.ThriftName(), err); }
+ err = oprot.WriteStructEnd()
+ if err != nil { return thrift.NewTProtocolExceptionWriteStruct(p.ThriftName(), err); }
+ return err
+}
+
+func (p *ListUInt8Byte) WriteField1(oprot thrift.TProtocol) (err thrift.TProtocolException) {
+ if p._value != nil {
+ err = oprot.WriteFieldBegin("_value", thrift.LIST, 1)
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(1, "_value", p.ThriftName(), err); }
+ err = oprot.WriteListBegin(thrift.BYTE, p._value.Len())
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "", "list", err); }
+ for Iter159 := range p._value.Iter() {
+ Iter160 := Iter159.(byte)
+ err = oprot.WriteByte(byte(Iter160))
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(0, "Iter160", "", err); }
+ }
+ err = oprot.WriteListEnd()
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "", "list", err); }
+ err = oprot.WriteFieldEnd()
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(1, "_value", p.ThriftName(), err); }
+ }
+ return err
+}
+
+func (p *ListUInt8Byte) WriteField_value(oprot thrift.TProtocol) (thrift.TProtocolException) {
+ return p.WriteField1(oprot)
+}
+
+func (p *ListUInt8Byte) WriteField2(oprot thrift.TProtocol) (err thrift.TProtocolException) {
+ err = oprot.WriteFieldBegin("_length", thrift.BYTE, 2)
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(2, "_length", p.ThriftName(), err); }
+ err = oprot.WriteByte(byte(p._length))
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(2, "_length", p.ThriftName(), err); }
+ err = oprot.WriteFieldEnd()
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(2, "_length", p.ThriftName(), err); }
+ return err
+}
+
+func (p *ListUInt8Byte) WriteField_length(oprot thrift.TProtocol) (thrift.TProtocolException) {
+ return p.WriteField2(oprot)
+}
+
+func (p *ListUInt8Byte) TStructName() string {
+ return "ListUInt8Byte"
+}
+
+func (p *ListUInt8Byte) ThriftName() string {
+ return "ListUInt8_Byte"
+}
+
+func (p *ListUInt8Byte) String() string {
+ if p == nil {
+ return "<nil>"
+ }
+ return fmt.Sprintf("ListUInt8Byte(%+v)", *p)
+}
+
+func (p *ListUInt8Byte) CompareTo(other interface{}) (int, bool) {
+ if other == nil {
+ return 1, true
+ }
+ data, ok := other.(*ListUInt8Byte)
+ if !ok {
+ return 0, false
+ }
+ if cmp, ok := p._value.CompareTo(data._value); !ok || cmp != 0 {
+ return cmp, ok
+ }
+ if p._length != data._length {
+ if p._length < data._length {
+ return -1, true
+ }
+ return 1, true
+ }
+ return 0, true
+}
+
+func (p *ListUInt8Byte) AttributeByFieldId(id int) interface{} {
+ switch id {
+ default: return nil
+ case 1: return p._value
+ case 2: return p._length
+ }
+ return nil
+}
+
+func (p *ListUInt8Byte) TStructFields() thrift.TFieldContainer {
+ return thrift.NewTFieldContainer([]thrift.TField{
+ thrift.NewTField("_value", thrift.LIST, 1),
+ thrift.NewTField("_length", thrift.BYTE, 2),
+ })
+}
+
+/**
+ * Attributes:
* - Retval
* - _nodeNeighbors
*/
@@ -4381,9 +4619,9 @@ func (p *UInt32ListByte) Read(iprot thrift.TProtocol) (err thrift.TProtocolExcep
}
func (p *UInt32ListByte) ReadField1(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- v147, err148 := iprot.ReadI32()
- if err148 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err148); }
- p.Retval = v147
+ v161, err162 := iprot.ReadI32()
+ if err162 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err162); }
+ p.Retval = v161
return err
}
@@ -4392,16 +4630,16 @@ func (p *UInt32ListByte) ReadFieldRetval(iprot thrift.TProtocol) (thrift.TProtoc
}
func (p *UInt32ListByte) ReadField2(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- _etype154, _size151, err := iprot.ReadListBegin()
+ _etype168, _size165, err := iprot.ReadListBegin()
if err != nil {
return thrift.NewTProtocolExceptionReadField(-1, "p._nodeNeighbors", "", err)
}
- p._nodeNeighbors = thrift.NewTList(_etype154, _size151)
- for _i155:= 0; _i155 < _size151; _i155++ {
- v157, err158 := iprot.ReadByte()
- if err158 != nil { return thrift.NewTProtocolExceptionReadField(0, "_elem156", "", err158); }
- _elem156 := v157
- p._nodeNeighbors.Push(_elem156)
+ p._nodeNeighbors = thrift.NewTList(_etype168, _size165)
+ for _i169:= 0; _i169 < _size165; _i169++ {
+ v171, err172 := iprot.ReadByte()
+ if err172 != nil { return thrift.NewTProtocolExceptionReadField(0, "_elem170", "", err172); }
+ _elem170 := v171
+ p._nodeNeighbors.Push(_elem170)
}
err = iprot.ReadListEnd()
if err != nil { return thrift.NewTProtocolExceptionReadField(-1, "", "list",err); }
@@ -4446,10 +4684,10 @@ func (p *UInt32ListByte) WriteField2(oprot thrift.TProtocol) (err thrift.TProtoc
if err != nil { return thrift.NewTProtocolExceptionWriteField(2, "_nodeNeighbors", p.ThriftName(), err); }
err = oprot.WriteListBegin(thrift.BYTE, p._nodeNeighbors.Len())
if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "", "list", err); }
- for Iter159 := range p._nodeNeighbors.Iter() {
- Iter160 := Iter159.(byte)
- err = oprot.WriteByte(byte(Iter160))
- if err != nil { return thrift.NewTProtocolExceptionWriteField(0, "Iter160", "", err); }
+ for Iter173 := range p._nodeNeighbors.Iter() {
+ Iter174 := Iter173.(byte)
+ err = oprot.WriteByte(byte(Iter174))
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(0, "Iter174", "", err); }
}
err = oprot.WriteListEnd()
if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "", "list", err); }
@@ -4603,9 +4841,9 @@ func (p *BoolGetNodeClassInformation) Read(iprot thrift.TProtocol) (err thrift.T
}
func (p *BoolGetNodeClassInformation) ReadField1(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- v161, err162 := iprot.ReadBool()
- if err162 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err162); }
- p.Retval = v161
+ v175, err176 := iprot.ReadBool()
+ if err176 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err176); }
+ p.Retval = v175
return err
}
@@ -4614,9 +4852,9 @@ func (p *BoolGetNodeClassInformation) ReadFieldRetval(iprot thrift.TProtocol) (t
}
func (p *BoolGetNodeClassInformation) ReadField2(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- v163, err164 := iprot.ReadString()
- if err164 != nil { return thrift.NewTProtocolExceptionReadField(2, "_className", p.ThriftName(), err164); }
- p._className = v163
+ v177, err178 := iprot.ReadString()
+ if err178 != nil { return thrift.NewTProtocolExceptionReadField(2, "_className", p.ThriftName(), err178); }
+ p._className = v177
return err
}
@@ -4625,9 +4863,9 @@ func (p *BoolGetNodeClassInformation) ReadField_className(iprot thrift.TProtocol
}
func (p *BoolGetNodeClassInformation) ReadField3(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- v165, err166 := iprot.ReadByte()
- if err166 != nil { return thrift.NewTProtocolExceptionReadField(3, "_classVersion", p.ThriftName(), err166); }
- p._classVersion = v165
+ v179, err180 := iprot.ReadByte()
+ if err180 != nil { return thrift.NewTProtocolExceptionReadField(3, "_classVersion", p.ThriftName(), err180); }
+ p._classVersion = v179
return err
}
@@ -4827,9 +5065,9 @@ func (p *GetAssociationsReturnStruct) Read(iprot thrift.TProtocol) (err thrift.T
}
func (p *GetAssociationsReturnStruct) ReadField1(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- v167, err168 := iprot.ReadI32()
- if err168 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err168); }
- p.Retval = v167
+ v181, err182 := iprot.ReadI32()
+ if err182 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err182); }
+ p.Retval = v181
return err
}
@@ -4838,16 +5076,16 @@ func (p *GetAssociationsReturnStruct) ReadFieldRetval(iprot thrift.TProtocol) (t
}
func (p *GetAssociationsReturnStruct) ReadField2(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- _etype174, _size171, err := iprot.ReadListBegin()
+ _etype188, _size185, err := iprot.ReadListBegin()
if err != nil {
return thrift.NewTProtocolExceptionReadField(-1, "p.OAssociations", "", err)
}
- p.OAssociations = thrift.NewTList(_etype174, _size171)
- for _i175:= 0; _i175 < _size171; _i175++ {
- v177, err178 := iprot.ReadByte()
- if err178 != nil { return thrift.NewTProtocolExceptionReadField(0, "_elem176", "", err178); }
- _elem176 := v177
- p.OAssociations.Push(_elem176)
+ p.OAssociations = thrift.NewTList(_etype188, _size185)
+ for _i189:= 0; _i189 < _size185; _i189++ {
+ v191, err192 := iprot.ReadByte()
+ if err192 != nil { return thrift.NewTProtocolExceptionReadField(0, "_elem190", "", err192); }
+ _elem190 := v191
+ p.OAssociations.Push(_elem190)
}
err = iprot.ReadListEnd()
if err != nil { return thrift.NewTProtocolExceptionReadField(-1, "", "list",err); }
@@ -4892,10 +5130,10 @@ func (p *GetAssociationsReturnStruct) WriteField2(oprot thrift.TProtocol) (err t
if err != nil { return thrift.NewTProtocolExceptionWriteField(2, "o_associations", p.ThriftName(), err); }
err = oprot.WriteListBegin(thrift.BYTE, p.OAssociations.Len())
if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "", "list", err); }
- for Iter179 := range p.OAssociations.Iter() {
- Iter180 := Iter179.(byte)
- err = oprot.WriteByte(byte(Iter180))
- if err != nil { return thrift.NewTProtocolExceptionWriteField(0, "Iter180", "", err); }
+ for Iter193 := range p.OAssociations.Iter() {
+ Iter194 := Iter193.(byte)
+ err = oprot.WriteByte(byte(Iter194))
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(0, "Iter194", "", err); }
}
err = oprot.WriteListEnd()
if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "", "list", err); }
@@ -5035,9 +5273,9 @@ func (p *GetAllScenesReturnStruct) Read(iprot thrift.TProtocol) (err thrift.TPro
}
func (p *GetAllScenesReturnStruct) ReadField1(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- v181, err182 := iprot.ReadByte()
- if err182 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err182); }
- p.Retval = v181
+ v195, err196 := iprot.ReadByte()
+ if err196 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err196); }
+ p.Retval = v195
return err
}
@@ -5046,16 +5284,16 @@ func (p *GetAllScenesReturnStruct) ReadFieldRetval(iprot thrift.TProtocol) (thri
}
func (p *GetAllScenesReturnStruct) ReadField2(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- _etype188, _size185, err := iprot.ReadListBegin()
+ _etype202, _size199, err := iprot.ReadListBegin()
if err != nil {
return thrift.NewTProtocolExceptionReadField(-1, "p._sceneIds", "", err)
}
- p._sceneIds = thrift.NewTList(_etype188, _size185)
- for _i189:= 0; _i189 < _size185; _i189++ {
- v191, err192 := iprot.ReadByte()
- if err192 != nil { return thrift.NewTProtocolExceptionReadField(0, "_elem190", "", err192); }
- _elem190 := v191
- p._sceneIds.Push(_elem190)
+ p._sceneIds = thrift.NewTList(_etype202, _size199)
+ for _i203:= 0; _i203 < _size199; _i203++ {
+ v205, err206 := iprot.ReadByte()
+ if err206 != nil { return thrift.NewTProtocolExceptionReadField(0, "_elem204", "", err206); }
+ _elem204 := v205
+ p._sceneIds.Push(_elem204)
}
err = iprot.ReadListEnd()
if err != nil { return thrift.NewTProtocolExceptionReadField(-1, "", "list",err); }
@@ -5100,10 +5338,10 @@ func (p *GetAllScenesReturnStruct) WriteField2(oprot thrift.TProtocol) (err thri
if err != nil { return thrift.NewTProtocolExceptionWriteField(2, "_sceneIds", p.ThriftName(), err); }
err = oprot.WriteListBegin(thrift.BYTE, p._sceneIds.Len())
if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "", "list", err); }
- for Iter193 := range p._sceneIds.Iter() {
- Iter194 := Iter193.(byte)
- err = oprot.WriteByte(byte(Iter194))
- if err != nil { return thrift.NewTProtocolExceptionWriteField(0, "Iter194", "", err); }
+ for Iter207 := range p._sceneIds.Iter() {
+ Iter208 := Iter207.(byte)
+ err = oprot.WriteByte(byte(Iter208))
+ if err != nil { return thrift.NewTProtocolExceptionWriteField(0, "Iter208", "", err); }
}
err = oprot.WriteListEnd()
if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "", "list", err); }
@@ -5243,9 +5481,9 @@ func (p *SceneGetValuesReturnStruct) Read(iprot thrift.TProtocol) (err thrift.TP
}
func (p *SceneGetValuesReturnStruct) ReadField1(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- v195, err196 := iprot.ReadI32()
- if err196 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err196); }
- p.Retval = v195
+ v209, err210 := iprot.ReadI32()
+ if err210 != nil { return thrift.NewTProtocolExceptionReadField(1, "retval", p.ThriftName(), err210); }
+ p.Retval = v209
return err
}
@@ -5254,16 +5492,16 @@ func (p *SceneGetValuesReturnStruct) ReadFieldRetval(iprot thrift.TProtocol) (th
}
func (p *SceneGetValuesReturnStruct) ReadField2(iprot thrift.TProtocol) (err thrift.TProtocolException) {
- _etype202, _size199, err := iprot.ReadListBegin()
+ _etype216, _size213, err := iprot.ReadListBegin()
if err != nil {
return thrift.NewTProtocolExceptionReadField(-1, "p.OValue", "", err)
}
- p.OValue = thrift.NewTList(_etype202, _size199)
- for _i203:= 0; _i203 < _size199; _i203++ {
- _elem204 := NewRemoteValueID()
- err207 := _elem204.Read(iprot)
- if err207 != nil { return thrift.NewTProtocolExceptionReadStruct("_elem204RemoteValueID", err207); }
- p.OValue.Push(_elem204)
+ p.OValue = thrift.NewTList(_etype216, _size213)
+ for _i217:= 0; _i217 < _size213; _i217++ {
+ _elem218 := NewRemoteValueID()
+ err221 := _elem218.Read(iprot)
+ if err221 != nil { return thrift.NewTProtocolExceptionReadStruct("_elem218RemoteValueID", err221); }
+ p.OValue.Push(_elem218)
}
err = iprot.ReadListEnd()
if err != nil { return thrift.NewTProtocolExceptionReadField(-1, "", "list",err); }
@@ -5308,9 +5546,9 @@ func (p *SceneGetValuesReturnStruct) WriteField2(oprot thrift.TProtocol) (err th
if err != nil { return thrift.NewTProtocolExceptionWriteField(2, "o_value", p.ThriftName(), err); }
err = oprot.WriteListBegin(thrift.STRUCT, p.OValue.Len())
if err != nil { return thrift.NewTProtocolExceptionWriteField(-1, "", "list", err); }
- for Iter208 := range p.OValue.Iter() {
- Iter209 := Iter208.(*RemoteValueID)
- err = Iter209.Write(oprot)
+ for Iter222 := range p.OValue.Iter() {
+ Iter223 := Iter222.(*RemoteValueID)
+ err = Iter223.Write(oprot)
if err != nil { return thrift.NewTProtocolExceptionWriteStruct("RemoteValueID", err); }
}
err = oprot.WriteListEnd()
View
14 gen-java/OpenZWave/Bool_Bool.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -30,7 +30,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Bool_Bool implements org.apache.thrift.TBase<Bool_Bool, Bool_Bool._Fields>, java.io.Serializable, Cloneable {
+public class Bool_Bool implements org.apache.thrift.TBase<Bool_Bool, Bool_Bool._Fields>, java.io.Serializable, Cloneable, Comparable<Bool_Bool> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bool_Bool");
private static final org.apache.thrift.protocol.TField RETVAL_FIELD_DESC = new org.apache.thrift.protocol.TField("retval", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -289,30 +289,30 @@ public int hashCode() {
return 0;
}
+ @Override
public int compareTo(Bool_Bool other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- Bool_Bool typedOther = (Bool_Bool)other;
- lastComparison = Boolean.valueOf(isSetRetval()).compareTo(typedOther.isSetRetval());
+ lastComparison = Boolean.valueOf(isSetRetval()).compareTo(other.isSetRetval());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRetval()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, typedOther.retval);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, other.retval);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetO_value()).compareTo(typedOther.isSetO_value());
+ lastComparison = Boolean.valueOf(isSetO_value()).compareTo(other.isSetO_value());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetO_value()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, typedOther.o_value);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, other.o_value);
if (lastComparison != 0) {
return lastComparison;
}
View
14 gen-java/OpenZWave/Bool_Float.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -30,7 +30,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Bool_Float implements org.apache.thrift.TBase<Bool_Float, Bool_Float._Fields>, java.io.Serializable, Cloneable {
+public class Bool_Float implements org.apache.thrift.TBase<Bool_Float, Bool_Float._Fields>, java.io.Serializable, Cloneable, Comparable<Bool_Float> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bool_Float");
private static final org.apache.thrift.protocol.TField RETVAL_FIELD_DESC = new org.apache.thrift.protocol.TField("retval", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -289,30 +289,30 @@ public int hashCode() {
return 0;
}
+ @Override
public int compareTo(Bool_Float other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- Bool_Float typedOther = (Bool_Float)other;
- lastComparison = Boolean.valueOf(isSetRetval()).compareTo(typedOther.isSetRetval());
+ lastComparison = Boolean.valueOf(isSetRetval()).compareTo(other.isSetRetval());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRetval()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, typedOther.retval);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, other.retval);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetO_value()).compareTo(typedOther.isSetO_value());
+ lastComparison = Boolean.valueOf(isSetO_value()).compareTo(other.isSetO_value());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetO_value()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, typedOther.o_value);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, other.o_value);
if (lastComparison != 0) {
return lastComparison;
}
View
18 gen-java/OpenZWave/Bool_GetNodeClassInformation.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -30,7 +30,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Bool_GetNodeClassInformation implements org.apache.thrift.TBase<Bool_GetNodeClassInformation, Bool_GetNodeClassInformation._Fields>, java.io.Serializable, Cloneable {
+public class Bool_GetNodeClassInformation implements org.apache.thrift.TBase<Bool_GetNodeClassInformation, Bool_GetNodeClassInformation._Fields>, java.io.Serializable, Cloneable, Comparable<Bool_GetNodeClassInformation> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bool_GetNodeClassInformation");
private static final org.apache.thrift.protocol.TField RETVAL_FIELD_DESC = new org.apache.thrift.protocol.TField("retval", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -348,40 +348,40 @@ public int hashCode() {
return 0;
}
+ @Override
public int compareTo(Bool_GetNodeClassInformation other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- Bool_GetNodeClassInformation typedOther = (Bool_GetNodeClassInformation)other;
- lastComparison = Boolean.valueOf(isSetRetval()).compareTo(typedOther.isSetRetval());
+ lastComparison = Boolean.valueOf(isSetRetval()).compareTo(other.isSetRetval());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRetval()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, typedOther.retval);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, other.retval);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSet_className()).compareTo(typedOther.isSet_className());
+ lastComparison = Boolean.valueOf(isSet_className()).compareTo(other.isSet_className());
if (lastComparison != 0) {
return lastComparison;
}
if (isSet_className()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this._className, typedOther._className);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this._className, other._className);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSet_classVersion()).compareTo(typedOther.isSet_classVersion());
+ lastComparison = Boolean.valueOf(isSet_classVersion()).compareTo(other.isSet_classVersion());
if (lastComparison != 0) {
return lastComparison;
}
if (isSet_classVersion()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this._classVersion, typedOther._classVersion);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this._classVersion, other._classVersion);
if (lastComparison != 0) {
return lastComparison;
}
View
14 gen-java/OpenZWave/Bool_Int.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -30,7 +30,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Bool_Int implements org.apache.thrift.TBase<Bool_Int, Bool_Int._Fields>, java.io.Serializable, Cloneable {
+public class Bool_Int implements org.apache.thrift.TBase<Bool_Int, Bool_Int._Fields>, java.io.Serializable, Cloneable, Comparable<Bool_Int> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bool_Int");
private static final org.apache.thrift.protocol.TField RETVAL_FIELD_DESC = new org.apache.thrift.protocol.TField("retval", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -289,30 +289,30 @@ public int hashCode() {
return 0;
}
+ @Override
public int compareTo(Bool_Int other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- Bool_Int typedOther = (Bool_Int)other;
- lastComparison = Boolean.valueOf(isSetRetval()).compareTo(typedOther.isSetRetval());
+ lastComparison = Boolean.valueOf(isSetRetval()).compareTo(other.isSetRetval());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRetval()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, typedOther.retval);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, other.retval);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetO_value()).compareTo(typedOther.isSetO_value());
+ lastComparison = Boolean.valueOf(isSetO_value()).compareTo(other.isSetO_value());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetO_value()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, typedOther.o_value);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, other.o_value);
if (lastComparison != 0) {
return lastComparison;
}
View
14 gen-java/OpenZWave/Bool_Int16.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -30,7 +30,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Bool_Int16 implements org.apache.thrift.TBase<Bool_Int16, Bool_Int16._Fields>, java.io.Serializable, Cloneable {
+public class Bool_Int16 implements org.apache.thrift.TBase<Bool_Int16, Bool_Int16._Fields>, java.io.Serializable, Cloneable, Comparable<Bool_Int16> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bool_Int16");
private static final org.apache.thrift.protocol.TField RETVAL_FIELD_DESC = new org.apache.thrift.protocol.TField("retval", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -289,30 +289,30 @@ public int hashCode() {
return 0;
}
+ @Override
public int compareTo(Bool_Int16 other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- Bool_Int16 typedOther = (Bool_Int16)other;
- lastComparison = Boolean.valueOf(isSetRetval()).compareTo(typedOther.isSetRetval());
+ lastComparison = Boolean.valueOf(isSetRetval()).compareTo(other.isSetRetval());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRetval()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, typedOther.retval);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, other.retval);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetO_value()).compareTo(typedOther.isSetO_value());
+ lastComparison = Boolean.valueOf(isSetO_value()).compareTo(other.isSetO_value());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetO_value()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, typedOther.o_value);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, other.o_value);
if (lastComparison != 0) {
return lastComparison;
}
View
18 gen-java/OpenZWave/Bool_ListString.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (1.0.0-dev)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -30,7 +30,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class Bool_ListString implements org.apache.thrift.TBase<Bool_ListString, Bool_ListString._Fields>, java.io.Serializable, Cloneable {
+public class Bool_ListString implements org.apache.thrift.TBase<Bool_ListString, Bool_ListString._Fields>, java.io.Serializable, Cloneable, Comparable<Bool_ListString> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Bool_ListString");
private static final org.apache.thrift.protocol.TField RETVAL_FIELD_DESC = new org.apache.thrift.protocol.TField("retval", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -309,30 +309,30 @@ public int hashCode() {
return 0;
}
+ @Override
public int compareTo(Bool_ListString other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- Bool_ListString typedOther = (Bool_ListString)other;
- lastComparison = Boolean.valueOf(isSetRetval()).compareTo(typedOther.isSetRetval());
+ lastComparison = Boolean.valueOf(isSetRetval()).compareTo(other.isSetRetval());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetRetval()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, typedOther.retval);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retval, other.retval);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetO_value()).compareTo(typedOther.isSetO_value());
+ lastComparison = Boolean.valueOf(isSetO_value()).compareTo(other.isSetO_value());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetO_value()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, typedOther.o_value);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.o_value, other.o_value);
if (lastComparison != 0) {
return lastComparison;
}
@@ -428,7 +428,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Bool_ListString str
struct.o_value = new ArrayList<String>(_list16.size);
for (int _i17 = 0; _i17 < _list16.size; ++_i17)
{
- String _elem18; // required
+ String _elem18;
_elem18 = iprot.readString();
struct.o_value.add(_elem18);
}
@@ -522,7 +522,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, Bool_ListString stru
struct.o_value = new ArrayList<String>(_list21.size);
for (int _i22 = 0; _i22 < _list21.size; ++_i22)
{
- String _elem23; // required
+ String _elem23;