attribute values are arrays

miraisolutions · Jan 10, 2024 · 77b6b22 · 77b6b22
1 parent 0ac2484
commit 77b6b22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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<String, String> attributes, RDataFrameWrapper value) {
+    public RDataFrameWithAttributes(Map<String, String[]> 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
@@ -10,9 +10,9 @@
  */
 class ResultWithAttributes {
 
-    private final Map<String,String> attributes;
+    private final Map<String,String[]> attributes;
 
-    public ResultWithAttributes(Map<String,String> theAttributes) {
+    public ResultWithAttributes(Map<String,String[]> theAttributes) {
         this.attributes = theAttributes;
     }
 
@@ -21,22 +21,22 @@ public ResultWithAttributes() {
     }
 
     public ResultWithAttributes(Attribute attributeName, String attributeValue) {
-        this(Collections.singletonMap(attributeName.toString(), attributeValue));
+        this(Collections.singletonMap(attributeName.toString(), new String[]{attributeValue}));
     }
 
-    public Map<String, String> getAttributes() {
+    public Map<String, String[]> getAttributes() {
         return Collections.unmodifiableMap(attributes);
     }
 
     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);
     }
 }