From 0b8792e4bab8e1b4de0f61aa8296b34161639e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedek=20Horv=C3=A1th?= Date: Tue, 14 May 2024 11:24:37 +0200 Subject: [PATCH] fix(mps-sync-plugin): replace intendedFinalization annotation field with a generic message --- .../org/modelix/mps/sync/ISyncService.kt | 4 ++-- .../org/modelix/mps/sync/SyncServiceImpl.kt | 2 +- .../sync/bindings/BindingSortComparator.kt | 2 +- .../mps/sync/bindings/BindingsRegistry.kt | 6 +++--- .../modelix/mps/sync/bindings/EmptyBinding.kt | 2 +- .../modelix/mps/sync/bindings/ModelBinding.kt | 2 +- .../mps/sync/bindings/ModuleBinding.kt | 2 +- .../mps/sync/modelix/BranchRegistry.kt | 2 +- .../sync/modelix/ItemAlreadySynchronized.kt | 14 ++++++------- .../mps/sync/modelix/ModelixBranchListener.kt | 2 +- .../mps/sync/mps/ActiveMpsProjectInjector.kt | 2 +- .../sync/mps/ApplicationLifecycleTracker.kt | 2 +- .../sync/mps/ModelPersistenceWithFixedId.kt | 4 ++-- .../mps/sync/mps/RepositoryChangeListener.kt | 2 +- .../mps/sync/mps/factories/SNodeFactory.kt | 4 ++-- .../sync/mps/factories/SolutionProducer.kt | 2 +- .../sync/mps/notifications/AlertNotifier.kt | 10 +++++----- .../sync/mps/notifications/BalloonNotifier.kt | 4 ++-- .../mps/sync/mps/notifications/INotifier.kt | 4 ++-- .../InjectableNotifierWrapper.kt | 2 +- .../sync/mps/notifications/NoOpNotifier.kt | 2 +- .../mps/sync/mps/util/ModelRenameHelper.kt | 2 +- .../modelix/mps/sync/mps/util/SModelExt.kt | 10 +++++----- .../modelix/mps/sync/mps/util/SModuleExt.kt | 4 ++-- .../mps/sync/mps/util/SModuleReference.kt | 2 +- .../org/modelix/mps/sync/mps/util/SNodeExt.kt | 2 +- .../mps/sync/tasks/FuturesWaitQueue.kt | 6 +++--- .../modelix/mps/sync/tasks/SyncDirection.kt | 2 +- .../org/modelix/mps/sync/tasks/SyncLock.kt | 4 ++-- .../org/modelix/mps/sync/tasks/SyncQueue.kt | 2 +- .../org/modelix/mps/sync/tasks/SyncTask.kt | 6 +++--- .../SynchronizationException.kt | 8 ++++---- .../transformation/cache/MpsToModelixMap.kt | 8 ++++---- .../incremental/ModelixTreeChangeVisitor.kt | 2 +- .../initial/ITreeToSTreeTransformer.kt | 2 +- .../transformers/ModelTransformer.kt | 4 ++-- .../transformers/ModuleTransformer.kt | 2 +- .../transformers/NodeTransformer.kt | 2 +- .../incremental/ModelChangeListener.kt | 2 +- .../incremental/ModuleChangeListener.kt | 2 +- .../incremental/NodeChangeListener.kt | 2 +- .../mpsToModelix/initial/ModelSynchronizer.kt | 4 ++-- .../initial/ModuleSynchronizer.kt | 2 +- .../mpsToModelix/initial/NodeSynchronizer.kt | 4 ++-- .../org/modelix/mps/sync/util/BooleanUtil.kt | 2 ++ .../mps/sync/util/CompletableFutureExt.kt | 4 ++-- .../org/modelix/mps/sync/util/INodeExt.kt | 20 +++++++++---------- .../mps/sync/util/SynchronizedCollections.kt | 4 ++-- .../sync/util/WaitForSubtaskCompletionUtil.kt | 6 +++--- .../mps/sync/plugin/ModelSyncService.kt | 2 +- .../mps/sync/plugin/action/ModelSyncAction.kt | 2 +- .../sync/plugin/action/ModelixActionGroup.kt | 2 +- .../sync/plugin/action/ModuleSyncAction.kt | 2 +- .../sync/plugin/action/UnbindModelAction.kt | 2 +- .../sync/plugin/action/UnbindModuleAction.kt | 2 +- .../CloudResourcesConfigurationComponent.kt | 2 +- .../plugin/gui/BindingsComboBoxRefresher.kt | 2 +- .../sync/plugin/gui/ModelSyncGuiFactory.kt | 2 +- .../mps/sync/plugin/icons/CloudIcons.kt | 2 +- .../sync/plugin/icons/LetterInSquareIcon.kt | 2 +- .../sync/plugin/indicator/CloudIndicator.kt | 2 +- .../MPSSynchronizationAppLifecycleListener.kt | 2 +- ...MPSSynchronizationDynamicPluginListener.kt | 2 +- 63 files changed, 113 insertions(+), 111 deletions(-) diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/ISyncService.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/ISyncService.kt index 50dc8e20..18ca9add 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/ISyncService.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/ISyncService.kt @@ -11,7 +11,7 @@ import java.io.IOException import java.net.URL import java.util.concurrent.CompletableFuture -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") interface ISyncService : AutoCloseable { @Throws(IOException::class) @@ -34,7 +34,7 @@ interface ISyncService : AutoCloseable { fun setActiveProject(project: Project) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") interface IBinding { fun activate(callback: Runnable? = null) diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/SyncServiceImpl.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/SyncServiceImpl.kt index 8a50d147..d9867a94 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/SyncServiceImpl.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/SyncServiceImpl.kt @@ -28,7 +28,7 @@ import org.modelix.mps.sync.transformation.mpsToModelix.initial.ModuleSynchroniz import java.io.IOException import java.net.URL -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class SyncServiceImpl(userNotifier: INotifier) : ISyncService { private val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/BindingSortComparator.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/BindingSortComparator.kt index c029c242..a93f1ab9 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/BindingSortComparator.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/BindingSortComparator.kt @@ -19,7 +19,7 @@ package org.modelix.mps.sync.bindings import org.modelix.kotlin.utils.UnstableModelixFeature import org.modelix.mps.sync.IBinding -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class BindingSortComparator : Comparator { /** * ModelBindings should come first, then ModuleBindings. If both bindings have the same type, then they are sorted lexicographically. diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/BindingsRegistry.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/BindingsRegistry.kt index c0eca4a0..e3225a35 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/BindingsRegistry.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/BindingsRegistry.kt @@ -26,7 +26,7 @@ import org.modelix.mps.sync.util.synchronizedLinkedHashSet import org.modelix.mps.sync.util.synchronizedMap import java.util.concurrent.LinkedBlockingQueue -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object BindingsRegistry { private val modelBindingsByModule = synchronizedMap>() @@ -88,13 +88,13 @@ object BindingsRegistry { changedBindings.put(BindingState(binding, BindingLifecycleState.REMOVE)) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class BindingState( val binding: IBinding, val state: BindingLifecycleState, ) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") enum class BindingLifecycleState { ADD, REMOVE, diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/EmptyBinding.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/EmptyBinding.kt index eacd669c..62592c35 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/EmptyBinding.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/EmptyBinding.kt @@ -21,7 +21,7 @@ import org.modelix.mps.sync.IBinding import org.modelix.mps.sync.util.completeWithDefault import java.util.concurrent.CompletableFuture -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class EmptyBinding : IBinding { override fun activate(callback: Runnable?) {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/ModelBinding.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/ModelBinding.kt index de5f22b3..b6ce6862 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/ModelBinding.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/ModelBinding.kt @@ -32,7 +32,7 @@ import org.modelix.mps.sync.transformation.mpsToModelix.incremental.NodeChangeLi import org.modelix.mps.sync.util.completeWithDefault import java.util.concurrent.CompletableFuture -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelBinding(val model: SModelBase, branch: IBranch) : IBinding { private val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/ModuleBinding.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/ModuleBinding.kt index 2224c76c..c58532ae 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/ModuleBinding.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/bindings/ModuleBinding.kt @@ -33,7 +33,7 @@ import org.modelix.mps.sync.util.completeWithDefault import org.modelix.mps.sync.util.waitForCompletionOfEach import java.util.concurrent.CompletableFuture -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModuleBinding(val module: AbstractModule, branch: IBranch) : IBinding { private val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/BranchRegistry.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/BranchRegistry.kt index 7e6296bb..24632329 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/BranchRegistry.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/BranchRegistry.kt @@ -27,7 +27,7 @@ import org.modelix.model.lazy.BranchReference import org.modelix.model.mpsadapters.MPSLanguageRepository import org.modelix.mps.sync.mps.RepositoryChangeListener -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object BranchRegistry : AutoCloseable { var branch: IBranch? = null diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/ItemAlreadySynchronized.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/ItemAlreadySynchronized.kt index d455a975..3b9960eb 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/ItemAlreadySynchronized.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/ItemAlreadySynchronized.kt @@ -14,34 +14,34 @@ import org.modelix.kotlin.utils.UnstableModelixFeature * Module C to the server. So in this case Module A just creates this token to let the sync flow know that Module C * does not have to be synced again. */ -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") abstract class ItemAlreadySynchronized(val item: Any) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelAlreadySynchronized(val model: SModel) : ItemAlreadySynchronized(model) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModuleAlreadySynchronized(val module: SModule) : ItemAlreadySynchronized(module) /** * An exception to show that the referred item is already synchronized to Modelix. */ -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") abstract class ItemAlreadySynchronizedException(val item: Any, message: String) : Exception(message) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelAlreadySynchronizedException(val model: SModel) : ItemAlreadySynchronizedException( model, "Model '${model.name}' in Module '${model.module?.moduleName}' already exists on the server, therefore it and its parent module will not be synchronized completely. Remove the parent module from the project and synchronize it from the server instead.", ) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModuleAlreadySynchronizedException(val module: SModule) : ItemAlreadySynchronizedException( module, "Module '${module.moduleName}' already exists on the server, therefore it will not be synchronized. Remove it from the project and synchronize it from the server instead.", ) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class NodeAlreadySynchronizedException(val node: SNode) : ItemAlreadySynchronizedException( node, "Node '${node.name}' already exists on server, therefore it will not be synched. Remove its parent node or its parent model and synchronize the parent model from the server instead.", diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/ModelixBranchListener.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/ModelixBranchListener.kt index a26f86d7..f98749f0 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/ModelixBranchListener.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/modelix/ModelixBranchListener.kt @@ -24,7 +24,7 @@ import org.modelix.model.client2.ReplicatedModel import org.modelix.model.mpsadapters.MPSLanguageRepository import org.modelix.mps.sync.transformation.modelixToMps.incremental.ModelixTreeChangeVisitor -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelixBranchListener( replicatedModel: ReplicatedModel, languageRepository: MPSLanguageRepository, diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ActiveMpsProjectInjector.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ActiveMpsProjectInjector.kt index 6b1cefa9..5f60fe40 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ActiveMpsProjectInjector.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ActiveMpsProjectInjector.kt @@ -22,7 +22,7 @@ import jetbrains.mps.ide.project.ProjectHelper import jetbrains.mps.project.MPSProject import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object ActiveMpsProjectInjector { // TODO what shall happen if we switch MPSProjects? Some threads might still be working on the old MPSProject. (with other words: search for all places where this field is referred to and think about if it can cause trouble if we change this reference to another one suddenly..) diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ApplicationLifecycleTracker.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ApplicationLifecycleTracker.kt index a4908c41..05614008 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ApplicationLifecycleTracker.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ApplicationLifecycleTracker.kt @@ -18,7 +18,7 @@ package org.modelix.mps.sync.mps import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object ApplicationLifecycleTracker { var applicationClosing = false } diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ModelPersistenceWithFixedId.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ModelPersistenceWithFixedId.kt index 5c046335..5a34b0f1 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ModelPersistenceWithFixedId.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/ModelPersistenceWithFixedId.kt @@ -44,7 +44,7 @@ import java.io.IOException * Uses the provided model ID instead of SModelId.generate(). * Everything else is just copied from DefaultModelPersistence. */ -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") open class ModelPersistenceWithFixedId(val moduleRef: SModuleReference, val modelId: SModelId) : DefaultModelPersistence() { @@ -69,7 +69,7 @@ open class ModelPersistenceWithFixedId(val moduleRef: SModuleReference, val mode } } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") open class ModelPersistenceFacility(modelFactory: DefaultModelPersistence, dataSource: StreamDataSource) : LazyLoadFacility(modelFactory, dataSource, true) { protected val source0: StreamDataSource diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/RepositoryChangeListener.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/RepositoryChangeListener.kt index a8a579b4..c9cd5653 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/RepositoryChangeListener.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/RepositoryChangeListener.kt @@ -24,7 +24,7 @@ import org.modelix.model.api.ITree import org.modelix.mps.sync.bindings.BindingsRegistry import org.modelix.mps.sync.transformation.mpsToModelix.initial.NodeSynchronizer -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class RepositoryChangeListener(branch: IBranch) : SRepositoryListenerBase() { private val bindingsRegistry = BindingsRegistry diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/factories/SNodeFactory.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/factories/SNodeFactory.kt index 4ea02826..9c0f3a49 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/factories/SNodeFactory.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/factories/SNodeFactory.kt @@ -41,7 +41,7 @@ import org.modelix.mps.sync.transformation.cache.MpsToModelixMap import org.modelix.mps.sync.util.nodeIdAsLong import org.modelix.mps.sync.util.waitForCompletionOfEachTask -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class SNodeFactory( private val conceptRepository: MPSLanguageRepository, private val nodeMap: MpsToModelixMap, @@ -157,7 +157,7 @@ class SNodeFactory( fun clearResolvableReferences() = resolvableReferences.clear() } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class ResolvableReference( val source: SNode, val reference: SReferenceLink, diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/factories/SolutionProducer.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/factories/SolutionProducer.kt index c8bfc3dc..3ff5c02d 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/factories/SolutionProducer.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/factories/SolutionProducer.kt @@ -34,7 +34,7 @@ import org.modelix.mps.sync.mps.ActiveMpsProjectInjector import java.io.File // TODO hacky solution. A nicer one could be: https://github.com/JetBrains/MPS/blob/master/workbench/mps-platform/jetbrains.mps.ide.platform/source_gen/jetbrains/mps/project/modules/SolutionProducer.java -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class SolutionProducer { private val project diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/AlertNotifier.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/AlertNotifier.kt index 29042360..9ba4e028 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/AlertNotifier.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/AlertNotifier.kt @@ -7,7 +7,7 @@ import org.modelix.kotlin.utils.UnstableModelixFeature import java.awt.Color import javax.swing.JComponent -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class AlertNotifier(private val project: Project, private val title: String = "Modelix Sync Plugin") : INotifier { override fun error(message: String, responseListener: UserResponseListener?) { @@ -34,7 +34,7 @@ class AlertNotifier(private val project: Project, private val title: String = "M } } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") private abstract class ModelixDialog(project: Project, title: String, message: String, color: Color) : DialogWrapper(project) { @@ -52,14 +52,14 @@ private abstract class ModelixDialog(project: Project, title: String, message: S override fun createCenterPanel(): JComponent? = null } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") private class ModelixErrorDialog(project: Project, title: String, message: String) : ModelixDialog(project, title, message, MessageType.ERROR.titleForeground) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") private class ModelixWarningDialog(project: Project, title: String, message: String) : ModelixDialog(project, title, message, MessageType.WARNING.titleForeground) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") private class ModelixInfoDialog(project: Project, title: String, message: String) : ModelixDialog(project, title, message, MessageType.INFO.titleForeground) diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/BalloonNotifier.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/BalloonNotifier.kt index 9dd34cb4..e20357e8 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/BalloonNotifier.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/BalloonNotifier.kt @@ -8,7 +8,7 @@ import com.intellij.openapi.project.Project import org.modelix.kotlin.utils.UnstableModelixFeature import javax.swing.event.HyperlinkEvent -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class BalloonNotifier( private val project: Project, private val title: String = "Modelix Sync Plugin", @@ -38,7 +38,7 @@ class BalloonNotifier( } } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") private class UrlListenerToUserResponseAdapter( private val userResponseListener: UserResponseListener?, ) : NotificationListener { diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/INotifier.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/INotifier.kt index 3eca2735..7cbfeafb 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/INotifier.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/INotifier.kt @@ -2,7 +2,7 @@ package org.modelix.mps.sync.mps.notifications import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") interface INotifier { fun error(message: String, responseListener: UserResponseListener? = null) @@ -12,7 +12,7 @@ interface INotifier { fun info(message: String, responseListener: UserResponseListener? = null) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun interface UserResponseListener { fun userResponded(response: UserResponse) diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/InjectableNotifierWrapper.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/InjectableNotifierWrapper.kt index bafc5c86..d69ac4ea 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/InjectableNotifierWrapper.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/InjectableNotifierWrapper.kt @@ -3,7 +3,7 @@ package org.modelix.mps.sync.mps.notifications import mu.KLogger import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object InjectableNotifierWrapper { var notifier: INotifier = NoOpNotifier() diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/NoOpNotifier.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/NoOpNotifier.kt index af18a273..4011c828 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/NoOpNotifier.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/notifications/NoOpNotifier.kt @@ -2,7 +2,7 @@ package org.modelix.mps.sync.mps.notifications import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class NoOpNotifier : INotifier { override fun error(message: String, responseListener: UserResponseListener?) {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/ModelRenameHelper.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/ModelRenameHelper.kt index 85a1470d..19cde84d 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/ModelRenameHelper.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/ModelRenameHelper.kt @@ -26,7 +26,7 @@ import org.jetbrains.mps.openapi.module.SModule import org.modelix.kotlin.utils.UnstableModelixFeature import org.modelix.mps.sync.mps.ActiveMpsProjectInjector -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelRenameHelper(private val model: EditableSModelBase) { val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModelExt.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModelExt.kt index 2e2888ba..c386e3fc 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModelExt.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModelExt.kt @@ -22,30 +22,30 @@ import org.jetbrains.mps.openapi.model.SModel import org.jetbrains.mps.openapi.module.SModuleReference import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun SModel.addDevKit(devKitModuleReference: SModuleReference) { require(this is SModelDescriptorStub) { "Model ${this.modelId} must be an SModelDescriptorStub" } this.addDevKit(devKitModuleReference) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun SModel.deleteDevKit(devKitModuleReference: SModuleReference) { require(this is SModelDescriptorStub) { "Model ${this.modelId} must be an SModelDescriptorStub" } this.deleteDevKit(devKitModuleReference) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun SModel.addLanguageImport(sLanguage: SLanguage, version: Int) { require(this is SModelDescriptorStub) { "Model ${this.modelId} must be an SModelDescriptorStub" } this.addLanguage(sLanguage) this.setLanguageImportVersion(sLanguage, version) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun SModel.deleteLanguage(sLanguage: SLanguage) { require(this is SModelDescriptorStub) { "Model ${this.modelId} must be an SModelDescriptorStub" } this.deleteLanguageId(sLanguage) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun SModel.getModelixId() = this.modelId.toString() diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModuleExt.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModuleExt.kt index 930809d2..f5cc3c63 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModuleExt.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModuleExt.kt @@ -26,7 +26,7 @@ import org.jetbrains.mps.openapi.module.SModule import org.modelix.kotlin.utils.UnstableModelixFeature import org.modelix.mps.sync.mps.ModelPersistenceWithFixedId -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun SModule.createModel(name: String, id: SModelId): SModel? { val modelName = SModelName(name) val modelRoot = this.modelRoots.filterIsInstance().firstOrNull { it.canCreateModel(modelName) } @@ -38,5 +38,5 @@ fun SModule.createModel(name: String, id: SModelId): SModel? { return null } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun SModule.getModelixId() = this.moduleId.toString() diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModuleReference.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModuleReference.kt index f871a7e0..b6da2c97 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModuleReference.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SModuleReference.kt @@ -3,5 +3,5 @@ package org.modelix.mps.sync.mps.util import org.jetbrains.mps.openapi.module.SModuleReference import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun SModuleReference.getModelixId() = this.moduleId.toString() diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SNodeExt.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SNodeExt.kt index cd93d02c..40b20654 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SNodeExt.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/mps/util/SNodeExt.kt @@ -3,5 +3,5 @@ package org.modelix.mps.sync.mps.util import org.jetbrains.mps.openapi.model.SNode import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun SNode.getModelixId() = this.nodeId.toString() diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/FuturesWaitQueue.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/FuturesWaitQueue.kt index ee9aad1e..c0a4ce9c 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/FuturesWaitQueue.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/FuturesWaitQueue.kt @@ -26,7 +26,7 @@ import java.util.concurrent.LinkedBlockingQueue import java.util.stream.Collectors import java.util.stream.Stream -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object FuturesWaitQueue : Runnable, AutoCloseable { private val logger = KotlinLogging.logger {} @@ -174,10 +174,10 @@ object FuturesWaitQueue : Runnable, AutoCloseable { } } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class FutureWithPredecessors(val predecessors: Set>, val future: FillableFuture) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class FillableFuture( val future: CompletableFuture, val shallBeFilled: Boolean = false, diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncDirection.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncDirection.kt index 3625d8de..6a40a7fe 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncDirection.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncDirection.kt @@ -18,7 +18,7 @@ package org.modelix.mps.sync.tasks import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") enum class SyncDirection { MODELIX_TO_MPS, MPS_TO_MODELIX, diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncLock.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncLock.kt index f13e16ef..e3363dbc 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncLock.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncLock.kt @@ -18,7 +18,7 @@ package org.modelix.mps.sync.tasks import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") enum class SyncLock { MPS_WRITE, MPS_READ, @@ -27,7 +27,7 @@ enum class SyncLock { NONE, } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class SnycLockComparator : Comparator { /** diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncQueue.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncQueue.kt index af08c3f8..64299de5 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncQueue.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncQueue.kt @@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.Executors -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object SyncQueue : AutoCloseable { private val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncTask.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncTask.kt index 10428c95..bd0f79d1 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncTask.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/tasks/SyncTask.kt @@ -19,7 +19,7 @@ package org.modelix.mps.sync.tasks import org.modelix.kotlin.utils.UnstableModelixFeature import java.util.concurrent.CompletableFuture -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class SyncTask( requiredLocks: LinkedHashSet, val syncDirection: SyncDirection, @@ -33,7 +33,7 @@ class SyncTask( private val stackTrace: List = Thread.currentThread().stackTrace.toList() } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ContinuableSyncTask(private val previousTask: SyncTask) { fun continueWith( @@ -61,5 +61,5 @@ class ContinuableSyncTask(private val previousTask: SyncTask) { fun getResult() = previousTask.result } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") typealias SyncTaskAction = (Any?) -> Any? diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/SynchronizationException.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/SynchronizationException.kt index 44dac06c..92e93acb 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/SynchronizationException.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/SynchronizationException.kt @@ -2,17 +2,17 @@ package org.modelix.mps.sync.transformation import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") abstract class SynchronizationException(override val message: String, cause: Throwable? = null) : Exception(message, cause) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelixToMpsSynchronizationException(message: String, cause: Throwable? = null) : SynchronizationException("Error occurred, while synchronizing from the server: $message", cause) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class MpsToModelixSynchronizationException(message: String, cause: Throwable? = null) : SynchronizationException("Error occurred, while synchronizing to the server: $message", cause) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") const val pleaseCheckLogs = "The error provided no further information, please check logs for details." diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/cache/MpsToModelixMap.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/cache/MpsToModelixMap.kt index f09cb235..3b35d71f 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/cache/MpsToModelixMap.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/cache/MpsToModelixMap.kt @@ -32,7 +32,7 @@ import org.modelix.mps.sync.util.synchronizedMap * - use with caution, otherwise this cache may cause memory leaks * - if you add a new Map as a field in the class, then please also add it to the `remove`, `isMappedToMps`, and `isMappedToModelix` methods below */ -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object MpsToModelixMap { private val nodeToModelixId = synchronizedMap() @@ -229,11 +229,11 @@ object MpsToModelixMap { fun isMappedToModelix(node: SNode) = this[node] != null } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class ModelWithModelReference(val source: SModel, val modelReference: SModelReference) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class ModelWithModuleReference(val source: SModel, val moduleReference: SModuleReference) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class ModuleWithModuleReference(val source: SModule, val moduleReference: SModuleReference) diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/incremental/ModelixTreeChangeVisitor.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/incremental/ModelixTreeChangeVisitor.kt index 3aee4e79..00df30df 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/incremental/ModelixTreeChangeVisitor.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/incremental/ModelixTreeChangeVisitor.kt @@ -44,7 +44,7 @@ import org.modelix.mps.sync.util.isModuleDependency import org.modelix.mps.sync.util.isSingleLanguageDependency import org.modelix.mps.sync.util.nodeIdAsLong -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelixTreeChangeVisitor( private val replicatedModel: ReplicatedModel, branch: IBranch, diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/initial/ITreeToSTreeTransformer.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/initial/ITreeToSTreeTransformer.kt index 765aeb6e..d8452477 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/initial/ITreeToSTreeTransformer.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/initial/ITreeToSTreeTransformer.kt @@ -33,7 +33,7 @@ import org.modelix.mps.sync.util.nodeIdAsLong import java.util.concurrent.CompletableFuture import java.util.concurrent.atomic.AtomicReference -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ITreeToSTreeTransformer(private val branch: IBranch, mpsLanguageRepository: MPSLanguageRepository) { private val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/ModelTransformer.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/ModelTransformer.kt index 942616b6..7771d381 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/ModelTransformer.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/ModelTransformer.kt @@ -59,7 +59,7 @@ import org.modelix.mps.sync.util.isModel import org.modelix.mps.sync.util.nodeIdAsLong import org.modelix.mps.sync.util.waitForCompletionOfEachTask -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelTransformer(private val branch: IBranch, mpsLanguageRepository: MPSLanguageRepository) { private val logger = KotlinLogging.logger {} @@ -342,7 +342,7 @@ class ModelTransformer(private val branch: IBranch, mpsLanguageRepository: MPSLa } } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class ResolvableModelImport( val source: SModel, val targetModelId: String, diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/ModuleTransformer.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/ModuleTransformer.kt index 85ad3726..2da8cf00 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/ModuleTransformer.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/ModuleTransformer.kt @@ -56,7 +56,7 @@ import org.modelix.mps.sync.util.waitForCompletionOfEachTask import java.text.ParseException import java.util.concurrent.CompletableFuture -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModuleTransformer(private val branch: IBranch, mpsLanguageRepository: MPSLanguageRepository) { companion object { diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/NodeTransformer.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/NodeTransformer.kt index 04b328ac..59af90cc 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/NodeTransformer.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/modelixToMps/transformers/NodeTransformer.kt @@ -52,7 +52,7 @@ import org.modelix.mps.sync.util.nodeIdAsLong import java.util.UUID import kotlin.reflect.KFunction2 -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class NodeTransformer(private val branch: IBranch, mpsLanguageRepository: MPSLanguageRepository) { private val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/ModelChangeListener.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/ModelChangeListener.kt index b0da8e14..04958b6f 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/ModelChangeListener.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/ModelChangeListener.kt @@ -35,7 +35,7 @@ import org.modelix.mps.sync.mps.ApplicationLifecycleTracker import org.modelix.mps.sync.transformation.mpsToModelix.initial.ModelSynchronizer import org.modelix.mps.sync.transformation.mpsToModelix.initial.NodeSynchronizer -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelChangeListener(branch: IBranch, private val binding: ModelBinding) : SModelListener { private val modelSynchronizer = ModelSynchronizer(branch) diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/ModuleChangeListener.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/ModuleChangeListener.kt index 3239331b..eb3dd774 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/ModuleChangeListener.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/ModuleChangeListener.kt @@ -51,7 +51,7 @@ import org.modelix.mps.sync.util.waitForCompletionOfEach import org.modelix.mps.sync.util.waitForCompletionOfEachTask import java.util.concurrent.CompletableFuture -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModuleChangeListener(private val branch: IBranch) : SModuleListener { private val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/NodeChangeListener.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/NodeChangeListener.kt index e79cf580..92e9cef2 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/NodeChangeListener.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/incremental/NodeChangeListener.kt @@ -26,7 +26,7 @@ import org.modelix.model.api.IBranch import org.modelix.model.mpsadapters.MPSProperty import org.modelix.mps.sync.transformation.mpsToModelix.initial.NodeSynchronizer -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class NodeChangeListener(branch: IBranch) : SNodeChangeListener { private val synchronizer = NodeSynchronizer(branch) diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/ModelSynchronizer.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/ModelSynchronizer.kt index ea69d2c4..7f79e2a0 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/ModelSynchronizer.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/ModelSynchronizer.kt @@ -44,7 +44,7 @@ import org.modelix.mps.sync.util.nodeIdAsLong import org.modelix.mps.sync.util.synchronizedLinkedHashSet import org.modelix.mps.sync.util.waitForCompletionOfEachTask -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelSynchronizer(private val branch: IBranch, postponeReferenceResolution: Boolean = false) { private val logger = KotlinLogging.logger {} @@ -299,7 +299,7 @@ class ModelSynchronizer(private val branch: IBranch, postponeReferenceResolution } } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class CloudResolvableModelImport( val sourceModel: SModel, val targetModel: SModel, diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/ModuleSynchronizer.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/ModuleSynchronizer.kt index ad3c883b..8cecc940 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/ModuleSynchronizer.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/ModuleSynchronizer.kt @@ -51,7 +51,7 @@ import org.modelix.mps.sync.util.waitForCompletionOfEachTask import java.util.Collections import java.util.concurrent.CompletableFuture -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModuleSynchronizer(private val branch: IBranch) { private val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/NodeSynchronizer.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/NodeSynchronizer.kt index c146c4b9..42d98804 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/NodeSynchronizer.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/transformation/mpsToModelix/initial/NodeSynchronizer.kt @@ -41,7 +41,7 @@ import org.modelix.mps.sync.tasks.SyncQueue import org.modelix.mps.sync.transformation.cache.MpsToModelixMap import org.modelix.mps.sync.util.nodeIdAsLong -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class NodeSynchronizer( private val branch: IBranch, private val resolvableReferences: MutableCollection? = null, @@ -180,7 +180,7 @@ class NodeSynchronizer( } } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") data class CloudResolvableReference( val sourceNode: INode, val referenceLink: IReferenceLink, diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/BooleanUtil.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/BooleanUtil.kt index 3c394ca8..b13fb996 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/BooleanUtil.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/BooleanUtil.kt @@ -16,8 +16,10 @@ package org.modelix.mps.sync.util +import org.modelix.kotlin.utils.UnstableModelixFeature import java.text.ParseException +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object BooleanUtil { /** diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/CompletableFutureExt.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/CompletableFutureExt.kt index 83b129da..c40c3d4c 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/CompletableFutureExt.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/CompletableFutureExt.kt @@ -19,7 +19,7 @@ package org.modelix.mps.sync.util import org.modelix.kotlin.utils.UnstableModelixFeature import java.util.concurrent.CompletableFuture -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun CompletableFuture.bindTo(other: CompletableFuture): CompletableFuture { this.handle { result, throwable -> if (throwable != null) { @@ -31,7 +31,7 @@ fun CompletableFuture.bindTo(other: CompletableFuture): CompletableF return this } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun CompletableFuture.completeWithDefault(): CompletableFuture { this.complete(null) return this diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/INodeExt.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/INodeExt.kt index e4e52e4b..aa4547c7 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/INodeExt.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/INodeExt.kt @@ -23,7 +23,7 @@ import org.modelix.model.api.INode import org.modelix.model.api.PNodeAdapter import org.modelix.model.mpsadapters.MPSNode -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun INode.nodeIdAsLong(): Long = when (this) { is PNodeAdapter -> this.nodeId @@ -36,31 +36,31 @@ fun INode.nodeIdAsLong(): Long = else -> throw IllegalStateException("Unsupported INode implementation") } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun INode.isModule(): Boolean { val concept = this.concept ?: return false return concept.isSubConceptOf(BuiltinLanguages.MPSRepositoryConcepts.Module) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun INode.isModel(): Boolean { val concept = this.concept ?: return false return concept.isSubConceptOf(BuiltinLanguages.MPSRepositoryConcepts.Model) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun INode.isDevKitDependency(): Boolean { val concept = this.concept ?: return false return concept.isSubConceptOf(BuiltinLanguages.MPSRepositoryConcepts.DevkitDependency) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun INode.isSingleLanguageDependency(): Boolean { val concept = this.concept ?: return false return concept.isSubConceptOf(BuiltinLanguages.MPSRepositoryConcepts.SingleLanguageDependency) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun INode.isModelImport(): Boolean { val concept = this.concept ?: return false val isModelReference = concept.isSubConceptOf(BuiltinLanguages.MPSRepositoryConcepts.ModelReference) @@ -68,19 +68,19 @@ fun INode.isModelImport(): Boolean { return isModelReference && isModelImportRole } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun INode.isModuleDependency(): Boolean { val concept = this.concept ?: return false return concept.isSubConceptOf(BuiltinLanguages.MPSRepositoryConcepts.ModuleDependency) } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun INode.getModel(): INode? = findNode { it.isModel() } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun INode.getModule(): INode? = findNode { it.isModule() } -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") private fun INode.findNode(criterion: (INode) -> Boolean): INode? { if (criterion(this)) { return this diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/SynchronizedCollections.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/SynchronizedCollections.kt index 243d1382..da5363d9 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/SynchronizedCollections.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/SynchronizedCollections.kt @@ -19,8 +19,8 @@ package org.modelix.mps.sync.util import org.modelix.kotlin.utils.UnstableModelixFeature import java.util.Collections -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun synchronizedMap(): MutableMap = Collections.synchronizedMap(mutableMapOf()) -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun synchronizedLinkedHashSet(): MutableSet = Collections.synchronizedSet(LinkedHashSet()) diff --git a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/WaitForSubtaskCompletionUtil.kt b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/WaitForSubtaskCompletionUtil.kt index 59de208e..6d4efb10 100644 --- a/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/WaitForSubtaskCompletionUtil.kt +++ b/mps-sync-plugin-lib/src/main/kotlin/org/modelix/mps/sync/util/WaitForSubtaskCompletionUtil.kt @@ -32,7 +32,7 @@ import java.util.concurrent.CompletableFuture * avoid busy-waiting on the lock. The continuation of SyncTasks will take care of waiting for all futures to complete. * If you run a SyncTask on its own, then you have to manually wait for the task to complete. */ -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun Collection.waitForCompletionOfEachTask( collectResults: Boolean = false, continuableSyncTaskProducer: (T) -> ContinuableSyncTask, @@ -52,7 +52,7 @@ fun Collection.waitForCompletionOfEachTask( * * @param collectResults if true, then collects the Iterable results of futureProducer */ -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun Iterable.waitForCompletionOfEachTask( collectResults: Boolean = false, continuableSyncTaskProducer: (T) -> ContinuableSyncTask, @@ -73,7 +73,7 @@ fun Iterable.waitForCompletionOfEachTask( * * @param collectResults if true, then collects the Iterable results of futureProducer into an Iterable */ -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") fun Iterable.waitForCompletionOfEach( collectResults: Boolean = false, futureProducer: (T) -> CompletableFuture, diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/ModelSyncService.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/ModelSyncService.kt index 581b8ee9..cfc4a97d 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/ModelSyncService.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/ModelSyncService.kt @@ -52,7 +52,7 @@ import org.modelix.mps.sync.plugin.action.ModelixActionGroup import org.modelix.mps.sync.plugin.gui.ModuleIdWithName import java.net.URL -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") @Service(Service.Level.APP) class ModelSyncService : Disposable { diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModelSyncAction.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModelSyncAction.kt index a02e4b16..3e55a076 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModelSyncAction.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModelSyncAction.kt @@ -28,7 +28,7 @@ import org.modelix.mps.sync.modelix.BranchRegistry import org.modelix.mps.sync.mps.notifications.InjectableNotifierWrapper import org.modelix.mps.sync.plugin.ModelSyncService -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelSyncAction : AnAction { companion object { diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModelixActionGroup.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModelixActionGroup.kt index e62738f8..79be5779 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModelixActionGroup.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModelixActionGroup.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent import org.modelix.kotlin.utils.UnstableModelixFeature import org.modelix.mps.sync.plugin.icons.CloudIcons -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelixActionGroup : ActionGroup("Modelix Actions", "", CloudIcons.PLUGIN_ICON) { init { diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModuleSyncAction.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModuleSyncAction.kt index d071808a..1647d294 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModuleSyncAction.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/ModuleSyncAction.kt @@ -28,7 +28,7 @@ import org.modelix.mps.sync.modelix.BranchRegistry import org.modelix.mps.sync.mps.notifications.InjectableNotifierWrapper import org.modelix.mps.sync.plugin.ModelSyncService -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModuleSyncAction : AnAction { companion object { diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/UnbindModelAction.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/UnbindModelAction.kt index 900a3e90..a610635b 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/UnbindModelAction.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/UnbindModelAction.kt @@ -25,7 +25,7 @@ import org.jetbrains.mps.openapi.model.SModel import org.modelix.kotlin.utils.UnstableModelixFeature import org.modelix.mps.sync.bindings.BindingsRegistry -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class UnbindModelAction : AnAction { companion object { diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/UnbindModuleAction.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/UnbindModuleAction.kt index c5772994..97633de8 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/UnbindModuleAction.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/action/UnbindModuleAction.kt @@ -25,7 +25,7 @@ import org.jetbrains.mps.openapi.module.SModule import org.modelix.kotlin.utils.UnstableModelixFeature import org.modelix.mps.sync.bindings.BindingsRegistry -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class UnbindModuleAction : AnAction { companion object { diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/configuration/CloudResourcesConfigurationComponent.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/configuration/CloudResourcesConfigurationComponent.kt index ce1a8d22..5394c946 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/configuration/CloudResourcesConfigurationComponent.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/configuration/CloudResourcesConfigurationComponent.kt @@ -27,7 +27,7 @@ import org.modelix.kotlin.utils.UnstableModelixFeature * This component handles the storage of the cloud configuration. * For information about component persistence refer to https://jetbrains.org/intellij/sdk/docs/basics/persisting_state_of_components.html */ -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") @Service(Service.Level.PROJECT) @State( name = "CloudResources", diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/gui/BindingsComboBoxRefresher.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/gui/BindingsComboBoxRefresher.kt index 30b780ba..d61bb67d 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/gui/BindingsComboBoxRefresher.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/gui/BindingsComboBoxRefresher.kt @@ -22,7 +22,7 @@ import org.modelix.mps.sync.bindings.BindingLifecycleState import org.modelix.mps.sync.bindings.BindingSortComparator import org.modelix.mps.sync.bindings.BindingsRegistry -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class BindingsComboBoxRefresher(private val gui: ModelSyncGuiFactory.ModelSyncGui) : Thread() { private val bindingsComparator = BindingSortComparator() diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/gui/ModelSyncGuiFactory.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/gui/ModelSyncGuiFactory.kt index aacb5f9f..5ece3b29 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/gui/ModelSyncGuiFactory.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/gui/ModelSyncGuiFactory.kt @@ -59,7 +59,7 @@ import javax.swing.JList import javax.swing.JPanel import javax.swing.JSeparator -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class ModelSyncGuiFactory : ToolWindowFactory, Disposable { private lateinit var toolWindowContent: ModelSyncGui diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/icons/CloudIcons.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/icons/CloudIcons.kt index 07eaf8d2..b5b01b4e 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/icons/CloudIcons.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/icons/CloudIcons.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.IconLoader import com.intellij.ui.JBColor import org.modelix.kotlin.utils.UnstableModelixFeature -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") object CloudIcons { private const val FONT_SIZE = 14 diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/icons/LetterInSquareIcon.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/icons/LetterInSquareIcon.kt index 20f352c0..098872bd 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/icons/LetterInSquareIcon.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/icons/LetterInSquareIcon.kt @@ -28,7 +28,7 @@ import java.awt.RenderingHints import java.awt.geom.RoundRectangle2D import javax.swing.Icon -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class LetterInSquareIcon( private val letter: String, private val fontSize: Int, diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/indicator/CloudIndicator.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/indicator/CloudIndicator.kt index 0361c7a7..38c54c1d 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/indicator/CloudIndicator.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/indicator/CloudIndicator.kt @@ -30,7 +30,7 @@ import org.modelix.mps.sync.plugin.icons.CloudIcons import java.awt.event.MouseEvent import javax.swing.JComponent -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class CloudIndicator : StatusBarWidgetFactory { companion object { private const val ID = "CloudStatus" diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/listeners/MPSSynchronizationAppLifecycleListener.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/listeners/MPSSynchronizationAppLifecycleListener.kt index ac50d10e..c4231dbf 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/listeners/MPSSynchronizationAppLifecycleListener.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/listeners/MPSSynchronizationAppLifecycleListener.kt @@ -22,7 +22,7 @@ import mu.KotlinLogging import org.modelix.kotlin.utils.UnstableModelixFeature import org.modelix.mps.sync.plugin.ModelSyncService -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class MPSSynchronizationAppLifecycleListener : AppLifecycleListener { private val logger = KotlinLogging.logger {} diff --git a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/listeners/MPSSynchronizationDynamicPluginListener.kt b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/listeners/MPSSynchronizationDynamicPluginListener.kt index edea1281..d08aeb96 100644 --- a/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/listeners/MPSSynchronizationDynamicPluginListener.kt +++ b/mps-sync-plugin/src/main/kotlin/org/modelix/mps/sync/plugin/listeners/MPSSynchronizationDynamicPluginListener.kt @@ -23,7 +23,7 @@ import mu.KotlinLogging import org.modelix.kotlin.utils.UnstableModelixFeature import org.modelix.mps.sync.plugin.ModelSyncService -@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "2024.1") +@UnstableModelixFeature(reason = "The new modelix MPS plugin is under construction", intendedFinalization = "This feature is finalized when the new sync plugin is ready for release.") class MPSSynchronizationDynamicPluginListener : DynamicPluginListener { private val logger = KotlinLogging.logger {}