#989 Made viewport keys iterable.

plugin/virtualized-table-plugin/src/main/scala/org/finos/vuu/plugin/virtualized/table/VirtualizedViewPortKeys.scala

@@ -10,9 +10,10 @@ class VirtualizedViewPortKeys(tablePrimaryKeys: TablePrimaryKeys) extends ViewPo
   override def create(tableKeys: TablePrimaryKeys): ViewPortKeys = ???
 
   override def get(index: Int): String = tablePrimaryKeys.get(index)
-  override def slice(from: Int, to: Int): Array[String] = tablePrimaryKeys.sliceTableKeys(from, to).toArray
+  override def sliceToArray(from: Int, to: Int): Array[String] = tablePrimaryKeys.sliceTableKeys(from, to).toArray
   override def sliceToKeys(from: Int, to: Int): ViewPortKeys = ???
   override def length: Int = tablePrimaryKeys.length
   override def toArray(): Array[String] = tablePrimaryKeys.toArray
   def setDataInRange(from: Int, to: Int, data: Array[String]): Unit = ???
+  override def iterator: Iterator[String] = tablePrimaryKeys.iterator
 }

vuu/src/main/scala/org/finos/vuu/core/table/InMemDataTable.scala

@@ -71,7 +71,7 @@ trait DataTable extends KeyedObservable[RowKeyUpdate] with RowSource {
     val columns = getTableDef.columns
     val keys = primaryKeys
 
-    val selectedKeys = keys.toArray.slice(start, end) //.slice(start, end)//drop(start).take(end - start)
+    val selectedKeys = keys.toArray.slice(start, end) //.sliceToArray(start, end)//drop(start).take(end - start)
 
     val rows = selectedKeys.map(key => pullRowAsArray(key, ViewPortColumnCreator.create(this, columns.map(_.name).toList)))
 

vuu/src/main/scala/org/finos/vuu/feature/EmptyViewPortKeys.scala

@@ -5,9 +5,10 @@ import org.finos.vuu.feature.inmem.InMemViewPortKeys
 
 object EmptyViewPortKeys extends ViewPortKeys {
   override def create(immutableArray: TablePrimaryKeys): ViewPortKeys = InMemViewPortKeys(immutableArray)
-  override def slice(from: Int, to: Int): Array[String] = Array()
+  override def sliceToArray(from: Int, to: Int): Array[String] = Array()
   override def get(index: Int): String = null
   override def sliceToKeys(from: Int, to: Int): ViewPortKeys = EmptyViewPortKeys
   override def toArray(): Array[String] = Array()
   override def length: Int = 0
-  }
+  override def iterator: Iterator[String] = Array().iterator
+}

vuu/src/main/scala/org/finos/vuu/feature/ViewPortKeys.scala

@@ -3,10 +3,10 @@ package org.finos.vuu.feature
 import org.finos.toolbox.collection.array.ImmutableArray
 import org.finos.vuu.core.table.TablePrimaryKeys
 
-trait ViewPortKeys {
+trait ViewPortKeys extends Iterable[String] {
     def create(tableKeys: TablePrimaryKeys): ViewPortKeys
     def get(index: Int): String
-    def slice(from: Int, to: Int): Array[String]
+    def sliceToArray(from: Int, to: Int): Array[String]
     def sliceToKeys(from: Int, to: Int): ViewPortKeys
     def length: Int
     def toArray(): Array[String]

vuu/src/main/scala/org/finos/vuu/feature/inmem/InMemViewPortKeys.scala

@@ -7,8 +7,9 @@ import org.finos.vuu.feature.ViewPortKeys
 case class InMemViewPortKeys(keys: TablePrimaryKeys) extends ViewPortKeys{
   override def create(immutableArray: TablePrimaryKeys): ViewPortKeys = InMemViewPortKeys(immutableArray)
   override def get(index: Int): String = keys.get(index)
-  override def slice(from: Int, to: Int): Array[String] = keys.slice(from, to).toArray
+  override def sliceToArray(from: Int, to: Int): Array[String] = keys.slice(from, to).toArray
   override def sliceToKeys(from: Int, to: Int): ViewPortKeys = InMemViewPortKeys(keys.sliceTableKeys(from, to))
   override def length: Int = keys.length
   override def toArray(): Array[String] = keys.toArray
+  override def iterator: Iterator[String] = keys.iterator
 }

vuu/src/main/scala/org/finos/vuu/viewport/ViewPort.scala

@@ -276,7 +276,7 @@ class ViewPortImpl(val id: String,
     val from = currentRange.from
     val to = currentRange.to
 
-    val inrangeKeys = keys.slice(from, to)
+    val inrangeKeys = keys.sliceToArray(from, to)
 
     logger.info(s"Sending updates on ${inrangeKeys.length} inrangeKeys")
 

vuu/src/main/scala/org/finos/vuu/viewport/ViewPortContainer.scala

@@ -364,7 +364,7 @@ class ViewPortContainer(val tableContainer: TableContainer, val providerContaine
         val columns = vp.getColumns
         val keys = vp.getKeysInRange
 
-        val rows = keys.toArray.map(key => vp.table.pullRowAsArray(key, columns))
+        val rows = keys.map(key => vp.table.pullRowAsArray(key, columns)).toArray
 
         val headers = if (vp.hasGroupBy)
           Array[String]("depth", "isOpen", "key", "isLeaf") ++ columns.getColumns().map(_.name).toArray[String]