Configuration explorer cleanup

TOOLS/ce/src/main/scala/org.opalj.ce/CommentParser.scala

@@ -18,7 +18,7 @@ import org.opalj.log.OPALLogger
  * The Comment Parser is responsible for parsing the HOCON files and its comments.
  * Do NOT use this class directly, use ConfigParserWrapper for safe parsing instead.
  */
-class CommentParser() {
+class CommentParser {
     private var iterator: Iterator[String] = Iterator.empty
     private var line = ""
     implicit val logContext: LogContext = GlobalLogContext

TOOLS/ce/src/main/scala/org.opalj.ce/CommentParserWrapper.scala

@@ -3,6 +3,7 @@ package org.opalj
 package ce
 
 import java.nio.file.Path
+import scala.collection.immutable
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 
@@ -18,7 +19,7 @@ class CommentParserWrapper {
      * @param filepaths accepts a list of full paths to the HOCON config files that shall be parsed.
      * @return is a list of the parsed configuration files, paired with the path they originate from.
      */
-    def iterateConfigs(filepaths: mutable.Buffer[Path], rootDirectory: Path): ListBuffer[ConfigObject] = {
+    def iterateConfigs(filepaths: Iterable[Path], rootDirectory: Path): immutable.Seq[ConfigObject] = {
         val commentedConfigs = new ListBuffer[ConfigObject]
         for (filepath <- filepaths) {
             commentedConfigs += ParseComments(filepath, rootDirectory)
@@ -47,7 +48,7 @@ class CommentParserWrapper {
             config.collapse()
         }
 
-        commentedConfigs
+        commentedConfigs.toSeq
     }
 
     /**

TOOLS/ce/src/main/scala/org.opalj.ce/ConfigurationExplorer.scala

@@ -4,7 +4,6 @@ package ce
 
 import java.io.File
 import java.nio.file.Paths
-import scala.collection.mutable.ListBuffer
 
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
@@ -36,15 +35,15 @@ object ConfigurationExplorer extends App {
 
     // Replace class type values
     if (conf.getBoolean("org.opalj.ce.replaceSubclasses")) {
-        val se = new SubclassExtractor(locator, buildVersion)
+        val se = new SubclassExtractor(locator.FindJarArchives(buildVersion).toArray)
         for (config <- configs) {
             config.replaceClasses(se)
         }
     }
 
     // Export
     val HE = new HTMLExporter(
-        configs.asInstanceOf[ListBuffer[ConfigNode]],
+        configs,
         Paths.get(locator.getProjectRoot + conf.getString("org.opalj.ce.html.template"))
     )
     HE.exportHTML(conf, new File(locator.getProjectRoot + conf.getString("org.opalj.ce.html.export")))

TOOLS/ce/src/main/scala/org.opalj.ce/FileLocator.scala

@@ -7,7 +7,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.attribute.BasicFileAttributes
-import scala.collection.mutable
+import scala.collection.immutable.Seq
 import scala.collection.mutable.ListBuffer
 import scala.jdk.CollectionConverters._
 
@@ -39,21 +39,21 @@ class FileLocator(var config: Config) {
      * Loads the filenames of the configuration files that shall be parsed.
      * @return is a List of the filenames that shall be parsed by the Configuration Explorer.
      */
-    def getConfigurationFilenames: mutable.Buffer[String] = {
+    def getConfigurationFilenames: Seq[String] = {
         val projectNames = config.getStringList("org.opalj.ce.configurationFilenames").asScala
 
         OPALLogger.info("Configuration Explorer", "Loaded the following Filenames: ")
         for (filename <- projectNames) {
             OPALLogger.info("Configuration Explorer", filename)
         }
-        projectNames
+        projectNames.toSeq
     }
 
     /**
      * Finds all files that are named after one of the configuration filenames and are NOT within the target folder structure.
      * @return returns a List of full FilePaths to all found config files.
      */
-    def getConfigurationPaths: mutable.Buffer[Path] = {
+    def getConfigurationPaths: Seq[Path] = {
         val projectNames = getConfigurationFilenames
         searchFiles(projectNames)
     }
@@ -63,7 +63,7 @@ class FileLocator(var config: Config) {
      * @param Filenames Accepts a List of all filenames that should be included in the result.
      * @return returns a List of full FilePaths to all found files.
      */
-    def searchFiles(Filenames: mutable.Buffer[String]): mutable.Buffer[Path] = {
+    def searchFiles(Filenames: Seq[String]): Seq[Path] = {
         val projectRoot = Paths.get(getProjectRoot)
         val foundFiles = ListBuffer[Path]()
 
@@ -82,15 +82,15 @@ class FileLocator(var config: Config) {
                 }
             }
         )
-        foundFiles
+        foundFiles.toSeq
     }
 
     /**
      * Finds all jar archives in the project, where the file name contains the pathWildcard.
      * @param pathWildcard accepts a String to filter the filenames of the jar archives. Will only return jar archives that contain the parameter in their file name.
      * @return Will only return jar archives that contain the parameter in their file name and that are not in the bg-jobs folder.
      */
-    def FindJarArchives(pathWildcard: String): mutable.Buffer[File] = {
+    def FindJarArchives(pathWildcard: String): Seq[File] = {
         val projectRoot = Paths.get(getProjectRoot)
         val foundFiles = ListBuffer[File]()
         Files.walkFileTree(
@@ -108,6 +108,6 @@ class FileLocator(var config: Config) {
                 }
             }
         )
-        foundFiles
+        foundFiles.toSeq
     }
 }

TOOLS/ce/src/main/scala/org.opalj.ce/HTMLExporter.scala

@@ -5,7 +5,6 @@ package ce
 import java.io.File
 import java.io.PrintWriter
 import java.nio.file.Path
-import scala.collection.mutable.ListBuffer
 import scala.io.Source
 import scala.util.Using
 
@@ -16,7 +15,7 @@ import com.typesafe.config.Config
  * @param ConfigList Accepts a List of parsed Configuration Files.
  * @param templatePath Accepts a Path to the HTML Template that should be used.
  */
-class HTMLExporter(ConfigList: ListBuffer[ConfigNode], templatePath: Path) {
+class HTMLExporter(ConfigList: Iterable[ConfigNode], templatePath: Path) {
     /**
      * Exports the ConfigList into an HTML file.
      * The following parameters are all read from the Configuration Explorer config, however, the CE config was not handed over due to namespace conflicts with the internally used ConfigNode.

TOOLS/ce/src/main/scala/org.opalj.ce/SubclassExtractor.scala

@@ -17,8 +17,7 @@ import org.opalj.br.analyses.Project
  * @param f accepts any initialized FileLocator.
  * @param pathWildcard accepts a Wildcard that must be present in every .jar files file name in order to be used for hierarchy extraction.
  */
-class SubclassExtractor(val f: FileLocator, pathWildcard: String) {
-    val files: Array[File] = f.FindJarArchives(pathWildcard).toArray
+class SubclassExtractor(files: Array[File]) {
     val p: Project[URL] = Project.apply(files, Array(org.opalj.bytecode.RTJar))
     val classHierarchy: ClassHierarchy = p.classHierarchy