Changeset 429 for trunk/icedtea-web/plugin/icedteanp/IcedTeaScriptablePluginObject.cc

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaScriptablePluginObject.cc (modified) (51 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaScriptablePluginObject.cc

@@ -50 +50 @@
 IcedTeaScriptablePluginObject::deAllocate(NPObject *npobj)
 {
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
 }
 
@@ -56 +56 @@
 IcedTeaScriptablePluginObject::invalidate(NPObject *npobj)
 {
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::invalidate %p\n", npobj);
-}
-
-bool
-IcedTeaScriptablePluginObject::hasMethod(NPObject *npobj, NPIdentifier name)
-{
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasMethod %p\n", npobj);
-        return false;
-}
-
-bool
-IcedTeaScriptablePluginObject::invoke(NPObject *npobj, NPIdentifier name, const NPVariant *args,
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invalidate %p\n", npobj);
+}
+
+bool
+IcedTeaScriptablePluginObject::hasMethod(NPObject *npobj, NPIdentifier name_id)
+{
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::hasMethod %p\n", npobj);
+        return false;
+}
+
+bool
+IcedTeaScriptablePluginObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args,
                         uint32_t argCount,NPVariant *result)
 {
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::invoke %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invoke %p\n", npobj);
         return false;
 }
@@ -78 +78 @@
                                uint32_t argCount, NPVariant *result)
 {
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::invokeDefault %p\n", npobj);
-        return false;
-}
-
-bool
-IcedTeaScriptablePluginObject::hasProperty(NPObject *npobj, NPIdentifier name)
-{
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasProperty %p\n", npobj);
-        return false;
-}
-
-bool
-IcedTeaScriptablePluginObject::getProperty(NPObject *npobj, NPIdentifier name, NPVariant *result)
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invokeDefault %p\n", npobj);
+        return false;
+}
+
+bool
+IcedTeaScriptablePluginObject::hasProperty(NPObject *npobj, NPIdentifier name_id)
+{
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::hasProperty %p\n", npobj);
+        return false;
+}
+
+bool
+IcedTeaScriptablePluginObject::getProperty(NPObject *npobj, NPIdentifier name_id, NPVariant *result)
 {
         // Package request?
-        if (!strcmp(browser_functions.utf8fromidentifier(name), "java"))
+        if (IcedTeaPluginUtilities::NPIdentifierAsString(name_id) == "java")
         {
-                //NPObject* obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(getInstanceFromMemberPtr(npobj), name);
+                //NPObject* obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(getInstanceFromMemberPtr(npobj), name);
                 //OBJECT_TO_NPVARIANT(obj, *result);
 
-                //printf ("Filling variant %p with object %p\n", result);
+                //PLUGIN_ERROR ("Filling variant %p with object %p\n", result);
         }
 
@@ -105 +105 @@
 
 bool
-IcedTeaScriptablePluginObject::setProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value)
-{
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::setProperty %p\n", npobj);
-        return false;
-}
-
-bool
-IcedTeaScriptablePluginObject::removeProperty(NPObject *npobj, NPIdentifier name)
-{
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::removeProperty %p\n", npobj);
+IcedTeaScriptablePluginObject::setProperty(NPObject *npobj, NPIdentifier name_id, const NPVariant *value)
+{
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::setProperty %p\n", npobj);
+        return false;
+}
+
+bool
+IcedTeaScriptablePluginObject::removeProperty(NPObject *npobj, NPIdentifier name_id)
+{
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::removeProperty %p\n", npobj);
         return false;
 }
@@ -121 +121 @@
 IcedTeaScriptablePluginObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
 {
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::enumerate %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::enumerate %p\n", npobj);
         return false;
 }
@@ -129 +129 @@
                    NPVariant *result)
 {
-        printf ("** Unimplemented: IcedTeaScriptablePluginObject::construct %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::construct %p\n", npobj);
         return false;
 }
@@ -140 +140 @@
 }
 
+static NPClass
+scriptable_plugin_object_class() {
+    NPClass np_class;
+    np_class.structVersion = NP_CLASS_STRUCT_VERSION;
+    np_class.allocate = allocate_scriptable_jp_object;
+    np_class.deallocate = IcedTeaScriptableJavaPackageObject::deAllocate;
+    np_class.invalidate = IcedTeaScriptableJavaPackageObject::invalidate;
+    np_class.hasMethod = IcedTeaScriptableJavaPackageObject::hasMethod;
+    np_class.invoke = IcedTeaScriptableJavaPackageObject::invoke;
+    np_class.invokeDefault = IcedTeaScriptableJavaPackageObject::invokeDefault;
+    np_class.hasProperty = IcedTeaScriptableJavaPackageObject::hasProperty;
+    np_class.getProperty = IcedTeaScriptableJavaPackageObject::getProperty;
+    np_class.setProperty = IcedTeaScriptableJavaPackageObject::setProperty;
+    np_class.removeProperty = IcedTeaScriptableJavaPackageObject::removeProperty;
+    np_class.enumerate = IcedTeaScriptableJavaPackageObject::enumerate;
+    np_class.construct = IcedTeaScriptableJavaPackageObject::construct;
+    return np_class;
+}
+
 NPObject*
-IcedTeaScriptablePluginObject::get_scriptable_java_package_object(NPP instance, const NPUTF8* name)
-{
-
-        NPObject* scriptable_object;
-
-        NPClass* np_class = new NPClass();
-        np_class->structVersion = NP_CLASS_STRUCT_VERSION;
-        np_class->allocate = allocate_scriptable_jp_object;
-        np_class->deallocate = IcedTeaScriptableJavaPackageObject::deAllocate;
-        np_class->invalidate = IcedTeaScriptableJavaPackageObject::invalidate;
-        np_class->hasMethod = IcedTeaScriptableJavaPackageObject::hasMethod;
-        np_class->invoke = IcedTeaScriptableJavaPackageObject::invoke;
-        np_class->invokeDefault = IcedTeaScriptableJavaPackageObject::invokeDefault;
-        np_class->hasProperty = IcedTeaScriptableJavaPackageObject::hasProperty;
-        np_class->getProperty = IcedTeaScriptableJavaPackageObject::getProperty;
-        np_class->setProperty = IcedTeaScriptableJavaPackageObject::setProperty;
-        np_class->removeProperty = IcedTeaScriptableJavaPackageObject::removeProperty;
-        np_class->enumerate = IcedTeaScriptableJavaPackageObject::enumerate;
-        np_class->construct = IcedTeaScriptableJavaPackageObject::construct;
-
-        scriptable_object = browser_functions.createobject(instance, np_class);
-        PLUGIN_DEBUG("Returning new scriptable package class: %p from instance %p with name %s\n", scriptable_object, instance, name);
+IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(NPP instance, const NPUTF8* name)
+{
+    /* Shared NPClass instance for IcedTeaScriptablePluginObject */
+    static NPClass np_class = scriptable_plugin_object_class();
+
+    NPObject* scriptable_object = browser_functions.createobject(instance, &np_class);
+    PLUGIN_DEBUG("Returning new scriptable package class: %p from instance %p with name %s\n", scriptable_object, instance, name);
 
     ((IcedTeaScriptableJavaPackageObject*) scriptable_object)->setPackageName(name);
@@ -168 +172 @@
     IcedTeaPluginUtilities::storeInstanceID(scriptable_object, instance);
 
-        return scriptable_object;
+    return scriptable_object;
 }
 
@@ -186 +190 @@
 IcedTeaScriptableJavaPackageObject::setPackageName(const NPUTF8* name)
 {
-    this->package_name->append(name);
+    this->package_name->assign(name);
 }
 
@@ -192 +196 @@
 IcedTeaScriptableJavaPackageObject::getPackageName()
 {
-    return this->package_name->c_str();
+    return *this->package_name;
 }
 
@@ -198 +202 @@
 IcedTeaScriptableJavaPackageObject::deAllocate(NPObject *npobj)
 {
-    browser_functions.releaseobject(npobj);
+    delete (IcedTeaScriptableJavaPackageObject*)npobj;
 }
 
@@ -208 +212 @@
 
 bool
-IcedTeaScriptableJavaPackageObject::hasMethod(NPObject *npobj, NPIdentifier name)
+IcedTeaScriptableJavaPackageObject::hasMethod(NPObject *npobj, NPIdentifier name_id)
 {
     // Silly caller. Methods are for objects!
@@ -215 +219 @@
 
 bool
-IcedTeaScriptableJavaPackageObject::invoke(NPObject *npobj, NPIdentifier name, const NPVariant *args,
+IcedTeaScriptableJavaPackageObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args,
                         uint32_t argCount,NPVariant *result)
 {
-        printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invoke %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invoke %p\n", npobj);
         return false;
 }
@@ -226 +230 @@
                                uint32_t argCount, NPVariant *result)
 {
-        printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invokeDefault %p\n", npobj);
-        return false;
-}
-
-bool
-IcedTeaScriptableJavaPackageObject::hasProperty(NPObject *npobj, NPIdentifier name)
-{
-        PLUGIN_DEBUG("IcedTeaScriptableJavaPackageObject::hasProperty %s\n", browser_functions.utf8fromidentifier(name));
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invokeDefault %p\n", npobj);
+        return false;
+}
+
+bool
+IcedTeaScriptableJavaPackageObject::hasProperty(NPObject *npobj, NPIdentifier name_id)
+{
+        std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id);
+
+        PLUGIN_DEBUG("IcedTeaScriptableJavaPackageObject::hasProperty %s\n", name.c_str());
 
         bool hasProperty = false;
@@ -240 +246 @@
     NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj);
     int plugin_instance_id = get_id_from_instance(instance);
-
-        PLUGIN_DEBUG("Object package name: \"%s\"\n", ((IcedTeaScriptableJavaPackageObject*) npobj)->getPackageName().c_str());
+        IcedTeaScriptableJavaPackageObject* scriptable_obj = (IcedTeaScriptableJavaPackageObject*)npobj;
+
+        PLUGIN_DEBUG("Object package name: \"%s\"\n", scriptable_obj->getPackageName().c_str());
 
         // "^java" is always a package
-        if (((IcedTeaScriptableJavaPackageObject*) npobj)->getPackageName().length() == 0 &&
-            (  !strcmp(browser_functions.utf8fromidentifier(name), "java") ||
-               !strcmp(browser_functions.utf8fromidentifier(name), "javax")))
+        if (scriptable_obj->getPackageName().empty() && (name == "java" || name == "javax"))
         {
             return true;
         }
 
-        std::string property_name = ((IcedTeaScriptableJavaPackageObject*) npobj)->getPackageName();
-        if (property_name.length() > 0)
+        std::string property_name = scriptable_obj->getPackageName();
+        if (!property_name.empty())
             property_name += ".";
-        property_name += browser_functions.utf8fromidentifier(name);
+        property_name += name;
 
         PLUGIN_DEBUG("Looking for name \"%s\"\n", property_name.c_str());
@@ -276 +281 @@
 
 bool
-IcedTeaScriptableJavaPackageObject::getProperty(NPObject *npobj, NPIdentifier name, NPVariant *result)
-{
-
-        PLUGIN_DEBUG("IcedTeaScriptableJavaPackageObject::getProperty %s\n", browser_functions.utf8fromidentifier(name));
-
-        if (!browser_functions.utf8fromidentifier(name))
+IcedTeaScriptableJavaPackageObject::getProperty(NPObject *npobj, NPIdentifier name_id, NPVariant *result)
+{
+    std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id);
+
+        PLUGIN_DEBUG("IcedTeaScriptableJavaPackageObject::getProperty %s\n", name.c_str());
+
+        if (!browser_functions.identifierisstring(name_id))
             return false;
 
@@ -289 +295 @@
     NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj);
     int plugin_instance_id = get_id_from_instance(instance);
-
-        std::string property_name = ((IcedTeaScriptableJavaPackageObject*) npobj)->getPackageName();
-        if (property_name.length() > 0)
-            property_name += ".";
-        property_name += browser_functions.utf8fromidentifier(name);
+    IcedTeaScriptableJavaPackageObject* scriptable_obj = (IcedTeaScriptableJavaPackageObject*)npobj;
+
+    std::string property_name = scriptable_obj->getPackageName();
+    if (!property_name.empty())
+        property_name += ".";
+    property_name += name;
 
         java_result = java_request.findClass(plugin_instance_id, property_name);
@@ -305 +312 @@
         {
                 PLUGIN_DEBUG("Returning package object\n");
-                obj = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(
+                obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(
                                   IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj),
                                   property_name.c_str());
@@ -312 +319 @@
         {
                 PLUGIN_DEBUG("Returning Java object\n");
-                obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(
+                obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(
                                 IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj),
                                 *(java_result->return_string), "0", false);
@@ -323 +330 @@
 
 bool
-IcedTeaScriptableJavaPackageObject::setProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value)
+IcedTeaScriptableJavaPackageObject::setProperty(NPObject *npobj, NPIdentifier name_id, const NPVariant *value)
 {
         // Can't be going around setting properties on namespaces.. that's madness!
@@ -330 +337 @@
 
 bool
-IcedTeaScriptableJavaPackageObject::removeProperty(NPObject *npobj, NPIdentifier name)
-{
-        printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::removeProperty %p\n", npobj);
+IcedTeaScriptableJavaPackageObject::removeProperty(NPObject *npobj, NPIdentifier name_id)
+{
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::removeProperty %p\n", npobj);
         return false;
 }
@@ -339 +346 @@
 IcedTeaScriptableJavaPackageObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
 {
-        printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::enumerate %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::enumerate %p\n", npobj);
         return false;
 }
@@ -347 +354 @@
                    NPVariant *result)
 {
-        printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::construct %p\n", npobj);
+        PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::construct %p\n", npobj);
         return false;
 }
@@ -358 +365 @@
 }
 
+
+static NPClass
+scriptable_java_package_object_class() {
+    NPClass np_class;
+    np_class.structVersion = NP_CLASS_STRUCT_VERSION;
+    np_class.allocate = allocate_scriptable_java_object;
+    np_class.deallocate = IcedTeaScriptableJavaObject::deAllocate;
+    np_class.invalidate = IcedTeaScriptableJavaObject::invalidate;
+    np_class.hasMethod = IcedTeaScriptableJavaObject::hasMethod;
+    np_class.invoke = IcedTeaScriptableJavaObject::invoke;
+    np_class.invokeDefault = IcedTeaScriptableJavaObject::invokeDefault;
+    np_class.hasProperty = IcedTeaScriptableJavaObject::hasProperty;
+    np_class.getProperty = IcedTeaScriptableJavaObject::getProperty;
+    np_class.setProperty = IcedTeaScriptableJavaObject::setProperty;
+    np_class.removeProperty = IcedTeaScriptableJavaObject::removeProperty;
+    np_class.enumerate = IcedTeaScriptableJavaObject::enumerate;
+    np_class.construct = IcedTeaScriptableJavaObject::construct;
+    return np_class;
+}
+
 NPObject*
-IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(NPP instance,
+IcedTeaScriptableJavaObject::get_scriptable_java_object(NPP instance,
                                     std::string class_id,
                                     std::string instance_id,
                                     bool isArray)
 {
-    NPObject* scriptable_object;
-
-    std::string obj_key = std::string();
-    obj_key += class_id;
-    obj_key += ":";
-    obj_key += instance_id;
+    /* Shared NPClass instance for IcedTeaScriptablePluginObject */
+    static NPClass np_class = scriptable_java_package_object_class();
+
+    std::string obj_key = class_id + ":" + instance_id;
 
     PLUGIN_DEBUG("get_scriptable_java_object searching for %s...\n", obj_key.c_str());
-    scriptable_object = IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key);
+    IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key);
 
     if (scriptable_object != NULL)
@@ -381 +406 @@
     }
 
-
-        NPClass* np_class = new NPClass();
-        np_class->structVersion = NP_CLASS_STRUCT_VERSION;
-        np_class->allocate = allocate_scriptable_java_object;
-        np_class->deallocate = IcedTeaScriptableJavaObject::deAllocate;
-        np_class->invalidate = IcedTeaScriptableJavaObject::invalidate;
-        np_class->hasMethod = IcedTeaScriptableJavaObject::hasMethod;
-        np_class->invoke = IcedTeaScriptableJavaObject::invoke;
-        np_class->invokeDefault = IcedTeaScriptableJavaObject::invokeDefault;
-        np_class->hasProperty = IcedTeaScriptableJavaObject::hasProperty;
-        np_class->getProperty = IcedTeaScriptableJavaObject::getProperty;
-        np_class->setProperty = IcedTeaScriptableJavaObject::setProperty;
-        np_class->removeProperty = IcedTeaScriptableJavaObject::removeProperty;
-        np_class->enumerate = IcedTeaScriptableJavaObject::enumerate;
-        np_class->construct = IcedTeaScriptableJavaObject::construct;
-
-        // try to create normally
-    scriptable_object =  browser_functions.createobject(instance, np_class);
+    // try to create normally
+    scriptable_object = (IcedTeaScriptableJavaObject*)browser_functions.createobject(instance, &np_class);
 
     // didn't work? try creating asynch
@@ -409 +418 @@
 
         thread_data.parameters.push_back(instance);
-        thread_data.parameters.push_back(np_class);
+        thread_data.parameters.push_back(&np_class);
         thread_data.parameters.push_back(&scriptable_object);
 
@@ -421 +430 @@
     PLUGIN_DEBUG("Constructed new Java Object with classid=%s, instanceid=%s, isArray=%d and scriptable_object=%p\n", class_id.c_str(), instance_id.c_str(), isArray, scriptable_object);
 
-        ((IcedTeaScriptableJavaObject*) scriptable_object)->setClassIdentifier(class_id);
-    ((IcedTeaScriptableJavaObject*) scriptable_object)->setIsArray(isArray);
+    scriptable_object->class_id = class_id;
+    scriptable_object->is_object_array = isArray;
 
         if (instance_id != "0")
-            ((IcedTeaScriptableJavaObject*) scriptable_object)->setInstanceIdentifier(instance_id);
+            scriptable_object->instance_id = instance_id;
 
         IcedTeaPluginUtilities::storeInstanceID(scriptable_object, instance);
@@ -456 +465 @@
 }
 
-IcedTeaScriptableJavaObject::IcedTeaScriptableJavaObject(NPP instance)
-{
-        this->instance = instance;
-        this->class_id = new std::string();
-        this->instance_id = new std::string();
-}
-
-IcedTeaScriptableJavaObject::~IcedTeaScriptableJavaObject()
-{
-        delete this->class_id;
-        delete this->instance_id;
-}
-
-void
-IcedTeaScriptableJavaObject::setClassIdentifier(std::string class_id)
-{
-        this->class_id->append(class_id);
-}
-
-void
-IcedTeaScriptableJavaObject::setInstanceIdentifier(std::string instance_id)
-{
-        this->instance_id->append(instance_id);
-}
-
-void
-IcedTeaScriptableJavaObject::setIsArray(bool isArray)
-{
-    this->isObjectArray = isArray;
-}
-
-void
-IcedTeaScriptableJavaObject::deAllocate(NPObject *npobj)
-{
-        browser_functions.releaseobject(npobj);
-}
-
-void
-IcedTeaScriptableJavaObject::invalidate(NPObject *npobj)
-{
-        IcedTeaPluginUtilities::removeInstanceID(npobj);
-
-        std::string obj_key = std::string();
-        obj_key += ((IcedTeaScriptableJavaObject*) npobj)->getClassID();
-        obj_key += ":";
-        obj_key += ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID();
-
-        IcedTeaPluginUtilities::removeObjectMapping(obj_key);
-}
-
-bool
-IcedTeaScriptableJavaObject::hasMethod(NPObject *npobj, NPIdentifier name)
-{
-    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasMethod %s (ival=%d)\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name));
+bool
+IcedTeaScriptableJavaObject::hasMethod(NPObject *npobj, NPIdentifier name_id)
+{
+    std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id);
+    IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) npobj;
+
+    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasMethod %s (ival=%d)\n", name.c_str(), browser_functions.intfromidentifier(name_id));
     bool hasMethod = false;
 
     // If object is an array and requested "method" may be a number, check for it first
-    if ( !((IcedTeaScriptableJavaObject*) npobj)->isArray()  ||
-         (browser_functions.intfromidentifier(name) < 0))
-    {
-
-        if (!browser_functions.utf8fromidentifier(name))
+    if ( !scriptable_object->is_object_array  ||
+         (browser_functions.intfromidentifier(name_id) < 0))
+    {
+
+        if (!browser_functions.identifierisstring(name_id))
             return false;
 
@@ -523 +485 @@
         JavaRequestProcessor java_request = JavaRequestProcessor();
 
-        std::string classId = std::string(((IcedTeaScriptableJavaObject*) npobj)->getClassID());
-        std::string methodName = browser_functions.utf8fromidentifier(name);
-
-        java_result = java_request.hasMethod(classId, methodName);
+        java_result = java_request.hasMethod(scriptable_object->class_id, name);
         hasMethod = java_result->return_identifier != 0;
     }
@@ -535 +494 @@
 
 bool
-IcedTeaScriptableJavaObject::invoke(NPObject *npobj, NPIdentifier name, const NPVariant *args,
+IcedTeaScriptableJavaObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args,
                         uint32_t argCount, NPVariant *result)
 {
-    NPUTF8* method_name = browser_functions.utf8fromidentifier(name);
+    std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id);
 
     // Extract arg type array
-    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::invoke %s. Args follow.\n", method_name);
+    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::invoke %s. Args follow.\n", name.c_str());
     for (int i=0; i < argCount; i++)
     {
@@ -550 +509 @@
     JavaRequestProcessor java_request = JavaRequestProcessor();
 
-    NPObject* obj;
-    std::string instance_id = ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID();
-    std::string class_id = ((IcedTeaScriptableJavaObject*) npobj)->getClassID();
-    std::string callee;
-    std::string source;
+    IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj;
+
+    std::string instance_id = scriptable_object->instance_id;
+    std::string class_id = scriptable_object->class_id;
 
     NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj);
@@ -567 +525 @@
         if (id == "-1")
         {
-            printf("Unable to create arguments on Java side\n");
+            PLUGIN_ERROR("Unable to create arguments on Java side\n");
             return false;
         }
@@ -577 +535 @@
     {
         PLUGIN_DEBUG("Calling static method\n");
-        callee = ((IcedTeaScriptableJavaObject*) npobj)->getClassID();
         java_result = java_request.callStaticMethod(
                         IcedTeaPluginUtilities::getSourceFromInstance(instance),
-                        callee, browser_functions.utf8fromidentifier(name), arg_ids);
+                        scriptable_object->class_id, name, arg_ids);
     } else
     {
         PLUGIN_DEBUG("Calling method normally\n");
-        callee = ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID();
         java_result = java_request.callMethod(
                         IcedTeaPluginUtilities::getSourceFromInstance(instance),
-                        callee, browser_functions.utf8fromidentifier(name), arg_ids);
+                        scriptable_object->instance_id, name, arg_ids);
     }
 
     if (java_result->error_occurred)
     {
-        // error message must be allocated on heap
-        char* error_msg = (char*) malloc(java_result->error_msg->length()*sizeof(char));
-        strcpy(error_msg, java_result->error_msg->c_str());
-        browser_functions.setexception(npobj, error_msg);
+        browser_functions.setexception(npobj, java_result->error_msg->c_str());
         return false;
     }
@@ -604 +557 @@
 
 bool
-IcedTeaScriptableJavaObject::invokeDefault(NPObject *npobj, const NPVariant *args,
-                               uint32_t argCount, NPVariant *result)
-{
-        printf ("** Unimplemented: IcedTeaScriptableJavaObject::invokeDefault %p\n", npobj);
-        return false;
-}
-
-bool
-IcedTeaScriptableJavaObject::hasProperty(NPObject *npobj, NPIdentifier name)
-{
-    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasProperty %s (ival=%d)\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name));
+IcedTeaScriptableJavaObject::hasProperty(NPObject *npobj, NPIdentifier name_id)
+{
+    std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id);
+
+    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::hasProperty %s (ival=%d)\n", name.c_str(), browser_functions.intfromidentifier(name_id));
     bool hasProperty = false;
 
+    IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj;
     // If it is an array, only length and indexes are valid
-    if (((IcedTeaScriptableJavaObject*) npobj)->isArray())
-    {
-        if (browser_functions.intfromidentifier(name) >= 0 ||
-            !strcmp(browser_functions.utf8fromidentifier(name), "length"))
+    if (scriptable_object->is_object_array)
+    {
+        if (browser_functions.intfromidentifier(name_id) >= 0 || name == "length")
             hasProperty = true;
 
     } else
     {
-
-        if (!browser_functions.utf8fromidentifier(name))
+        if (!browser_functions.identifierisstring(name_id))
             return false;
 
-        if (!strcmp(browser_functions.utf8fromidentifier(name), "Packages"))
+        if (name == "Packages")
         {
             hasProperty = true;
@@ -638 +584 @@
             JavaRequestProcessor java_request = JavaRequestProcessor();
 
-            std::string class_id = std::string(((IcedTeaScriptableJavaObject*) npobj)->getClassID());
-            std::string fieldName = browser_functions.utf8fromidentifier(name);
-
-            java_result = java_request.hasField(class_id, fieldName);
+            java_result = java_request.hasField(scriptable_object->class_id, name);
 
             hasProperty = java_result->return_identifier != 0;
@@ -652 +595 @@
 
 bool
-IcedTeaScriptableJavaObject::getProperty(NPObject *npobj, NPIdentifier name, NPVariant *result)
-{
-    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::getProperty %s (ival=%d)\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name));
-
-    bool isPropertyClass = false;
+IcedTeaScriptableJavaObject::getProperty(NPObject *npobj, NPIdentifier name_id, NPVariant *result)
+{
+    std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id);
+    bool is_string_id = browser_functions.identifierisstring(name_id);
+    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::getProperty %s (ival=%d)\n", name.c_str(), browser_functions.intfromidentifier(name_id));
+
     JavaResultData* java_result;
     JavaRequestProcessor java_request = JavaRequestProcessor();
 
-    NPObject* obj;
-    std::string instance_id = ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID();
-    std::string class_id = ((IcedTeaScriptableJavaObject*) npobj)->getClassID();
-    NPP instance = ((IcedTeaScriptableJavaObject*) npobj)->getInstance();
+    IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj;
+
+    std::string instance_id = scriptable_object->getInstanceID();
+    std::string class_id = scriptable_object->getClassID();
+    NPP instance = scriptable_object->instance;
 
     if (instance_id.length() > 0) // Could be an array or a simple object
     {
         // If array and requesting length
-        if ( ((IcedTeaScriptableJavaObject*) npobj)->isArray() &&
-             browser_functions.utf8fromidentifier(name) &&
-             !strcmp(browser_functions.utf8fromidentifier(name), "length"))
+        if ( scriptable_object->is_object_array && name == "length")
         {
             java_result = java_request.getArrayLength(instance_id);
-        } else if ( ((IcedTeaScriptableJavaObject*) npobj)->isArray() &&
-                    browser_functions.intfromidentifier(name) >= 0) // else if array and requesting index
+        } else if ( scriptable_object->is_object_array &&
+                    browser_functions.intfromidentifier(name_id) >= 0) // else if array and requesting index
         {
 
@@ -680 +623 @@
             if (java_result->error_occurred)
             {
-                printf("ERROR: Couldn't fetch array length\n");
+                PLUGIN_ERROR("ERROR: Couldn't fetch array length\n");
                 return false;
             }
@@ -687 +630 @@
 
             // Access beyond size?
-            if (browser_functions.intfromidentifier(name) >= length)
+            if (browser_functions.intfromidentifier(name_id) >= length)
             {
                 VOID_TO_NPVARIANT(*result);
@@ -694 +637 @@
 
             std::string index = std::string();
-            IcedTeaPluginUtilities::itoa(browser_functions.intfromidentifier(name), &index);
+            IcedTeaPluginUtilities::itoa(browser_functions.intfromidentifier(name_id), &index);
             java_result = java_request.getSlot(instance_id, index);
 
         } else // Everything else
         {
-            if (!browser_functions.utf8fromidentifier(name))
+            if (!is_string_id) {
                 return false;
-
-            if (!strcmp(browser_functions.utf8fromidentifier(name), "Packages"))
+            }
+
+            if (name == "Packages")
             {
-                NPObject* pkgObject = IcedTeaScriptablePluginObject::get_scriptable_java_package_object(instance, "");
+                NPObject* pkgObject = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(instance, "");
                 OBJECT_TO_NPVARIANT(pkgObject, *result);
                 return true;
@@ -711 +655 @@
             java_result = java_request.getField(
                         IcedTeaPluginUtilities::getSourceFromInstance(instance),
-                        class_id, instance_id, browser_functions.utf8fromidentifier(name));
+                        class_id, instance_id, name);
         }
     }
     else
     {
-        if (!browser_functions.utf8fromidentifier(name))
-            return true;
+        if (!is_string_id) {
+            return false;
+        }
 
         java_result = java_request.getStaticField(
                                 IcedTeaPluginUtilities::getSourceFromInstance(instance),
-                                class_id, browser_functions.utf8fromidentifier(name));
+                                class_id, name);
     }
 
@@ -734 +679 @@
 
 bool
-IcedTeaScriptableJavaObject::setProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value)
-{
-    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::setProperty %s (ival=%d) to:\n", browser_functions.utf8fromidentifier(name), browser_functions.intfromidentifier(name));
+IcedTeaScriptableJavaObject::setProperty(NPObject *npobj, NPIdentifier name_id, const NPVariant *value)
+{
+    std::string name = IcedTeaPluginUtilities::NPIdentifierAsString(name_id);
+    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::setProperty %s (ival=%d) to:\n", name.c_str(), browser_functions.intfromidentifier(name_id));
     IcedTeaPluginUtilities::printNPVariant(*value);
 
-    bool isPropertyClass = false;
     JavaResultData* java_result;
     JavaRequestProcessor java_request = JavaRequestProcessor();
-
-    NPObject* obj;
-    std::string instance_id = ((IcedTeaScriptableJavaObject*) npobj)->getInstanceID();
-    std::string class_id = ((IcedTeaScriptableJavaObject*) npobj)->getClassID();
+    IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj;
+
+    std::string instance_id = scriptable_object->getInstanceID();
+    std::string class_id = scriptable_object->getClassID();
 
     NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj);
@@ -752 +697 @@
     {
         // If array
-        if ( ((IcedTeaScriptableJavaObject*) npobj)->isArray() &&
-             browser_functions.utf8fromidentifier(name) &&
-             !strcmp(browser_functions.utf8fromidentifier(name), "length"))
+        if (scriptable_object->is_object_array && name == "length")
         {
-            printf("ERROR: Array length is not a modifiable property\n");
+            PLUGIN_ERROR("ERROR: Array length is not a modifiable property\n");
             return false;
-        } else if ( ((IcedTeaScriptableJavaObject*) npobj)->isArray() &&
-                    browser_functions.intfromidentifier(name) >= 0) // else if array and requesting index
+        } else if ( scriptable_object->is_object_array &&
+                    browser_functions.intfromidentifier(name_id) >= 0) // else if array and requesting index
         {
 
@@ -765 +708 @@
             if (java_result->error_occurred)
             {
-                printf("ERROR: Couldn't fetch array length\n");
+                PLUGIN_ERROR("ERROR: Couldn't fetch array length\n");
                 return false;
             }
@@ -772 +715 @@
 
             // Access beyond size?
-            if (browser_functions.intfromidentifier(name) >= length)
+            if (browser_functions.intfromidentifier(name_id) >= length)
             {
                 return true;
@@ -778 +721 @@
 
             std::string index = std::string();
-            IcedTeaPluginUtilities::itoa(browser_functions.intfromidentifier(name), &index);
+            IcedTeaPluginUtilities::itoa(browser_functions.intfromidentifier(name_id), &index);
 
             std::string value_id = std::string();
@@ -792 +735 @@
             java_result = java_request.setField(
                         IcedTeaPluginUtilities::getSourceFromInstance(instance),
-                        class_id, instance_id, browser_functions.utf8fromidentifier(name), value_id);
+                        class_id, instance_id, name, value_id);
         }
     }
@@ -802 +745 @@
         java_result = java_request.setStaticField(
                                 IcedTeaPluginUtilities::getSourceFromInstance(instance),
-                                class_id, browser_functions.utf8fromidentifier(name), value_id);
+                                class_id, name, value_id);
     }
 
@@ -815 +758 @@
 
 bool
-IcedTeaScriptableJavaObject::removeProperty(NPObject *npobj, NPIdentifier name)
-{
-        printf ("** Unimplemented: IcedTeaScriptableJavaObject::removeProperty %p\n", npobj);
-        return false;
-}
-
-bool
-IcedTeaScriptableJavaObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-        printf ("** Unimplemented: IcedTeaScriptableJavaObject::enumerate %p\n", npobj);
-        return false;
-}
-
-bool
 IcedTeaScriptableJavaObject::construct(NPObject *npobj, const NPVariant *args, uint32_t argCount,
                    NPVariant *result)
 {
+    IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*)npobj;
     // Extract arg type array
-    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::construct %s. Args follow.\n", ((IcedTeaScriptableJavaObject*) npobj)->getClassID().c_str());
+    PLUGIN_DEBUG("IcedTeaScriptableJavaObject::construct %s. Args follow.\n", scriptable_object->getClassID().c_str());
     for (int i=0; i < argCount; i++)
     {
@@ -842 +772 @@
     JavaRequestProcessor java_request = JavaRequestProcessor();
 
-    NPObject* obj;
-    std::string class_id = ((IcedTeaScriptableJavaObject*) npobj)->getClassID();
     NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj);
 
@@ -854 +782 @@
         if (id == "0")
         {
-            // error message must be allocated on heap
-            char* error_msg = (char*) malloc(1024*sizeof(char));
-            strcpy(error_msg, "Unable to create argument on Java side");
-
-            browser_functions.setexception(npobj, error_msg);
+            browser_functions.setexception(npobj, "Unable to create argument on Java side");
             return false;
         }
@@ -867 +791 @@
     java_result = java_request.newObject(
                             IcedTeaPluginUtilities::getSourceFromInstance(instance),
-                            class_id,
+                            scriptable_object->class_id,
                             arg_ids);
 
     if (java_result->error_occurred)
     {
-        // error message must be allocated on heap
-        int length = java_result->error_msg->length();
-        char* error_msg = (char*) malloc((length+1)*sizeof(char));
-        strcpy(error_msg, java_result->error_msg->c_str());
-
-        browser_functions.setexception(npobj, error_msg);
+        browser_functions.setexception(npobj, java_result->error_msg->c_str());
         return false;
     }
 
-    std::string return_obj_instance_id = std::string();
-    std::string return_obj_class_id = class_id;
-    return_obj_instance_id.append(*(java_result->return_string));
-
-    obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_object(
+    std::string return_obj_instance_id = *java_result->return_string;
+    std::string return_obj_class_id = scriptable_object->class_id;
+
+    NPObject* obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(
                                 IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj),
                                 return_obj_class_id, return_obj_instance_id, false);