Add class parameter to TabulaMapImpl

julianmendez · Nov 6, 2018 · dcd846e · dcd846e
1 parent ed3df1e
commit dcd846e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/tabulas-core/src/main/scala/de/tudresden/inf/lat/tabulas/parser/SimpleFormatParser.scala b/tabulas-core/src/main/scala/de/tudresden/inf/lat/tabulas/parser/SimpleFormatParser.scala
@@ -325,7 +325,7 @@ class SimpleFormatParser(input: Reader) extends Parser {
 
     }
 
-    val result = new TableMapImpl()
+    val result = TableMapImpl()
     mapOfTables.keySet.foreach(key => result.put(key, mapOfTables.get(key).get))
     result
   }

diff --git a/tabulas-core/src/main/scala/de/tudresden/inf/lat/tabulas/table/TableMapImpl.scala b/tabulas-core/src/main/scala/de/tudresden/inf/lat/tabulas/table/TableMapImpl.scala
@@ -6,31 +6,19 @@ import scala.collection.mutable
 /** This is the default implementation of a table map.
   *
   */
-class TableMapImpl extends TableMap {
-
-  private val _map = new mutable.TreeMap[String, Table]()
-
-  /** Constructs a new table map using another one.
-    *
-    * @param otherTableMap
-    * other table map
-    */
-  def this(otherTableMap: TableMap) = {
-    this()
-    otherTableMap.getTableIds.foreach(tableId => put(tableId, otherTableMap.getTable(tableId).get))
-  }
+class TableMapImpl(map: mutable.TreeMap[String, Table]) extends TableMap {
 
   override def getTableIds: Seq[String] = {
     val result = new mutable.ArrayBuffer[String]()
-    result ++= this._map.keySet
+    result ++= this.map.keySet
     result
   }
 
-  override def put(id: String, table: Table): Option[Table] = { this._map.put(id, table) }
+  override def put(id: String, table: Table): Option[Table] = { this.map.put(id, table) }
 
-  override def getTable(id: String): Option[Table] = { this._map.get(id) }
+  override def getTable(id: String): Option[Table] = { this.map.get(id) }
 
-  override def hashCode(): Int = { this._map.hashCode() }
+  override def hashCode(): Int = { this.map.hashCode() }
 
   override def equals(obj: Any): Boolean = {
     val result = obj match {
@@ -59,6 +47,18 @@ class TableMapImpl extends TableMap {
 
 object TableMapImpl {
 
-  def apply(): TableMapImpl = new TableMapImpl
+  def apply(): TableMapImpl = new TableMapImpl(mutable.TreeMap[String, Table]())
+
+  /** Constructs a new table map using another one.
+    *
+    * @param otherTableMap
+    * other table map
+    */
+  def apply(otherTableMap: TableMap): TableMapImpl = {
+    val map = mutable.TreeMap[String, Table]()
+    otherTableMap.getTableIds
+      .foreach(tableId => map.put(tableId, otherTableMap.getTable(tableId).get))
+    new TableMapImpl(map)
+  }
 
 }
diff --git a/tabulas-core/src/test/scala/de/tudresden/inf/lat/tabulas/main/MainTest.scala b/tabulas-core/src/test/scala/de/tudresden/inf/lat/tabulas/main/MainTest.scala
@@ -77,7 +77,7 @@ class MainTest extends FunSuite {
 
     // Make a copy of the tableMap
     // val newTableMap: TableMapImpl = new TableMapImpl(oldTableMap)
-    val newTableMap: TableMapImpl = new TableMapImpl()
+    val newTableMap: TableMapImpl = TableMapImpl()
     oldTableMap.getTableIds.foreach(tableId => newTableMap.put(tableId, oldTableMap.getTable(tableId).get))
 
     assertContent(newTableMap, ExpectedOutputFileName)

diff --git a/tabulas-ext/src/main/scala/de/tudresden/inf/lat/tabulas/ext/parser/CalendarParser.scala b/tabulas-ext/src/main/scala/de/tudresden/inf/lat/tabulas/ext/parser/CalendarParser.scala
@@ -321,7 +321,7 @@ class CalendarParser extends Parser {
         + " keywords  (line " + lineCounter + ").")
     }
 
-    val result: TableMapImpl = new TableMapImpl()
+    val result: TableMapImpl = TableMapImpl()
     map.keySet.foreach(key => result.put(key, map.get(key).get))
     result
   }

diff --git a/tabulas-ext/src/main/scala/de/tudresden/inf/lat/tabulas/ext/parser/CsvParser.scala b/tabulas-ext/src/main/scala/de/tudresden/inf/lat/tabulas/ext/parser/CsvParser.scala
@@ -149,7 +149,7 @@ class CsvParser extends Parser {
       }
     }
 
-    val result: TableMapImpl = new TableMapImpl()
+    val result: TableMapImpl = TableMapImpl()
     result.put(DefaultTableName, currentTable)
     result
   }