Mercurial > octave-nkf

diff libinterp/octave-value/ov-java.h @ 15813:10d6ab9b1b4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement octave_value function class_name() for class "octave_java" * libinterp/octave-value/ov-class.cc(Fclass): Remove special code for Java objects; Just call class_name() on octave_value object. * libinterp/octave-value/ov-java.h: Declare octave_value type functions. Rename confusing octave_java class private variable java_type to java_classname. * libinterp/octave-value/ov-java.cc: Replace tests for Java object from class_name() == "octave_java" to is_java().
author Rik <rik@octave.org>
date Tue, 18 Dec 2012 10:29:51 -0800
parents d9b8333df5e4
children abc9e5f3c661
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.h	Tue Dec 18 08:21:29 2012 -0800
+++ b/libinterp/octave-value/ov-java.h	Tue Dec 18 10:29:51 2012 -0800
@@ -140,7 +140,7 @@
   jobject to_java (void) const { return java_object; }
   jclass to_class (void) const { return java_class; }
 
-  std::string java_class_name (void) const { return java_type; }
+  std::string java_class_name (void) const { return java_classname; }
 
   octave_base_value* clone (void) const { return new octave_java (*this); }
   octave_base_value* empty_clone (void) const { return new octave_java (); }
@@ -157,7 +157,7 @@
 
   void print (std::ostream& os, bool pr_as_read_syntax = false) const
   {
-    os << "<Java object: " << java_type << ">";
+    os << "<Java object: " << java_classname << ">";
     newline(os);
   }
 
@@ -288,7 +288,7 @@
             jclass_ref clsCls (current_env, current_env->GetObjectClass (java_class));
             jmethodID mID = current_env->GetMethodID (clsCls, "getCanonicalName", "()Ljava/lang/String;");
             jobject_ref resObj (current_env, current_env->CallObjectMethod (java_class, mID));
-            java_type = jstring_to_string (current_env, resObj);
+            java_classname = jstring_to_string (current_env, resObj);
           }
       }
   }
@@ -312,15 +312,27 @@
 
 private:
 
-  DECLARE_OCTAVE_ALLOCATOR
-
-  DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
-
   jobject java_object;
 
   jclass java_class;
 
-  std::string java_type;
+  std::string java_classname;
+
+  DECLARE_OCTAVE_ALLOCATOR
+
+public:
+  int type_id (void) const { return t_id; }
+  std::string type_name (void) const { return t_name; }
+  std::string class_name (void) const { return java_classname; }
+
+  static int static_type_id (void) { return t_id; }
+  static std::string static_type_name (void) { return t_name; }
+  static std::string static_class_name (void) { return "<unknown>"; }
+  static void register_type (void);
+
+private:
+  static int t_id;
+  static const std::string t_name;
 };
 
 #endif