From 77b6b22bc6cbf94d7e9b702a4b4de6301c15deaf Mon Sep 17 00:00:00 2001 From: spoltier Date: Thu, 28 Oct 2021 16:07:01 +0200 Subject: [PATCH] attribute values are arrays --- .../xlconnect/RDataFrameWithAttributes.java | 2 +- .../xlconnect/ResultWithAttributes.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/miraisolutions/xlconnect/RDataFrameWithAttributes.java b/src/main/java/com/miraisolutions/xlconnect/RDataFrameWithAttributes.java index 514e333..3306c63 100644 --- a/src/main/java/com/miraisolutions/xlconnect/RDataFrameWithAttributes.java +++ b/src/main/java/com/miraisolutions/xlconnect/RDataFrameWithAttributes.java @@ -8,7 +8,7 @@ public class RDataFrameWithAttributes extends ResultWithAttributes{ private final RDataFrameWrapper value; - public RDataFrameWithAttributes(Map attributes, RDataFrameWrapper value) { + public RDataFrameWithAttributes(Map attributes, RDataFrameWrapper value) { super(attributes); this.value = value; } diff --git a/src/main/java/com/miraisolutions/xlconnect/ResultWithAttributes.java b/src/main/java/com/miraisolutions/xlconnect/ResultWithAttributes.java index c70c496..83112ea 100644 --- a/src/main/java/com/miraisolutions/xlconnect/ResultWithAttributes.java +++ b/src/main/java/com/miraisolutions/xlconnect/ResultWithAttributes.java @@ -10,9 +10,9 @@ */ class ResultWithAttributes { - private final Map attributes; + private final Map attributes; - public ResultWithAttributes(Map theAttributes) { + public ResultWithAttributes(Map theAttributes) { this.attributes = theAttributes; } @@ -21,10 +21,10 @@ public ResultWithAttributes() { } public ResultWithAttributes(Attribute attributeName, String attributeValue) { - this(Collections.singletonMap(attributeName.toString(), attributeValue)); + this(Collections.singletonMap(attributeName.toString(), new String[]{attributeValue})); } - public Map getAttributes() { + public Map getAttributes() { return Collections.unmodifiableMap(attributes); } @@ -32,11 +32,11 @@ public String[] getAttributeNames() { return attributes.keySet().toArray(new String[0]); } - public String[] getAttributeValues() { + /* public String[] getAttributeValues() { return attributes.values().toArray(new String[0]); - } + }*/ - public String getAttributeValue(String attributeName){ + public String[] getAttributeValue(String attributeName){ return attributes.get(attributeName); } }