Merge pull request #2 from ottogroup/master

merge
ottogroup · Feb 20, 2017 · 48004c6 · 48004c6
2 parents 4107807 + 3d2e367
commit 48004c6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/schedoscope-core/src/main/scala/org/schedoscope/dsl/Commentable.scala b/schedoscope-core/src/main/scala/org/schedoscope/dsl/Commentable.scala
@@ -22,12 +22,17 @@ trait Commentable {
   /**
     * An optional comment about the named entity.
     */
-  var comment: Option[String] = None
+  private var _comment: Option[String] = None
+
+  /**
+    * Return the comment
+    */
+  def comment = _comment
 
   /**
     * Provide a comment describing the named entity's purpose.
     */
   def comment(aComment: String) {
-    comment = Some(aComment)
+    _comment = Some(aComment)
   }
 }
diff --git a/schedoscope-core/src/main/scala/org/schedoscope/dsl/ExternalView.scala b/schedoscope-core/src/main/scala/org/schedoscope/dsl/ExternalView.scala
@@ -104,6 +104,8 @@ case class ExternalView(view: View) extends View {
 
   override def transformVia(ft: () => Transformation) = {}
 
+  override def comment = view.comment
+
   override def exportTo(export: () => Transformation) = {}
 
   override def configureExport(k: String, v: Any) = {}

diff --git a/schedoscope-core/src/main/scala/org/schedoscope/dsl/StructureDsl.scala b/schedoscope-core/src/main/scala/org/schedoscope/dsl/StructureDsl.scala
@@ -48,7 +48,8 @@ trait StructureDsl extends Named with Commentable {
   def fieldOf[T: Manifest](orderWeight: Int = 100, comment: String = null, overrideName: String = null) = {
     val f = Field[T](orderWeight, if (overrideName != null) Some(overrideName) else None)
 
-    f.comment = if (comment != null) Some(comment) else None
+    if (comment != null)
+      f.comment(comment)
 
     registerField(f)
     f

diff --git a/...oscope-core/src/main/scala/org/schedoscope/scheduler/commandline/SchedoscopeReplCli.scala b/...oscope-core/src/main/scala/org/schedoscope/scheduler/commandline/SchedoscopeReplCli.scala
@@ -28,7 +28,8 @@ class SchedoscopeCliRepl(val schedoscope: SchedoscopeService) {
     val ctrl = new SchedoscopeCliCommandRunner(schedoscope)
     val reader = new ConsoleReader()
     val history = new History()
-    history.setHistoryFile(new File(System.getenv("HOME") + "/.schedoscope_history"))
+    val histFileDir = Option(System.getenv("XDG_CACHE_HOME")).getOrElse(System.getenv("HOME") + "/.cache")
+    history.setHistoryFile(new File(histFileDir + "/schedoscope_history"))
     reader.setHistory(history)
     while (true) {
       try {