From 1eab9404b8ecbd51e5270af0cc0c9545e68f35f2 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Sat, 2 Dec 2017 05:20:21 +0300
Subject: Remove categories to prevent injection errors

When not NodeLocationAwareGenerator used
---
 core/src/main/kotlin/Utilities/DokkaModules.kt             | 13 -------------
 core/src/main/resources/dokka/generator/default.properties |  2 --
 core/src/main/resources/dokka/generator/javadoc.properties |  2 --
 core/src/main/resources/dokka/language/java.properties     |  1 -
 core/src/main/resources/dokka/language/kotlin.properties   |  1 -
 core/src/main/resources/dokka/outline/yaml.properties      |  1 -
 6 files changed, 20 deletions(-)
 delete mode 100644 core/src/main/resources/dokka/generator/default.properties
 delete mode 100644 core/src/main/resources/dokka/generator/javadoc.properties
 delete mode 100644 core/src/main/resources/dokka/language/java.properties
 delete mode 100644 core/src/main/resources/dokka/language/kotlin.properties
 delete mode 100644 core/src/main/resources/dokka/outline/yaml.properties

diff --git a/core/src/main/kotlin/Utilities/DokkaModules.kt b/core/src/main/kotlin/Utilities/DokkaModules.kt
index a2d720ef..fcc2f692 100644
--- a/core/src/main/kotlin/Utilities/DokkaModules.kt
+++ b/core/src/main/kotlin/Utilities/DokkaModules.kt
@@ -51,19 +51,6 @@ class DokkaOutputModule(val options: DocumentationOptions,
         binder.bind(LanguageService::class.java).to(KotlinLanguageService::class.java)
         binder.bind(File::class.java).annotatedWith(Names.named("outputDir")).toInstance(File(options.outputDir))
 
-//        binder.bindNameAnnotated<LocationService, SingleFolderLocationService>("singleFolder")
-//        binder.bindNameAnnotated<FileLocationService, SingleFolderLocationService>("singleFolder")
-//        binder.bindNameAnnotated<LocationService, FoldersLocationService>("folders")
-//        binder.bindNameAnnotated<FileLocationService, FoldersLocationService>("folders")
-
-        // defaults
-//        binder.bind(LocationService::class.java).to(FoldersLocationService::class.java)
-//        binder.bind(FileLocationService::class.java).to(FoldersLocationService::class.java)
-
-        binder.registerCategory<OutlineFormatService>("outline")
-        binder.registerCategory<FormatService>("format")
-        binder.registerCategory<Generator>("generator")
-
         binder.bind<DocumentationOptions>().toInstance(options)
         binder.bind<DokkaLogger>().toInstance(logger)
         binder.bind(StringListType).annotatedWith(Names.named(impliedPlatformsName)).toInstance(options.impliedPlatforms)
diff --git a/core/src/main/resources/dokka/generator/default.properties b/core/src/main/resources/dokka/generator/default.properties
deleted file mode 100644
index a4a16200..00000000
--- a/core/src/main/resources/dokka/generator/default.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-class=org.jetbrains.dokka.FileGenerator
-description=Default documentation generator
\ No newline at end of file
diff --git a/core/src/main/resources/dokka/generator/javadoc.properties b/core/src/main/resources/dokka/generator/javadoc.properties
deleted file mode 100644
index 4075704f..00000000
--- a/core/src/main/resources/dokka/generator/javadoc.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-class=org.jetbrains.dokka.javadoc.JavadocGenerator
-description=Produces output via JDK javadoc tool
\ No newline at end of file
diff --git a/core/src/main/resources/dokka/language/java.properties b/core/src/main/resources/dokka/language/java.properties
deleted file mode 100644
index ab42f532..00000000
--- a/core/src/main/resources/dokka/language/java.properties
+++ /dev/null
@@ -1 +0,0 @@
-class=org.jetbrains.dokka.JavaLanguageService
\ No newline at end of file
diff --git a/core/src/main/resources/dokka/language/kotlin.properties b/core/src/main/resources/dokka/language/kotlin.properties
deleted file mode 100644
index 16092007..00000000
--- a/core/src/main/resources/dokka/language/kotlin.properties
+++ /dev/null
@@ -1 +0,0 @@
-class=org.jetbrains.dokka.KotlinLanguageService
\ No newline at end of file
diff --git a/core/src/main/resources/dokka/outline/yaml.properties b/core/src/main/resources/dokka/outline/yaml.properties
deleted file mode 100644
index 7268af37..00000000
--- a/core/src/main/resources/dokka/outline/yaml.properties
+++ /dev/null
@@ -1 +0,0 @@
-class=org.jetbrains.dokka.YamlOutlineService
\ No newline at end of file
-- 
cgit