Cosmetics

ShellRechargeSolutionsEU · Oct 10, 2012 · 3ff3f1c · 3ff3f1c
1 parent 5d76b07
commit 3ff3f1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/main/scala/info/folone/scala/poi/Workbook.scala b/src/main/scala/info/folone/scala/poi/Workbook.scala
@@ -6,10 +6,7 @@ import effect.IO
 
 package info.folone.scala.poi {
 
-  class Workbook(sheets: Set[Sheet]) {
-
-    val sheetSet = sheets
-
+  class Workbook(val sheets: Set[Sheet]) {
     private lazy val book = {
       val workbook = new HSSFWorkbook
       sheets foreach { sh ⇒
@@ -111,8 +108,7 @@ package info.folone.scala.poi {
     }
   }
 
-  class Sheet(nm: String)(rw: Set[Row]) {
-    val (name, rows) = (nm, rw)
+  class Sheet(val name: String)(val rows: Set[Row]) {
     override def toString = Show[Sheet].shows(this)
     override def equals(obj: Any) =
       obj != null && obj.isInstanceOf[Sheet] && Equal[Sheet].equal(obj.asInstanceOf[Sheet], this)
@@ -121,8 +117,7 @@ package info.folone.scala.poi {
     def apply(name: String)(rows: Set[Row]) = new Sheet(name)(rows)
     def unapply(sheet: Sheet) = Some((sheet.name), (sheet.rows))
   }
-  class Row(idx: Int)(cl: Set[Cell]) {
-    val (index, cells) = (idx, cl)
+  class Row(val index: Int)(val cells: Set[Cell]) {
     override def toString = Show[Row].shows(this)
     override def equals(obj: Any) =
       obj != null && obj.isInstanceOf[Row] && Equal[Row].equal(obj.asInstanceOf[Row], this)

diff --git a/src/main/scala/info/folone/scala/poi/package.scala b/src/main/scala/info/folone/scala/poi/package.scala
@@ -31,14 +31,14 @@ package object poi {
   implicit val wbInstance = new Monoid[Workbook] with Equal[Workbook] with Show[Workbook] {
     override def zero = Workbook(Set[Sheet]())
     override def append(f1: Workbook, f2: ⇒ Workbook) =
-      Workbook(mergeSets(f1.sheetSet, f2.sheetSet, (_: Sheet).name))
+      Workbook(mergeSets(f1.sheets, f2.sheets, (_: Sheet).name))
     override def equal(a1: Workbook, a2: Workbook): Boolean =
-      (a1.sheetSet.toIndexedSeq.sortBy((x: Sheet) ⇒ x.name) zip
-       a1.sheetSet.toIndexedSeq.sortBy((x: Sheet) ⇒ x.name))
+      (a1.sheets.toIndexedSeq.sortBy((x: Sheet) ⇒ x.name) zip
+       a1.sheets.toIndexedSeq.sortBy((x: Sheet) ⇒ x.name))
       .foldLeft (true) { (acc, v) ⇒
         acc && Equal[Sheet].equal(v._1, v._2)
       }
-    override def shows(as: Workbook) = "Workbook(" + as.sheetSet + ")"
+    override def shows(as: Workbook) = "Workbook(" + as.sheets + ")"
   }
 
   // Lenses
@@ -48,7 +48,7 @@ package object poi {
     lens(c ⇒ store(c.data)(changed ⇒ c.copy(data = changed)))
   val rowLens   = setLens[Row, Cell]  (lens(r ⇒ store(r.cells)(changed ⇒ Row(r.index) (changed))))
   val sheetLens = setLens[Sheet, Row] (lens(s ⇒ store(s.rows) (changed ⇒ Sheet(s.name)(changed))))
-  val wbLens    = setLens[Workbook, Sheet] (lens(wb ⇒ store(wb.sheetSet)(changed ⇒ Workbook(changed))))
+  val wbLens    = setLens[Workbook, Sheet] (lens(wb ⇒ store(wb.sheets)(changed ⇒ Workbook(changed))))
 
   // Utility functions
   private def mergeSets[A: Semigroup, B](list1: Set[A], list2: Set[A], on: A ⇒ B): Set[A] =