updated load function in CompositeExtractor to take Type arg not PageNode

hadyelsahar · hadyelsahar · commit 17dcaa8b2988 · 2013-11-19T09:58:57.000+02:00
diff --git a/core/src/main/scala/org/dbpedia/extraction/mappings/CompositeExtractor.scala b/core/src/main/scala/org/dbpedia/extraction/mappings/CompositeExtractor.scala
@@ -4,9 +4,9 @@ import org.dbpedia.extraction.destinations.Quad
 import org.dbpedia.extraction.wikiparser.PageNode
 import org.dbpedia.extraction.mappings.Extractor
 
-class CompositeExtractor(extractors: Seq[Extractor[PageNode]])
-extends CompositeMapping[PageNode](extractors: _*)
-with Extractor[PageNode]
+class CompositeExtractor[T](extractors: Seq[Extractor[T]])
+extends CompositeMapping[T](extractors: _*)
+with Extractor[T]
 
 /**
  * Creates new extractors.
@@ -18,22 +18,22 @@ object CompositeExtractor
      *
      * TODO: using reflection here loses compile-time type safety.
      *
-     * @param extractors List of extractor classes to be instantiated
+     * @param classes List of extractor classes to be instantiated
      * @param context Any type of object that implements the required parameter methods for the extractors
      */
-    def load(classes: Seq[Class[_ <: Extractor[_]]], context: AnyRef): Extractor[PageNode] =
+    def load[T](classes: Seq[Class[_ <: Extractor[_]]], context: AnyRef): Extractor[T] =
     {
       val extractors = classes.map(_.getConstructor(classOf[AnyRef]).newInstance(context))
 
-      var pageNodeExtractors : Seq[Extractor[PageNode]] = Seq.empty
+      val selectedExtractors : Seq[Extractor[T]] = Seq.empty
 
       extractors foreach { extractor : Extractor[_] =>
         extractor match {
-        case ex : Extractor[PageNode] =>  pageNodeExtractors :+ ex
+        case ex : Extractor[T] =>  selectedExtractors :+ ex
         case _ =>
-      }
+        }
       }
 
-      new CompositeExtractor(pageNodeExtractors: Seq[Extractor[PageNode]])
+      new CompositeExtractor[T](selectedExtractors: Seq[Extractor[T]])
     }
 }
diff --git a/dump/src/main/scala/org/dbpedia/extraction/dump/extract/ConfigLoader.scala b/dump/src/main/scala/org/dbpedia/extraction/dump/extract/ConfigLoader.scala
@@ -121,7 +121,7 @@ class ConfigLoader(config: Config)
         }
 
         //Extractors
-        val extractor = CompositeExtractor.load(extractorClasses, context)
+        val extractor = CompositeExtractor.load[PageNode](extractorClasses, context)
         val datasets = extractor.datasets
         
         var formats = new ArrayBuffer[Destination]()

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ class ConfigLoader(config: Config)`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`//Extractors`
`124`		`- val extractor = CompositeExtractor.load(extractorClasses, context)`
	`124`	`+ val extractor = CompositeExtractor.load[PageNode](extractorClasses, context)`
`125`	`125`	`val datasets = extractor.datasets`
`126`	`126`
`127`	`127`	`var formats = new ArrayBuffer[Destination]()`