Fix inheritance declarations

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAlgorithm.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAlgorithm.scala
index c1984bf..e87619e 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAlgorithm.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLAlgorithm.scala
@@ -43,9 +43,9 @@ package gr.grnet.aquarium.logic.accounting.dsl
  */
 case class DSLAlgorithm (
   name: String,
-  overrides: Option[DSLAlgorithm],
+  override  val overrides: Option[DSLAlgorithm],
   algorithms: Map[DSLResource, String],
-  effective: DSLTimeFrame
+  override  val effective: DSLTimeFrame
 ) extends DSLTimeBoundedItem[DSLAlgorithm](overrides, effective)
 
 

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCreditPlan.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCreditPlan.scala
index 8df94e1..06cc756 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCreditPlan.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLCreditPlan.scala
@@ -43,8 +43,8 @@ package gr.grnet.aquarium.logic.accounting.dsl
  */
 case class DSLCreditPlan (
   name: String,
-  overrides: Option[DSLCreditPlan],
+  override  val overrides: Option[DSLCreditPlan],
   credits: Float,
   at: List[DSLTimeSpec],
-  effective: DSLTimeFrame
+  override  val effective: DSLTimeFrame
 ) extends DSLTimeBoundedItem[DSLCreditPlan](overrides, effective)

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPriceList.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPriceList.scala
index 3089375..4d80d8d 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPriceList.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLPriceList.scala
@@ -42,7 +42,7 @@ package gr.grnet.aquarium.logic.accounting.dsl
  */
 case class DSLPriceList (
   name: String,
-  overrides: Option[DSLPriceList],
+  override  val overrides: Option[DSLPriceList],
   prices: Map[DSLResource,  Float],
-  effective: DSLTimeFrame
+  override  val effective: DSLTimeFrame
 ) extends DSLTimeBoundedItem[DSLPriceList](overrides, effective)

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeBoundedItem.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeBoundedItem.scala
index 5da3e6f..7a5e88d 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeBoundedItem.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/DSLTimeBoundedItem.scala
@@ -41,5 +41,5 @@ package gr.grnet.aquarium.logic.accounting.dsl
  *
  * @author Georgios Gousios <gousiosg@gmail.com>
  */
-abstract class DSLTimeBoundedItem[T](overrides: Option[T],
-                                     effective: DSLTimeFrame)
+abstract class DSLTimeBoundedItem[T](val overrides: Option[T],
+                                     val effective: DSLTimeFrame)