lib/win32ole/win32ole_variable.rb in jruby-win32ole-0.8.0 vs lib/win32ole/win32ole_variable.rb in jruby-win32ole-0.8.1
- old
+ new
@@ -1,6 +1,8 @@
class WIN32OLE_VARIABLE
+ java_import org.racob.com.VarDesc
+
attr_reader :name
def initialize(type, var_desc, name)
@type, @var_desc, @name = type, var_desc, name
end
@@ -13,14 +15,25 @@
# TODO: Fill in other details when they actually exist
[@type.ole_type]
end
def value
- from_variant(@var_desc.constant)
+ RubyWIN32OLE.from_variant(JRuby.runtime, @var_desc.constant)
end
def variable_kind
- variable_kind_string(varkind)
+ case varkind
+ when VarDesc::VAR_PERINSTANCE then
+ "PERINSTANCE"
+ when VarDesc::VAR_STATIC then
+ "STATIC"
+ when VarDesc::VAR_CONST then
+ "CONSTANT"
+ when VarDesc::VAR_DISPATCH then
+ "DISPATCH"
+ else
+ "UNKNOWN"
+ end
end
def varkind
@var_desc.varkind
end