test1

JetBrains-Research · Jan 4, 2024 · 3680125 · 3680125
1 parent d0fdd85
commit 3680125
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -46,20 +46,20 @@ allprojects {
             kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
         }
 
-        withType<Detekt>().configureEach {
-            jvmTarget = jdkVersion
-        }
+//        withType<Detekt>().configureEach {
+//            jvmTarget = jdkVersion
+//        }
 
         test {
             useJUnit()
         }
     }
 
-    detekt {
-        buildUponDefaultConfig = true
-        allRules = false
-        config = files("$rootDir/config/detekt.yml")
-    }
+//    detekt {
+//        buildUponDefaultConfig = true
+//        allRules = false
+//        config = files("$rootDir/config/detekt.yml")
+//    }
 }
 
 tasks {

diff --git a/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/TaskTrackerPlugin.kt b/ij-plugin/src/main/kotlin/org/jetbrains/research/tasktracker/TaskTrackerPlugin.kt
@@ -18,7 +18,7 @@ object TaskTrackerPlugin {
     private val logger: Logger = Logger.getInstance(javaClass)
 
     // TODO: add a settings panel to update properties and the main config
-    lateinit var mainConfig: MainTaskTrackerConfig
+    var mainConfig: MainTaskTrackerConfig = MainTaskTrackerConfig(loadProps().toPluginProperties())
     lateinit var initializationHandler: InitializationHandler
 
     fun initPlugin() {

diff --git a/...rc/main/kotlin/org/jetbrains/research/tasktracker/ui/main/panel/MainPluginPanelFactory.kt b/...rc/main/kotlin/org/jetbrains/research/tasktracker/ui/main/panel/MainPluginPanelFactory.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 import org.jetbrains.concurrency.Promise
+import org.jetbrains.research.tasktracker.TaskTrackerPlugin
 import org.jetbrains.research.tasktracker.config.content.task.base.Task
 import org.jetbrains.research.tasktracker.tracking.BaseTracker
 import org.jetbrains.research.tasktracker.tracking.TaskFileHandler
@@ -56,6 +57,7 @@ class MainPluginPanelFactory : ToolWindowFactory {
     lateinit var project: Project
 
     override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
+        TaskTrackerPlugin.initPlugin()
         this.project = project
         mainWindow = project.getService(MainWindowService::class.java).mainWindow
         mainWindow.jComponent.size = JBUI.size(toolWindow.component.width, toolWindow.component.height)

diff --git a/ij-plugin/src/main/resources/META-INF/plugin.xml b/ij-plugin/src/main/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@
         <toolWindow doNotActivateOnStart="true"
                     factoryClass="org.jetbrains.research.tasktracker.ui.main.panel.MainPluginPanelFactory"
                     id="TaskTracker" anchor="right"/>
-        <postStartupActivity implementation="org.jetbrains.research.tasktracker.activities.InitActivity"/>
+<!--        <postStartupActivity implementation="org.jetbrains.research.tasktracker.activities.InitActivity"/>-->
         <notificationGroup id="tasktracker" displayType="BALLOON"/>
     </extensions>