Merge pull request #29 from lstreckeisen/update-architecture

Update architecture

Author: lstreckeisen

docs/architecture.dsl

@@ -13,11 +13,7 @@ workspace "ContextMapper IntelliJ Plugin" {
                     tag "Maintained"
                 }
 
-                cml = component "CML Editor Features" "Provides CML editor features" {
-                    tag "Maintained"
-                }
-
-                generators = component "CML Generators" "Generate additional resources from CML models" {
+                actions = component "CML Editor Actions" "Generate additional resources from CML models" {
                     tag "Maintained"
                 }
             }
@@ -66,20 +62,23 @@ workspace "ContextMapper IntelliJ Plugin" {
                 completionProvider = component "CML Completion Provider" {
                     tag "Maintained"
                 }
+
+                commandHandler = component "CML Command Handler" {
+                    tag "Maintained"
+                }
             }
         }
 
         pluginUser -> intelliJ.editor "uses"
-        intelliJ.cmPlugin -> intelliJ.lsp4ij "configures"
-        intelliJ.cmPlugin -> intelliJ.editor "extends"
+
         intelliJ.lsp4ij -> intelliJ.editor "integrates with"
         intelliJ.lsp4ij -> languageServer.server "starts"
         intelliJ.lsp4ij -> languageServer.server "communicates with"
         languageServer.server -> intelliJ.lsp4ij "provides editor services"
 
-        intelliJ.editor -> intelliJ.cmPlugin.generators "triggers"
+        intelliJ.editor -> intelliJ.cmPlugin.actions "triggers actions"
         intelliJ.cmPlugin.lsp4ijConfig -> intelliJ.lsp4ij "configures"
-        intelliJ.cmPlugin.cml -> intelliJ.editor "extends"
+        intelliJ.cmPlugin.actions -> intelliJ.lsp4ij "triggers command execution"
 
         languageServer.server.server -> languageServer.server.tokenProvider "requests tokens from"
         languageServer.server.server -> languageServer.server.semanticValidator "requests validation from"
@@ -88,6 +87,7 @@ workspace "ContextMapper IntelliJ Plugin" {
         languageServer.server.server -> languageServer.server.hoverProvider "requests hover documentation from"
         languageServer.server.server -> languageServer.server.formatters "gets formatting changes from"
         languageServer.server.server -> languageServer.server.completionProvider "requests autocomplete suggestions from"
+        languageServer.server.server -> languageServer.server.commandHandler "trigger command/generator execution"
     }
 
     views {

src/main/kotlin/org/contextmapper/intellij/actions/PlantUMLAction.kt

@@ -6,7 +6,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.redhat.devtools.lsp4ij.commands.CommandExecutor
-import org.contextmapper.intellij.generators.ContextMapperGenerator
+import org.contextmapper.intellij.actions.generators.ContextMapperGenerator
 import org.contextmapper.intellij.notifications.showErrorNotification
 import org.contextmapper.intellij.notifications.showInfoNotification
 import org.eclipse.lsp4j.Command

src/main/kotlin/org/contextmapper/intellij/generators/ContextMapperGenerator.kt renamed to src/main/kotlin/org/contextmapper/intellij/actions/generators/ContextMapperGenerator.kt

@@ -1,4 +1,4 @@
-package org.contextmapper.intellij.generators
+package org.contextmapper.intellij.actions.generators
 
 import com.intellij.openapi.project.Project
 import com.redhat.devtools.lsp4ij.commands.CommandExecutor

src/main/kotlin/org/contextmapper/intellij/generators/ContextMapperGeneratorException.kt renamed to src/main/kotlin/org/contextmapper/intellij/actions/generators/ContextMapperGeneratorException.kt

@@ -1,3 +1,3 @@
-package org.contextmapper.intellij.generators
+package org.contextmapper.intellij.actions.generators
 
 class ContextMapperGeneratorException(message: String, cause: Throwable? = null) : Exception(message, cause)

src/main/kotlin/org/contextmapper/intellij/generators/GeneratorResult.kt renamed to src/main/kotlin/org/contextmapper/intellij/actions/generators/GeneratorResult.kt

@@ -1,3 +1,3 @@
-package org.contextmapper.intellij.generators
+package org.contextmapper.intellij.actions.generators
 
 data class GeneratorResult(val generatedFiles: List<String>)

src/test/kotlin/org/contextmapper/intellij/generators/ContextMapperGeneratorTest.kt renamed to src/test/kotlin/org/contextmapper/intellij/actions/generators/ContextMapperGeneratorTest.kt

@@ -1,4 +1,4 @@
-package org.contextmapper.intellij.generators
+package org.contextmapper.intellij.actions.generators
 
 import com.intellij.openapi.project.Project
 import com.redhat.devtools.lsp4ij.commands.CommandExecutor