Option toggle rework process & terminate when project get disposed

nhat-phan · nhat-phan · commit 1dc5b29c58df · 2020-06-06T19:50:00.000+02:00
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/AbstractApplicationServiceProvider.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/AbstractApplicationServiceProvider.kt
@@ -14,6 +14,7 @@ import net.ntworld.mergeRequestIntegrationIde.compatibility.IntellijIdeApi
 import net.ntworld.mergeRequestIntegrationIde.compatibility.*
 import net.ntworld.mergeRequestIntegrationIde.infrastructure.internal.ProviderSettingsImpl
 import net.ntworld.mergeRequestIntegrationIde.infrastructure.internal.ServiceBase
+import net.ntworld.mergeRequestIntegrationIde.infrastructure.setting.ApplicationSettings
 import net.ntworld.mergeRequestIntegrationIde.infrastructure.setting.ApplicationSettingsManager
 import net.ntworld.mergeRequestIntegrationIde.infrastructure.setting.ApplicationSettingsManagerImpl
 import net.ntworld.mergeRequestIntegrationIde.watcher.WatcherManager
@@ -63,7 +64,7 @@ abstract class AbstractApplicationServiceProvider : ApplicationServiceProvider,
 
     override val intellijIdeApi: IntellijIdeApi = Version201Adapter()
 
-    override val settingsManager: ApplicationSettingsManager = ApplicationSettingsManagerImpl()
+    override val settingsManager: ApplicationSettingsManager = ApplicationSettingsManagerImpl(::onSettingsChanged)
 
     override fun getAllProjectServiceProviders(): List<ProjectServiceProvider> {
         return myProjectServiceProviders.toList()
@@ -119,4 +120,10 @@ abstract class AbstractApplicationServiceProvider : ApplicationServiceProvider,
         }
         return legalGrantedDomains.contains(url.host)
     }
+
+    private fun onSettingsChanged(old: ApplicationSettings, new: ApplicationSettings) {
+        getAllProjectServiceProviders().forEach {
+            it.onApplicationSettingsChanged(old, new)
+        }
+    }
 }
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/AbstractProjectServiceProvider.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/AbstractProjectServiceProvider.kt
@@ -207,6 +207,14 @@ abstract class AbstractProjectServiceProvider(
 
     override fun isDoingCodeReview(): Boolean = null !== reviewContextManager.findDoingCodeReviewContext()
 
+    override fun onApplicationSettingsChanged(old: ApplicationSettings, new: ApplicationSettings) {
+        if (!old.enableReworkProcess && new.enableReworkProcess) {
+            for (provider in providerStorage.registeredProviders) {
+                reworkManager.createBranchWatcher(provider)
+            }
+        }
+    }
+
     override fun startCodeReview(providerData: ProviderData, mergeRequest: MergeRequest) {
         reviewContextManager.setContextToDoingCodeReview(providerData.id, mergeRequest.id)
         val reviewContext = reviewContextManager.findDoingCodeReviewContext()
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/ProjectServiceProvider.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/ProjectServiceProvider.kt
@@ -70,6 +70,8 @@ interface ProjectServiceProvider {
 
     fun isDoingCodeReview(): Boolean
 
+    fun onApplicationSettingsChanged(old: ApplicationSettings, new: ApplicationSettings)
+
     fun notify(message: String)
 
     fun notify(message: String, type: NotificationType)
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/notifier/ProjectNotifier.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/notifier/ProjectNotifier.kt
@@ -3,6 +3,7 @@ package net.ntworld.mergeRequestIntegrationIde.infrastructure.notifier
 import com.intellij.util.messages.Topic
 import net.ntworld.mergeRequest.ProviderData
 import net.ntworld.mergeRequestIntegrationIde.infrastructure.ReviewContext
+import net.ntworld.mergeRequestIntegrationIde.infrastructure.setting.ApplicationSettings
 
 interface ProjectNotifier {
     companion object {
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/setting/ApplicationSettings.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/setting/ApplicationSettings.kt
@@ -20,6 +20,8 @@ interface ApplicationSettings {
 
     val displayMergeRequestState: Boolean
 
+    val enableReworkProcess: Boolean
+
     fun toApiOptions(): ApiOptions {
         return ApiOptionsImpl(
             enableRequestCache = this.enableRequestCache
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/setting/ApplicationSettingsImpl.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/setting/ApplicationSettingsImpl.kt
@@ -8,7 +8,8 @@ data class ApplicationSettingsImpl(
     override val checkoutTargetBranch: Boolean,
     override val maxDiffChangesOpenedAutomatically: Int,
     override val displayUpVotesAndDownVotes: Boolean,
-    override val displayMergeRequestState: Boolean
+    override val displayMergeRequestState: Boolean,
+    override val enableReworkProcess: Boolean
 ) : ApplicationSettings {
     companion object {
         val DEFAULT = ApplicationSettingsImpl(
@@ -19,7 +20,8 @@ data class ApplicationSettingsImpl(
             checkoutTargetBranch = false,
             maxDiffChangesOpenedAutomatically = 10,
             displayUpVotesAndDownVotes = false,
-            displayMergeRequestState = true
+            displayMergeRequestState = true,
+            enableReworkProcess = true
         )
     }
 }
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/setting/ApplicationSettingsManagerImpl.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/setting/ApplicationSettingsManagerImpl.kt
@@ -3,7 +3,9 @@ package net.ntworld.mergeRequestIntegrationIde.infrastructure.setting
 import net.ntworld.mergeRequestIntegrationIde.infrastructure.setting.option.*
 import org.jdom.Element
 
-class ApplicationSettingsManagerImpl : ApplicationSettingsManager {
+class ApplicationSettingsManagerImpl(
+    private val changedInvoker: ((ApplicationSettings, ApplicationSettings) -> Unit)
+) : ApplicationSettingsManager {
     private var mySettings: ApplicationSettings = ApplicationSettingsImpl.DEFAULT
     private val myOptionEnableRequestCache = EnableRequestCacheOption()
     private val myOptionSaveMRFilterState = SaveMRFilterStateOption()
@@ -13,6 +15,7 @@ class ApplicationSettingsManagerImpl : ApplicationSettingsManager {
     private val myOptionMaxDiffChangesOpenedAutomatically = MaxDiffChangesOpenedAutomaticallyOption()
     private val myOptionDisplayUpVotesAndDownVotes = DisplayUpVotesAndDownVotesOption()
     private val myOptionDisplayMergeRequestState = DisplayMergeRequestStateOption()
+    private val myOptionEnableReworkProcess = EnableReworkProcessOption()
     private val myAllSettingOptions = listOf<SettingOption<*>>(
         myOptionEnableRequestCache,
         myOptionSaveMRFilterState,
@@ -21,7 +24,8 @@ class ApplicationSettingsManagerImpl : ApplicationSettingsManager {
         myOptionCheckoutTargetBranch,
         myOptionMaxDiffChangesOpenedAutomatically,
         myOptionDisplayUpVotesAndDownVotes,
-        myOptionDisplayMergeRequestState
+        myOptionDisplayMergeRequestState,
+        myOptionEnableReworkProcess
     )
 
     val settings: ApplicationSettings
@@ -51,6 +55,9 @@ class ApplicationSettingsManagerImpl : ApplicationSettingsManager {
     override val displayMergeRequestState: Boolean
         get() = mySettings.displayMergeRequestState
 
+    override val enableReworkProcess: Boolean
+        get() = mySettings.enableReworkProcess
+
     override fun readFrom(elements: List<Element>): ApplicationSettings {
         var settings = ApplicationSettingsImpl.DEFAULT
         for (item in elements) {
@@ -87,10 +94,13 @@ class ApplicationSettingsManagerImpl : ApplicationSettingsManager {
         writeOption(element, myOptionMaxDiffChangesOpenedAutomatically, mySettings.maxDiffChangesOpenedAutomatically)
         writeOption(element, myOptionDisplayUpVotesAndDownVotes, mySettings.displayUpVotesAndDownVotes)
         writeOption(element, myOptionDisplayMergeRequestState, mySettings.displayMergeRequestState)
+        writeOption(element, myOptionEnableReworkProcess, mySettings.enableReworkProcess)
     }
 
     override fun update(settings: ApplicationSettings) {
+        val oldSettings = mySettings
         mySettings = settings
+        changedInvoker.invoke(oldSettings, settings)
     }
 
     private fun<T> writeOption(root: Element, option: SettingOption<T>, value: T) {
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/setting/option/EnableReworkProcessOption.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/infrastructure/setting/option/EnableReworkProcessOption.kt
@@ -0,0 +1,15 @@
+package net.ntworld.mergeRequestIntegrationIde.infrastructure.setting.option
+
+import net.ntworld.mergeRequestIntegrationIde.infrastructure.setting.ApplicationSettingsImpl
+
+class EnableReworkProcessOption : BooleanOption() {
+    override val name: String = "rework:enabled"
+
+    override fun getOptionValueFromSettings(settings: ApplicationSettingsImpl): Boolean {
+        return settings.enableReworkProcess
+    }
+
+    override fun copySettings(settings: ApplicationSettingsImpl, value: Boolean): ApplicationSettingsImpl {
+        return settings.copy(enableReworkProcess = value)
+    }
+}
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/rework/internal/BranchWatcherImpl.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/rework/internal/BranchWatcherImpl.kt
@@ -22,11 +22,14 @@ class BranchWatcherImpl(
     override val interval: Long = 3000
 
     override fun canExecute(): Boolean {
-        return true
+        return !projectServiceProvider.project.isDisposed
     }
 
     override fun shouldTerminate(): Boolean {
-        return myTerminate || projectServiceProvider.isDoingCodeReview()
+        return myTerminate ||
+            projectServiceProvider.project.isDisposed ||
+            projectServiceProvider.isDoingCodeReview() ||
+            !projectServiceProvider.applicationSettings.enableReworkProcess
     }
 
     override fun execute() {
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/rework/internal/ReworkManagerImpl.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/rework/internal/ReworkManagerImpl.kt
@@ -48,6 +48,10 @@ internal class ReworkManagerImpl(
     }
 
     override fun createBranchWatcher(providerData: ProviderData) {
+        if (!projectServiceProvider.applicationSettings.enableReworkProcess) {
+            return
+        }
+
         if (providerData.status != ProviderStatus.ACTIVE || myBranchWatchers.containsKey(providerData.id)) {
             return
         }
@@ -74,6 +78,10 @@ internal class ReworkManagerImpl(
     }
 
     override fun requestCreateReworkWatcher(providers: List<ProviderData>, branchName: String) {
+        if (!projectServiceProvider.applicationSettings.enableReworkProcess) {
+            return
+        }
+
         val pair = findProviderData(providers, branchName)
         val providerData = pair.first
         val repository = pair.second
@@ -83,6 +91,10 @@ internal class ReworkManagerImpl(
     }
 
     override fun requestCreateReworkWatcher(providerData: ProviderData, repository: GitRepository, branchName: String) {
+        if (!projectServiceProvider.applicationSettings.enableReworkProcess) {
+            return
+        }
+
         val key = ReworkWatcher.keyOf(providerData, branchName)
         if (myReworkWatchers.contains(key)) {
             return
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/rework/internal/ReworkWatcherImpl.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/rework/internal/ReworkWatcherImpl.kt
@@ -123,11 +123,15 @@ class ReworkWatcherImpl(
     }
 
     override fun canExecute(): Boolean {
-        return !myTerminate
+        return !myTerminate && !projectServiceProvider.project.isDisposed
     }
 
     override fun shouldTerminate(): Boolean {
-        return myTerminate || repository.currentBranchName != branchName || projectServiceProvider.isDoingCodeReview()
+        return myTerminate ||
+            projectServiceProvider.project.isDisposed ||
+            repository.currentBranchName != branchName ||
+            projectServiceProvider.isDoingCodeReview() ||
+            !projectServiceProvider.applicationSettings.enableReworkProcess
     }
 
     override fun execute() {
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/ui/configuration/SettingsConfiguration.form b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/ui/configuration/SettingsConfiguration.form
@@ -227,6 +227,44 @@
               </vspacer>
             </children>
           </grid>
+          <grid id="824c0" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="10" left="0" bottom="0" right="0"/>
+            <constraints>
+              <tabbedpane title="Rework Process"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <grid id="26163" binding="myReworkProcessOptionsPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="0" left="0" bottom="0" right="0"/>
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+                <border type="none"/>
+                <children>
+                  <component id="21a2a" class="javax.swing.JCheckBox" binding="myEnableReworkProcess">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="Enable rework process which watch and display changes and comments based on current branch"/>
+                    </properties>
+                  </component>
+                  <vspacer id="730e6">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                  </vspacer>
+                </children>
+              </grid>
+              <vspacer id="73bb">
+                <constraints>
+                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                </constraints>
+              </vspacer>
+            </children>
+          </grid>
         </children>
       </tabbedpane>
     </children>
diff --git a/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/ui/configuration/SettingsConfiguration.kt b/merge-request-integration-core/src/main/kotlin/net/ntworld/mergeRequestIntegrationIde/ui/configuration/SettingsConfiguration.kt
@@ -28,6 +28,9 @@ class SettingsConfiguration : SettingsUI {
 
     var myMaxDiffChangesOpenedAutomatically: JTextField? = null
 
+    var myReworkProcessOptionsPanel: JPanel? = null
+    var myEnableReworkProcess: JCheckBox? = null
+
     override val dispatcher = EventDispatcher.create(SettingsUI.Listener::class.java)
 
     init {
@@ -38,6 +41,7 @@ class SettingsConfiguration : SettingsUI {
         myShowAddCommentIconsInDiffViewGutter!!.addActionListener { dispatchSettingsUpdated() }
         myDisplayUpVotesAndDownVotes!!.addActionListener { dispatchSettingsUpdated() }
         myDisplayMergeRequestState!!.addActionListener { dispatchSettingsUpdated() }
+        myEnableReworkProcess!!.addActionListener { dispatchSettingsUpdated() }
 
         myCheckoutTargetBranch!!.addActionListener { dispatchSettingsUpdated() }
         myMaxDiffChangesOpenedAutomatically!!.document.addDocumentListener(object : DocumentListener {
@@ -62,7 +66,8 @@ class SettingsConfiguration : SettingsUI {
                     myMaxDiffChangesOpenedAutomatically!!.text
                 ),
                 displayUpVotesAndDownVotes = myDisplayUpVotesAndDownVotes!!.isSelected,
-                displayMergeRequestState = myDisplayMergeRequestState!!.isSelected
+                displayMergeRequestState = myDisplayMergeRequestState!!.isSelected,
+                enableReworkProcess = myEnableReworkProcess!!.isSelected
             )
         dispatcher.multicaster.change(settings)
     }
@@ -76,6 +81,7 @@ class SettingsConfiguration : SettingsUI {
         myMaxDiffChangesOpenedAutomatically!!.text = settings.maxDiffChangesOpenedAutomatically.toString()
         myDisplayUpVotesAndDownVotes!!.isSelected = settings.displayUpVotesAndDownVotes
         myDisplayMergeRequestState!!.isSelected = settings.displayMergeRequestState
+        myEnableReworkProcess!!.isSelected = settings.enableReworkProcess
     }
 
     override fun createComponent(): JComponent = myWholePanel!!

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ data class ApplicationSettingsImpl(`
`8`	`8`	`override val checkoutTargetBranch: Boolean,`
`9`	`9`	`override val maxDiffChangesOpenedAutomatically: Int,`
`10`	`10`	`override val displayUpVotesAndDownVotes: Boolean,`
`11`		`- override val displayMergeRequestState: Boolean`
	`11`	`+ override val displayMergeRequestState: Boolean,`
	`12`	`+ override val enableReworkProcess: Boolean`
`12`	`13`	`) : ApplicationSettings {`
`13`	`14`	`companion object {`
`14`	`15`	`val DEFAULT = ApplicationSettingsImpl(`
`@@ -19,7 +20,8 @@ data class ApplicationSettingsImpl(`
`19`	`20`	`checkoutTargetBranch = false,`
`20`	`21`	`maxDiffChangesOpenedAutomatically = 10,`
`21`	`22`	`displayUpVotesAndDownVotes = false,`
`22`		`- displayMergeRequestState = true`
	`23`	`+ displayMergeRequestState = true,`
	`24`	`+ enableReworkProcess = true`
`23`	`25`	`)`
`24`	`26`	`}`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,14 @@ class BranchWatcherImpl(`
`22`	`22`	`override val interval: Long = 3000`
`23`	`23`
`24`	`24`	`override fun canExecute(): Boolean {`
`25`		`- return true`
	`25`	`+ return !projectServiceProvider.project.isDisposed`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`override fun shouldTerminate(): Boolean {`
`29`		`- return myTerminate \|\| projectServiceProvider.isDoingCodeReview()`
	`29`	`+ return myTerminate \|\|`
	`30`	`+ projectServiceProvider.project.isDisposed \|\|`
	`31`	`+ projectServiceProvider.isDoingCodeReview() \|\|`
	`32`	`+ !projectServiceProvider.applicationSettings.enableReworkProcess`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`override fun execute() {`