Read named by sheet

pom.xml

@@ -21,7 +21,7 @@
     <groupId>com.miraisolutions</groupId>
     <artifactId>XLConnect</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <name>XLConnect</name>
     <url>https://mirai-solutions.ch/</url>
     <repositories>

src/main/java/com/miraisolutions/xlconnect/Attribute.java

@@ -0,0 +1,10 @@
+package com.miraisolutions.xlconnect;
+
+public enum Attribute {
+    WORKSHEET_SCOPE {
+        @Override
+        public String toString() {
+            return "worksheetScope";
+        }
+    }
+}

src/main/java/com/miraisolutions/xlconnect/BooleanWithAttributes.java

@@ -0,0 +1,25 @@
+package com.miraisolutions.xlconnect;
+
+public class BooleanWithAttributes extends ResultWithAttributes implements WithJNI{
+
+    private final boolean value;
+
+    public BooleanWithAttributes(Attribute attributeName, String attributeValue, boolean value) {
+        super(attributeName, attributeValue);
+        this.value = value;
+    }
+
+    public BooleanWithAttributes(boolean value) {
+        super();
+        this.value = value;
+    }
+
+    public boolean getValue() {
+        return value;
+    }
+
+    @Override
+    public String jni() {
+        return "Z";
+    }
+}

src/main/java/com/miraisolutions/xlconnect/DataFrameWithAttributes.java

@@ -0,0 +1,19 @@
+package com.miraisolutions.xlconnect;
+
+import com.miraisolutions.xlconnect.data.DataFrame;
+
+public class DataFrameWithAttributes extends ResultWithAttributes{
+
+    private final DataFrame value;
+
+    public DataFrameWithAttributes(Attribute attributeName, String attributeValue, DataFrame value) {
+        super(attributeName, attributeValue);
+        this.value = value;
+    }
+
+
+    public DataFrame getValue() {
+        return value;
+    }
+
+}

src/main/java/com/miraisolutions/xlconnect/RDataFrameWithAttributes.java

@@ -0,0 +1,20 @@
+package com.miraisolutions.xlconnect;
+
+import com.miraisolutions.xlconnect.integration.r.RDataFrameWrapper;
+
+import java.util.Map;
+
+public class RDataFrameWithAttributes extends ResultWithAttributes{
+
+    private final RDataFrameWrapper value;
+
+    public RDataFrameWithAttributes(Map<String, String[]> attributes, RDataFrameWrapper value) {
+        super(attributes);
+        this.value = value;
+    }
+
+    public RDataFrameWrapper getValue() {
+        return value;
+    }
+
+}

src/main/java/com/miraisolutions/xlconnect/ResultWithAttributes.java

@@ -0,0 +1,42 @@
+package com.miraisolutions.xlconnect;
+
+
+import java.util.*;
+
+/**
+ * Represent attributes to be set on an object in R as part of the result to be returned.
+ * Should be extended for each required type. Not using a generic typed value, because it looks like R can't retrieve it
+ * in a specific subtype (we get an Object instance).
+ */
+class ResultWithAttributes {
+
+    private final Map<String,String[]> attributes;
+
+    public ResultWithAttributes(Map<String,String[]> theAttributes) {
+        this.attributes = theAttributes;
+    }
+
+    public ResultWithAttributes() {
+        this(Collections.emptyMap());
+    }
+
+    public ResultWithAttributes(Attribute attributeName, String attributeValue) {
+        this(Collections.singletonMap(attributeName.toString(), new String[]{attributeValue}));
+    }
+
+    public Map<String, String[]> getAttributes() {
+        return Collections.unmodifiableMap(attributes);
+    }
+
+    public String[] getAttributeNames() {
+        return attributes.keySet().toArray(new String[0]);
+    }
+
+    /* public String[] getAttributeValues() {
+        return attributes.values().toArray(new String[0]);
+    }*/
+
+    public String[] getAttributeValue(String attributeName){
+        return attributes.get(attributeName);
+    }
+}

src/main/java/com/miraisolutions/xlconnect/WithJNI.java

@@ -0,0 +1,8 @@
+package com.miraisolutions.xlconnect;
+
+public interface WithJNI {
+    /**
+     * @return the JNI to use for the getValue() method
+     */
+    String jni();
+}