refactor style package structure

7 files changed, 14 insertions, 23 deletions

diff --git a/src/main/scala/scalam/plotting/Plot.scala b/src/main/scala/scalam/plotting/Plot.scala
index 8b4a562..dd60689 100644
--- a/src/main/scala/scalam/plotting/Plot.scala
+++ b/src/main/scala/scalam/plotting/Plot.scala
@@ -3,7 +3,6 @@ package scalam.plotting
 import scala.sys.process._
 import scalam.m.ast._
 import scalax.file.Path
-import scalam.plotting.styles._
 import scala.collection.mutable.Map
 import scala.collection.mutable.ListBuffer
 import scalam.io.Saveable
diff --git a/src/main/scala/scalam/plotting/styles/color/colors.scala b/src/main/scala/scalam/plotting/color/colors.scala
index 58fcd29..d44fe70 100644
--- a/src/main/scala/scalam/plotting/styles/color/colors.scala
+++ b/src/main/scala/scalam/plotting/color/colors.scala
@@ -1,9 +1,7 @@
-package scalam.plotting.styles.color
+package scalam.plotting.color
 
 import scalam.m.ast._
-import scalam.plotting.DataSet
-import scalam.plotting.styles.Style
-import scalam.plotting.styles.StyleElement
+import scalam.plotting.StyleElement
 
 trait Color extends StyleElement {
   def name = StringLiteral("Color")
diff --git a/src/main/scala/scalam/plotting/styles/color/styles.scala b/src/main/scala/scalam/plotting/color/styles.scala
index a70d5e7..4a82310 100644
--- a/src/main/scala/scalam/plotting/styles/color/styles.scala
+++ b/src/main/scala/scalam/plotting/color/styles.scala
@@ -1,9 +1,8 @@
-package scalam.plotting.styles.color
+package scalam.plotting.color
 
 import scalam.m.ast._
 import scalam.plotting.DataSet
-import scalam.plotting.styles.Style
-import scalam.plotting.styles.StyleElement
+import scalam.plotting.Style
 
 class MColorStyle(val function: Identifier) extends Style[Color] {
   private val ColorVariable = Identifier("cc")
diff --git a/src/main/scala/scalam/plotting/styles/line/lines.scala b/src/main/scala/scalam/plotting/line/lines.scala
index f0bc24a..340ebd1 100644
--- a/src/main/scala/scalam/plotting/styles/line/lines.scala
+++ b/src/main/scala/scalam/plotting/line/lines.scala
@@ -1,7 +1,7 @@
-package scalam.plotting.styles.line
+package scalam.plotting.line
 
 import scalam.m.ast._
-import scalam.plotting.styles.StyleElement
+import scalam.plotting.StyleElement
 
 trait Line extends StyleElement {
   val name = StringLiteral("LineStyle")
diff --git a/src/main/scala/scalam/plotting/styles/marker/markers.scala b/src/main/scala/scalam/plotting/marker/markers.scala
index 81ed1fa..6b1da8c 100644
--- a/src/main/scala/scalam/plotting/styles/marker/markers.scala
+++ b/src/main/scala/scalam/plotting/marker/markers.scala
@@ -1,9 +1,7 @@
-package scalam.plotting.styles.marker
+package scalam.plotting.marker
 
-import scalam.plotting.DataSet
 import scalam.m.ast._
-import scalam.plotting.styles.Style
-import scalam.plotting.styles.StyleElement
+import scalam.plotting.StyleElement
 
 trait Marker extends StyleElement {
   def name = StringLiteral("Marker")
diff --git a/src/main/scala/scalam/plotting/styles/marker/styles.scala b/src/main/scala/scalam/plotting/marker/styles.scala
index 9e80d99..9dcc89b 100644
--- a/src/main/scala/scalam/plotting/styles/marker/styles.scala
+++ b/src/main/scala/scalam/plotting/marker/styles.scala
@@ -1,9 +1,8 @@
-package scalam.plotting.styles.marker
+package scalam.plotting.marker
 
 import scalam.plotting.DataSet
 import scalam.m.ast._
-import scalam.plotting.styles.Style
-import scalam.plotting.styles.StyleElement
+import scalam.plotting.Style
 
 object AllMarkerStyle extends Style[Marker] {
 
@@ -12,6 +11,6 @@ object AllMarkerStyle extends Style[Marker] {
     case (d, i) => d -> markers(i % (markers.length-1))    
   }.toMap
   
-  def apply(dataSets: Seq[DataSet]) = (Seq.empty[Statement], map(dataSets))
+  def apply(dataSets: Seq[DataSet]) = (Seq.empty[Root], map(dataSets))
 
 }
\ No newline at end of file
diff --git a/src/main/scala/scalam/plotting/styles/styles.scala b/src/main/scala/scalam/plotting/styles.scala
index e7d59fc..951fdae 100644
--- a/src/main/scala/scalam/plotting/styles/styles.scala
+++ b/src/main/scala/scalam/plotting/styles.scala
@@ -1,9 +1,7 @@
-package scalam.plotting.styles
+package scalam.plotting
 
-import scalam.plotting.DataSet
 import scalam.m.ast._
 
-
 trait StyleElement {
   //command line option
   def name: Expression
@@ -11,8 +9,8 @@ trait StyleElement {
   def expression: Expression
 }
 
-trait Style[+S <: StyleElement] {  
-  def apply(dataSets: Seq[DataSet]): Tuple2[Seq[Root], DataSet => S]
+trait Style[+S <: StyleElement] {
+  def apply(dataSets: Seq[DataSet]): (Seq[Root], DataSet => S)
 }
 
 case class Uniform[S <: StyleElement](element: S) extends Style[S] {