Start typing and select a procedure type from the completion suggestions:
+
+
+
+
Press Tab or Enter to insert the markup.
+
+
+
+## Add interactive elements
+
+### Tabs
+
+To add switchable content, you can make use of tabs (inject them by starting to type `tab` on a new line):
+
+
+
+ { width=450 }
+
+
+
+ ]]>
+
+
+
+### Collapsible blocks
+
+Apart from injecting entire XML elements, you can use attributes to configure the behavior of certain elements.
+For example, you can collapse a chapter that contains non-essential information:
+
+#### Supplementary info {collapsible="true"}
+
+Content under a collapsible header will be collapsed by default,
+but you can modify the behavior by adding the following attribute:
+`default-state="expanded"`
+
+### Convert selection to XML
+
+If you need to extend an element with more functions, you can convert selected content from Markdown to semantic markup.
+For example, if you want to merge cells in a table, it's much easier to convert it to XML than do this in Markdown.
+Position the caret anywhere in the table and press Alt+Enter:
+
+
+
+## Feedback and support
+
+Please report any issues, usability improvements, or feature requests to our
+YouTrack project
+(you will need to register).
+
+You are welcome to join our
+public Slack workspace.
+Before you do, please read our [Code of conduct](https://plugins.jetbrains.com/plugin/20158-writerside/docs/writerside-code-of-conduct.html).
+We assume that you’ve read and acknowledged it before joining.
+
+You can also always email us at [writerside@jetbrains.com](mailto:writerside@jetbrains.com).
+
+
+
+ Markup reference
+ Reorder topics in the TOC
+ Build and publish
+ Configure Search
+
+
\ No newline at end of file
diff --git a/Writerside/topics/aplus-lms.yaml/API_Reference.md b/Writerside/topics/aplus-lms.yaml/API_Reference.md
new file mode 100644
index 000000000..158d9a3a3
--- /dev/null
+++ b/Writerside/topics/aplus-lms.yaml/API_Reference.md
@@ -0,0 +1,3 @@
+# API Reference
+
+Start typing here...
\ No newline at end of file
diff --git a/Writerside/topics/aplus-lms.yaml/courses_GET.md b/Writerside/topics/aplus-lms.yaml/courses_GET.md
new file mode 100644
index 000000000..b2c20189e
--- /dev/null
+++ b/Writerside/topics/aplus-lms.yaml/courses_GET.md
@@ -0,0 +1,3 @@
+# /courses GET
+
+
\ No newline at end of file
diff --git a/Writerside/topics/starter-topic.md b/Writerside/topics/starter-topic.md
new file mode 100644
index 000000000..a8557078f
--- /dev/null
+++ b/Writerside/topics/starter-topic.md
@@ -0,0 +1,131 @@
+
+ This is the title
+ Description of the starting page
+
+
+ Some topic
+ Some other topic
+
+
+
+ Main group title
+ Some topic
+ Some other topic
+ ...
+
+
+
+ highlighted group title
+ Some topic
+ Some other topic
+ ...
+
+
+
+
+ Other tools
+ Some topic
+ Some other topic
+ ...
+
+
+
+
+ Frameworks
+ Some topic
+ Some other topic
+ ...
+
+ ...
+
+
+
+# About A+ Courses
+
+
+
+## Add new topics
+
+You can create empty topics, or choose a template for different types of content that contains some boilerplate
+structure to help you get started:
+
+{ width=290 }{border-effect=line}
+
+## Write content
+
+%product% supports two types of markup: Markdown and XML.
+When you create a new help article, you can choose between two topic types, but this doesn't mean you have to stick to a
+single format.
+You can author content in Markdown and extend it with semantic attributes or inject entire XML elements.
+
+## Inject XML
+
+For example, this is how you inject a procedure:
+
+
+
+
Start typing and select a procedure type from the completion suggestions:
+
+
+
+
Press Tab or Enter to insert the markup.
+
+
+
+## Add interactive elements
+
+### Tabs
+
+To add switchable content, you can make use of tabs (inject them by starting to type `tab` on a new line):
+
+
+
+ { width=450 }
+
+
+
+ ]]>
+
+
+
+### Collapsible blocks
+
+Apart from injecting entire XML elements, you can use attributes to configure the behavior of certain elements.
+For example, you can collapse a chapter that contains non-essential information:
+
+#### Supplementary info {collapsible="true"}
+
+Content under a collapsible header will be collapsed by default,
+but you can modify the behavior by adding the following attribute:
+`default-state="expanded"`
+
+### Convert selection to XML
+
+If you need to extend an element with more functions, you can convert selected content from Markdown to semantic markup.
+For example, if you want to merge cells in a table, it's much easier to convert it to XML than do this in Markdown.
+Position the caret anywhere in the table and press Alt+Enter:
+
+
+
+## Feedback and support
+
+Please report any issues, usability improvements, or feature requests to our
+YouTrack project
+(you will need to register).
+
+You are welcome to join our
+public Slack workspace.
+Before you do, please read our [Code of conduct](https://plugins.jetbrains.com/plugin/20158-writerside/docs/writerside-code-of-conduct.html).
+We assume that you’ve read and acknowledged it before joining.
+
+You can also always email us at [writerside@jetbrains.com](mailto:writerside@jetbrains.com).
+
+
+
+ Markup reference
+ Reorder topics in the TOC
+ Build and publish
+ Configure Search
+
+
\ No newline at end of file
diff --git a/Writerside/v.list b/Writerside/v.list
new file mode 100644
index 000000000..2d12cb39f
--- /dev/null
+++ b/Writerside/v.list
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/Writerside/writerside.cfg b/Writerside/writerside.cfg
new file mode 100644
index 000000000..bde22ba56
--- /dev/null
+++ b/Writerside/writerside.cfg
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 61f7b828b..3382c9651 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,24 +1,28 @@
import org.jetbrains.changelog.Changelog
import org.jetbrains.changelog.markdownToHTML
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
fun properties(key: String): Provider = providers.gradleProperty(key)
fun environment(key: String): Provider = providers.environmentVariable(key)
plugins {
- java
- idea
+// id("java")
+// id("idea")
// scala
// jacoco
// checkstyle
- kotlin("plugin.serialization") version embeddedKotlinVersion
// ./gradle/libs.versions.toml
- alias(libs.plugins.kotlin) // Kotlin support
- alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin
- alias(libs.plugins.changelog) // Gradle Changelog Plugin
- alias(libs.plugins.qodana) // Gradle Qodana Plugin
- alias(libs.plugins.kover) // Gradle Kover Plugin
-
+ id("org.jetbrains.kotlin.jvm") version "2.0.0"
+ kotlin("plugin.serialization") version "2.0.0"
+ id("org.jetbrains.intellij.platform") version "2.0.0" // IntelliJ Platform Gradle Plugin
+ id("org.jetbrains.changelog") version "2.2.1"
+ id("org.jetbrains.qodana") version "2024.1.5"
+ id("org.jetbrains.kotlinx.kover") version "0.8.2"
+// alias(libs.plugins.kotlin) // Kotlin support
+// alias(libs.plugins.changelog) // Gradle Changelog Plugin
+// alias(libs.plugins.qodana) // Gradle Qodana Plugin
+// alias(libs.plugins.kover) // Gradle Kover Plugin
}
group = properties("pluginGroup").get()
@@ -26,9 +30,7 @@ version = properties("pluginVersion").get()
// Set the JVM language level used to build the project.
kotlin {
- jvmToolchain {
- languageVersion = JavaLanguageVersion.of(21)
- }
+ jvmToolchain(21)
}
// Configure project's dependencies
@@ -41,67 +43,63 @@ repositories {
}
}
-idea {
- module {
- isDownloadJavadoc = true
- isDownloadSources = true
+dependencies {
+ implementation(libs.zip4j)
+ implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
+ implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")
+ implementation("io.ktor:ktor-client-core:2.3.11")
+ implementation("io.ktor:ktor-client-cio:2.3.11")
+ implementation("io.ktor:ktor-client-resources:2.3.11")
+ implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.11")
+ implementation("io.ktor:ktor-client-content-negotiation:2.3.11")
+
+// compileOnly(libs.scalaLibrary)
+
+// testImplementation(libs.jupiterApi)
+// testRuntimeOnly(libs.junitPlatformLauncher)
+// testRuntimeOnly(libs.junitJupiterEngine)
+//
+// testImplementation(libs.junit)
+// testImplementation(libs.hamcrest)
+// testImplementation(libs.mockito)
+// testImplementation(libs.restAssured) {
+// exclude(group = "commons-codec", module = "commons-codec") // Excluded because of Cxeb68d52e-5509
+// }
+
+ configurations.all {
+ exclude(group = "org.jetbrains.kotlinx", module = "kotlinx.coroutines") // Only the bundled version is allowed
+ exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
+ exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core-jvm")
+ exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-jdk8")
+ exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-slf4j")
+ exclude(group = "org.slf4j")
+// resolutionStrategy.sortArtifacts(ResolutionStrategy.SortOrder.DEPENDENCY_FIRST)
}
-}
-dependencies {
// IntelliJ Platform Gradle Plugin Dependencies Extension - read more:
// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
intellijPlatform {
- create(properties("platformType"), properties("platformVersion"))
+ create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
// Plugin Dependencies.
// Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
- bundledPlugins(properties("platformBundledPlugins").map { it.split(',') })
+// bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
// Plugin Dependencies.
// Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
- plugins(properties("platformPlugins").map { it.split(',') })
+ plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
instrumentationTools()
pluginVerifier()
zipSigner()
- }
-
- implementation(libs.zip4j)
- implementation(libs.json)
- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
- implementation("io.ktor:ktor-client-core:2.3.11")
- implementation("io.ktor:ktor-client-cio:2.3.11")
- implementation("io.ktor:ktor-client-resources:2.3.11")
-
- compileOnly(libs.scalaLibrary)
-
- testImplementation(libs.jupiterApi)
- testRuntimeOnly(libs.junitPlatformLauncher)
- testRuntimeOnly(libs.junitJupiterEngine)
-
- testImplementation(libs.junit)
- testImplementation(libs.hamcrest)
- testImplementation(libs.mockito)
- testImplementation(libs.restAssured) {
- exclude(group = "commons-codec", module = "commons-codec") // Excluded because of Cxeb68d52e-5509
- }
-
- configurations.all {
- exclude(group = "org.jetbrains.kotlinx", module = "kotlinx.coroutines") // Only the bundled version is allowed
- exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
- exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core-jvm")
- exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-jdk8")
- exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-slf4j")
- exclude(group = "org.slf4j")
-// resolutionStrategy.sortArtifacts(ResolutionStrategy.SortOrder.DEPENDENCY_FIRST)
+// testFramework(TestFrameworkType.Platform)
}
}
// Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html
intellijPlatform {
pluginConfiguration {
- version = properties("pluginVersion")
+ version = providers.gradleProperty("pluginVersion")
// Extract the section from README.md and provide for the plugin's manifest
description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
@@ -118,7 +116,7 @@ intellijPlatform {
val changelog = project.changelog // local variable for configuration cache compatibility
// Get the latest available change notes from the changelog file
- changeNotes = properties("pluginVersion").map { pluginVersion ->
+ changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion ->
with(changelog) {
renderItem(
(getOrNull(pluginVersion) ?: getUnreleased())
@@ -130,31 +128,27 @@ intellijPlatform {
}
ideaVersion {
- sinceBuild = properties("pluginSinceBuild")
- untilBuild = properties("pluginUntilBuild")
+ sinceBuild = providers.gradleProperty("pluginSinceBuild")
+ untilBuild = providers.gradleProperty("pluginUntilBuild")
}
}
signing {
- certificateChain = environment("CERTIFICATE_CHAIN")
- privateKey = environment("PRIVATE_KEY")
- password = environment("PRIVATE_KEY_PASSWORD")
+ certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN")
+ privateKey = providers.environmentVariable("PRIVATE_KEY")
+ password = providers.environmentVariable("PRIVATE_KEY_PASSWORD")
}
publishing {
- token = environment("INTELLIJ_PUBLISH_TOKEN")
- // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels,
- // like 2.1.7-alpha.3
- // Specify pre-release label to publish the plugin in a custom Release Channel automatically.
- // Read more:
+ token = providers.environmentVariable("PUBLISH_TOKEN")
+ // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
+ // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
// https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-// channels = properties("pluginVersion").map { listOf(it.substringAfter('-',
-// "").substringBefore('.').ifEmpty { "default"
-// }) }
- channels = listOf(System.getenv("INTELLIJ_PUBLISH_CHANNEL"))
+ channels = providers.gradleProperty("pluginVersion")
+ .map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
}
- verifyPlugin {
+ pluginVerification {
ides {
recommended()
}
@@ -164,69 +158,67 @@ intellijPlatform {
// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
changelog {
groups.empty()
- repositoryUrl = properties("pluginRepositoryUrl")
+ repositoryUrl = providers.gradleProperty("pluginRepositoryUrl")
}
// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
-//koverReport {
-// defaults {
-// xml {
-// onCheck = true
+//kover {
+// reports {
+// total {
+// xml {
+// onCheck = true
+// }
// }
// }
//}
-abstract class GatherBuildInfoTask : DefaultTask() {
- @get:Input
- abstract val pluginVersion: Property
-
- @get:Input
- abstract val courseVersion: Property
-
- @get:OutputDirectory
- abstract val outputDir: DirectoryProperty
-
- @TaskAction
- fun gatherBuildInfo() {
- outputDir.file("build-info.properties").get().asFile.writeText(
- """
- version=${pluginVersion.get()}
- courseVersion=${courseVersion.get()}
- """.trimIndent()
- )
- }
-}
+//abstract class GatherBuildInfoTask : DefaultTask() {
+// @get:Input
+// abstract val pluginVersion: Property
+//
+// @get:Input
+// abstract val courseVersion: Property
+//
+// @get:OutputDirectory
+// abstract val outputDir: DirectoryProperty
+//
+// @TaskAction
+// fun gatherBuildInfo() {
+// outputDir.file("build-info.properties").get().asFile.writeText(
+// """
+// version=${pluginVersion.get()}
+// courseVersion=${courseVersion.get()}
+// """.trimIndent()
+// )
+// }
+//}
tasks {
wrapper {
- gradleVersion = properties("gradleVersion").get()
+ gradleVersion = providers.gradleProperty("gradleVersion").get()
}
publishPlugin {
dependsOn(patchChangelog)
}
- test {
- useJUnitPlatform()
- }
-
- buildSearchableOptions {
- enabled = false // Disabled because it breaks dynamic reload
- }
+// buildSearchableOptions {
+// enabled = false // Disabled because it breaks dynamic reload
+// }
// jacocoTestReport {
// reports.xml.required = true
// }
- register("gatherBuildInfo") {
- pluginVersion = properties("pluginVersion").get()
- courseVersion = properties("courseVersion").get()
- outputDir = layout.buildDirectory.dir("resources/main")
- }
-
- classes {
- dependsOn("gatherBuildInfo")
- }
+// register("gatherBuildInfo") {
+// pluginVersion = properties("pluginVersion").get()
+// courseVersion = properties("courseVersion").get()
+// outputDir = layout.buildDirectory.dir("resources/main")
+// }
+//
+// classes {
+// dependsOn("gatherBuildInfo")
+// }
// check {
// dependsOn("jacocoTestReport")
@@ -235,6 +227,21 @@ tasks {
runIde {
properties("idea.is.internal=true")
}
+
+// prepareSandbox {
+// disabledPlugins = listOf("org.jetbrains.kotlin")
+// }
+ intellijPlatformTesting {
+ runIde {
+ create("runCustom") {
+ type = IntelliJPlatformType.IntellijIdeaCommunity
+ version = providers.gradleProperty("platformVersion")
+ plugins {
+ disablePlugins("org.jetbrains.kotlin")
+ }
+ }
+ }
+ }
}
//checkstyle {
diff --git a/gradle.properties b/gradle.properties
index f5512a827..e8e64824e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,6 @@ pluginRepositoryUrl = https://github.com/Aalto-LeTech/aplus-courses
# SemVer format -> https://semver.org
pluginVersion = 4.0.0-beta1
-courseVersion = 1.0
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 242
@@ -14,16 +13,15 @@ pluginUntilBuild = 242.*
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType = IC
-platformVersion = 242.16677.21
+platformVersion = 242.20224.159
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
-platformPlugins = org.intellij.scala:2024.2.5
-# Example: platformBundledPlugins = com.intellij.java
-platformBundledPlugins = com.intellij.java
+platformPlugins = org.intellij.scala:2024.2.17
+#platformBundledPlugins = com.intellij.java
# Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.8
+gradleVersion = 8.9
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
kotlin.stdlib.default.dependency = false
@@ -32,8 +30,6 @@ kotlin.code.style = official
# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
org.gradle.configuration-cache = true
-#org.gradle.configuration-cache = false
# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
org.gradle.caching = true
-#org.gradle.caching = false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5bdacd778..e937cbcbb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,16 +11,8 @@ hamcrest = "2.2"
mockito = "5.11.0"
restAssured = "5.4.0"
-# plugins
-kotlin = "2.0.0"
-changelog = "2.2.0"
-intelliJPlatform = "2.0.0-beta7"
-qodana = "2024.1.5"
-kover = "0.8.0"
-
[libraries]
zip4j = { group = "net.lingala.zip4j", name = "zip4j", version.ref = "zip4j" }
-json = { group = "org.json", name = "json", version.ref = "json" }
scalaLibrary = { group = "org.scala-lang", name = "scala3-library_3", version.ref = "scalaLibrary" }
@@ -32,10 +24,3 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
restAssured = { group = "io.rest-assured", name = "rest-assured", version.ref = "restAssured" }
-
-[plugins]
-changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
-intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" }
-kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
-qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f..d64cd4917 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4413138c..09523c0e5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a426..f5feea6d6 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# SPDX-License-Identifier: Apache-2.0
+#
##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 7101f8e46..9b42019c7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
diff --git a/qodana.yaml b/qodana.yaml
index 341b86c78..f254dc2e6 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -1,10 +1,13 @@
+# Qodana configuration:
+# https://www.jetbrains.com/help/qodana/qodana-yaml.html
+
version: 1.0
linter: jetbrains/qodana-jvm-community:latest
-projectJDK: "17"
+projectJDK: "21"
profile:
name: qodana.recommended
exclude:
- name: All
paths:
- .qodana
- - images
\ No newline at end of file
+ - images
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 61e1697e0..49b4eca67 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1 @@
-plugins {
- id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-}
-
rootProject.name = "A+ Courses"
diff --git a/src/main/java/fi/aalto/cs/apluscourses/dal/APlusExerciseDataSource.java b/src/main/java/fi/aalto/cs/apluscourses/dal/APlusExerciseDataSource.java
deleted file mode 100644
index f81c31aa2..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/dal/APlusExerciseDataSource.java
+++ /dev/null
@@ -1,446 +0,0 @@
-package fi.aalto.cs.apluscourses.dal;
-
-import static fi.aalto.cs.apluscourses.utils.ListUtil.appendTwoLists;
-
-import fi.aalto.cs.apluscourses.model.Authentication;
-import fi.aalto.cs.apluscourses.model.Course;
-import fi.aalto.cs.apluscourses.model.exercise.Exercise;
-import fi.aalto.cs.apluscourses.model.ExerciseDataSource;
-import fi.aalto.cs.apluscourses.model.exercise.ExerciseGroup;
-import fi.aalto.cs.apluscourses.model.Group;
-import fi.aalto.cs.apluscourses.model.InvalidAuthenticationException;
-import fi.aalto.cs.apluscourses.model.exercise.Points;
-import fi.aalto.cs.apluscourses.model.Student;
-import fi.aalto.cs.apluscourses.model.Submission;
-import fi.aalto.cs.apluscourses.model.exercise.SubmissionInfo;
-import fi.aalto.cs.apluscourses.model.exercise.SubmissionResult;
-import fi.aalto.cs.apluscourses.model.User;
-import fi.aalto.cs.apluscourses.model.news.NewsItem;
-import fi.aalto.cs.apluscourses.utils.cache.Cache;
-import fi.aalto.cs.apluscourses.utils.cache.CachePreference;
-import fi.aalto.cs.apluscourses.utils.cache.CachePreferences;
-import fi.aalto.cs.apluscourses.utils.cache.DualCache;
-import fi.aalto.cs.apluscourses.utils.cache.JsonFileCache;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
-
-public class APlusExerciseDataSource implements ExerciseDataSource {
-
- private static final String EXERCISES = "exercises";
- private static final String SUBMISSIONS = "submissions";
- private static final String COURSES = "courses";
- private static final String POINTS = "points";
- private static final String USERS = "users";
- private static final String STUDENTS = "students";
- public static final String RESULTS = "results";
- public static final String ME = "me";
- private static final String NEWS = "news";
-
- @NotNull
- private final Client client;
-
- @NotNull
- private final String apiUrl;
-
- @NotNull
- private final Parser parser;
-
-
- /**
- * Default constructor.
- */
- public APlusExerciseDataSource(@NotNull String apiUrl, @NotNull Path cacheFile, long courseLastModified) {
- var dataAccess = new DefaultDataAccess(new DualCache<>(new JsonFileCache(cacheFile)));
- dataAccess.updateCacheExpiration(courseLastModified);
- this.client = dataAccess;
- this.parser = dataAccess;
- this.apiUrl = apiUrl;
- }
-
- /**
- * Constructor for demanding use (e.g. tests).
- *
- * @param client Client to fetch and post.
- * @param apiUrl The base URL of API.
- * @param parser JSON parser.
- */
- public APlusExerciseDataSource(@NotNull String apiUrl,
- @NotNull Client client,
- @NotNull Parser parser) {
- this.client = client;
- this.apiUrl = apiUrl;
- this.parser = parser;
- }
-
- private List getPaginatedResults(@NotNull String url,
- @NotNull Authentication authentication,
- @NotNull CachePreference cachePreference,
- @NotNull Function parseFunction)
- throws IOException {
- JSONObject response = client.fetch(url, authentication, cachePreference);
- var results = parser.parsePaginatedResults(response, parseFunction);
- var nextPage = parser.parseNextPageUrl(response);
-
- return nextPage == null ? results
- : appendTwoLists(results, getPaginatedResults(nextPage, authentication, cachePreference, parseFunction));
- }
-
- private List getPaginatedResults(@NotNull String url,
- @NotNull Authentication authentication,
- @NotNull Function parseFunction)
- throws IOException {
- return getPaginatedResults(url, authentication, CachePreferences.GET_NEW_AND_FORGET, parseFunction);
- }
-
- @NotNull
- private Map> getExerciseOrder(@NotNull Course course, @NotNull Authentication authentication)
- throws IOException {
- String url = apiUrl + COURSES + "/" + course.id + "/tree/";
- JSONObject response = client.fetch(url, authentication);
- return parser.parseExerciseOrder(response);
- }
-
- /**
- * Get all of the groups from the A+ API for the user corresponding to the given authentication. A
- * group with id 0 and a single member name "Submit alone" is added to the beginning of the list.
- *
- * @return A list of {@link Group}s that the user is a member of in the given course.
- * @throws IOException If an error occurs (e.g. network error).
- */
- @NotNull
- public List getGroups(@NotNull Course course, @NotNull Authentication authentication)
- throws IOException {
- String url = apiUrl + COURSES + "/" + course.id + "/mygroups/";
- return getPaginatedResults(url, authentication, Group::fromJsonObject);
- }
-
- @Override
- public void clearCache() {
- client.clearCache();
- }
-
- @Override
- public void updateCacheExpiration(long courseLastModified) {
- client.updateCacheExpiration(courseLastModified);
- }
-
- /**
- * Get all of the exercise groups in the given course by making a request to the A+ API.
- *
- * @throws IOException If an IO error occurs (for an example a network issue). This is an instance
- * of {@link InvalidAuthenticationException} if authentication is invalid.
- */
- @Override
- @NotNull
- public List getExerciseGroups(@NotNull Course course,
- @NotNull Authentication authentication,
- @NotNull String languageCode)
- throws IOException {
- return Collections.emptyList();
-// String url = apiUrl + COURSES + "/" + course.getId() + "/" + EXERCISES + "/";
-// var exerciseOrder = getExerciseOrder(course, authentication);
-// return getPaginatedResults(url, authentication,
-// object -> ExerciseGroup.Companion.fromJsonObject(object, exerciseOrder, languageCode,
-// course.getHiddenElements()));
- }
-
- /**
- * Get all of the points for the given course by making a request to the A+ API.
- *
- * @throws IOException If an IO error occurs (for an example a network issue). This is an instance
- * of {@link InvalidAuthenticationException} if authentication is invalid.
- */
- @Override
- @NotNull
- public Points getPoints(@NotNull Course course, @NotNull Authentication authentication)
- throws IOException {
- return getPoints(course, authentication, null);
- }
-
- @Override
- @NotNull
- public Points getPoints(@NotNull Course course, @NotNull Authentication authentication,
- @Nullable Student student) throws IOException {
- String url = apiUrl + COURSES + "/" + course.id + "/" + POINTS + "/"
- + (student == null ? ME : student.getId()) + "/";
- JSONObject response = client.fetch(url, authentication);
- return parser.parsePoints(response);
- }
-
- @Override
- @NotNull
- public SubmissionResult getSubmissionResult(@NotNull String submissionUrl,
- @NotNull Exercise exercise,
- @NotNull Authentication authentication,
- @NotNull Course course,
- @NotNull CachePreference cachePreference)
- throws IOException {
- JSONObject response = client.fetch(submissionUrl, authentication, cachePreference);
- return parser.parseSubmissionResult(response, exercise, course);
- }
-
- @Override
- @NotNull
- public Exercise getExercise(long exerciseId,
- @NotNull Points points,
- @NotNull Set optionalCategories,
- @NotNull Authentication authentication,
- @NotNull CachePreference cachePreference,
- @NotNull String languageCode) throws IOException {
- var url = apiUrl + "exercises/" + exerciseId + "/";
- var response = client.fetch(url, authentication, cachePreference);
- return parser.parseExercise(response, points, optionalCategories, languageCode);
- }
-
- @Override
- @NotNull
- public String getSubmissionFeedback(long submissionId,
- @NotNull Authentication authentication) throws IOException {
- var url = apiUrl + "submissions/" + submissionId + "/";
- var response = client.fetch(url, authentication, CachePreferences.GET_NEW_AND_FORGET);
- return response.getString("feedback");
- }
-
- @Override
- @NotNull
- public User getUser(@NotNull Authentication authentication) throws IOException {
- String url = apiUrl + USERS + "/" + ME + "/";
- JSONObject response = client.fetch(url, authentication);
- return parser.parseUser(authentication, response);
- }
-
- @Override
- @NotNull
- public List getStudents(@NotNull Course course,
- @NotNull Authentication authentication,
- @NotNull CachePreference cachePreference) throws IOException {
- String url = apiUrl + COURSES + "/" + course.id + "/" + STUDENTS + "/";
- return getPaginatedResults(url, authentication, cachePreference, Student::fromJsonObject);
- }
-
- @Override
- @NotNull
- public ZonedDateTime getEndingTime(@NotNull Course course,
- @NotNull Authentication authentication)
- throws IOException {
- String url = apiUrl + COURSES + "/" + course.id + "/";
- JSONObject response = client.fetch(url, authentication);
- return parser.parseEndingTime(response);
- }
-
- @Override
- public @NotNull List getNews(@NotNull Course course,
- @NotNull Authentication authentication,
- @NotNull String language) throws IOException {
- String url = apiUrl + COURSES + "/" + course.id + "/" + NEWS + "/";
- return getPaginatedResults(url, authentication, CachePreferences.GET_NEW_AND_FORGET,
- jsonObject -> NewsItem.fromJsonObject(jsonObject, course, language));
- }
-
- /**
- * Sends the submission to the server.
- *
- * @throws IOException If there are IO related errors.
- */
- @Override
- @Nullable
- public String submit(@NotNull Submission submission, @NotNull Authentication authentication)
- throws IOException {
- Map data = new HashMap<>();
- data.put("__aplus__", "{ \"group\": " + submission.getGroup().getId() + ", \"lang\": \""
- + submission.getLanguage() + "\" }");
- for (Map.Entry entry : submission.getFiles().entrySet()) {
- data.put(entry.getKey(), entry.getValue().toFile());
- }
- String url = apiUrl + EXERCISES + "/" + submission.getExercise().getId()
- + "/" + SUBMISSIONS + "/submit/";
- return client.post(url, authentication, data);
- }
-
- @NotNull
- public Client getClient() {
- return client;
- }
-
- @NotNull
- public String getApiUrl() {
- return apiUrl;
- }
-
- @NotNull
- public Parser getParser() {
- return parser;
- }
-
- public static class DefaultDataAccess implements Client, Parser {
-
- @NotNull
- private final Cache cache;
-
- public DefaultDataAccess(@NotNull Cache cache) {
- this.cache = cache;
- }
-
- @Override
- public JSONObject fetch(@NotNull String url,
- @Nullable Authentication authentication,
- @NotNull CachePreference cachePreference) throws IOException {
- var value = cache.getValue(url, cachePreference);
- if (value != null) {
- return value;
- }
-// try (InputStream inputStream = CoursesClient.fetch(new URL(url), authentication)) {
-// var streamString = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
-// var response = new JSONObject(new JSONTokener(streamString));
-// cache.putValue(url, response, cachePreference);
-// return response;
-// }
- return value;
- }
-
- @Override
- @Nullable
- public String post(@NotNull String url,
- @NotNull Authentication authentication,
- @NotNull Map data) throws IOException {
-// return CoursesClient.post(
-// new URL(url),
-// authentication,
-// data,
-// response -> Optional
-// .ofNullable(response.getFirstHeader("Location"))
-// .map(Header::getValue)
-// .orElse(null)
-// );
- return null;
- }
-
- @Override
- public List parsePaginatedResults(@NotNull JSONObject object,
- @NotNull Function parseFunction) {
- var jsonResults = object.getJSONArray(RESULTS);
- var results = new ArrayList();
- for (int i = 0; i < jsonResults.length(); i++) {
- results.add(parseFunction.apply(jsonResults.getJSONObject(i)));
- }
- return results;
- }
-
- @Override
- public String parseNextPageUrl(@NotNull JSONObject object) {
- return object.optString("next", null);
- }
-
- @Override
- public SubmissionInfo parseSubmissionInfo(@NotNull JSONObject object) {
- return null;
- }
-
-// @Override
-// public SubmissionInfo parseSubmissionInfo(@NotNull JSONObject object) {
-// return SubmissionInfo.fromJsonObject(object);
-// }
-
- @Override
- public Group parseGroup(@NotNull JSONObject object) {
- return Group.fromJsonObject(object);
- }
-
- @Override
- public Points parsePoints(@NotNull JSONObject object) {
- return null;
- }
-
-// @Override
-// public Points parsePoints(@NotNull JSONObject object) {
-// return Points.fromJsonObject(object);
-// }
-
- @Override
- public Map> parseExerciseOrder(@NotNull JSONObject object) {
- var modules = object.getJSONArray("modules");
- var exerciseIds = new HashMap>();
-
- for (int i = 0; i < modules.length(); i++) {
- var module = modules.getJSONObject(i);
- var moduleChildren = module.getJSONArray("children");
- var moduleExerciseIds = new ArrayList();
-
- for (int j = 0; j < moduleChildren.length(); j++) {
- var chapterChildren = moduleChildren.getJSONObject(j).getJSONArray("children");
- for (int k = 0; k < chapterChildren.length(); k++) {
- moduleExerciseIds.add(chapterChildren.getJSONObject(k).getLong("id"));
- }
- }
-
- var moduleId = module.getLong("id");
- exerciseIds.put(moduleId, moduleExerciseIds);
- }
- return exerciseIds;
- }
-
- @Override
- public Exercise parseExercise(@NotNull JSONObject jsonObject, @NotNull Points points,
- @NotNull Set optionalCategories, @NotNull String languageCode) {
- return null;
- }
-
- @Override
- public SubmissionResult parseSubmissionResult(@NotNull JSONObject jsonObject, @NotNull Exercise exercise,
- @NotNull Course course) {
- return null;
- }
-
-// @Override
-// public Exercise parseExercise(@NotNull JSONObject jsonObject,
-// @NotNull Points points,
-// @NotNull Set optionalCategories,
-// @NotNull String languageCode) {
-// return Exercise.Companion.fromJsonObject(jsonObject, points, optionalCategories, languageCode);
-// }
-
-// @Override
-// public SubmissionResult parseSubmissionResult(@NotNull JSONObject object,
-// @NotNull Exercise exercise,
-// @NotNull Course course) {
-// return SubmissionResult.fromJsonObject(object, exercise, course);
-// }
-
- @Override
- public User parseUser(@NotNull Authentication authentication,
- @NotNull JSONObject object) {
- var fullName = object.optString("full_name");
- var username = object.optString("username");
- var studentId = object.optString("student_id");
- var id = object.optInt("id");
-
- return new User(authentication, fullName.equals("") ? username : fullName, studentId, id);
- }
-
- @Override
- public ZonedDateTime parseEndingTime(@NotNull JSONObject object) {
- return ZonedDateTime.parse(object.getString("ending_time"));
- }
-
- @Override
- public void clearCache() {
- cache.clearAll();
- }
-
- @Override
- public void updateCacheExpiration(long courseLastModified) {
- cache.updateExpirationTimestamp(courseLastModified);
- }
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/dal/APlusTokenAuthentication.java b/src/main/java/fi/aalto/cs/apluscourses/dal/APlusTokenAuthentication.java
deleted file mode 100644
index 0ec0d4dea..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/dal/APlusTokenAuthentication.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package fi.aalto.cs.apluscourses.dal;
-
-import org.apache.http.HttpRequest;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-//public class APlusTokenAuthentication extends TokenAuthentication {
-//
-// public static final String AUTHORIZATION_HEADER = "Authorization";
-//
-// public static final String APLUS_USER = "A+_user";
-//
-// /**
-// * Initializes an instance with the given token. Note, that the given token array is not cleared
-// * or overwritten.
-// */
-// public APlusTokenAuthentication(char @NotNull [] token,
-// @Nullable TokenStorage passwordStorage) {
-// super(APLUS_USER, token, passwordStorage);
-// }
-//
-// /**
-// * Creates an authentication object that cannot be persisted.
-// *
-// * @param token Token.
-// */
-// public APlusTokenAuthentication(@NotNull char[] token) {
-// this(token, null);
-// }
-//
-// @Override
-// public void addToRequest(@NotNull HttpRequest request) {
-// request.addHeader(AUTHORIZATION_HEADER, "Token " + new String(token));
-// }
-//
-// public static Factory getFactoryFor(@Nullable TokenStorage passwordStorage) {
-// return token -> new APlusTokenAuthentication(token, passwordStorage);
-// }
-//}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/dal/Client.java b/src/main/java/fi/aalto/cs/apluscourses/dal/Client.java
deleted file mode 100644
index 80cb019f9..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/dal/Client.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package fi.aalto.cs.apluscourses.dal;
-
-import fi.aalto.cs.apluscourses.model.Authentication;
-import fi.aalto.cs.apluscourses.utils.cache.CachePreference;
-import fi.aalto.cs.apluscourses.utils.cache.CachePreferences;
-import java.io.IOException;
-import java.util.Map;
-import org.jetbrains.annotations.NotNull;
-import org.json.JSONObject;
-
-public interface Client {
- JSONObject fetch(@NotNull String url,
- @NotNull Authentication authentication,
- @NotNull CachePreference cachePreference) throws IOException;
-
- default JSONObject fetch(@NotNull String url,
- @NotNull Authentication authentication) throws IOException {
- // Ignore all cache entries by default
- return fetch(url, authentication, CachePreferences.GET_NEW_AND_FORGET);
- }
-
- String post(@NotNull String url,
- @NotNull Authentication authentication,
- @NotNull Map data) throws IOException;
-
- default void clearCache() {}
-
- default void updateCacheExpiration(long courseLastModified) {}
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/dal/Parser.java b/src/main/java/fi/aalto/cs/apluscourses/dal/Parser.java
deleted file mode 100644
index f66a0013f..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/dal/Parser.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package fi.aalto.cs.apluscourses.dal;
-
-import fi.aalto.cs.apluscourses.model.Authentication;
-import fi.aalto.cs.apluscourses.model.Course;
-import fi.aalto.cs.apluscourses.model.exercise.Exercise;
-import fi.aalto.cs.apluscourses.model.Group;
-import fi.aalto.cs.apluscourses.model.exercise.Points;
-import fi.aalto.cs.apluscourses.model.exercise.SubmissionInfo;
-import fi.aalto.cs.apluscourses.model.exercise.SubmissionResult;
-import fi.aalto.cs.apluscourses.model.User;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import org.jetbrains.annotations.NotNull;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-public interface Parser {
-
- List parsePaginatedResults(@NotNull JSONObject object,
- @NotNull Function parseFunction);
-
- String parseNextPageUrl(@NotNull JSONObject object);
-
- SubmissionInfo parseSubmissionInfo(@NotNull JSONObject object);
-
- Group parseGroup(@NotNull JSONObject object);
-
- Points parsePoints(@NotNull JSONObject object);
-
- Map> parseExerciseOrder(@NotNull JSONObject object);
-
- Exercise parseExercise(@NotNull JSONObject jsonObject,
- @NotNull Points points,
- @NotNull Set optionalCategories,
- @NotNull String languageCode);
-
- SubmissionResult parseSubmissionResult(@NotNull JSONObject jsonObject,
- @NotNull Exercise exercise,
- @NotNull Course course);
-
- User parseUser(@NotNull Authentication authentication,
- @NotNull JSONObject jsonObject);
-
- ZonedDateTime parseEndingTime(@NotNull JSONObject object);
-
- /**
- * Parses an JSON array to a list using a given parsing function.
- *
- * @param array JSON array.
- * @param parse Function that parses an JSONObject to T object.
- * @param Type of the result items.
- * @return A list whose items are parsed from JSON objects of the given array.
- */
- default List parseArray(@NotNull JSONArray array, @NotNull Function parse) {
- int length = array.length();
- List results = new ArrayList<>(length);
- for (int i = 0; i < length; i++) {
- results.add(parse.apply(array.getJSONObject(i)));
- }
- return results;
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/dal/PasswordStorage.java b/src/main/java/fi/aalto/cs/apluscourses/dal/PasswordStorage.java
deleted file mode 100644
index df86e329d..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/dal/PasswordStorage.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package fi.aalto.cs.apluscourses.dal;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public interface PasswordStorage {
- boolean store(@NotNull String user, char @Nullable [] password);
-
- void remove();
-
- char @Nullable [] restorePassword();
-
- interface Factory {
- @Nullable
- PasswordStorage create(@NotNull String service);
-
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/dal/TokenAuthentication.java b/src/main/java/fi/aalto/cs/apluscourses/dal/TokenAuthentication.java
deleted file mode 100644
index 0d8521b29..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/dal/TokenAuthentication.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package fi.aalto.cs.apluscourses.dal;
-
-import fi.aalto.cs.apluscourses.model.Authentication;
-import java.util.Arrays;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public abstract class TokenAuthentication implements Authentication {
- @NotNull
- protected final String user;
- protected final char @NotNull [] token;
- @Nullable
- protected final TokenStorage passwordStorage;
-
- /**
- * Base class constructor.
- *
- * @param user Name of the user that is referred to when persisting the token
- * @param token Token. The array is cloned and the argument is not cleared.
- * @param passwordStorage Password storage. If null, the authentication won't be persisted.
- */
- protected TokenAuthentication(@NotNull String user,
- char @NotNull [] token,
- @Nullable TokenStorage passwordStorage) {
- this.user = user;
- this.token = token.clone();
- this.passwordStorage = passwordStorage;
- }
-
- @Override
- public boolean persist() {
- return false;//passwordStorage != null && passwordStorage.store(user, token);
- }
-
- /**
- * Returns true if the token represents the same string as the parameter.
- *
- * @param string String to compare.
- * @return True, if strings are equal, otherwise false.
- */
- public boolean tokenEquals(@Nullable String string) {
- return new String(token).equals(string);
- }
-
- @Override
- public void clear() {
- Arrays.fill(token, '\0');
- }
-
- public interface Factory {
- @NotNull
- TokenAuthentication create(char[] token);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/APlusAuthenticationAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/APlusAuthenticationAction.java
deleted file mode 100644
index b42e994f4..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/APlusAuthenticationAction.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.DumbAwareAction;
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.intellij.notifications.ApiTokenNotSetNotification;
-import fi.aalto.cs.apluscourses.intellij.notifications.DefaultNotifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.intellij.services.CourseProjectProvider;
-import fi.aalto.cs.apluscourses.intellij.services.Dialogs;
-import fi.aalto.cs.apluscourses.model.Authentication;
-import fi.aalto.cs.apluscourses.presentation.AuthenticationViewModel;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import org.jetbrains.annotations.NotNull;
-
-public class APlusAuthenticationAction extends DumbAwareAction {
-
- private static final Logger logger = APlusLogger.logger;
-
- public static final String ACTION_ID = APlusAuthenticationAction.class.getCanonicalName();
-
- @NotNull
- private final CourseProjectProvider courseProjectProvider;
-
- @NotNull
- private final Dialogs dialogs;
-
-// @NotNull
-// private final PasswordStorage.Factory passwordStorageFactory;
-
- @NotNull
- private final Notifier notifier;
-
- /**
- * Called by the platform.
- */
- public APlusAuthenticationAction() {
- this(
- PluginSettings.getInstance()::getCourseProject,
- Dialogs.DEFAULT,
-// TokenStorage::new,
- new DefaultNotifier()
- );
- }
-
- /**
- * Constructor for testing.
- */
- public APlusAuthenticationAction(@NotNull CourseProjectProvider courseProjectProvider,
- @NotNull Dialogs dialogs,
-// @NotNull PasswordStorage.Factory passwordStorageFactory,
- @NotNull Notifier notifier) {
- this.courseProjectProvider = courseProjectProvider;
- this.dialogs = dialogs;
-// this.passwordStorageFactory = passwordStorageFactory;
- this.notifier = notifier;
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- e.getPresentation().setEnabled(courseProjectProvider.getCourseProject(e.getProject()) != null);
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- logger.debug("Starting APlusAuthenticationAction");
- Project project = e.getProject();
- var courseProject = courseProjectProvider.getCourseProject(project);
- if (courseProject == null) {
- logger.warn("Course project was null");
- return;
- }
- var course = courseProject.course;
-
- String apiUrl = course.getApiUrl();
- String authenticationHtmlUrl = course.getHtmlUrl() + "accounts/accounts/";
-
-// PasswordStorage passwordStorage = passwordStorageFactory.create(apiUrl);
- AuthenticationViewModel authenticationViewModel = new AuthenticationViewModel(
-// APlusTokenAuthentication.getFactoryFor(passwordStorage),
- authenticationHtmlUrl,
- course.getExerciseDataSource()
- );
-
- if (!dialogs.create(authenticationViewModel, project).showAndGet()) {
- logger.info("Authentication cancelled");
- return;
- }
-
- Authentication authentication = authenticationViewModel.getAuthentication();
- if (authentication == null) {
- return;
- }
- if (!authentication.persist()) {
- notifier.notify(new ApiTokenNotSetNotification(), project);
- }
- courseProject.setAuthentication(authentication);
-// courseProject.exercisesUpdater.restart(courseProject);
- logger.info("Authentication finished");
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/AboutAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/AboutAction.java
deleted file mode 100644
index 7a984e155..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/AboutAction.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAwareAction;
-import fi.aalto.cs.apluscourses.ui.AboutDialog;
-import org.jetbrains.annotations.NotNull;
-
-public class AboutAction extends DumbAwareAction {
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- if (e.getProject() == null) {
- return;
- }
- new AboutDialog(e.getProject()).show();
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ActionGroups.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ActionGroups.java
deleted file mode 100644
index 51779a74f..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ActionGroups.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-public class ActionGroups {
-
- public static final String NEWS_ACTIONS =
- "fi.aalto.cs.apluscourses.intellij.actions.ActionGroups.NEWS_ACTIONS";
- public static final String MODULE_ACTIONS =
- "fi.aalto.cs.apluscourses.intellij.actions.ActionGroups.MODULE_ACTIONS";
- public static final String EXERCISE_ACTIONS =
- "fi.aalto.cs.apluscourses.intellij.actions.ActionGroups.EXERCISE_ACTIONS";
- public static final String MENU_ACTIONS =
- "fi.aalto.cs.apluscourses.intellij.actions.ActionGroups.MENU_ACTIONS";
- public static final String TOOL_WINDOW_ACTIONS =
- "fi.aalto.cs.apluscourses.intellij.actions.ActionGroups.TOOL_WINDOW_ACTIONS";
-
- private ActionGroups() {
-
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ActionUtil.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ActionUtil.java
deleted file mode 100644
index 04d743372..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ActionUtil.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.ActionManager;
-import com.intellij.openapi.actionSystem.ActionPlaces;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataContext;
-import java.awt.Component;
-import java.awt.event.ActionListener;
-import org.jetbrains.annotations.NotNull;
-
-public class ActionUtil {
-
- /**
- * Launches {@link AnAction}.
- *
- * @param actionId Id of the action.
- * @param dataContext A {@link DataContext} for the action.
- */
- public static void launch(@NotNull String actionId, @NotNull DataContext dataContext) {
- // https://intellij-support.jetbrains.com/hc/en-us/community/posts/206130119/comments/206169635
- AnAction action = ActionManager.getInstance().getAction(actionId);
- AnActionEvent event = AnActionEvent.createFromAnAction(action, null, ActionPlaces.UNKNOWN,
- dataContext);
- action.actionPerformed(event);
- }
-
- /**
- * Returns an {@link ActionListener} that launches {@link AnAction} corresponding to the given
- * id each time {@code actionPerformed()} is called.
- *
- * @param actionId Id of the action.
- * @param source A {@link Component} that gives the {@link DataContext} for the action.
- * @return An {@link ActionListener}
- */
- public static ActionListener createOnEventLauncher(@NotNull String actionId,
- @NotNull Component source) {
- return actionEvent -> launch(actionId, DataManager.getInstance().getDataContext(source));
- }
-
- private ActionUtil() {
-
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/AssistantModeAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/AssistantModeAction.java
deleted file mode 100644
index 524a4c9ba..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/AssistantModeAction.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.DumbAwareToggleAction;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import org.jetbrains.annotations.NotNull;
-
-public class AssistantModeAction extends DumbAwareToggleAction {
- private static final Logger logger = APlusLogger.logger;
-
- @Override
- public boolean isSelected(@NotNull AnActionEvent e) {
- return PluginSettings.getInstance().isAssistantMode();
- }
-
- @Override
- public void setSelected(@NotNull AnActionEvent e, boolean state) {
- PluginSettings.getInstance().setAssistantMode(state);
- logger.info("Assistant mode set to $s".formatted(state));
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/CourseProjectAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/CourseProjectAction.java
deleted file mode 100644
index 8ff507ad0..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/CourseProjectAction.java
+++ /dev/null
@@ -1,459 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.concurrency.JobScheduler;
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ex.ApplicationEx;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.intellij.model.SettingsImporter;
-import fi.aalto.cs.apluscourses.intellij.notifications.CourseConfigListErrorNotification;
-import fi.aalto.cs.apluscourses.intellij.notifications.CourseFileError;
-import fi.aalto.cs.apluscourses.intellij.notifications.CourseVersionOutdatedError;
-import fi.aalto.cs.apluscourses.intellij.notifications.CourseVersionTooNewError;
-import fi.aalto.cs.apluscourses.intellij.notifications.DefaultNotifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.NetworkErrorNotification;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.model.ComponentInstaller;
-import fi.aalto.cs.apluscourses.model.ComponentInstallerImpl;
-import fi.aalto.cs.apluscourses.model.Course;
-import fi.aalto.cs.apluscourses.model.CourseProject;
-import fi.aalto.cs.apluscourses.model.MalformedCourseConfigurationException;
-import fi.aalto.cs.apluscourses.presentation.CourseItemViewModel;
-import fi.aalto.cs.apluscourses.presentation.CourseProjectViewModel;
-import fi.aalto.cs.apluscourses.presentation.CourseSelectionViewModel;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.ui.InstallerDialogs;
-import fi.aalto.cs.apluscourses.ui.courseproject.CourseProjectActionDialogs;
-import fi.aalto.cs.apluscourses.ui.courseproject.CourseProjectActionDialogsImpl;
-import fi.aalto.cs.apluscourses.ui.ideactivities.ComponentDatabase;
-import fi.aalto.cs.apluscourses.ui.utils.PluginInstallerDialogs;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import fi.aalto.cs.apluscourses.utils.BuildInfo;
-import fi.aalto.cs.apluscourses.utils.PluginAutoInstaller;
-import fi.aalto.cs.apluscourses.utils.PostponedRunnable;
-import fi.aalto.cs.apluscourses.utils.Version;
-import fi.aalto.cs.apluscourses.utils.async.SimpleAsyncTaskManager;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.yaml.snakeyaml.Yaml;
-
-public class CourseProjectAction extends AnAction {
-
- private static final Logger logger = APlusLogger.logger;
-
- public static final String ACTION_ID = CourseProjectAction.class.getCanonicalName();
-
-// @NotNull
-// private final CourseFactory courseFactory;
-
- private final boolean useCourseFile;
-
- @NotNull
- private final SettingsImporter settingsImporter;
-
- @NotNull
- private final ComponentInstaller.Factory installerFactory;
-
- @NotNull
- private final PostponedRunnable ideRestarter;
-
- @NotNull
- private final CourseProjectActionDialogs dialogs;
-
- @NotNull
- private final InstallerDialogs.Factory installerDialogsFactory;
-
- @NotNull
- private final Notifier notifier;
-
- private final ExecutorService executor;
-
- private static final String COURSE_LIST_URL =
- "https://version.aalto.fi/gitlab/aplus-courses/course-config-urls/-/raw/main/courses.yaml";
-
- private static final List FALLBACK_COURSES = List.of(
- new CourseItemViewModel("CS-A1141 Tietorakenteet ja algoritmit Y", "Fall 2023",
- "https://gitmanager.cs.aalto.fi/static/CS-A1141_2023Autumn/_static/apluscourses/a1141_course_config.json"),
- new CourseItemViewModel("CS-A1143 Data Structures and Algorithms Y", "Fall 2023",
- "https://gitmanager.cs.aalto.fi/static/CS-A1143_2023Autumn/_static/apluscourses/a1143_course_config.json"),
- new CourseItemViewModel("Ohjelmointistudio 2 / Programming Studio A", "Spring 2023",
- "https://gitmanager.cs.aalto.fi/static/studios-spring-2023/modules/s2_course_config.json"),
- new CourseItemViewModel("O1", "Fall 2022",
- "https://gitmanager.cs.aalto.fi/static/O1_2022/modules/o1_course_config.json")
- );
-
- /**
- * Construct a course project action with the given parameters.
- *
- * @param courseFactory An instance of {@link CourseFactory} that is used to create a course
- * instance from a URL.
- * @param useCourseFile Determines whether a course file is read/created or not. This is useful
- * only for testing purposes.
- * @param settingsImporter An instance of {@link SettingsImporter} that is used to import IDE and
- * project settings.
- * @param installerFactory The factory used to create the component installer. The component
- * installer is then used to install the automatically installed
- * components of the course. This is useful mainly for testing.
- * @param ideRestarter A {@link PostponedRunnable} that is used to restart the IDE after
- * everything related to the course project action is done. In practice,
- * this is either immediately after the action is done, or after all
- * automatically installed components for the course have been installed.
- * Since the installation of automatically installed components may take
- * quite a while, it is advisable for this to show the user a confirmation
- * dialog regarding the restart.
- * @param notifier Notification bus.
- */
- public CourseProjectAction(@NotNull CourseFactory courseFactory,
- boolean useCourseFile,
- @NotNull SettingsImporter settingsImporter,
- @NotNull ComponentInstaller.Factory installerFactory,
- @NotNull PostponedRunnable ideRestarter,
- @NotNull CourseProjectActionDialogs dialogs,
- @NotNull InstallerDialogs.Factory installerDialogsFactory,
- @NotNull Notifier notifier,
- @NotNull ExecutorService executor) {
-// this.courseFactory = courseFactory;
- this.useCourseFile = useCourseFile;
- this.settingsImporter = settingsImporter;
- this.installerFactory = installerFactory;
- this.ideRestarter = ideRestarter;
- this.dialogs = dialogs;
- this.installerDialogsFactory = installerDialogsFactory;
- this.notifier = notifier;
- this.executor = executor;
- }
-
- /**
- * Construct a course project action with sensible defaults.
- */
- public CourseProjectAction() {
-// this.courseFactory = (url, project) -> Course.Companion.fromUrl(url, new IntelliJModelFactory(project), project);
- this.useCourseFile = true;
- this.settingsImporter = new SettingsImporter();
- this.installerFactory = new ComponentInstallerImpl.FactoryImpl<>(new SimpleAsyncTaskManager());
- this.dialogs = new CourseProjectActionDialogsImpl();
- this.ideRestarter = new PostponedRunnable(() -> {
- if (dialogs.showRestartDialog()) {
- ((ApplicationEx) ApplicationManager.getApplication()).restart(true);
- }
- });
- this.installerDialogsFactory = InstallerDialogs::new;
- this.notifier = new DefaultNotifier();
- this.executor = JobScheduler.getScheduler();
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- logger.debug("Starting CourseProjectAction");
- Project project = e.getProject();
-
- if (project == null) {
- return;
- }
-
- URL courseUrl = tryGetCourseUrl(project);
- if (courseUrl == null) {
- return;
- }
-
- Course course = tryGetCourse(project, courseUrl);
- if (course == null) {
- return;
- }
-
- final Boolean pluginDependencyResult = PluginAutoInstaller.ensureDependenciesInstalled(project, notifier,
- course.getRequiredPlugins(), PluginInstallerDialogs::askForInstallationConsentOnCreation);
-
- if (pluginDependencyResult == null) {
- // the user cancelled dependency installation
- return;
- } else if (!pluginDependencyResult) {
- // new plugins installed, we must restart
- if (!PluginInstallerDialogs.askForIDERestart()) {
- return;
- }
-
- ((ApplicationEx) ApplicationManager.getApplication()).restart(true);
- return;
- }
-
- var version = BuildInfo.INSTANCE.courseVersion;
- var versionComparison = version.compareTo(course.getVersion());
-
- if (versionComparison == Version.ComparisonStatus.MAJOR_TOO_OLD
- || versionComparison == Version.ComparisonStatus.MAJOR_TOO_NEW) {
- if (versionComparison == Version.ComparisonStatus.MAJOR_TOO_OLD) {
- logger.warn("A+ Courses version outdated: installed %s, required %s".formatted(version, course.getVersion()));
- } else {
- logger.warn("A+ Courses version too new: installed %s, required %s".formatted(version, course.getVersion()));
- }
- notifier.notify(
- versionComparison == Version.ComparisonStatus.MAJOR_TOO_OLD
- ? new CourseVersionOutdatedError() : new CourseVersionTooNewError(), project);
- return;
- }
-
- CourseProjectViewModel courseProjectViewModel
- = new CourseProjectViewModel(course, settingsImporter.currentlyImportedIdeSettings());
- if (!dialogs.showMainDialog(project, courseProjectViewModel)) {
- return;
- }
-
- String language = Objects.requireNonNull(courseProjectViewModel.languageProperty.get());
- logger.info("Language chosen: %s".formatted(language));
- if (!tryCreateCourseFile(project, courseUrl, language)) {
- return;
- }
-
- boolean importIdeSettings = courseProjectViewModel.shouldApplyNewIdeSettings();
- logger.info("Should apply new IDE settings: %s".formatted(importIdeSettings));
-
- var basePath = Optional.ofNullable(project.getBasePath()).map(Paths::get).orElse(null);
- if (basePath == null) {
- logger.warn("Settings could not be imported because (default?) project does not have path.");
- return;
- }
-
- if (useCourseFile) {
- // The course file is not created in testing.
- var currentProject = PluginSettings.getInstance().getCourseProject(project);
- if (currentProject != null) {
-// currentProject.courseUpdater.restart();
-// currentProject.exercisesUpdater.restart(currentProject);
- } else {
- var courseProject = new CourseProject(course, courseUrl, project, notifier);
- PluginSettings.getInstance().registerCourseProject(courseProject);
- }
- }
-
- Future autoInstallDone = executor.submit(() -> startAutoInstalls(course, project));
-
- Future projectSettingsImported =
- executor.submit(() -> tryImportProjectSettings(project, basePath, course));
-
- Future ideSettingsImported =
- executor.submit(() -> importIdeSettings && tryImportIdeSettings(project, course));
-
- Future customPropertiesImported =
- executor.submit(() -> tryImportCustomProperties(project, basePath, course));
-
- executor.submit(() -> tryImportFeedbackCss(project, course));
-
- ComponentDatabase.showToolWindow(ComponentDatabase.APLUS_TOOL_WINDOW, project);
-
- executor.execute(() -> {
- try {
- autoInstallDone.get();
- if (projectSettingsImported.get() && customPropertiesImported.get() // NOSONAR
- && importIdeSettings && ideSettingsImported.get()) { // NOSONAR
- ideRestarter.run();
- }
- } catch (InterruptedException ex) {
- Thread.currentThread().interrupt();
- } catch (ExecutionException ex) {
- logger.warn("An exception was thrown in an asynchronous call", ex);
- }
- });
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- // This action is available only if a non-default project is open
- Project project = e.getProject();
- e.getPresentation().setEnabledAndVisible(project != null && !project.isDefault());
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-
- @FunctionalInterface
- public interface CourseFactory {
-
- @NotNull
- Course fromUrl(@NotNull URL courseUrl, @NotNull Project project)
- throws IOException, MalformedCourseConfigurationException;
- }
-
- @Nullable
- private URL tryGetCourseUrl(@NotNull Project project) {
- logger.info("Getting course url");
- try {
- if (useCourseFile && PluginSettings.getInstance().getCourseFileManager(project).load()) {
- logger.info("Course file exists");
- return PluginSettings.getInstance().getCourseFileManager(project).getCourseUrl();
- }
-
- CourseSelectionViewModel viewModel = new CourseSelectionViewModel();
- Executors.newSingleThreadExecutor().submit(() -> viewModel.courses.set(fetchCourses(project)));
- boolean cancelled = !dialogs.showCourseSelectionDialog(project, viewModel);
- if (cancelled) {
- logger.info("Canceled course selection");
- return null;
- } else {
- var url = new URL(Objects.requireNonNull(viewModel.selectedCourseUrl.get()));
- logger.info("Got url: %s".formatted(url));
- return url;
- }
- } catch (MalformedURLException e) {
- // User entered an invalid URL (or the default list has an invalid URL, which would be a bug)
- logger.warn("Malformed course configuration file URL", e);
- notifier.notify(new NetworkErrorNotification(e), project);
- return null;
- } catch (IOException e) {
- notifier.notify(new NetworkErrorNotification(e), project);
- return null;
- }
- }
-
- private CourseItemViewModel[] fetchCourses(@NotNull Project project) {
- try {
- var url = new URL(COURSE_LIST_URL);
-// var courseStream = CoursesClient.fetch(url);
- var yaml = new Yaml();
-
- var courseList = List.of(Map.of("", ""));// (List>) (); // yaml.load(courseStream);
- return courseList.stream().map(CourseItemViewModel::fromMap).toArray(CourseItemViewModel[]::new);
- } catch (MalformedURLException e) {
- logger.info("Malformed course config list url", e);
-// } catch (IOException e) {
-// logger.info("Failed to fetch course config list", e);
- } catch (ClassCastException e) {
- logger.info("Course config list yaml corrupted", e);
- }
- notifier.notify(new CourseConfigListErrorNotification(), project);
- return FALLBACK_COURSES.toArray(CourseItemViewModel[]::new);
- }
-
- /**
- * Returns a course created from the course configuration file at the given URL. The user is
- * notified if the course initialization fails.
- *
- * @param project The currently open project.
- * @param courseUrl The URL from which the course configuration file is downloaded.
- * @return The course created from the course configuration file or null in case of an error.
- */
- @Nullable
- private Course tryGetCourse(@NotNull Project project, @NotNull URL courseUrl) {
-// try {
- logger.debug("Getting course");
- return null;//courseFactory.fromUrl(courseUrl, project);
-// } catch (IOException e) {
-// logger.warn("Network error", e);
-// notifier.notify(new NetworkErrorNotification(e), project);
-// return null;
-// } catch (MalformedCourseConfigurationException e) {
-// logger.warn("Malformed course configuration file", e);
-// notifier.notify(new CourseConfigurationError(e), project);
-// return null;
-// }
- }
-
- private void startAutoInstalls(@NotNull Course course, @NotNull Project project) {
- ComponentInstaller.Dialogs installerDialogs = installerDialogsFactory.getDialogs(project);
- ComponentInstaller installer = installerFactory.getInstallerFor(course, installerDialogs, course.callbacks);
- installer.install(course.getAutoInstallComponents());
- }
-
- /**
- * Creates a file in the project settings directory which contains the given course configuration
- * file URL and language.
- *
- * @return True if the file was successfully created, false otherwise.
- */
- private boolean tryCreateCourseFile(@NotNull Project project,
- @NotNull URL courseUrl,
- @NotNull String language) {
- try {
- logger.debug("Creating course file");
- if (useCourseFile) {
- PluginSettings
- .getInstance()
- .getCourseFileManager(project)
- .createAndLoad(courseUrl, language);
- }
- return true;
- } catch (IOException e) {
- logger.warn("Failed to create course file", e);
- notifier.notify(new CourseFileError(e), project);
- return false;
- }
- }
-
- /**
- * Tries importing project settings from the given course. Shows a notification to the user if a
- * network error occurs.
- *
- * @return True if project settings were successfully imported, false otherwise.
- */
- private boolean tryImportProjectSettings(@NotNull Project project,
- @NotNull Path basePath,
- @NotNull Course course) {
- try {
- settingsImporter.importProjectSettings(project, basePath, course);
- return true;
- } catch (IOException e) {
- logger.warn("Failed to import project settings", e);
- notifier.notify(new NetworkErrorNotification(e), project);
- return false;
- }
- }
-
- /**
- * Tries importing IDE settings from the given course. Shows a notification to the user if a
- * network error occurs.
- *
- * @return True if IDE settings were successfully imported, false otherwise.
- */
- private boolean tryImportIdeSettings(@NotNull Project project, @NotNull Course course) {
- try {
- settingsImporter.importIdeSettings(course);
- settingsImporter.importVMOptions(course);
- logger.info("Imported IDE settings");
- return true;
- } catch (IOException e) {
- logger.warn("Failed to import IDE settings", e);
- notifier.notify(new NetworkErrorNotification(e), project);
- return false;
- }
- }
-
- private boolean tryImportCustomProperties(@NotNull Project project, @NotNull Path basePath,
- @NotNull Course course) {
- try {
- settingsImporter.importCustomProperties(basePath, course, project);
- return true;
- } catch (IOException e) {
- logger.warn("Failed to import custom properties", e);
- notifier.notify(new NetworkErrorNotification(e), project);
- return false;
- }
- }
-
- private void tryImportFeedbackCss(@NotNull Project project,
- @NotNull Course course) {
- try {
- settingsImporter.importFeedbackCss(project, course);
- } catch (IOException e) {
- logger.warn("Failed to import custom properties", e);
- notifier.notify(new NetworkErrorNotification(e), project);
- }
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/DownloadSubmissionAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/DownloadSubmissionAction.java
deleted file mode 100644
index 5731325e5..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/DownloadSubmissionAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.diagnostic.Logger;
-import fi.aalto.cs.apluscourses.intellij.notifications.DefaultNotifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.intellij.services.MainViewModelProvider;
-import fi.aalto.cs.apluscourses.intellij.utils.Interfaces;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import org.jetbrains.annotations.NotNull;
-
-public class DownloadSubmissionAction extends AnAction {
-
- private static final Logger logger = APlusLogger.logger;
-
- @NotNull
- private final MainViewModelProvider mainViewModelProvider;
-
- @NotNull
- private final Notifier notifier;
-
- @NotNull
- private final Interfaces.AssistantModeProvider assistantModeProvider;
-
- /**
- * Constructor with reasonable defaults.
- */
- public DownloadSubmissionAction() {
- this(
- PluginSettings.getInstance(),
- new DefaultNotifier(),
- () -> PluginSettings.getInstance().isAssistantMode()
- );
- }
-
-
- /**
- * Construct an exercise submission action with the given parameters. This constructor is useful
- * for testing purposes.
- */
- public DownloadSubmissionAction(@NotNull MainViewModelProvider mainViewModelProvider,
- @NotNull Notifier notifier,
- @NotNull Interfaces.AssistantModeProvider assistantModeProvider) {
- this.mainViewModelProvider = mainViewModelProvider;
- this.notifier = notifier;
- this.assistantModeProvider = assistantModeProvider;
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- logger.info("Starting DownloadSubmissionAction");
- var project = e.getProject();
- var mainViewModel = mainViewModelProvider.getMainViewModel(project);
- var courseViewModel = mainViewModel.courseViewModel.get();
-// var exercisesTreeViewModel = mainViewModel.exercisesViewModel.get();
-// if (project == null || courseViewModel == null || exercisesTreeViewModel == null) {
-// return;
-// }
-// var selectedItem = exercisesTreeViewModel.getSelectedItem();
-// if (!(selectedItem instanceof SubmissionResultViewModel)) {
-// logger.info("Selected item not submission result");
-// return;
-// }
-//
-// var selection = (ExercisesTreeViewModel.ExerciseTreeSelection) exercisesTreeViewModel.findSelected();
-// var selectedExercise = selection.getExercise();
-// var selectedExerciseGroup = selection.getExerciseGroup();
-// if (selectedExercise == null || selectedExerciseGroup == null) {
-// notifier.notifyAndHide(new ExerciseNotSelectedNotification(), project);
-// return;
-// }
-//
-// var exercise = selectedExercise.getModel();
-// var course = courseViewModel.getModel();
-//
-// new SubmissionDownloader().downloadSubmission(project, course, exercise,
-// (SubmissionResult) selectedItem.getModel());
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- e.getPresentation().setVisible(assistantModeProvider.isAssistantMode());
- e.getPresentation().setEnabled(false);
- var mainViewModel = mainViewModelProvider.getMainViewModel(e.getProject());
- var courseViewModel = mainViewModel.courseViewModel.get();
-// var exercisesTreeViewModel = mainViewModel.exercisesViewModel.get();
-// if (courseViewModel != null && exercisesTreeViewModel != null) {
-// var selection = (ExercisesTreeViewModel.ExerciseTreeSelection) exercisesTreeViewModel.findSelected();
-// ExerciseViewModel selectedExercise = selection.getExercise();
-// var selectedItem = exercisesTreeViewModel.getSelectedItem();
-// e.getPresentation().setEnabled(selectedItem instanceof SubmissionResultViewModel
-// && selectedExercise != null
-// && (selectedExercise.isSubmittable()));
-// }
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ExportModuleAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ExportModuleAction.java
deleted file mode 100644
index c392e0c2c..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ExportModuleAction.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectUtil;
-import com.intellij.openapi.vfs.VirtualFile;
-import fi.aalto.cs.apluscourses.intellij.model.ProjectModuleSource;
-import fi.aalto.cs.apluscourses.intellij.notifications.DefaultNotifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.IoErrorNotification;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.intellij.services.Dialogs;
-import fi.aalto.cs.apluscourses.intellij.utils.Interfaces;
-import fi.aalto.cs.apluscourses.presentation.FileSaveViewModel;
-import fi.aalto.cs.apluscourses.presentation.ModuleSelectionViewModel;
-import java.io.IOException;
-import java.nio.file.Path;
-import net.lingala.zip4j.ZipFile;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class ExportModuleAction extends AnAction {
-
- @NotNull
- private final ProjectModuleSource moduleSource;
-
- @NotNull
- private final ProjectPathResolver projectPathResolver;
-
- @NotNull
- private final DirectoryZipper zipper;
-
- @NotNull
- private final Dialogs dialogs;
-
- @NotNull
- private final Notifier notifier;
-
- @NotNull
- private final Interfaces.ModuleDirGuesser moduleDirGuesser;
-
- /**
- * Create an {@link ExportModuleAction} with the given parameters. This constructor is mostly
- * useful for testing purposes.
- */
- public ExportModuleAction(@NotNull ProjectModuleSource moduleSource,
- @NotNull ProjectPathResolver projectPathResolver,
- @NotNull DirectoryZipper zipper,
- @NotNull Dialogs dialogs,
- @NotNull Notifier notifier,
- @NotNull Interfaces.ModuleDirGuesser moduleDirGuesser) {
- this.moduleSource = moduleSource;
- this.projectPathResolver = projectPathResolver;
- this.zipper = zipper;
- this.dialogs = dialogs;
- this.notifier = notifier;
- this.moduleDirGuesser = moduleDirGuesser;
- }
-
- /**
- * Create an {@link ExportModuleAction} with sensible defaults.
- */
- public ExportModuleAction() {
- this(
- new ProjectModuleSource(),
- project -> project.getProjectFile().getParent().getParent(),
- (zip, directory) -> new ZipFile(zip.toString()).addFolder(directory.toFile()),
- Dialogs.DEFAULT,
- new DefaultNotifier(),
- ProjectUtil::guessModuleDir
- );
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- Project project = e.getProject();
- e.getPresentation().setEnabled(project != null && !project.isDefault());
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- Project project = e.getProject();
- if (project == null || project.isDefault()) {
- return;
- }
-
- Module[] availableModules = moduleSource.getModules(project);
-
- ModuleSelectionViewModel moduleSelectionViewModel = new ModuleSelectionViewModel(
- availableModules, getText("ui.exportModule.selectModule"), project, moduleDirGuesser);
- if (!dialogs.create(moduleSelectionViewModel, project).showAndGet()) {
- return;
- }
-
- Module selectedModule = moduleSelectionViewModel.selectedModule.get();
- VirtualFile moduleDirectory = moduleSelectionViewModel.selectedModuleFile.get();
- if (selectedModule == null || moduleDirectory == null) {
- return; // Should never happen though
- }
-
- FileSaveViewModel fileViewModel = new FileSaveViewModel(
- getText("ui.exportModule.saveDialog.title"),
- getText("ui.exportModule.saveDialog.description"),
- projectPathResolver.getProjectPath(project),
- selectedModule.getName() + ".zip"
- );
-
- if (!dialogs.create(fileViewModel, project).showAndGet()) {
- return;
- }
-
- try {
- zipper.zipDirectory(
- fileViewModel.getPath(), moduleDirectory.toNioPath()
- );
- } catch (IOException ex) {
- notifier.notify(new IoErrorNotification(ex), project);
- }
- }
-
- @FunctionalInterface
- public interface ProjectPathResolver {
- @Nullable
- VirtualFile getProjectPath(@NotNull Project project);
- }
-
- @FunctionalInterface
- public interface DirectoryZipper {
- void zipDirectory(@NotNull Path zipPath, @NotNull Path directoryPath) throws IOException;
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/InstallModuleAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/InstallModuleAction.java
deleted file mode 100644
index 84898448d..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/InstallModuleAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.DumbAwareAction;
-import fi.aalto.cs.apluscourses.intellij.services.MainViewModelProvider;
-import fi.aalto.cs.apluscourses.model.Component;
-import fi.aalto.cs.apluscourses.model.ComponentInstaller;
-import fi.aalto.cs.apluscourses.model.ComponentInstallerImpl;
-import fi.aalto.cs.apluscourses.model.Course;
-import fi.aalto.cs.apluscourses.presentation.CourseViewModel;
-import fi.aalto.cs.apluscourses.presentation.base.BaseViewModel;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.ui.InstallerDialogs;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import fi.aalto.cs.apluscourses.utils.async.SimpleAsyncTaskManager;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.jetbrains.annotations.NotNull;
-
-public class InstallModuleAction extends DumbAwareAction {
-
- private static final Logger logger = APlusLogger.logger;
-
- public static final String ACTION_ID = InstallModuleAction.class.getCanonicalName();
- @NotNull
- private final MainViewModelProvider mainViewModelProvider;
- @NotNull
- private final ComponentInstaller.Factory componentInstallerFactory;
- @NotNull
- private final InstallerDialogs.Factory dialogsFactory;
-
- /**
- * Constructs an action using given main view model provider and module installer factory.
- *
- * @param mainViewModelProvider A main view model provider.
- * @param componentInstallerFactory A component installer factory.
- */
- public InstallModuleAction(@NotNull MainViewModelProvider mainViewModelProvider,
- @NotNull ComponentInstaller.Factory componentInstallerFactory,
- @NotNull InstallerDialogs.Factory dialogsFactory) {
-
- this.mainViewModelProvider = mainViewModelProvider;
- this.componentInstallerFactory = componentInstallerFactory;
- this.dialogsFactory = dialogsFactory;
- }
-
- /**
- * Called by the framework.
- */
- public InstallModuleAction() {
- this(PluginSettings.getInstance(),
- new ComponentInstallerImpl.FactoryImpl<>(new SimpleAsyncTaskManager()),
- InstallerDialogs::new);
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- CourseViewModel courseViewModel =
- mainViewModelProvider.getMainViewModel(e.getProject()).courseViewModel.get();
- boolean isModuleSelected = courseViewModel != null
- && !courseViewModel.getModules().isSelectionEmpty();
- e.getPresentation().setEnabled(isModuleSelected);
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- logger.debug("Starting InstallModuleAction");
- CourseViewModel courseViewModel =
- mainViewModelProvider.getMainViewModel(e.getProject()).courseViewModel.get();
- if (courseViewModel != null) {
- List modules = courseViewModel.getModules().streamSelectedElements()
- .map(BaseViewModel::getModel)
- .collect(Collectors.toList());
- logger.info("Downloading modules: %s".formatted(modules));
- Course course = courseViewModel.getModel();
- componentInstallerFactory.getInstallerFor(course,
- dialogsFactory.getDialogs(e.getProject()), course.callbacks)
- .installAsync(modules, () -> downloadDone(course));
- }
- }
-
- private void downloadDone(@NotNull Course course) {
- course.validate();
- logger.debug("Finished downloading modules");
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/LogInOutAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/LogInOutAction.java
deleted file mode 100644
index 26107ac0c..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/LogInOutAction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAwareAction;
-import fi.aalto.cs.apluscourses.dal.PasswordStorage;
-import fi.aalto.cs.apluscourses.dal.TokenStorage;
-import fi.aalto.cs.apluscourses.intellij.services.CourseProjectProvider;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class LogInOutAction extends DumbAwareAction {
- @NotNull
- private final CourseProjectProvider courseProjectProvider;
-
-// @NotNull
-// private final PasswordStorage.Factory passwordStorageFactory;
-
-
- public LogInOutAction() {
- this(PluginSettings.getInstance()::getCourseProject//,
-// TokenStorage::new
- );
- }
-
- public LogInOutAction(@NotNull CourseProjectProvider courseProjectProvider//,
-// @NotNull PasswordStorage.Factory passwordStorageFactory
- ) {
- this.courseProjectProvider = courseProjectProvider;
-// this.passwordStorageFactory = passwordStorageFactory;
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- if (isLoggedIn(e)) {
- var project = courseProjectProvider.getCourseProject(e.getProject());
- if (project != null && project.getAuthentication() != null) {
- project.setAuthentication(null);
-// project.removePasswordFromStorage(passwordStorageFactory);
-// project.exercisesUpdater.restart(project);
- }
- } else {
- ActionUtil.launch(APlusAuthenticationAction.ACTION_ID, e.getDataContext());
- }
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- var text = isLoggedIn(e)
- ? getText("presentation.userDropdown.logOut")
- : getText("presentation.userDropdown.logIn");
- e.getPresentation().setText(text);
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-
- private boolean isLoggedIn(@NotNull AnActionEvent e) {
- var project = courseProjectProvider.getCourseProject(e.getProject());
- if (project != null) {
- return !project.getUserName().equals("");
- } else {
- return false;
- }
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/OpenDocumentationAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/OpenDocumentationAction.java
deleted file mode 100644
index 420934f0e..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/OpenDocumentationAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAwareAction;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import fi.aalto.cs.apluscourses.intellij.notifications.DefaultNotifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.UrlRenderingErrorNotification;
-import fi.aalto.cs.apluscourses.intellij.services.MainViewModelProvider;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.model.UrlRenderer;
-import fi.aalto.cs.apluscourses.presentation.CourseViewModel;
-import org.jetbrains.annotations.NotNull;
-
-public class OpenDocumentationAction extends DumbAwareAction {
-
- @NotNull
- private final MainViewModelProvider mainViewModelProvider;
-
- @NotNull
- private final UrlRenderer urlRenderer;
-
- @NotNull
- private final Notifier notifier;
-
- /**
- * Action constructor.
- */
- public OpenDocumentationAction(@NotNull MainViewModelProvider mainViewModelProvider,
- @NotNull UrlRenderer urlRenderer,
- @NotNull Notifier notifier) {
- this.mainViewModelProvider = mainViewModelProvider;
- this.urlRenderer = urlRenderer;
- this.notifier = notifier;
- }
-
- public OpenDocumentationAction() {
- this(PluginSettings.getInstance(), new UrlRenderer(), new DefaultNotifier());
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- CourseViewModel courseViewModel =
- mainViewModelProvider.getMainViewModel(e.getProject()).courseViewModel.get();
- e.getPresentation().setEnabled(courseViewModel != null && courseViewModel.getModules().canOpenDocumentation());
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- Project project = e.getProject();
- if (project == null) {
- return;
- }
- CourseViewModel courseViewModel =
- mainViewModelProvider.getMainViewModel(project).courseViewModel.get();
- if (courseViewModel == null) {
- return;
- }
- var selection = courseViewModel.getModules().getSingleSelectedElement();
- if (selection.isEmpty()) {
- return;
- }
- var module = selection.get().getModel();
- var virtualFile = LocalFileSystem.getInstance().findFileByIoFile(module.getDocumentationIndexFullPath().toFile());
- if (virtualFile == null) {
- return;
- }
- try {
- urlRenderer.show(project, virtualFile);
- } catch (Exception ex) {
- notifier.notify(new UrlRenderingErrorNotification(ex), project);
- }
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/OpenItemAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/OpenItemAction.java
deleted file mode 100644
index 72c751e31..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/OpenItemAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAwareAction;
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.intellij.notifications.DefaultNotifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.UrlRenderingErrorNotification;
-import fi.aalto.cs.apluscourses.intellij.services.MainViewModelProvider;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.model.Browsable;
-import fi.aalto.cs.apluscourses.model.UrlRenderer;
-import fi.aalto.cs.apluscourses.presentation.base.BaseTreeViewModel;
-import fi.aalto.cs.apluscourses.presentation.base.SelectableNodeViewModel;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class OpenItemAction extends DumbAwareAction {
- @NotNull
- protected final MainViewModelProvider mainViewModelProvider;
-
- @NotNull
- private final UrlRenderer urlRenderer;
-
- @NotNull
- private final Notifier notifier;
-
- /**
- * Construct an {@link OpenItemAction} instance with the given parameters. This constructor
- * is mainly useful for testing purposes.
- */
- protected OpenItemAction(@NotNull MainViewModelProvider mainViewModelProvider,
- @NotNull UrlRenderer urlRenderer,
- @NotNull Notifier notifier) {
- this.mainViewModelProvider = mainViewModelProvider;
- this.urlRenderer = urlRenderer;
- this.notifier = notifier;
- }
-
- /**
- * Construct an {@link OpenItemAction} instance with reasonable defaults.
- */
- protected OpenItemAction() {
- this(
- PluginSettings.getInstance(),
- new UrlRenderer(),
- new DefaultNotifier()
- );
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- if (e.getProject() == null) {
- return;
- }
- BaseTreeViewModel treeViewModel = getTreeViewModel(e.getProject());
- if (treeViewModel == null) {
- return;
- }
-
- SelectableNodeViewModel nodeViewModel = treeViewModel.getSelectedItem();
- if (nodeViewModel == null) {
- return;
- }
-
- try {
- urlRenderer.show(((Browsable) nodeViewModel.getModel()).getHtmlUrl());
- } catch (Exception ex) {
- notifier.notify(new UrlRenderingErrorNotification(ex), e.getProject());
- }
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- var project = e.getProject();
- e.getPresentation().setEnabled(project != null && getTreeViewModel(project) != null);
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-
- @Nullable
- BaseTreeViewModel getTreeViewModel(@NotNull Project project) {
- return null;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/OpenNewsItemAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/OpenNewsItemAction.java
deleted file mode 100644
index 0fcf32b32..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/OpenNewsItemAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.intellij.services.MainViewModelProvider;
-import fi.aalto.cs.apluscourses.model.news.NewsTree;
-import fi.aalto.cs.apluscourses.model.UrlRenderer;
-import fi.aalto.cs.apluscourses.presentation.base.BaseTreeViewModel;
-import org.jetbrains.annotations.NotNull;
-
-public class OpenNewsItemAction extends OpenItemAction {
-
- public static final String ACTION_ID = OpenNewsItemAction.class.getCanonicalName();
-
- /**
- * Construct an {@link OpenNewsItemAction} instance with the given parameters. This constructor
- * is mainly useful for testing purposes.
- */
- public OpenNewsItemAction(@NotNull MainViewModelProvider mainViewModelProvider,
- @NotNull UrlRenderer urlRenderer,
- @NotNull Notifier notifier) {
- super(mainViewModelProvider, urlRenderer, notifier);
- }
-
- /**
- * Construct an {@link OpenNewsItemAction} instance with reasonable defaults.
- */
- public OpenNewsItemAction() {
- super();
- }
-
- @Override
- BaseTreeViewModel getTreeViewModel(@NotNull Project project) {
- return mainViewModelProvider.getMainViewModel(project).newsTreeViewModel.get();
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ReadAllNewsAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ReadAllNewsAction.java
deleted file mode 100644
index b3547cd7b..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ReadAllNewsAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAwareAction;
-import fi.aalto.cs.apluscourses.intellij.services.MainViewModelProvider;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class ReadAllNewsAction extends DumbAwareAction {
- @NotNull
- private final MainViewModelProvider mainViewModelProvider;
-
- protected ReadAllNewsAction(@NotNull MainViewModelProvider mainViewModelProvider) {
-
- this.mainViewModelProvider = mainViewModelProvider;
- }
-
- /**
- * Construct an {@link OpenItemAction} instance with reasonable defaults.
- */
- protected ReadAllNewsAction() {
- this(
- PluginSettings.getInstance()
- );
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- var project = e.getProject();
- var mainViewModel = mainViewModelProvider.getMainViewModel(project);
- var newsViewModel = mainViewModel.newsTreeViewModel.get();
- if (newsViewModel == null) {
- return;
- }
- newsViewModel.getModel().setAllRead();
- mainViewModel.newsTreeViewModel.valueChanged();
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- var project = e.getProject();
- var mainViewModel = mainViewModelProvider.getMainViewModel(project);
- e.getPresentation().setEnabled(mainViewModel.newsTreeViewModel.get() != null);
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/RefreshModulesAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/RefreshModulesAction.java
deleted file mode 100644
index cf5fa9856..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/RefreshModulesAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAwareAction;
-import fi.aalto.cs.apluscourses.intellij.services.CourseProjectProvider;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class RefreshModulesAction extends DumbAwareAction {
-
- @NotNull
- private final CourseProjectProvider courseProjectProvider;
-
- public RefreshModulesAction(@NotNull CourseProjectProvider courseProjectProvider) {
- this.courseProjectProvider = courseProjectProvider;
- }
-
- public RefreshModulesAction() {
- this(PluginSettings.getInstance()::getCourseProject);
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- var project = e.getProject();
- e.getPresentation().setEnabled(
- project != null && courseProjectProvider.getCourseProject(project) != null);
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- var courseProject = courseProjectProvider.getCourseProject(e.getProject());
- if (courseProject == null) {
- return;
- }
- courseProject.courseUpdater.restart();
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ResetSettingsAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ResetSettingsAction.java
deleted file mode 100644
index 9ae42c6cf..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/ResetSettingsAction.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.DumbAwareAction;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import org.jetbrains.annotations.NotNull;
-
-public class ResetSettingsAction extends DumbAwareAction {
-
- private static final Logger logger = APlusLogger.logger;
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- PluginSettings.getInstance().resetLocalSettings();
- logger.info("Reset local settings");
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/SelectAllOptionsAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/SelectAllOptionsAction.java
deleted file mode 100644
index 118e71d2c..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/SelectAllOptionsAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAwareAction;
-import fi.aalto.cs.apluscourses.presentation.filter.Options;
-import org.jetbrains.annotations.NotNull;
-
-public class SelectAllOptionsAction extends DumbAwareAction {
-
- @NotNull
- private final Options options;
-
- public SelectAllOptionsAction(@NotNull Options options) {
- this.options = options;
- getTemplatePresentation().setText(this::getSelectText);
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- options.toggleAll();
- }
-
- /**
- * The text description for toggling all options.
- */
- public String getSelectText() {
- return options.isAnyActive()
- ? getText("presentation.filter.selectAll")
- : getText("presentation.filter.deselectAll");
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/SelectStudentAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/SelectStudentAction.java
deleted file mode 100644
index 89967c92a..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/SelectStudentAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import fi.aalto.cs.apluscourses.intellij.notifications.DefaultNotifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.NetworkErrorNotification;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.intellij.services.CourseProjectProvider;
-import fi.aalto.cs.apluscourses.intellij.services.Dialogs;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.intellij.utils.Interfaces;
-import fi.aalto.cs.apluscourses.presentation.SelectStudentViewModel;
-import fi.aalto.cs.apluscourses.utils.cache.CachePreferences;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class SelectStudentAction extends AnAction {
- @NotNull
- private final CourseProjectProvider courseProjectProvider;
-
- @NotNull
- private final Interfaces.AssistantModeProvider assistantModeProvider;
-
- @NotNull
- private final Notifier notifier;
-
- @NotNull
- private final Dialogs dialogs;
-
- /**
- * Default constructor.
- */
- public SelectStudentAction() {
- this(PluginSettings.getInstance()::getCourseProject,
- () -> PluginSettings.getInstance().isAssistantMode(),
- new DefaultNotifier(),
- Dialogs.DEFAULT);
- }
-
- /**
- * A constructor.
- */
- public SelectStudentAction(@NotNull CourseProjectProvider courseProjectProvider,
- @NotNull Interfaces.AssistantModeProvider assistantModeProvider,
- @NotNull Notifier notifier,
- @NotNull Dialogs dialogs) {
- this.courseProjectProvider = courseProjectProvider;
- this.assistantModeProvider = assistantModeProvider;
- this.notifier = notifier;
- this.dialogs = dialogs;
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- var courseProject = courseProjectProvider.getCourseProject(e.getProject());
- if (courseProject == null) {
- return;
- }
- var course = courseProject.course;
- var auth = courseProject.getAuthentication();
- if (auth == null) {
- return;
- }
- try {
- var students = course.getExerciseDataSource()
- .getStudents(course, auth, CachePreferences.GET_MAX_ONE_WEEK_OLD);
- var studentListViewModel = new SelectStudentViewModel(students, course, auth);
- if (!dialogs.create(studentListViewModel, e.getProject()).showAndGet()) {
- return;
- }
- courseProject.setSelectedStudent(studentListViewModel.selectedStudent.get());
-// courseProject.exercisesUpdater.restart(courseProject);
- } catch (IOException ex) {
- notifier.notifyAndHide(new NetworkErrorNotification(ex), e.getProject());
- }
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- e.getPresentation().setVisible(assistantModeProvider.isAssistantMode());
- var courseProject = courseProjectProvider.getCourseProject(e.getProject());
- e.getPresentation().setEnabled(courseProject != null && courseProject.getAuthentication() != null);
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/UserActionGroup.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/UserActionGroup.java
deleted file mode 100644
index d11388e59..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/UserActionGroup.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DefaultActionGroup;
-import com.intellij.openapi.actionSystem.impl.ActionButton;
-import com.intellij.openapi.project.DumbAware;
-import fi.aalto.cs.apluscourses.intellij.services.CourseProjectProvider;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import icons.PluginIcons;
-import org.jetbrains.annotations.NotNull;
-
-public class UserActionGroup extends DefaultActionGroup implements DumbAware {
- private final CourseProjectProvider courseProjectProvider;
-
- public UserActionGroup() {
- this(PluginSettings.getInstance()::getCourseProject);
- }
-
- public UserActionGroup(CourseProjectProvider courseProjectProvider) {
- this.courseProjectProvider = courseProjectProvider;
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- e.getPresentation().putClientProperty(ActionButton.HIDE_DROPDOWN_ICON, Boolean.TRUE);
- var project = courseProjectProvider.getCourseProject(e.getProject());
- e.getPresentation().setVisible(project != null);
- if (project != null) {
- var userName = project.getUserName();
- var loggedIn = !userName.equals("");
- var icon = loggedIn ? PluginIcons.A_PLUS_USER_ACTIVE : PluginIcons.A_PLUS_USER;
- var text = loggedIn
- ? getAndReplaceText("presentation.userDropdown.loggedInAs", userName)
- : getText("presentation.userDropdown.notLoggedIn");
- e.getPresentation().setIcon(icon);
- e.getPresentation().setText(text);
- }
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/UserNameAction.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/UserNameAction.java
deleted file mode 100644
index 67c6a4cea..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/actions/UserNameAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.actions;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import fi.aalto.cs.apluscourses.intellij.services.CourseProjectProvider;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class UserNameAction extends AnAction {
- private final CourseProjectProvider courseProjectProvider;
-
- public UserNameAction() {
- this(PluginSettings.getInstance()::getCourseProject);
- }
-
- public UserNameAction(CourseProjectProvider courseProjectProvider) {
- this.courseProjectProvider = courseProjectProvider;
- }
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent e) {
- // Does nothing.
- }
-
- @Override
- public void update(@NotNull AnActionEvent e) {
- e.getPresentation().setEnabled(false);
- var project = courseProjectProvider.getCourseProject(e.getProject());
- if (project != null) {
- var userName = project.getUserName();
- userName = userName.equals("") ? getText("presentation.userDropdown.notLoggedIn") : userName;
- e.getPresentation().setText(userName);
- }
- }
-
- @Override
- public @NotNull ActionUpdateThread getActionUpdateThread() {
- return ActionUpdateThread.BGT;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/APlusProject.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/APlusProject.java
deleted file mode 100644
index 3f39bb143..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/APlusProject.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import com.intellij.openapi.application.ReadAction;
-import com.intellij.openapi.module.ModuleManager;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.roots.libraries.LibraryTable;
-import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
-import com.intellij.util.concurrency.annotations.RequiresReadLock;
-import com.intellij.util.messages.MessageBus;
-import fi.aalto.cs.apluscourses.model.Component;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class APlusProject {
-
- @NotNull
- private final Project project;
-
- public APlusProject(@NotNull Project project) {
- this.project = project;
- }
-
- /**
- * Returns the IntelliJ IDEA project corresponding to this project. Throws {@link
- * IllegalStateException} if the project is disposed.
- */
- @RequiresReadLock
- @NotNull
- public Project getProject() {
- if (project.isDisposed()) {
- throw new IllegalStateException("Project is disposed.");
- }
- return project;
- }
-
- @NotNull
- public Path getBasePath() {
- return Paths.get(Objects.requireNonNull(ReadAction.compute(this::getProject).getBasePath()));
- }
-
- @RequiresReadLock
- @NotNull
- public ModuleManager getModuleManager() {
- return ModuleManager.getInstance(getProject());
- }
-
- /**
- * Returns the root manager of the given module.
- *
- * @param moduleName The name of the module.
- * @return The root manager of the module or null, if the module doesn't exist in the project.
- */
- @RequiresReadLock
- @Nullable
- public ModuleRootManager getModuleRootManager(@NotNull String moduleName) {
- return Optional.ofNullable(getModuleManager().findModuleByName(moduleName))
- .map(ModuleRootManager::getInstance).orElse(null);
- }
-
- @RequiresReadLock
- @NotNull
- public MessageBus getMessageBus() {
- return getProject().getMessageBus();
- }
-
- @RequiresReadLock
- @NotNull
- public LibraryTable getLibraryTable() {
- return LibraryTablesRegistrar.getInstance().getLibraryTable(getProject());
- }
-
- /**
- * Returns a state in which the given component should be.
- *
- * @param component An IntelliJ specific component.
- * @param Type of the component.
- * @return Component state.
- */
- public > int resolveComponentState(
- @NotNull C component) {
- return ReadAction.compute(new ComponentStateResolver<>(component)::resolve);
- }
-
- public boolean doesDirExist(Path relativePath) {
- return getBasePath().resolve(relativePath).toFile().isDirectory();
- }
-
- private class ComponentStateResolver> {
- private final C component;
-
- public ComponentStateResolver(C component) {
- this.component = component;
- }
-
- @RequiresReadLock
- public int resolve() {
- /*
- * Four cases to check for here:
- * 0. The component is in the project but the files are missing -> ERROR.
- * 1. The component is in the project, so its state should be INSTALLED.
- * 2. The component is not in the project but the module files are present in the file
- * system, so its state should be FETCHED.
- * 3. The component files aren't present in the file system (and by extension the component
- * isn't in the project), so its state should be NOT_INSTALLED.
- */
- boolean loaded = component.getPlatformObject() != null;
- boolean filesOk = doesDirExist(component.getPath());
- if (loaded && !filesOk) {
- return Component.ERROR;
- }
- if (loaded) {
- return Component.LOADED;
- }
- if (filesOk) {
- return Component.FETCHED;
- }
- return Component.NOT_INSTALLED;
- }
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/CommonLibraryProvider.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/CommonLibraryProvider.java
deleted file mode 100644
index 931db81bb..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/CommonLibraryProvider.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import fi.aalto.cs.apluscourses.model.Component;
-import fi.aalto.cs.apluscourses.model.ComponentSource;
-import fi.aalto.cs.apluscourses.model.Library;
-import java.util.Collection;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class CommonLibraryProvider implements ComponentSource {
- private final APlusProject project;
- private final ConcurrentMap commonLibraries;
- private volatile Component.InitializationCallback initializationCallback; // NOSONAR
-
- public CommonLibraryProvider(@NotNull APlusProject project) {
- this.project = project;
- commonLibraries = new ConcurrentHashMap<>();
- }
-
- @Nullable
- @Override
- public Component getComponentIfExists(@NotNull String name) {
- // computeIfAbsent: If the function returns null no mapping is recorded.
- return commonLibraries.computeIfAbsent(name,
- ((Function) this::createLibrary).andThen(this::initialize));
- }
-
- public void setInitializationCallback(
- @Nullable Component.InitializationCallback initializationCallback) {
- this.initializationCallback = initializationCallback;
- }
-
- @Nullable
- protected Library createLibrary(@NotNull String name) {
- if (name.startsWith("scala-sdk-3")) {
- return new Scala3Sdk(name, name.replace("scala-sdk-", ""), project);
- } else if (name.startsWith("scala-sdk-")) {
- return new ScalaSdk(name, name.replace("scala-sdk-", ""), project);
- } else if (name.startsWith("scala-library-")) {
- return new ScalaLibrary(name, name.replace("scala-library-", ""), project);
- }
- return null;
- }
-
- @Nullable
- private Library initialize(@Nullable Library library) {
- if (library != null && initializationCallback != null) {
- initializationCallback.initialize(library);
- }
- return library;
- }
-
- @NotNull
- public Collection getProvidedLibraries() {
- return commonLibraries.values();
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/IntelliJComponent.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/IntelliJComponent.java
deleted file mode 100644
index d289a8c32..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/IntelliJComponent.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import com.intellij.util.concurrency.annotations.RequiresReadLock;
-import org.jetbrains.annotations.Nullable;
-
-public interface IntelliJComponent {
- @RequiresReadLock
- @Nullable
- T getPlatformObject();
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/IntelliJCourse.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/IntelliJCourse.java
deleted file mode 100644
index 131fdf12d..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/IntelliJCourse.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import com.intellij.ProjectTopics;
-import com.intellij.openapi.application.ReadAction;
-import com.intellij.openapi.project.ModuleListener;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.libraries.LibraryTable;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileManager;
-import com.intellij.openapi.vfs.newvfs.BulkFileListener;
-import com.intellij.openapi.vfs.newvfs.events.VFileDeleteEvent;
-import com.intellij.openapi.vfs.newvfs.events.VFileEvent;
-import com.intellij.util.concurrency.annotations.RequiresReadLock;
-import com.intellij.util.messages.MessageBusConnection;
-import fi.aalto.cs.apluscourses.dal.APlusExerciseDataSource;
-import fi.aalto.cs.apluscourses.model.Component;
-import fi.aalto.cs.apluscourses.model.Course;
-import fi.aalto.cs.apluscourses.model.ExerciseDataSource;
-import fi.aalto.cs.apluscourses.model.Library;
-import fi.aalto.cs.apluscourses.model.Module;
-import fi.aalto.cs.apluscourses.utils.Callbacks;
-import fi.aalto.cs.apluscourses.utils.CourseHiddenElements;
-import fi.aalto.cs.apluscourses.utils.PluginDependency;
-import fi.aalto.cs.apluscourses.utils.Version;
-import java.net.URL;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class IntelliJCourse extends Course {
-
- @NotNull
- private final APlusProject project;
-
- private final CommonLibraryProvider commonLibraryProvider;
-
- private final PlatformListener platformListener;
-
- private final ExerciseDataSource exerciseDataSource;
-
- /**
- * Constructor.
- */
- public IntelliJCourse(@NotNull String id,
- @NotNull String name,
- @NotNull String aplusUrl,
- @NotNull List languages,
- @NotNull List modules,
- @NotNull List libraries,
- @NotNull Map> exerciseModules,
- @NotNull Map resourceUrls,
- @NotNull Map vmOptions,
- @NotNull Set optionalCategories,
- @NotNull List autoInstallComponentNames,
- @NotNull Map> replInitialCommands,
- @NotNull String replAdditionalArguments,
- @NotNull Version courseVersion,
- @NotNull APlusProject project,
- @NotNull CommonLibraryProvider commonLibraryProvider,
- @NotNull List pluginDependencies,
- @NotNull CourseHiddenElements hiddenElements,
- @NotNull Callbacks callbacks,
- boolean requireAuthenticationForModules,
- @Nullable String feedbackParser,
- @Nullable String newsParser,
- long courseLastModified) {
- super(
- id,
- name,
- aplusUrl,
- languages,
- modules,
- libraries,
- exerciseModules,
- resourceUrls,
- vmOptions,
- optionalCategories,
- autoInstallComponentNames,
- replInitialCommands,
- replAdditionalArguments,
- courseVersion,
- pluginDependencies,
- hiddenElements,
- callbacks,
- requireAuthenticationForModules,
- feedbackParser,
- newsParser
- );
-
- this.project = project;
- this.commonLibraryProvider = commonLibraryProvider;
- this.platformListener = new PlatformListener();
- this.exerciseDataSource = new APlusExerciseDataSource(getApiUrl(), project.getBasePath()
- .resolve(Paths.get(Project.DIRECTORY_STORE_FOLDER, "a-plus-cache.json")), courseLastModified);
- }
-
- @NotNull
- public APlusProject getProject() {
- return project;
- }
-
- @NotNull
- public CommonLibraryProvider getCommonLibraryProvider() {
- return commonLibraryProvider;
- }
-
- @Nullable
- @Override
- public Component getComponentIfExists(@NotNull String name) {
- Component component = super.getComponentIfExists(name);
- return component != null ? component : commonLibraryProvider.getComponentIfExists(name);
- }
-
- @Nullable
- public Component getComponentIfExists(VirtualFile file) {
- Component component = getComponentIfExists(file.getName());
- return component != null && component.getFullPath().equals(Paths.get(file.getPath())) ? component : null;
- }
-
-// @NotNull
-// @Override
-// public Collection getComponents() {
-// return Stream.concat(
-// super.getComponents().stream(),
-// commonLibraryProvider.getProvidedLibraries().stream()
-// ).collect(Collectors.toCollection(ArrayList::new));
-// }
-
- @Override
- public void register() {
- ReadAction.run(platformListener::registerListeners);
- }
-
- @Override
- public void unregister() {
- ReadAction.run(platformListener::unregisterListeners);
- }
-
- @NotNull
- @Override
- public ExerciseDataSource getExerciseDataSource() {
- return exerciseDataSource;
- }
-
- private class PlatformListener {
-
- private MessageBusConnection messageBusConnection;
-
- @NotNull
- private final LibraryTable.Listener libraryTableListener = new LibraryTable.Listener() {
- @Override
- public void afterLibraryRemoved(
- @NotNull com.intellij.openapi.roots.libraries.Library library) {
- Optional.ofNullable(library.getName())
- .map(IntelliJCourse.this::getComponentIfExists)
- .ifPresent(Component::setUnresolved);
- }
- };
-
- @RequiresReadLock
- public synchronized void registerListeners() {
- if (messageBusConnection != null) {
- return;
- }
- messageBusConnection = project.getMessageBus().connect();
- messageBusConnection.subscribe(VirtualFileManager.VFS_CHANGES,
- new BulkFileListener() {
- @Override
- public void after(@NotNull List events) {
- for (VFileEvent event : events) {
- if (event instanceof VFileDeleteEvent) {
- Optional.ofNullable(event.getFile())
- .map(IntelliJCourse.this::getComponentIfExists)
- .ifPresent(Component::setUnresolved);
- }
- }
- }
- }
- );
- messageBusConnection.subscribe(ProjectTopics.MODULES, new ModuleListener() {
- @Override
- public void moduleRemoved(@NotNull Project project,
- @NotNull com.intellij.openapi.module.Module projectModule) {
- Optional.of(projectModule.getName())
- .map(IntelliJCourse.this::getComponentIfExists)
- .ifPresent(Component::setUnresolved);
- }
- });
- project.getLibraryTable().addListener(libraryTableListener);
- }
-
- @RequiresReadLock
- public synchronized void unregisterListeners() {
- if (messageBusConnection == null) {
- return;
- }
- messageBusConnection.disconnect();
- messageBusConnection = null;
- project.getLibraryTable().removeListener(libraryTableListener);
- }
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/IntelliJLibrary.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/IntelliJLibrary.java
deleted file mode 100644
index 535df83f6..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/IntelliJLibrary.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import com.intellij.openapi.application.WriteAction;
-import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.roots.impl.libraries.LibraryEx;
-import com.intellij.openapi.roots.libraries.LibraryProperties;
-import com.intellij.openapi.roots.libraries.LibraryTable;
-import com.intellij.openapi.roots.libraries.PersistentLibraryKind;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VfsUtil;
-import com.intellij.openapi.vfs.VirtualFileManager;
-import com.intellij.util.concurrency.annotations.RequiresReadLock;
-import com.intellij.util.concurrency.annotations.RequiresWriteLock;
-import fi.aalto.cs.apluscourses.model.Library;
-import fi.aalto.cs.apluscourses.utils.content.Content;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Stream;
-import org.apache.commons.io.FileUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public abstract class IntelliJLibrary
- >, S>
- extends Library
- implements IntelliJComponent {
-
- @NotNull
- protected final APlusProject project;
-
- protected IntelliJLibrary(@NotNull String name, @NotNull APlusProject project) {
- super(name);
- this.project = project;
- }
-
- @Override
- public void fetch() throws IOException {
- for (Content content : getContents()) {
- content.copyTo(getFullPath(), project.getProject());
- }
- }
-
- @NotNull
- protected abstract Content @NotNull [] getContents();
-
- @RequiresWriteLock
- @SuppressWarnings("unchecked")
- protected void loadInternal() {
- LibraryTable.ModifiableModel libraryTable = project.getLibraryTable().getModifiableModel();
- var library = libraryTable
- .createLibrary(getName(), getLibraryKind())
- .getModifiableModel();
- for (String uri : getClassUris()) {
- library.addRoot(uri, OrderRootType.CLASSES);
- }
-
- //HACK: this is the only way to access properties that I am aware of
- var libraryEx = (LibraryEx.ModifiableModelEx) library;
- LibraryProperties properties = libraryEx.getProperties();
- if (properties != null) {
- var newState = getPropertiesState(properties.getState());
- if (newState != null) {
- properties.loadState(newState);
- libraryEx.setProperties(properties);
- }
- }
-
- library.commit();
- libraryTable.commit();
- VirtualFileManager.getInstance().syncRefresh();
- }
-
- @Override
- public void load() {
- WriteAction.runAndWait(this::loadInternal);
- }
-
- @Override
- public void unload() {
- super.unload();
- WriteAction.runAndWait(this::unloadInternal);
- }
-
- @RequiresWriteLock
- private void unloadInternal() {
- LibraryTable libraryTable = project.getLibraryTable();
- com.intellij.openapi.roots.libraries.Library library = getPlatformObject();
- if (library != null) {
- libraryTable.removeLibrary(library);
- }
- }
-
- @Override
- public void remove() throws IOException {
- FileUtils.deleteDirectory(getFullPath().toFile());
- }
-
- @NotNull
- @Override
- public Path getPath() {
- return Paths.get("lib", getName());
- }
-
- @Override
- @NotNull
- public Path getFullPath() {
- return project.getBasePath().resolve(getPath());
- }
-
- @Override
- protected int resolveStateInternal() {
- return project.resolveComponentState(this);
- }
-
- /**
- * URIs MUST NOT be escaped! Note that java.net.URI does escaping so avoid using that.
- *
- * @return URIs to be included in classes of the library.
- */
- @RequiresReadLock
- protected String[] getClassUris() {
- return getUris(getClassRoots(), path -> VfsUtil.getUrlForLibraryRoot(path.toFile()));
- }
-
- protected String[] getUris(@NotNull String[] roots, Function pathToUri) {
- return Arrays.stream(roots)
- .filter(string -> !string.isEmpty())
- .map(getFullPath()::resolve)
- .map(pathToUri)
- .toArray(String[]::new);
- }
-
- /**
- * Gets local file system URIs of the given roots.
- *
- * @param roots File names for library class roots.
- * @return An array of URI strings (unescaped).
- */
- @RequiresReadLock
- protected String[] getUris(@NotNull String[] roots) {
- String protocol = LocalFileSystem.getInstance().getProtocol();
- return getUris(roots, path -> VirtualFileManager.constructUrl(protocol,
- FileUtil.toSystemIndependentName(path.toString())));
- }
-
- @NotNull
- protected String[] getClassRoots() {
- return getJarFiles(); // use all JAR files by default
- }
-
- @Nullable
- protected K getLibraryKind() {
- return null; // default to null ("normal")
- }
-
- /**
- * Helper method that returns all the JAR files in the library path.
- *
- * @return An array of filenames.
- */
- @NotNull
- protected String[] getJarFiles() {
- File[] files = Objects.requireNonNull(getFullPath().toFile().listFiles());
- return Stream.of(files)
- .map(File::getName)
- .filter(fileName -> fileName.endsWith(".jar"))
- .toArray(String[]::new);
- }
-
- @Nullable
- protected S getPropertiesState(@Nullable S currentState) {
- return currentState;
- }
-
-
- @Override
- @RequiresReadLock
- @Nullable
- public com.intellij.openapi.roots.libraries.Library getPlatformObject() {
- return project.getLibraryTable().getLibraryByName(getName());
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/ProjectModuleSource.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/ProjectModuleSource.java
deleted file mode 100644
index f939ef7fb..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/ProjectModuleSource.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleManager;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class ProjectModuleSource {
-
- @NotNull
- public Module[] getModules(@NotNull Project project) {
- return ModuleManager.getInstance(project).getModules();
- }
-
- @Nullable
- public Module getModule(@NotNull Project project, @NotNull String moduleName) {
- return ModuleManager.getInstance(project).findModuleByName(moduleName);
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/Scala3Sdk.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/Scala3Sdk.java
deleted file mode 100644
index b0681a8e8..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/Scala3Sdk.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import fi.aalto.cs.apluscourses.utils.content.Content;
-import fi.aalto.cs.apluscourses.utils.content.RemoteZippedDir;
-import java.util.Arrays;
-import org.jetbrains.annotations.NotNull;
-
-public class Scala3Sdk extends ScalaSdk {
-
- /**
- * Constructs a new Scala3 SDK object.
- */
- public Scala3Sdk(@NotNull String name,
- @NotNull String scalaVersion,
- @NotNull APlusProject project) {
- super(name, scalaVersion, project);
- }
-
- @Override
- @NotNull
- protected Content @NotNull [] getContents() {
- return new Content[] {
- new RemoteZippedDir(
- "https://github.com/lampepfl/dotty/releases/download/"
- + scalaVersion + "/scala3-" + scalaVersion + ".zip",
- "scala3-" + scalaVersion + "/lib")
- };
- }
-
- @Override
- @NotNull
- protected String @NotNull [] getClassRoots() {
- return Arrays.stream(getJarFiles())
- .filter(lib -> lib.startsWith("scala-library") || lib.startsWith("scala3-library"))
- .toArray(String[]::new);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/ScalaLibrary.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/ScalaLibrary.java
deleted file mode 100644
index 2b4a47112..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/ScalaLibrary.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import com.intellij.openapi.roots.impl.libraries.UnknownLibraryKind;
-import fi.aalto.cs.apluscourses.utils.content.Content;
-import fi.aalto.cs.apluscourses.utils.content.RemoteZippedFile;
-import org.jdom.Element;
-import org.jetbrains.annotations.NotNull;
-
-public class ScalaLibrary extends IntelliJLibrary {
-
- private final String scalaVersion;
-
- protected ScalaLibrary(@NotNull String name,
- @NotNull String scalaVersion,
- @NotNull APlusProject project) {
- super(name, project);
- this.scalaVersion = scalaVersion;
- }
-
- @Override
- @NotNull
- protected Content @NotNull [] getContents() {
- return new Content[] {
- new RemoteZippedFile(
- "https://scala-lang.org/files/archive/scala-" + scalaVersion + ".zip",
- "scala-" + scalaVersion + "/lib/scala-library.jar")
- };
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/ScalaSdk.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/ScalaSdk.java
deleted file mode 100644
index 7fee8fef9..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/ScalaSdk.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import com.intellij.openapi.roots.libraries.PersistentLibraryKind;
-import fi.aalto.cs.apluscourses.utils.content.Content;
-import fi.aalto.cs.apluscourses.utils.content.RemoteZippedDir;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.plugins.scala.project.ScalaLanguageLevel;
-import org.jetbrains.plugins.scala.project.ScalaLibraryProperties;
-import org.jetbrains.plugins.scala.project.ScalaLibraryPropertiesState;
-import org.jetbrains.plugins.scala.project.ScalaLibraryType;
-
-public class ScalaSdk extends IntelliJLibrary
- , ScalaLibraryPropertiesState> {
-
- @NotNull
- protected final String scalaVersion;
-
- /**
- * Constructs a new Scala SDK object.
- */
- public ScalaSdk(@NotNull String name,
- @NotNull String scalaVersion,
- @NotNull APlusProject project) {
- super(name, project);
- this.scalaVersion = scalaVersion;
- }
-
- @Override
- @NotNull
- protected Content @NotNull [] getContents() {
- return new Content[] {
- new RemoteZippedDir(
- "https://scala-lang.org/files/archive/scala-" + scalaVersion + ".zip",
- "scala-" + scalaVersion + "/lib")
- };
- }
-
- @Override
- @NotNull
- protected String @NotNull [] getClassRoots() {
- return new String[] {
- "scala-library.jar",
- "scala-reflect.jar"
- };
- }
-
- @NotNull
- protected String @NotNull [] getCompilerRoots() {
- return getJarFiles();
- }
-
- @Override
- @NotNull
- public PersistentLibraryKind getLibraryKind() {
- return ScalaLibraryType.Kind$.MODULE$;
- }
-
- @Override
- @Nullable
- protected ScalaLibraryPropertiesState getPropertiesState(
- @Nullable ScalaLibraryPropertiesState currentState) {
- return new ScalaLibraryPropertiesState(
- ScalaLanguageLevel.findByVersion(scalaVersion).get(),
- getUris(getCompilerRoots()), new String[0], null);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/SettingsImporter.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/model/SettingsImporter.java
deleted file mode 100644
index 2cf777d7e..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/model/SettingsImporter.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.model;
-
-import com.intellij.diagnostic.VMOptions;
-import com.intellij.ide.startup.StartupActionScriptManager;
-import com.intellij.openapi.application.PathManager;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.updateSettings.impl.UpdateSettings;
-import com.intellij.openapi.util.io.FileUtilRt;
-import fi.aalto.cs.apluscourses.model.Course;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import fi.aalto.cs.apluscourses.utils.PluginResourceBundle;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.stream.Collectors;
-import net.lingala.zip4j.ZipFile;
-import net.lingala.zip4j.model.FileHeader;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class SettingsImporter {
-
- private static final Logger logger = APlusLogger.logger;
-
- /**
- * Downloads the course IDE settings ZIP file to a temporary file. Also adds IDEA startup actions
- * that unzip the temporary file to the IDEA configuration path after which the temporary file is
- * deleted. Therefore, the new IDE settings only take effect once IDEA is restarted and the
- * temporary file must still exist at that point.
- *
- * @throws IOException If an IO error occurs (e.g. network issues).
- */
- public void importIdeSettings(@NotNull Course course) throws IOException {
- URL ideSettingsUrl = course.getAppropriateIdeSettingsUrl();
- if (ideSettingsUrl == null) {
- return;
- }
-
- File file = FileUtilRt.createTempFile("course-ide-settings", ".zip");
-// CoursesClient.fetch(ideSettingsUrl, file);
- String configPath = FileUtilRt.toSystemIndependentName(PathManager.getConfigPath());
- StartupActionScriptManager.addActionCommands(
- List.of(
- new StartupActionScriptManager.UnzipCommand(file.toPath(), Path.of(configPath)),
- new StartupActionScriptManager.DeleteCommand(file.toPath())
- )
- );
-
- UpdateSettings.getInstance().forceCheckForUpdateAfterRestart();
-
- PluginSettings.getInstance().setImportedIdeSettingsId(course.id);
- }
-
- /**
- * Imports the VM options from the course configuration file into the IDE. If there are no
- * options to import, this function does nothing.
- */
- @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
- public void importVMOptions(@NotNull Course course) throws IOException {
- if (!VMOptions.canWriteOptions()) {
- logger.warn("Cannot import VM options because the IDE is configured not to use them");
- return;
- }
-
- var options = course.getVMOptions();
- for (var option : options.entrySet()) {
- VMOptions.setProperty(option.getKey(), option.getValue());
- }
-
- logger.info("Imported " + options.size() + " VM options");
- }
-
- /**
- * Returns the ID of the course for which the latest IDE settings import has been done.
- */
- @Nullable
- public String currentlyImportedIdeSettings() {
- return PluginSettings.getInstance().getImportedIdeSettingsId();
- }
-
- /**
- * Downloads the course project settings ZIP file to a temporary file. After that the files from
- * the .idea directory of the ZIP file are extracted to the .idea directory of the given project,
- * after which the project is reloaded. If the course does not provide custom project settings,
- * this method does nothing.
- *
- * @throws IOException If an IO error occurs (e.g. network issues).
- */
- public void importProjectSettings(@NotNull Project project, @NotNull Path basePath, @NotNull Course course)
- throws IOException {
- URL settingsUrl = course.getResourceUrls().get("projectSettings");
- if (settingsUrl == null) {
- return;
- }
-
- Path settingsPath = basePath.resolve(Project.DIRECTORY_STORE_FOLDER);
-
- File settingsZip = FileUtilRt.createTempFile("course-project-settings", ".zip");
-// CoursesClient.fetch(settingsUrl, settingsZip);
- ZipFile zipFile = new ZipFile(settingsZip);
-
- extractZipTo(zipFile, settingsPath);
-
- // a hard-coded workspace setting
-// CompilerWorkspaceConfiguration.getInstance(project).AUTO_SHOW_ERRORS_IN_EDITOR = false; TODO
- logger.info("Imported project settings");
- }
-
- /**
- * Downloads a custom properties file if it exists, and saves it to the project's
- * .idea directory.
- *
- * @throws IOException If an IO error occurs (e.g. network issues).
- */
- public void importCustomProperties(@NotNull Path basePath, @NotNull Course course,
- @NotNull Project project)
- throws IOException {
- URL settingsUrl = course.getResourceUrls().get("customProperties");
- if (settingsUrl == null) {
- return;
- }
-
- Path settingsPath = basePath.resolve(Project.DIRECTORY_STORE_FOLDER);
-
- File file = settingsPath.resolve(PluginResourceBundle.CUSTOM_RESOURCES_FILENAME).toFile();
-// CoursesClient.fetch(settingsUrl, file);
-
- PluginResourceBundle.setCustomBundle(file, project);
- logger.info("Imported custom properties");
- }
-
- /**
- * Downloads the feedback CSS and saves it to the MainViewModel.
- *
- * @throws IOException If an IO error occurs (e.g. network issues).
- */
- public void importFeedbackCss(@NotNull Project project, @NotNull Course course) throws IOException {
- var cssUrl = course.getResourceUrls().get("feedbackCss");
- if (cssUrl == null) {
- return;
- }
-
- // TODO cache when string cache is available
-// var stream = CoursesClient.fetch(cssUrl);
-
-// var bytes = stream.readAllBytes();
-// var s = new String(bytes, StandardCharsets.UTF_8);
-
- PluginSettings.getInstance().getMainViewModel(project).feedbackCss = "";
- logger.info("Imported feedback CSS");
- }
-
- private static void extractZipTo(@NotNull ZipFile zipFile, @NotNull Path target)
- throws IOException {
- List fileNames = getZipFileNames(zipFile);
- for (String fileName : fileNames) {
- Path path = Paths.get(fileName);
- // The ZIP contains a .idea directory with all of the settings files. We want to extract the
- // files to the .idea directory without the .idea prefix, as otherwise we would end up with
- // .idea/.idea/.
- Path pathWithoutRoot = path.subpath(1, path.getNameCount());
- zipFile.extractFile(path.toString(), target.toString(), pathWithoutRoot.toString());
- }
- }
-
-
- /**
- * Returns the names of the files inside the given ZIP file. Directories are not included, but
- * files inside directories are included.
- *
- * @param zipFile The ZIP file from which the file names are read.
- * @return A list of names of the files inside the given ZIP file.
- * @throws IOException If an IO error occurs.
- */
- @NotNull
- private static List getZipFileNames(@NotNull ZipFile zipFile) throws IOException {
- return zipFile
- .getFileHeaders()
- .stream()
- .filter(file -> !file.isDirectory())
- .map(FileHeader::getFileName)
- .collect(Collectors.toList());
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/ApiTokenNotSetNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/ApiTokenNotSetNotification.java
deleted file mode 100644
index e988155b9..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/ApiTokenNotSetNotification.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class ApiTokenNotSetNotification extends Notification {
- /**
- * Constructs a notification that tells authentication is not set.
- */
- public ApiTokenNotSetNotification() {
- super(
- PluginSettings.A_PLUS,
- getText("notification.ApiTokenNotSet.title"),
- getText("notification.ApiTokenNotSet.content"),
- NotificationType.INFORMATION);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseConfigListErrorNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseConfigListErrorNotification.java
deleted file mode 100644
index 2ba690733..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseConfigListErrorNotification.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class CourseConfigListErrorNotification extends Notification {
-
- /**
- * Constructs a notification that notifies the user of an error about course configs.
- */
- public CourseConfigListErrorNotification() {
- super(
- PluginSettings.A_PLUS,
- getText("notification.CourseConfigListErrorNotification.title"),
- getText("notification.CourseConfigListErrorNotification.content"),
- NotificationType.ERROR);
- }
-
-}
-
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseConfigurationError.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseConfigurationError.java
deleted file mode 100644
index 15a8b9842..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseConfigurationError.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class CourseConfigurationError extends Notification {
-
- private final Exception exception;
-
- /**
- * Constructs a notification that notifies the user of an error that occurred while attempting to
- * parse a course configuration file.
- *
- * @param exception An exception that caused this notification.
- */
- public CourseConfigurationError(@NotNull Exception exception) {
- super(
- PluginSettings.A_PLUS,
- getText("notification.CourseConfigurationError.title"),
- getAndReplaceText("notification.CourseConfigurationError.content",
- exception.getMessage()),
- NotificationType.ERROR);
- this.exception = exception;
- }
-
- public Exception getException() {
- return exception;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseFileError.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseFileError.java
deleted file mode 100644
index dfd2f96ce..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseFileError.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class CourseFileError extends Notification {
-
- /**
- * Error to be shown when course settings file cannot be accessed.
- *
- * @param e Exception.
- */
- public CourseFileError(Exception e) {
- super(PluginSettings.A_PLUS,
- getText("notification.CourseFileError.title"),
- getAndReplaceText("notification.CourseFileError.content", e.getMessage()),
- NotificationType.ERROR);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseVersionOutdatedError.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseVersionOutdatedError.java
deleted file mode 100644
index 6a30afdde..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseVersionOutdatedError.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class CourseVersionOutdatedError extends Notification {
- /**
- * Notification to be shown when the plugin is outdated with respect to the current course.
- * This represents a mismatch in the major version and is an error.
- */
- public CourseVersionOutdatedError() {
- super(PluginSettings.A_PLUS, getText("notification.CourseVersionError.title"),
- getText("notification.CourseVersionOutdatedError.content"), NotificationType.ERROR);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseVersionOutdatedWarning.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseVersionOutdatedWarning.java
deleted file mode 100644
index 5bc7f1d8e..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseVersionOutdatedWarning.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class CourseVersionOutdatedWarning extends Notification {
- /**
- * Notification to be shown when the plugin is outdated with respect to the current course.
- * This represents a mismatch in the minor version and is a warning.
- */
- public CourseVersionOutdatedWarning() {
- super(PluginSettings.A_PLUS, getText("notification.CourseVersionError.title"),
- getText("notification.CourseVersionOutdatedWarning.content"), NotificationType.WARNING);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseVersionTooNewError.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseVersionTooNewError.java
deleted file mode 100644
index c8bf5765f..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/CourseVersionTooNewError.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class CourseVersionTooNewError extends Notification {
- /**
- * Notification to be shown when the plugin is too new to support the current course.
- */
- public CourseVersionTooNewError() {
- super(PluginSettings.A_PLUS, getText("notification.CourseVersionError.title"),
- getText("notification.CourseVersionTooNewError.content"), NotificationType.ERROR);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/DefaultNotifier.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/DefaultNotifier.java
deleted file mode 100644
index 8957dddbc..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/DefaultNotifier.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.Notifications;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class DefaultNotifier implements Notifier {
- public void notify(@NotNull Notification notification, @Nullable Project project) {
- Notifications.Bus.notify(notification, project);
- }
-
- public void notifyAndHide(@NotNull Notification notification, @Nullable Project project) {
- NotificationUtil.notifyAndHide(notification, project);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/ExerciseNotSelectedNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/ExerciseNotSelectedNotification.java
deleted file mode 100644
index aa3f0271a..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/ExerciseNotSelectedNotification.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class ExerciseNotSelectedNotification extends Notification {
-
- /**
- * Constructs a notification that notifies the user that no exercise is selected. This should be
- * shown when the user uses the exercise submission button, but no exercise is selected.
- */
- public ExerciseNotSelectedNotification() {
- super(
- PluginSettings.A_PLUS,
- getText("notification.ExerciseNotSelectedNotification.title"),
- getText("notification.ExerciseNotSelectedNotification.content"),
- NotificationType.INFORMATION);
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/FeedbackAvailableNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/FeedbackAvailableNotification.java
deleted file mode 100644
index 67ffe9269..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/FeedbackAvailableNotification.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.intellij.actions.OpenSubmissionNotificationAction;
-import fi.aalto.cs.apluscourses.intellij.actions.ShowFeedbackNotificationAction;
-import fi.aalto.cs.apluscourses.intellij.services.MainViewModelProvider;
-import fi.aalto.cs.apluscourses.model.exercise.Exercise;
-import fi.aalto.cs.apluscourses.model.exercise.SubmissionResult;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class FeedbackAvailableNotification extends Notification {
-
- /**
- * Construct a notification that notifies the user that feedback is available for a submission.
- * The notification contains a link that can be used to open the feedback and the amount of
- * points the submission got.
- */
- public FeedbackAvailableNotification(@NotNull SubmissionResult submissionResult,
- @NotNull Exercise exercise,
- @NotNull MainViewModelProvider mainViewModelProvider,
- @NotNull Project project) {
- super(
- PluginSettings.A_PLUS,
- getText("notification.FeedbackAvailableNotification.title"),
-// getAndReplaceText("notification.FeedbackAvailableNotification.content",
-// exercise.name, SubmissionResultUtil.getStatus(submissionResult)),
- NotificationType.INFORMATION
- );
- if (mainViewModelProvider.getMainViewModel(project).feedbackCss != null) {
- super.addAction(new ShowFeedbackNotificationAction(submissionResult));
- }
- super.addAction(new OpenSubmissionNotificationAction(submissionResult));
- }
-
-
- public FeedbackAvailableNotification(@NotNull SubmissionResult submissionResult,
- @NotNull Exercise exercise,
- @NotNull Project project) {
- this(submissionResult, exercise, PluginSettings.getInstance(), project);
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/IoErrorNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/IoErrorNotification.java
deleted file mode 100644
index 13930d8f6..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/IoErrorNotification.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-
-public class IoErrorNotification extends Notification {
-
- @NotNull
- private final IOException exception;
-
- /**
- * Construct an error notification that tells the user of an IO error.
- *
- * @param exception The exception corresponding to the IO error.
- */
- public IoErrorNotification(@NotNull IOException exception) {
- super(
- PluginSettings.A_PLUS,
- getText("notification.IoErrorNotification.title"),
- getAndReplaceText("notification.IoErrorNotification.content",
- exception.getMessage()),
- NotificationType.ERROR);
- this.exception = exception;
- }
-
- @NotNull
- public IOException getException() {
- return exception;
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/MissingDependencyNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/MissingDependencyNotification.java
deleted file mode 100644
index e19e27946..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/MissingDependencyNotification.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import java.util.Set;
-import org.jetbrains.annotations.NotNull;
-
-public class MissingDependencyNotification extends Notification {
- /**
- * Construct a missing module notification which explains that modules with the given names couldn't be found.
- */
- public MissingDependencyNotification(@NotNull Set moduleNames) {
- super(
- PluginSettings.A_PLUS,
- getText("notification.MissingDependencyNotification.title"),
- getAndReplaceText("notification.MissingDependencyNotification.content", String.join(", ", moduleNames)),
- NotificationType.ERROR);
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/MissingFileNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/MissingFileNotification.java
deleted file mode 100644
index 407dbc638..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/MissingFileNotification.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import java.nio.file.Path;
-import org.jetbrains.annotations.NotNull;
-
-public class MissingFileNotification extends Notification {
-
- @NotNull
- private final Path path;
- @NotNull
- private final String filename;
-
- /**
- * Construct a missing file notification that explains that a file with the given name couldn't be
- * found in the given module.
- */
- public MissingFileNotification(@NotNull Path path, @NotNull String filename) {
- this(path, filename, false);
- }
-
- /**
- * Construct a missing file notification that explains that a file with the given name couldn't be
- * found in the given module.
- */
- public MissingFileNotification(@NotNull Path path, @NotNull String filename, boolean download) {
- super(
- PluginSettings.A_PLUS,
- getText("notification.MissingFileNotification.title"),
- getAndReplaceText(download ? "notification.MissingFileNotification.contentDownload"
- : "notification.MissingFileNotification.content", filename, path),
- NotificationType.ERROR);
- this.path = path;
- this.filename = filename;
- }
-
- @NotNull
- public Path getPath() {
- return path;
- }
-
- @NotNull
- public String getFilename() {
- return filename;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/MissingModuleNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/MissingModuleNotification.java
deleted file mode 100644
index 1d43a215a..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/MissingModuleNotification.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class MissingModuleNotification extends Notification {
-
- @NotNull
- private final String moduleName;
-
- /**
- * Construct a missing module notification that explains that a module with the given name
- * couldn't be found.
- */
- public MissingModuleNotification(@NotNull String moduleName) {
- super(
- PluginSettings.A_PLUS,
- getText("notification.MissingModuleNotification.title"),
- getAndReplaceText("notification.MissingModuleNotification.content", moduleName),
- NotificationType.ERROR);
- this.moduleName = moduleName;
- }
-
- @NotNull
- public String getModuleName() {
- return moduleName;
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NetworkErrorNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NetworkErrorNotification.java
deleted file mode 100644
index 7ce3fa130..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NetworkErrorNotification.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class NetworkErrorNotification extends Notification {
-
- @NotNull
- private final Exception exception;
-
- /**
- * Constructs a notification that notifies the user of an IO error arising from the HTTP client.
- *
- * @param exception An exception that caused this notification.
- */
- public NetworkErrorNotification(@NotNull Exception exception) {
- super(
- PluginSettings.A_PLUS,
- getText("notification.NetworkErrorNotification.title"),
- getAndReplaceText("notification.NetworkErrorNotification.content",
- exception.getMessage()),
- NotificationType.ERROR);
- this.exception = exception;
- }
-
- @NotNull
- public Exception getException() {
- return exception;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NewModulesVersionsNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NewModulesVersionsNotification.java
deleted file mode 100644
index e7e0cd226..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NewModulesVersionsNotification.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.model.Component;
-import fi.aalto.cs.apluscourses.model.Module;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A {@link Notification} wrapper to let the user know about some A+ Course modules having the new
- * versions of them in A+ LMS.
- */
-public class NewModulesVersionsNotification extends Notification {
-
- /**
- * Builds the notification.
- *
- * @param modules is a {@link List} {@link Module}s to process.
- */
- public NewModulesVersionsNotification(@NotNull List modules) {
- super(
- PluginSettings.A_PLUS,
- getText(modules.size() == 1
- ? "notification.NewModulesVersionsNotification.titleSingle"
- : "notification.NewModulesVersionsNotification.title"),
- getAndReplaceText(modules.size() == 1
- ? "notification.NewModulesVersionsNotification.contentSingle"
- : "notification.NewModulesVersionsNotification.content",
- getModuleNameStrings(modules)),
- NotificationType.INFORMATION);
- }
-
- /**
- * A naive helper method to get a comma separated String of Module names.
- *
- * @param modules a {@link List} {@link Module}s to process.
- * @return a {@link String} of comma separated Module names.
- */
- @NotNull
- public static String getModuleNameStrings(@NotNull List modules) {
- return modules
- .stream()
- .map(Component::getName)
- .collect(Collectors.joining(", "));
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NotSubmittableNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NotSubmittableNotification.java
deleted file mode 100644
index 8bd0ebc8c..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NotSubmittableNotification.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class NotSubmittableNotification extends Notification {
-
- /**
- * Construct a notification that explains that the exercise cannot be submitted from the plugin.
- */
- public NotSubmittableNotification() {
- super(
- PluginSettings.A_PLUS,
- getText("notification.NotSubmittableNotification.title"),
- getText("notification.NotSubmittableNotification.content"),
- NotificationType.ERROR
- );
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NotificationUtil.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NotificationUtil.java
deleted file mode 100644
index 49fc3d007..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/NotificationUtil.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.Notifications;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import java.util.concurrent.Executors;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class NotificationUtil {
- private static final Logger logger = APlusLogger.logger;
-
- private NotificationUtil() {
- }
-
- /**
- * Shows a notification and hides it after 6 seconds.
- *
- * @param notification The Notification to be shown.
- * @param project The Project where the Notification is shown.
- */
- public static void notifyAndHide(@NotNull Notification notification, @Nullable Project project) {
- // IntelliJ implementation of notifyAndHide is missing the project parameter from notify
- Notifications.Bus.notify(notification, project);
- Executors.newSingleThreadExecutor().submit(() -> {
- try {
- Thread.sleep(6000);
- notification.hideBalloon();
- } catch (InterruptedException e) {
- logger.warn("Notification timeout interrupted", e);
- Thread.currentThread().interrupt();
- }
- return null;
- });
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/Notifier.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/Notifier.java
deleted file mode 100644
index 0c0ed8e2d..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/Notifier.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import com.intellij.notification.Notification;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public interface Notifier {
- void notify(@NotNull Notification notification, @Nullable Project project);
-
- void notifyAndHide(@NotNull Notification notification, @Nullable Project project);
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/SubmissionSentNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/SubmissionSentNotification.java
deleted file mode 100644
index 29018d4cf..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/SubmissionSentNotification.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class SubmissionSentNotification extends Notification {
-
- /**
- * Construct a notification which informs the user that an exercise was submitted successfully.
- */
- public SubmissionSentNotification() {
- super(
- PluginSettings.A_PLUS,
- getText("notification.SuccessfulSubmissionNotification.title"),
- getText("notification.SuccessfulSubmissionNotification.content"),
- NotificationType.INFORMATION
- );
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/TaskCompleteNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/TaskCompleteNotification.java
deleted file mode 100644
index e95f5aa19..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/TaskCompleteNotification.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-
-public class TaskCompleteNotification extends Notification {
-
- /**
- * Constructor.
- */
- private TaskCompleteNotification(String contentKey, int index) {
- super(PluginSettings.A_PLUS,
- getText("notification.TaskCompleteNotification.title"),
- getAndReplaceText(contentKey, index),
- NotificationType.INFORMATION);
- }
-
- /**
- * Constructor.
- */
- private TaskCompleteNotification(String contentKey, int index, String instructions) {
- super(PluginSettings.A_PLUS,
- getText("notification.TaskCompleteNotification.title"),
- getAndReplaceText(contentKey, index) + "\n(" + instructions + ")",
- NotificationType.INFORMATION);
- }
-
- public static TaskCompleteNotification createTaskCompleteNotification(int index) {
- return new TaskCompleteNotification("notification.TaskCompleteNotification.content", index + 1);
- }
-
- public static TaskCompleteNotification createTaskAlreadyCompleteNotification(int index, String instructions) {
- return new TaskCompleteNotification("notification.TaskCompleteNotification.contentAlready",
- index + 1, instructions);
- }
-
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/TaskNotifier.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/TaskNotifier.java
deleted file mode 100644
index c7d6771bc..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/TaskNotifier.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-
-public class TaskNotifier {
-
- private final @NotNull Notifier notifier;
- private final @NotNull Project project;
-
- public TaskNotifier(@NotNull Notifier notifier, @NotNull Project project) {
- this.notifier = notifier;
- this.project = project;
- }
-
- public void notifyAlreadyEndTask(int index, String instructions) {
- notifier.notify(TaskCompleteNotification.createTaskAlreadyCompleteNotification(index, instructions), project);
- }
-
- public void notifyEndTask(int index) {
- notifier.notify(TaskCompleteNotification.createTaskCompleteNotification(index), project);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/UrlRenderingErrorNotification.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/UrlRenderingErrorNotification.java
deleted file mode 100644
index 4633da8b5..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/notifications/UrlRenderingErrorNotification.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.notifications;
-
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getAndReplaceText;
-import static fi.aalto.cs.apluscourses.utils.PluginResourceBundle.getText;
-
-import com.intellij.notification.Notification;
-import com.intellij.notification.NotificationType;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class UrlRenderingErrorNotification extends Notification {
-
- @NotNull
- private final Exception exception;
-
- /**
- * Construct a notification informing the user that an error occurred while attempting to render
- * a submission.
- */
- public UrlRenderingErrorNotification(@NotNull Exception exception) {
- super(
- PluginSettings.A_PLUS,
- getText("notification.UrlRenderingErrorNotification.title"),
- getAndReplaceText("notification.UrlRenderingErrorNotification.content",
- exception.getMessage()),
- NotificationType.ERROR
- );
- this.exception = exception;
- }
-
- @NotNull
- public Exception getException() {
- return exception;
- }
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/CourseProjectProvider.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/services/CourseProjectProvider.java
deleted file mode 100644
index 9e0e28585..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/CourseProjectProvider.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.services;
-
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.model.CourseProject;
-import org.jetbrains.annotations.Nullable;
-
-public interface CourseProjectProvider {
-
- @Nullable CourseProject getCourseProject(@Nullable Project project);
-
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/DefaultGroupIdSetting.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/services/DefaultGroupIdSetting.java
deleted file mode 100644
index b1389e72a..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/DefaultGroupIdSetting.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.services;
-
-import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
-
-public interface DefaultGroupIdSetting {
- @NotNull Optional getDefaultGroupId();
-
- void setDefaultGroupId(long groupId);
-
- void clearDefaultGroupId();
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/Dialogs.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/services/Dialogs.java
deleted file mode 100644
index 88a8f3539..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/Dialogs.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.services;
-
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.presentation.AuthenticationViewModel;
-import fi.aalto.cs.apluscourses.presentation.FileSaveViewModel;
-import fi.aalto.cs.apluscourses.presentation.ModuleSelectionViewModel;
-import fi.aalto.cs.apluscourses.presentation.SelectStudentViewModel;
-import fi.aalto.cs.apluscourses.presentation.exercise.DownloadSubmissionViewModel;
-import fi.aalto.cs.apluscourses.presentation.exercise.SubmissionViewModel;
-import fi.aalto.cs.apluscourses.ui.APlusAuthenticationView;
-import fi.aalto.cs.apluscourses.ui.Dialog;
-import fi.aalto.cs.apluscourses.ui.FileSaveView;
-import fi.aalto.cs.apluscourses.ui.SelectStudentDialog;
-import fi.aalto.cs.apluscourses.ui.exercise.DownloadSubmissionDialog;
-import fi.aalto.cs.apluscourses.ui.exercise.ModuleSelectionDialog;
-import fi.aalto.cs.apluscourses.ui.exercise.SubmissionDialog;
-import fi.aalto.cs.apluscourses.utils.FactorySelector;
-
-public class Dialogs extends FactorySelector {
- public static final Dialogs DEFAULT = new Dialogs();
-
- static {
- DEFAULT.register(ModuleSelectionViewModel.class, ModuleSelectionDialog::new);
- DEFAULT.register(SubmissionViewModel.class, SubmissionDialog::new);
- DEFAULT.register(AuthenticationViewModel.class, APlusAuthenticationView::new);
- DEFAULT.register(FileSaveViewModel.class, FileSaveView::new);
- DEFAULT.register(DownloadSubmissionViewModel.class, DownloadSubmissionDialog::new);
- DEFAULT.register(SelectStudentViewModel.class, SelectStudentDialog::new);
- }
-
- public interface Factory extends FactorySelector.Factory {
-
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/MainViewModelProvider.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/services/MainViewModelProvider.java
deleted file mode 100644
index 992cd76d9..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/MainViewModelProvider.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.services;
-
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.presentation.MainViewModel;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public interface MainViewModelProvider {
- @NotNull
- MainViewModel getMainViewModel(@Nullable Project project);
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/OpenSubmissionService.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/services/OpenSubmissionService.java
deleted file mode 100644
index a2ba52856..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/services/OpenSubmissionService.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.services;
-
-import static com.intellij.util.io.NettyKt.getOrigin;
-import static java.lang.Long.parseLong;
-
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectManager;
-import fi.aalto.cs.apluscourses.intellij.utils.SubmissionDownloader;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.utils.cache.CachePreferences;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpMethod;
-import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.codec.http.QueryStringDecoder;
-import java.io.IOException;
-import java.util.Arrays;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.ide.RestService;
-
-public class OpenSubmissionService extends RestService {
- private static final String NOT_LOADED_ERROR = "A+ Courses hasn't loaded assignments yet";
- private final CourseProjectProvider courseProjectProvider;
-
- public OpenSubmissionService() {
- this(PluginSettings.getInstance()::getCourseProject);
- }
-
- public OpenSubmissionService(@NotNull CourseProjectProvider courseProjectProvider) {
- this.courseProjectProvider = courseProjectProvider;
- }
-
- @Nullable
- @Override
- public String execute(@NotNull QueryStringDecoder urlDecoder, @NotNull FullHttpRequest request,
- @NotNull ChannelHandlerContext context) throws IOException {
- if (!isOriginApi(request)) {
- return "Origin not allowed";
- }
- var submissionIdString = getStringParameter("submissionId", urlDecoder);
- var exerciseUrl = getStringParameter("exerciseUrl", urlDecoder);
- if (submissionIdString == null || exerciseUrl == null) {
- return "HTTP request missing parameters";
- }
- long submissionId = parseLong(submissionIdString);
- var error = openSubmission(submissionId, exerciseUrl);
- if (error != null) {
- return error;
- }
- sendOk(request, context);
-
- return null;
- }
-
- @NotNull
- @Override
- protected String getServiceName() {
- return "aPlusSubmission";
- }
-
- @Override
- protected boolean isMethodSupported(@NotNull HttpMethod method) {
- return method == HttpMethod.POST;
- }
-
- @NotNull
- @Override
- protected OriginCheckResult isOriginAllowed(@NotNull HttpRequest request) {
- return OriginCheckResult.ALLOW;
- }
-
- private boolean isOriginApi(@NotNull HttpRequest request) {
- var project = getOpenAPlusProject();
- if (project == null) {
- return false;
- }
- var courseProject = courseProjectProvider.getCourseProject(project);
- if (courseProject == null) {
- return false;
- }
- var apiUrl = courseProject.course.getHtmlUrl();
- return apiUrl.equals(getOrigin(request) + "/");
- }
-
- @Nullable
- private String openSubmission(long submissionId, @NotNull String exerciseUrl) {
- var project = getOpenAPlusProject();
- if (project == null) {
- return "No A+ Courses project found";
- }
- var courseProject = courseProjectProvider.getCourseProject(project);
- if (courseProject == null) {
- return NOT_LOADED_ERROR;
- }
- var course = courseProject.course;
- var dataSource = course.getExerciseDataSource();
-
- var exerciseTree = courseProject.getExerciseTree();
- if (exerciseTree == null) {
- return NOT_LOADED_ERROR;
- }
- var exercise = exerciseTree.findExerciseByUrl(exerciseUrl);
- if (exercise == null) {
- return "Exercise not found";
- }
- var auth = courseProject.getAuthentication();
- if (auth == null) {
- return "A+ Courses Project not authenticated";
- }
-
- try {
- var submissionResult = dataSource.getSubmissionResult(
- course.getApiUrl() + "submissions/" + submissionId + "/", exercise,
- courseProject.getAuthentication(), courseProject.course, CachePreferences.FOR_THIS_SESSION_ONLY);
-
- ApplicationManager.getApplication().invokeLater(
- () -> new SubmissionDownloader().downloadSubmission(project, course, exercise, submissionResult));
- } catch (IOException e) {
- return e.toString();
- }
- return null;
- }
-
- @Nullable
- private Project getOpenAPlusProject() {
- return Arrays.stream(ProjectManager.getInstance().getOpenProjects())
- .filter(project -> courseProjectProvider.getCourseProject(project) != null)
- .findFirst()
- .orElse(null);
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/CourseFileManager.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/CourseFileManager.java
deleted file mode 100644
index 1ec3502ff..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/CourseFileManager.java
+++ /dev/null
@@ -1,354 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.module.ModuleManager;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ModuleRootManager;
-import fi.aalto.cs.apluscourses.intellij.notifications.MissingDependencyNotification;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.model.Module;
-import fi.aalto.cs.apluscourses.model.ModuleMetadata;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import fi.aalto.cs.apluscourses.utils.JsonUtil;
-import fi.aalto.cs.apluscourses.utils.Version;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import org.apache.commons.io.FileUtils;
-import org.jetbrains.annotations.NotNull;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class CourseFileManager {
-
- private static final Logger logger = APlusLogger.logger;
-
- private final File courseFile;
- private URL courseUrl;
- private String language;
- private Map modulesMetadata;
- private final Map> moduleDependencies;
- private final Project project;
- private final Notifier notifier;
-
- private static final String COURSE_FILE_NAME = "a-plus-project.json";
- private static final String URL_KEY = "url";
- private static final String LANGUAGE_KEY = "language";
- private static final String MODULES_KEY = "modules";
- private static final String MODULE_VERSION_KEY = "version";
- private static final String MODULE_DOWNLOADED_AT_KEY = "downloadedAt";
- private static final String MODULE_DEPENDENCIES_KEY = "dependencies";
-
- /**
- * Constructor.
- */
- public CourseFileManager(@NotNull Project project,
- @NotNull Notifier notifier) {
- courseFile = getCourseFile(project);
- this.project = project;
- this.notifier = notifier;
- this.moduleDependencies = new HashMap<>();
- }
-
- /**
- * Attempts to create a course file and load it for the given project with the given URL and
- * language. If a course file for already exists, then the URL and language is overwritten, but
- * the existing modules metadata in the course file is preserved.
- *
- * @param courseUrl The URL that gets added to the course file.
- * @param language The language string that gets added to the course file.
- * @throws IOException If an IO error occurs.
- */
- public synchronized void createAndLoad(@NotNull URL courseUrl,
- @NotNull String language) throws IOException {
- if (courseFile.exists()) {
- load();
- } else {
- // createAndLoad never overwrites modules metadata of an existing course file.
- // Should this be in the constructor?
- this.modulesMetadata = new HashMap<>();
- }
- this.courseUrl = courseUrl;
- this.language = language;
- writeCourseFile(
- new JSONObject()
- .put(URL_KEY, courseUrl.toString())
- .put(LANGUAGE_KEY, language)
- .put(MODULES_KEY, createModulesObject())
- .put(MODULE_DEPENDENCIES_KEY, createDependenciesObject())
- );
- }
-
- /**
- * Attempts to load the course file corresponding to the given project. Returns {@code false} if
- * the course file doesn't exist, {@code true} otherwise.
- *
- * @return {@code true} if the course file was successfully loaded, {@code false} if the course
- * file doesn't exist.
- * @throws IOException If an IO error occurs while reading the course file.
- */
- public synchronized boolean load() throws IOException {
- if (courseFile.exists()) {
- JSONObject jsonObject = readCourseFile();
- loadFromJsonObject(jsonObject);
- return true;
- }
- return false;
- }
-
- /**
- * Adds an entry for the given module to the currently loaded course file. If an entry already
- * exists for the given module, then it is overwritten with the new entry.
- *
- * @param module The module for which an entry is added.
- * @throws IOException If an IO error occurs while writing to the course file.
- */
- public synchronized void addModuleEntry(@NotNull Module module)
- throws IOException {
- ModuleMetadata newModuleMetadata = module.getMetadata();
- JSONObject newModuleObject = new JSONObject()
- .put(MODULE_VERSION_KEY, newModuleMetadata.getVersion())
- .put(MODULE_DOWNLOADED_AT_KEY, newModuleMetadata.getDownloadedAt());
-
- JSONObject modulesObject = createModulesObject();
-
- modulesObject.put(module.getName(), newModuleObject);
-
- addAllDependencies();
- fixDependencies();
-
- writeCourseFileWithModulesObject(modulesObject);
-
- // Only add the entry to the map after writing to the file, so that if the write fails, the map
- // is still in the correct state.
- modulesMetadata.put(module.getName(), newModuleMetadata);
- }
-
- /**
- * Only supports adding new modules, not removing them.
- */
- private synchronized void addModuleDependencies(
- @NotNull com.intellij.openapi.module.Module module) {
- var deps = getDependencies(module);
- var oldDeps = moduleDependencies.computeIfAbsent(module.getName(), m -> deps);
- if (oldDeps.size() < deps.size()) {
- moduleDependencies.put(module.getName(), deps);
- }
- }
-
- private synchronized void addAllDependencies() {
- var modules = ModuleManager.getInstance(project).getModules();
- for (var module : modules) {
- addModuleDependencies(module);
- }
- }
-
- private synchronized Set fixDependencies() {
- var moduleManager = ModuleManager.getInstance(project);
- var modules = moduleManager.getModules();
- var missingModules = new HashSet();
-
- for (var module : modules) {
- var depsInIml = getDependencies(module);
- var depsInJson = new HashSet<>(moduleDependencies.get(module.getName()));
- depsInJson.removeAll(depsInIml);
-
- if (!depsInJson.isEmpty()) {
- var model = ModuleRootManager.getInstance(module).getModifiableModel();
-
- for (var missingModelName : depsInJson) {
- var missingModule = moduleManager.findModuleByName(missingModelName);
-
- if (missingModule != null) {
- model.addModuleOrderEntry(missingModule);
- } else {
- missingModules.add(missingModelName);
- }
- }
- ApplicationManager.getApplication().invokeLater(() ->
- ApplicationManager.getApplication().runWriteAction(model::commit));
- }
- }
- return missingModules;
- }
-
- private synchronized Set getDependencies(
- @NotNull com.intellij.openapi.module.Module module) {
- return Arrays.stream(ModuleRootManager.getInstance(module).getDependencies())
- .map(com.intellij.openapi.module.Module::getName)
- .collect(Collectors.toCollection(HashSet::new));
- }
-
- /**
- * Returns the URL of the course for the currently loaded course file. This should only be called
- * after a course file has been successfully loaded.
- */
- @NotNull
- public synchronized URL getCourseUrl() {
- return courseUrl;
- }
-
- /**
- * Returns the language chosen by the user for the course corresponding to the currently loaded
- * course file. This should only be called after a course file has been successfully loaded.
- */
- @NotNull
- public synchronized String getLanguage() {
- return language;
- }
-
- /**
- * Returns the metadata of modules in the currently loaded course file, or an empty map if no
- * course file has been loaded.
- */
- @NotNull
- public synchronized Map getModulesMetadata() {
- // Return a copy so that later changes to the map aren't visible in the returned map.
- return modulesMetadata != null ? new HashMap<>(modulesMetadata) : Collections.emptyMap();
- }
-
- @NotNull
- private JSONObject readCourseFile() throws IOException {
- return new JSONObject(FileUtils.readFileToString(courseFile, StandardCharsets.UTF_8));
- }
-
- private void writeCourseFile(@NotNull JSONObject jsonObject) throws IOException {
- FileUtils.writeStringToFile(courseFile, jsonObject.toString(), StandardCharsets.UTF_8);
- }
-
- private void writeCourseFileWithModulesObject(@NotNull JSONObject modulesObject)
- throws IOException {
- writeCourseFile(new JSONObject()
- .put(URL_KEY, courseUrl.toString())
- .put(LANGUAGE_KEY, language)
- .put(MODULES_KEY, modulesObject)
- .put(MODULE_DEPENDENCIES_KEY, createDependenciesObject()));
- }
-
- /*
- * Returns the course file corresponding to the given project.
- */
- @NotNull
- private File getCourseFile(@NotNull Project project) {
- return Paths
- .get(Objects.requireNonNull(project.getBasePath()),
- Project.DIRECTORY_STORE_FOLDER,
- COURSE_FILE_NAME)
- .toFile();
- }
-
- /*
- * Returns a JSONObject corresponding to the contents of the modulesMetadata map.
- */
- @NotNull
- private JSONObject createModulesObject() {
- JSONObject modulesObject = new JSONObject();
- modulesMetadata.forEach((name, metadata) -> modulesObject
- .put(name, new JSONObject()
- .put(MODULE_VERSION_KEY, metadata.getVersion())
- .put(MODULE_DOWNLOADED_AT_KEY, metadata.getDownloadedAt())));
- return modulesObject;
- }
-
- @NotNull
- private JSONObject createDependenciesObject() {
- var dependenciesObject = new JSONObject();
- moduleDependencies.forEach(dependenciesObject::put);
- return dependenciesObject;
- }
-
- /*
- * Initializes local variables from the given JSON object.
- */
- private void loadFromJsonObject(@NotNull JSONObject jsonObject) throws IOException {
- this.courseUrl = new URL(jsonObject.getString(URL_KEY));
-
- try {
- this.language = jsonObject.getString(LANGUAGE_KEY);
- } catch (JSONException e) {
- logger.warn("Course file missing language, defaulting to 'en'", e);
- language = "en";
- }
-
- this.modulesMetadata = new HashMap<>();
- JSONObject modulesObject = jsonObject.optJSONObject(MODULES_KEY);
- if (modulesObject == null) {
- return;
- }
-
- Iterable moduleNames = modulesObject::keys;
- for (String moduleName : moduleNames) {
- JSONObject moduleObject = modulesObject.getJSONObject(moduleName);
-
- Version moduleVersion = Version.fromString(moduleObject.optString(MODULE_VERSION_KEY, "1.0"));
-
- ZonedDateTime downloadedAt;
- try {
- downloadedAt = ZonedDateTime.parse(moduleObject.getString(MODULE_DOWNLOADED_AT_KEY));
- } catch (JSONException e) {
- logger.warn(String.format("Module %s missing 'downloadedAt' in course file", moduleName), e);
- downloadedAt = Instant.EPOCH.atZone(ZoneId.systemDefault());
- }
-
- this.modulesMetadata
- .put(moduleName, new ModuleMetadata(moduleVersion, downloadedAt));
- }
-
-
- JSONObject dependenciesObject = jsonObject.optJSONObject(MODULE_DEPENDENCIES_KEY);
- if (dependenciesObject != null) {
- Iterable depModuleNames = dependenciesObject::keys;
-
- for (String moduleName : depModuleNames) {
- JSONArray jsonDependencies = dependenciesObject.getJSONArray(moduleName);
- Set dependencies = new HashSet<>(Arrays.asList(
- JsonUtil.parseArray(
- jsonDependencies, JSONArray::getString, Function.identity(), String[]::new)
- ));
-
- moduleDependencies.put(moduleName, dependencies);
- }
- }
- addAllDependencies();
- var missingModules = fixDependencies();
-
- if (!missingModules.isEmpty()) {
- notifier.notify(new MissingDependencyNotification(missingModules),
- project);
- }
-
- writeCourseFileWithModulesObject(modulesObject);
- }
-
- /**
- * Deletes the course file.
- */
- public void delete() {
- try {
- Files.delete(courseFile.toPath());
- } catch (IOException e) {
- // Ignore
- }
- }
-
- public boolean courseFileExists() {
- return courseFile.exists();
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/EdtTask.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/EdtTask.java
deleted file mode 100644
index 041801251..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/EdtTask.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.application.ApplicationManager;
-
-/**
- * A task that is executed in the event dispatcher thread.
- *
- * @param Type of the result.
- */
-public abstract class EdtTask {
- private volatile T result; // NOSONAR
-
- public T executeAndWait() {
- ApplicationManager.getApplication().invokeAndWait(this::executeInternal);
- return result;
- }
-
- private void executeInternal() {
- result = execute();
- }
-
- protected abstract T execute();
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ErrorHandler.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ErrorHandler.java
deleted file mode 100644
index 3b1ea0cc5..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ErrorHandler.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.ide.DataManager;
-import com.intellij.ide.plugins.PluginManager;
-import com.intellij.idea.IdeaLogger;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.application.ApplicationInfo;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ApplicationNamesInfo;
-import com.intellij.openapi.diagnostic.ErrorReportSubmitter;
-import com.intellij.openapi.diagnostic.IdeaLoggingEvent;
-import com.intellij.openapi.diagnostic.SubmittedReportInfo;
-import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.progress.Task;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.Messages;
-import com.intellij.util.Consumer;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.utils.BuildInfo;
-import java.awt.Component;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONObject;
-
-public class ErrorHandler extends ErrorReportSubmitter {
- @NotNull
- private static final String REPORT_SERVER = "https://apluscourses-reports.cs.aalto.fi/report";
-
- private JSONObject serializeErrorData(@Nullable String errorInfo,
- @Nullable String lastActionId,
- @NotNull List stackTraces) {
- var loadedPlugins = new ArrayList();
-
- try {
- for (var p : PluginManager.getLoadedPlugins()) {
- var pluginInfo = new JSONObject()
- .put("id", p.getPluginId() == null ? "" : p.getPluginId().getIdString())
- .put("name", p.getName());
-
- loadedPlugins.add(pluginInfo);
- }
- } catch (Exception e) {
- // ignore all exceptions here
- }
-
- return new JSONObject()
- .put("ideVersion", ApplicationInfo.getInstance().getFullVersion())
- .put("ideProduct", ApplicationNamesInfo.getInstance().getFullProductNameWithEdition())
- .put("osName", System.getProperty("os.name"))
- .put("osVersion", System.getProperty("os.version"))
- .put("jvmName", System.getProperty("java.vm.name"))
- .put("jvmVersion", System.getProperty("java.vm.version"))
- .put("pluginVersion", BuildInfo.INSTANCE.pluginVersion.toString())
- .put("loadedPlugins", loadedPlugins)
- .put("errorInfo", errorInfo)
- .put("lastAction", lastActionId)
- .put("stackTraces", stackTraces)
- .put("course", PluginSettings.getInstance().getTechnicalCourseDescription());
- }
-
- @Override
- public @NotNull String getPrivacyNoticeText() {
- return "The privacy policy is available here.";
- }
-
- @Override
- public @NotNull String getReportActionText() {
- return "Report to A+ Developers";
- }
-
- @Override
- public boolean submit(IdeaLoggingEvent @NotNull [] events,
- @Nullable String additionalInfo,
- @NotNull Component parentComponent,
- @NotNull Consumer consumer) {
- DataContext context = DataManager.getInstance().getDataContext(parentComponent);
- Project project = CommonDataKeys.PROJECT.getData(context);
-
- new Task.Backgroundable(project, "Sending error report") {
- @Override
- public void run(@NotNull ProgressIndicator indicator) {
- ApplicationManager.getApplication().invokeLater(() -> {
- Messages.showInfoMessage(parentComponent,
- "Thank you for submitting the report.", "Error Report");
- consumer.consume(new SubmittedReportInfo(SubmittedReportInfo.SubmissionStatus.NEW_ISSUE));
- });
-
- var serializedData = serializeErrorData(additionalInfo, IdeaLogger.ourLastActionId,
- Arrays.stream(events).map(IdeaLoggingEvent::getThrowableText)
- .collect(Collectors.toList()));
-
- HttpPost request = new HttpPost(REPORT_SERVER);
- request.setHeader("Content-Type", "application/json");
- request.setHeader("Connection", "close");
- request.setEntity(new StringEntity(serializedData.toString(), StandardCharsets.UTF_8));
-
- try (CloseableHttpClient client = HttpClients.createDefault()) {
- client.execute(request).close();
- } catch (Exception ex) {
- // silently ignore all errors
- }
- }
- }.queue();
- return true;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/IntelliJFilterOption.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/IntelliJFilterOption.java
deleted file mode 100644
index f5ecd6693..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/IntelliJFilterOption.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.presentation.filter.Filter;
-import fi.aalto.cs.apluscourses.presentation.filter.Option;
-import javax.swing.Icon;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class IntelliJFilterOption extends Option {
-
- private final PluginSettings.LocalIdeSettingsNames setting;
- private final PluginSettings.PropertiesManager propertiesManager;
-
- /**
- * An option, that is, a filter that when not selected, filters out those that match to the filter
- * given to this constructor.
- */
- public IntelliJFilterOption(@NotNull PluginSettings.PropertiesManager propertiesManager,
- @NotNull PluginSettings.LocalIdeSettingsNames setting,
- @NotNull String name,
- @Nullable Icon icon,
- @NotNull Filter filter) {
- super(name, icon, filter);
- this.setting = setting;
- this.propertiesManager = propertiesManager;
- isSelected.addValueObserver(this, IntelliJFilterOption::selectionChanged);
- }
-
- @Override
- public IntelliJFilterOption init() {
- isSelected.set(propertiesManager.getBoolean(setting.getId(), true), this);
- return this;
- }
-
- private void selectionChanged(@Nullable Boolean value) {
- if (value != null) { // if initialized
- propertiesManager.setValue(setting.getId(), value, true);
- }
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/Interfaces.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/Interfaces.java
deleted file mode 100644
index f79217f6c..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/Interfaces.java
+++ /dev/null
@@ -1,370 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.fileEditor.OpenFileDescriptor;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.newvfs.RefreshQueue;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.model.Authentication;
-import fi.aalto.cs.apluscourses.model.Group;
-import fi.aalto.cs.apluscourses.utils.cache.Cache;
-import fi.aalto.cs.apluscourses.utils.cache.CachePreferences;
-import fi.aalto.cs.apluscourses.utils.cache.JsonFileCache;
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class Interfaces {
- @FunctionalInterface
- public interface ModuleDirGuesser {
- @Nullable
- VirtualFile guessModuleDir(@NotNull Module module);
- }
-
- @FunctionalInterface
- public interface AuthenticationProvider {
- Authentication getAuthentication(@Nullable Project project);
- }
-
- @FunctionalInterface
- public interface Tagger {
- void putSystemLabel(@Nullable Project project, @NotNull String tag, int color);
- }
-
- @FunctionalInterface
- public interface DocumentSaver {
- void saveAllDocuments();
- }
-
- public interface DuplicateSubmissionChecker {
- boolean isDuplicateSubmission(@NotNull Project project, @NotNull String courseId, long exerciseId,
- @NotNull Map files);
-
- void onAssignmentSubmitted(@NotNull Project project, @NotNull String courseId, long exerciseId,
- @NotNull Map files);
- }
-
- public interface SubmissionGroupSelector {
- @Nullable
- String getLastSubmittedGroupId(@NotNull Project project, @NotNull String courseId, long exerciseId);
-
- void onAssignmentSubmitted(@NotNull Project project, @NotNull String courseId, long exerciseId,
- @NotNull Group group);
- }
-
- @FunctionalInterface
- public interface LanguageSource {
- @NotNull String getLanguage(@NotNull Project project);
- }
-
- @FunctionalInterface
- public interface AssistantModeProvider {
- boolean isAssistantMode();
- }
-
- @FunctionalInterface
- public interface FileRefresher {
- void refreshPath(VirtualFile file, Runnable callback);
- }
-
- public interface ReadNews {
- void setNewsRead(long id);
-
- String getReadNews();
- }
-
- @FunctionalInterface
- public interface FileBrowser {
- void navigateTo(File file, Project project);
- }
-
- @FunctionalInterface
- public interface VirtualFileFinder {
- VirtualFile findFile(File file);
- }
-
- public interface CollapsedPanels {
- void setCollapsed(@NotNull String title);
-
- void setExpanded(@NotNull String title);
- }
-
- public static class FileRefresherImpl {
- private FileRefresherImpl() {
-
- }
-
- /**
- * Refreshes the VFS.
- */
- public static void refreshPath(VirtualFile file, Runnable callback) {
- var refresher = RefreshQueue.getInstance().createSession(true, true, callback);
- if (file != null) {
- refresher.addFile(file);
- }
- refresher.launch();
- }
- }
-
- public static class DuplicateSubmissionCheckerImpl implements DuplicateSubmissionChecker {
-
- /**
- * A convenience class for handling the cached hashes - it facilitates conversion from and to a JSONObject,
- * and provides a simple interface for adding new hashes and checking for already existing hashes.
- */
- private static class SubmissionHashes {
- private static final String JSON_ENTRY_NAME = "hashes";
- private final @NotNull Set hashes;
-
- public SubmissionHashes(@Nullable JSONObject jsonObject) {
- hashes = new HashSet<>();
-
- if (jsonObject == null) {
- return;
- }
-
- final JSONArray hashesJson = jsonObject.optJSONArray(JSON_ENTRY_NAME);
- if (hashesJson == null) {
- return;
- }
-
- for (int i = 0; i < hashesJson.length(); ++i) {
- try {
- hashes.add(hashesJson.getString(i));
- } catch (JSONException e) {
- hashes.clear();
- return;
- }
- }
- }
-
- public @NotNull JSONObject toJsonObject() {
- final JSONObject jsonObject = new JSONObject();
- jsonObject.put(JSON_ENTRY_NAME, new JSONArray(hashes));
-
- return jsonObject;
- }
-
- public boolean containsHash(@NotNull String hash) {
- return hashes.contains(hash);
- }
-
- public void addHash(@NotNull String hash) {
- hashes.add(hash);
- }
- }
-
- private static Cache submissionsCache;
-
- private static void ensureCacheLoaded(@NotNull Project project) {
- if (submissionsCache == null) {
- Path projectPath = Path.of(Objects.requireNonNull(project.getBasePath()));
- submissionsCache = new JsonFileCache(
- projectPath.resolve(Path.of(Project.DIRECTORY_STORE_FOLDER, "a-plus-hashes.json")));
- }
- }
-
- @NotNull
- private static String getCacheKey(@NotNull String courseId, long exerciseId) {
- return "hash_c" + courseId + "_e" + exerciseId;
- }
-
- private static String hashFileToString(@NotNull MessageDigest digest, @NotNull Path path) {
- try {
- byte[] hash = digest.digest(Files.readAllBytes(path));
- return Base64.getEncoder().encodeToString(hash);
- } catch (IOException e) {
- throw new UncheckedIOException(e);
- }
- }
-
- private static String hashAllFiles(@NotNull Map files)
- throws NoSuchAlgorithmException {
- final MessageDigest shaDigest = MessageDigest.getInstance("SHA-256");
- final StringBuilder submissionString = new StringBuilder();
-
- // the iteration order is important so that files always get concatenated in the same order
- files.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEachOrdered(entry -> {
- submissionString.append(entry.getKey());
- submissionString.append('|'); // a separating character that is not in base-64 alphabet
- submissionString.append(hashFileToString(shaDigest, entry.getValue()));
- submissionString.append(',');
- });
-
- final byte[] finalHashBytes = shaDigest.digest(submissionString.toString().getBytes(StandardCharsets.UTF_8));
- return Base64.getEncoder().encodeToString(finalHashBytes);
- }
-
- /**
- * Checks whether the same submission has already been submitted by the user. If it is the case, the user
- * is asked whether they want to submit anyway or abort the submission.
- * @param project The current IntelliJ project.
- * @param courseId ID of the course which contains the exercise in question.
- * @param exerciseId ID of the exercise.
- * @param files A map of submittable files, as constructed in {@lin k SubmitExerciseAction}.
- * @return True if duplicate check succeeded and the submission should proceed; false if it should be cancelled.
- */
- @Override
- public boolean isDuplicateSubmission(@NotNull Project project,
- @NotNull String courseId,
- long exerciseId,
- @NotNull Map files) {
- // we want to defer creation of the cache until it's actually necessary
- ensureCacheLoaded(project);
-
- try {
- final String cacheKey = getCacheKey(courseId, exerciseId);
- final String currentHash = hashAllFiles(files);
- final JSONObject cachedHashesJson = submissionsCache.getValue(cacheKey, CachePreferences.PERMANENT);
-
- return new SubmissionHashes(cachedHashesJson).containsHash(currentHash);
- } catch (UncheckedIOException | NoSuchAlgorithmException e) {
- // if an exception occurs, don't bother the user and just proceed with submitting as normal
- // it's highly probable that in such case, submitting will fail later on anyway, and the error will be logged
- return true;
- }
- }
-
- @Override
- public void onAssignmentSubmitted(@NotNull Project project,
- @NotNull String courseId,
- long exerciseId,
- @NotNull Map files) {
- ensureCacheLoaded(project);
-
- try {
- final String cacheKey = getCacheKey(courseId, exerciseId);
- final String currentHash = hashAllFiles(files);
- final JSONObject cachedHashesJson = submissionsCache.getValue(cacheKey, CachePreferences.PERMANENT);
-
- final SubmissionHashes cachedHashes = new SubmissionHashes(cachedHashesJson);
- cachedHashes.addHash(currentHash);
- submissionsCache.putValue(cacheKey, cachedHashes.toJsonObject(), CachePreferences.PERMANENT);
- } catch (UncheckedIOException | NoSuchAlgorithmException e) {
- // ignore potential exceptions
- }
- }
- }
-
- public static class FileBrowserImpl {
- private FileBrowserImpl() {
-
- }
-
- /**
- * Opens the file in the editor.
- */
- public static void navigateTo(File file, Project project) {
- var vf = LocalFileSystem.getInstance().findFileByIoFile(file);
- if (vf != null) {
- new OpenFileDescriptor(project, vf).navigate(true);
- }
- }
- }
-
- public static class VirtualFileFinderImpl {
- private VirtualFileFinderImpl() {
-
- }
-
- /**
- * Finds a file.
- */
- @Nullable
- public static VirtualFile findVirtualFile(File file) {
- return LocalFileSystem.getInstance().findFileByIoFile(file);
- }
- }
-
- public static class CollapsedPanelsImpl implements Interfaces.CollapsedPanels {
- @Override
- public void setCollapsed(@NotNull String title) {
- PluginSettings.getInstance().setCollapsed(title);
- }
-
- @Override
- public void setExpanded(@NotNull String title) {
- PluginSettings.getInstance().setExpanded(title);
- }
- }
-
- public static class ReadNewsImpl implements ReadNews {
- @Override
- public void setNewsRead(long id) {
- PluginSettings.getInstance().setNewsRead(id);
- }
-
- @Override
- public String getReadNews() {
- return PluginSettings.getInstance().getReadNews();
- }
- }
-
- public static class SubmissionGroupSelectorImpl implements SubmissionGroupSelector {
- private static final String JSON_ENTRY_NAME = "lastGroup";
- private static Cache groupsCache;
-
- private static void ensureCacheLoaded(@NotNull Project project) {
- if (groupsCache == null) {
- Path projectPath = Path.of(Objects.requireNonNull(project.getBasePath()));
- groupsCache = new JsonFileCache(
- projectPath.resolve(Path.of(Project.DIRECTORY_STORE_FOLDER, "a-plus-groups.json")));
- }
- }
-
- @NotNull
- private static String getCacheKey(@NotNull String courseId, long exerciseId) {
- return "lastGroup_c" + courseId + "_e" + exerciseId;
- }
-
- @NotNull
- private static JSONObject createCacheObjectForGroup(@NotNull Group currentGroup) {
- final JSONObject jsonObject = new JSONObject();
- jsonObject.put(JSON_ENTRY_NAME, currentGroup.getMemberwiseId());
-
- return jsonObject;
- }
-
- @Override
- public @Nullable String getLastSubmittedGroupId(@NotNull Project project, @NotNull String courseId,
- long exerciseId) {
- ensureCacheLoaded(project);
-
- final String cacheKey = getCacheKey(courseId, exerciseId);
- final JSONObject cachedGroupJson = groupsCache.getValue(cacheKey, CachePreferences.PERMANENT);
-
- if (cachedGroupJson == null) {
- return null;
- }
-
- // if null is returned, then there were no past submissions and any group is allowed
- return cachedGroupJson.optString(JSON_ENTRY_NAME);
- }
-
- @Override
- public void onAssignmentSubmitted(@NotNull Project project, @NotNull String courseId, long exerciseId,
- @NotNull Group group) {
- ensureCacheLoaded(project);
-
- final String cacheKey = getCacheKey(courseId, exerciseId);
- groupsCache.putValue(cacheKey, createCacheObjectForGroup(group), CachePreferences.PERMANENT);
- }
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ListDependenciesPolicy.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ListDependenciesPolicy.java
deleted file mode 100644
index b7490ed49..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ListDependenciesPolicy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.roots.LibraryOrderEntry;
-import com.intellij.openapi.roots.ModuleOrderEntry;
-import com.intellij.openapi.roots.RootPolicy;
-import java.util.List;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * This class is a {@link RootPolicy} that builds a list of the names of those
- * {@link com.intellij.openapi.roots.OrderEntry} objects that represents dependencies of an
- * {@link fi.aalto.cs.apluscourses.intellij.model.IntelliJComponent} object (that is, modules
- * and non-module-level libraries).
- */
-public class ListDependenciesPolicy extends RootPolicy> {
-
- @Override
- public List visitModuleOrderEntry(@NotNull ModuleOrderEntry moduleOrderEntry,
- List value) {
- value.add(moduleOrderEntry.getModuleName());
- return value;
- }
-
- @Override
- public List visitLibraryOrderEntry(@NotNull LibraryOrderEntry libraryOrderEntry,
- List value) {
- if (!libraryOrderEntry.isModuleLevel()) {
- value.add(libraryOrderEntry.getLibraryName());
- }
- return value;
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/PluginLoadUnloadEventsListener.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/PluginLoadUnloadEventsListener.java
deleted file mode 100644
index 5cbf2be70..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/PluginLoadUnloadEventsListener.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.ide.plugins.DynamicPluginListener;
-import com.intellij.ide.plugins.IdeaPluginDescriptor;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import org.jetbrains.annotations.NotNull;
-
-public class PluginLoadUnloadEventsListener implements DynamicPluginListener {
-
- @Override
- public void beforePluginUnload(@NotNull IdeaPluginDescriptor pluginDescriptor, boolean isUpdate) {
- PluginSettings.getInstance().unsetLocalIdeSettings();
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ProjectKey.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ProjectKey.java
deleted file mode 100644
index b3e9aa975..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ProjectKey.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A class that makes it easy to use projects as keys in maps. The equals and hashCode methods are
- * based on the project base path. No reference to the project is stored, only a string containing
- * the path.
- */
-public class ProjectKey {
- @NotNull
- private final String projectPath;
-
- /**
- * Construct an instance with the given project.
- */
- public ProjectKey(@Nullable Project project) {
- if (project == null || project.isDefault()) {
- this.projectPath = "";
- } else {
- this.projectPath = project.getBasePath();
- }
- }
-
- @Override
- public boolean equals(Object other) {
- if (!(other instanceof ProjectKey)) {
- return false;
- }
- return projectPath.equals(((ProjectKey) other).projectPath);
- }
-
- @Override
- public int hashCode() {
- return projectPath.hashCode();
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ProjectViewUtil.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ProjectViewUtil.java
deleted file mode 100644
index 162c620ae..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ProjectViewUtil.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.command.WriteCommandAction;
-import com.intellij.openapi.fileTypes.FileTypeManager;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
-
-public class ProjectViewUtil {
-
- private ProjectViewUtil() {
-
- }
-
- /**
- * Method that adds a new file (pattern) to the list of files not being shown in the Project UI.
- *
- * @param ignoredFileName a {@link String} name of the file to be ignored.
- * @param project a {@link Project} to ignore the file from.
- */
- public static void ignoreFileInProjectView(@NotNull String ignoredFileName,
- @NotNull Project project) {
- FileTypeManager fileTypeManager = FileTypeManager.getInstance();
-
- // The below is a fix for a past bug, see issue #996
- String ignoredFiles = fileTypeManager.getIgnoredFilesList()
- .replaceAll("([^;])(?:\\.repl-commands)+", "$1");
-
- WriteCommandAction.runWriteCommandAction(project, () -> fileTypeManager
- .setIgnoredFilesList(ignoredFiles + ";" + ignoredFileName));
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ReplChangesObserver.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ReplChangesObserver.java
deleted file mode 100644
index 0f01e1e44..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ReplChangesObserver.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.Disposable;
-import com.intellij.openapi.editor.EditorFactory;
-import com.intellij.openapi.editor.event.DocumentEvent;
-import com.intellij.openapi.editor.event.DocumentListener;
-import com.intellij.openapi.fileEditor.FileDocumentManager;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ProjectFileIndex;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.vfs.VirtualFile;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import org.jetbrains.annotations.NotNull;
-
-public class ReplChangesObserver {
- private static boolean documentListenerInstalled;
- private static final @NotNull Disposable disposable = Disposer.newDisposable();
- private static final Set modifiedModules = Collections.synchronizedSet(new HashSet<>());
-
- private ReplChangesObserver() {
-
- }
-
- /**
- * Triggered when a REPL has started for a particular module, indicating that all pending code changes
- * have been applied in the REPL as well.
- * @param module The module for which the REPL is being opened.
- */
- public static void onStartedRepl(@NotNull Module module) {
- if (!documentListenerInstalled) {
- EditorFactory.getInstance().getEventMulticaster().addDocumentListener(
- new ChangesListener(module.getProject()), disposable);
- documentListenerInstalled = true;
- }
-
- modifiedModules.remove(module);
- }
-
- /**
- * Triggered when a module undergoes some code change, which indicates that existing REPLs should
- * show a warning message that they're running an outdated version of the module.
- * @param module The module which has been changed.
- */
- public static void onModuleChanged(@NotNull Module module) {
- modifiedModules.add(module);
- }
-
- public static boolean hasModuleChanged(@NotNull Module module) {
- return modifiedModules.contains(module);
- }
-
- private static class ChangesListener implements DocumentListener {
- private final @NotNull Project project;
-
- public ChangesListener(@NotNull Project project) {
- this.project = project;
- }
-
- @Override
- public void documentChanged(@NotNull DocumentEvent event) {
- VirtualFile file = FileDocumentManager.getInstance().getFile(event.getDocument());
- if (file == null) {
- return;
- }
-
- if (!project.isDisposed() && project.isOpen()) {
- Module module = ProjectFileIndex.getInstance(project).getModuleForFile(file);
- if (module == null) {
- return;
- }
-
- ReplChangesObserver.onModuleChanged(module);
- }
- }
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ScalaReplObserver.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ScalaReplObserver.java
deleted file mode 100644
index 6d616d9d4..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/ScalaReplObserver.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.utils.DelegateTimerTask;
-import java.util.Timer;
-import org.jetbrains.annotations.NotNull;
-//import org.jetbrains.plugins.scala.console.ScalaConsoleInfo;
-
-public class ScalaReplObserver {
-
- private final @NotNull Project project;
- private final @NotNull String module;
- private final @NotNull Callback callback;
- private final @NotNull Timer timer = new Timer();
-
- /**
- * Instantiates a new ScalaReplObserver.
- *
- * @param project Project.
- * @param module Name of the module.
- * @param callback Who to call, when the REPL is open.
- */
- public ScalaReplObserver(@NotNull Project project, @NotNull String module, @NotNull Callback callback) {
- this.project = project;
- this.module = module;
- this.callback = callback;
- }
-
- public void start() {
- timer.schedule(new DelegateTimerTask(this::checkIsReplOpen), 500, 500);
- }
-
- public void stop() {
- timer.cancel();
- }
-
- private void checkIsReplOpen() {
- if (isReplOpen()) {
- stop();
- callback.onReplOpen();
- }
- }
-
- public boolean isReplOpen() {
- return isReplOpen(project, module);
- }
-
- /**
- * Returns true if the REPL for a given module is open.
- */
- public static boolean isReplOpen(@NotNull Project project, @NotNull String module) {
- return false; //TODO
-// return ScalaConsoleInfo.getConsole(project) != null
-// && ExecutionManagerImpl.getAllDescriptors(project).stream().anyMatch(d -> d.getDisplayName().contains("REPL")
-// && d.getDisplayName().contains(module));
- }
-
- public interface Callback {
- void onReplOpen();
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/SubmissionDownloader.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/SubmissionDownloader.java
deleted file mode 100644
index c2bae6129..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/SubmissionDownloader.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.module.ModuleManager;
-import com.intellij.openapi.project.Project;
-import fi.aalto.cs.apluscourses.intellij.notifications.DefaultNotifier;
-import fi.aalto.cs.apluscourses.intellij.notifications.MissingFileNotification;
-import fi.aalto.cs.apluscourses.intellij.notifications.Notifier;
-import fi.aalto.cs.apluscourses.intellij.services.Dialogs;
-import fi.aalto.cs.apluscourses.model.ComponentInstaller;
-import fi.aalto.cs.apluscourses.model.ComponentInstallerImpl;
-import fi.aalto.cs.apluscourses.model.Course;
-import fi.aalto.cs.apluscourses.model.CourseProject;
-import fi.aalto.cs.apluscourses.model.FileDoesNotExistException;
-import fi.aalto.cs.apluscourses.model.FileFinder;
-import fi.aalto.cs.apluscourses.model.Module;
-import fi.aalto.cs.apluscourses.model.exercise.Exercise;
-import fi.aalto.cs.apluscourses.model.exercise.SubmissionFileInfo;
-import fi.aalto.cs.apluscourses.model.exercise.SubmissionResult;
-import fi.aalto.cs.apluscourses.presentation.exercise.DownloadSubmissionViewModel;
-import fi.aalto.cs.apluscourses.services.PluginSettings;
-import fi.aalto.cs.apluscourses.ui.InstallerDialogs;
-import fi.aalto.cs.apluscourses.utils.APlusLogger;
-import fi.aalto.cs.apluscourses.utils.WindowUtil;
-import fi.aalto.cs.apluscourses.utils.async.SimpleAsyncTaskManager;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class SubmissionDownloader {
-
- private static final Logger logger = APlusLogger.logger;
-
- @NotNull
- private final Interfaces.AuthenticationProvider authenticationProvider;
-
- @NotNull
- private final FileFinder fileFinder;
-
- @NotNull
- private final Dialogs dialogs;
-
- @NotNull
- private final Notifier notifier;
-
- // TODO: store language and default group ID in the object model and read them from there
- private final Interfaces.LanguageSource languageSource;
-
- @NotNull
- private final ComponentInstaller.Factory componentInstallerFactory;
-
- @NotNull
- private final InstallerDialogs.Factory dialogsFactory;
- private final Interfaces.FileRefresher fileRefresher;
- private final Interfaces.FileBrowser fileBrowser;
- private final Interfaces.VirtualFileFinder virtualFileFinder;
-
-
- /**
- * Constructor with reasonable defaults.
- */
- public SubmissionDownloader() {
- this(
- project -> Optional.ofNullable(PluginSettings.getInstance().getCourseProject(project))
- .map(CourseProject::getAuthentication).orElse(null),
- VfsUtil::findFileInDirectory,
- Dialogs.DEFAULT,
- new DefaultNotifier(),
- project -> PluginSettings.getInstance().getCourseFileManager(project).getLanguage(),
- new ComponentInstallerImpl.FactoryImpl<>(new SimpleAsyncTaskManager()),
- InstallerDialogs::new,
- Interfaces.FileRefresherImpl::refreshPath,
- Interfaces.FileBrowserImpl::navigateTo,
- Interfaces.VirtualFileFinderImpl::findVirtualFile
- );
- }
-
-
- /**
- * Construct an exercise submission action with the given parameters. This constructor is useful
- * for testing purposes.
- */
- public SubmissionDownloader(@NotNull Interfaces.AuthenticationProvider authenticationProvider,
- @NotNull FileFinder fileFinder,
- @NotNull Dialogs dialogs,
- @NotNull Notifier notifier,
- @NotNull Interfaces.LanguageSource languageSource,
- @NotNull ComponentInstaller.Factory componentInstallerFactory,
- @NotNull InstallerDialogs.Factory dialogsFactory,
- @NotNull Interfaces.FileRefresher fileRefresher,
- @NotNull Interfaces.FileBrowser fileBrowser,
- @NotNull Interfaces.VirtualFileFinder virtualFileFinder) {
- this.authenticationProvider = authenticationProvider;
- this.fileFinder = fileFinder;
- this.dialogs = dialogs;
- this.notifier = notifier;
- this.languageSource = languageSource;
- this.componentInstallerFactory = componentInstallerFactory;
- this.dialogsFactory = dialogsFactory;
- this.fileRefresher = fileRefresher;
- this.fileBrowser = fileBrowser;
- this.virtualFileFinder = virtualFileFinder;
- }
-
- /**
- * Downloads a submission.
- **/
- public void downloadSubmission(@NotNull Project project, @NotNull Course course, @NotNull Exercise exercise,
- @NotNull SubmissionResult submissionResult) {
- var selectedModule = getSelectedModule(project, course, exercise);
-
- var installedModules = Arrays
- .stream(ModuleManager.getInstance(project).getModules())
- .map(com.intellij.openapi.module.Module::getName)
- .collect(Collectors.toList());
-
- var downloadSubmissionViewModel = new DownloadSubmissionViewModel(course, selectedModule, submissionResult.getId(),
- installedModules);
-
- WindowUtil.bringWindowToFront(project);
-
- if (!dialogs.create(downloadSubmissionViewModel, project).showAndGet()) {
- return;
- }
-
- var module = downloadSubmissionViewModel.selectedModule.get();
- logger.info("User-selected module: %s".formatted(module));
- var newName = downloadSubmissionViewModel.moduleName.get();
- logger.info("New module name: %s".formatted(newName));
-
- if (module == null || newName == null) {
- return;
- }
-
- var moduleCopy = module.copy(newName);
-
- var moduleVf = virtualFileFinder.findFile(moduleCopy.getFullPath().toFile());
-
- componentInstallerFactory.getInstallerFor(course, dialogsFactory.getDialogs(project), course.callbacks)
- .installAsync(List.of(moduleCopy),
- () -> fileRefresher.refreshPath(moduleVf,
- () -> downloadFiles(project,
- course,
- submissionResult.getFilesInfo().toArray(new SubmissionFileInfo[0]),
- moduleCopy)));
- }
-
- @Nullable
- private Module getSelectedModule(@NotNull Project project,
- @NotNull Course course,
- @NotNull Exercise exercise) {
- var language = languageSource.getLanguage(project);
- logger.info("Selected language: %s".formatted(language));
-
- var exerciseModules = course.getExerciseModules().get(exercise.getId());
-
- var selectedComponent = Optional
- .ofNullable(exerciseModules)
- .map(self -> self.get(language))
- .map(course::getComponentIfExists).orElse(null);
-
- Module selectedModule = selectedComponent instanceof Module ? (Module) selectedComponent : null;
-
- logger.info("Auto-selected module: %s".formatted(selectedModule));
- return selectedModule;
- }
-
- private void downloadFiles(@Nullable Project project,
- @NotNull Course course,
- SubmissionFileInfo @NotNull [] submissionFilesInfo,
- @NotNull Module module) {
- if (project == null) {
- logger.info("Project null");
- return;
- }
- course.validate();
-
- var auth = authenticationProvider.getAuthentication(project);
-
- logger.info("Starting download");
- for (var info : submissionFilesInfo) {
- try {
- var file = fileFinder.findFile(module.getFullPath(), info.getFileName()).toFile();
- logger.info("Found file: %s".formatted(file));
-// CoursesClient.fetch(new URL(info.getUrl()), file, auth);
-// logger.info("Fetched file");
-// fileBrowser.navigateTo(file, project);
-// logger.info("Opened file");
- } catch (FileDoesNotExistException ex) {
- logger.warn("File not found", ex);
- notifier.notifyAndHide(new MissingFileNotification(module.getPath(), info.getFileName(), true), project);
-// } catch (IOException ex) {
-// logger.warn("IOException while downloading submission", ex);
-// notifier.notifyAndHide(new NetworkErrorNotification(ex), project);
- }
- }
- logger.debug("Finished downloading submission");
- }
-}
diff --git a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/VfsUtil.java b/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/VfsUtil.java
deleted file mode 100644
index 6d94ec22f..000000000
--- a/src/main/java/fi/aalto/cs/apluscourses/intellij/utils/VfsUtil.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package fi.aalto.cs.apluscourses.intellij.utils;
-
-import com.intellij.openapi.vfs.VfsUtilCore;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileVisitor;
-import com.intellij.util.concurrency.annotations.RequiresReadLock;
-import fi.aalto.cs.apluscourses.utils.StringUtil;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class VfsUtil {
-
- private static final char PATH_SEPARATOR = '/';
-
- private VfsUtil() {
-
- }
-
- /**
- * Combines system independent paths.
- * Considers nulls as empty paths.
- */
- @NotNull
- public static String joinPaths(@Nullable String... paths) {
- return Arrays.stream(paths)
- .filter(Objects::nonNull)
- .map(path -> StringUtil.strip(path, PATH_SEPARATOR))
- .collect(Collectors.joining(String.valueOf(PATH_SEPARATOR)));
- }
-
- /**
- * Recursively looks for a file in the given directory with the given name.
- *
- * @param directory The directory from which the search is done.
- * @param filename The name of the file that is searched for.
- * @return A {@link Path} to the found file, or {@code null} if a file isn't found.
- */
- @RequiresReadLock
- @Nullable
- public static Path findFileInDirectory(@NotNull Path directory, @NotNull String filename) {
- VirtualFile virtualFile = com.intellij.openapi.vfs.VfsUtil.findFile(directory, true);
- FileFinderVirtualFileVisitor visitor = new FileFinderVirtualFileVisitor(filename);
- if (virtualFile == null) {
- return null;
- }
- VfsUtilCore.visitChildrenRecursively(virtualFile, visitor);
- return visitor.getPath();
- }
-
- static class FileFinderVirtualFileVisitor extends VirtualFileVisitor
+ 
+
+## Feedback and support
+
+Please report any issues, usability improvements, or feature requests to our
+YouTrack project
+(you will need to register).
+
+You are welcome to join our
+public Slack workspace.
+Before you do, please read our [Code of conduct](https://plugins.jetbrains.com/plugin/20158-writerside/docs/writerside-code-of-conduct.html).
+We assume that you’ve read and acknowledged it before joining.
+
+You can also always email us at [writerside@jetbrains.com](mailto:writerside@jetbrains.com).
+
+