[daffodil-vscode] 14/28: - Apply fix to scala code so that it builds - Remove unused javaSource from build

[ar...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

arosien pushed a commit to branch daffodil-vscode-tdml
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git

commit 15d453d42c462bd83cfe55ee7f1dba64467eaed2
Author: Michael Hoke <mi...@nteligen.com>
AuthorDate: Thu Jun 30 14:23:16 2022 -0400

    - Apply fix to scala code so that it builds
    - Remove unused javaSource from build
---
 build.sbt                                                  |  3 +--
 .../scala/org.apache.daffodil.debugger.dap/Parse.scala     | 14 ++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.sbt b/build.sbt
index 1ca2d57..93fd28a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -45,8 +45,7 @@ lazy val commonSettings = {
     // remove the -Xcheckinit option added by the sbt tpoletcat plugin. This
     // option leads to non-reproducible builds
     scalacOptions --= Seq("-Xcheckinit"),
-    startYear := Some(2021),
-    javaSource := file("server/sbtXjc/target/scala-2.12/src_managed_cxf/org/apache/daffodil/tdml")
+    startYear := Some(2021)
   )
 }
 
diff --git a/server/core/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala b/server/core/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
index 617bdcc..8fc531b 100644
--- a/server/core/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
+++ b/server/core/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
@@ -679,11 +679,9 @@ object Parse {
         }
     }
     sealed trait TDMLConfig {
-      var (action, name, description) = 
-        this match {
-          case TDMLConfig.Config(action, name, description) => (action, name, description)
-          case TDMLConfig.None => ("none", "Default Test Case Name", "Generated by DFDL VSCode Extension")
-        }
+      val `action`: String
+      val `name`: String
+      val `description`: String
     }
     object InfosetOutput {
       case object None extends InfosetOutput
@@ -699,7 +697,11 @@ object Parse {
     }
     object TDMLConfig {
       case class Config(action: String, name: String, description: String) extends TDMLConfig
-      case object None extends TDMLConfig
+      case object None extends TDMLConfig {
+        val action = "none"
+        val name = "Default Test Case Name"
+        val description = "Generated by DFDL VSCode Extension"
+      }
 
       def apply(that: Debugee.LaunchArgs.TDMLConfig): TDMLConfig =
         that match {