implement attributes toggle

R/withAttributesFromJava.R

@@ -22,22 +22,22 @@
 #
 # Utility function for converting XLConnect java objects with added attributes
 # to R variables with the corresponding attributes.
+# Sets the attributes if option XLConnect.mapAttributesFromJava is TRUE. 
+# Otherwise only unwraps the java object.
 #
 # Author: Simon Poltier, Mirai Solutions GmbH
 #
 #############################################################################
 
 withAttributesFromJava <- function(jobj) {
 
-    # jni <- .jcall(jobj, "S", "jni")
-    # unwrapped <- .jcall(jobj, jni, "getValue")
     unwrapped <- jobj$getValue()
-
     allANames = .jcall(jobj, "[S", "getAttributeNames")
-    # allAValues = .jcall(jobj, "[S", "getAttributeValues")
 
-    for(i in seq(along = allANames)) {
-        attr(unwrapped, allANames[i]) <- jobj$getAttributeValue(allANames[i])
+    if(getOption("XLConnect.mapAttributesFromJava")){
+        for(i in seq(along = allANames)) {
+            attr(unwrapped, allANames[i]) <- jobj$getAttributeValue(allANames[i])
+        }
     }
     unwrapped
   }