changed method isUserOperationPartiallyObservedInSequence to be implemented directly by superclass UserOperationEvent as realised implementation is the same across sequence models

Author: mzorz

aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/UserOperationEvent.kt

@@ -12,8 +12,38 @@ abstract class UserOperationEvent(var sequence: EventSequence<TextWatcherEvent>
         sequence.clear()
     }
 
+    fun isUserOperationPartiallyObservedInSequence(sequence: EventSequence<TextWatcherEvent>): Boolean {
+        for (i in sequence.indices) {
+
+            val eventHolder = this.sequence[i]
+            val observableEvent = sequence[i]
+
+            // if time distance between any of the events is longer than 50 millis, discard this as this pattern is
+            // likely not produced by the platform, but rather the user.
+            // WARNING! When debugging with breakpoints, you should disable this check as time can exceed the 50 MS limit and
+            // create undesired behavior.
+            if (i > 0) { // only try to compare when we have at least 2 events, so we can compare with the previous one
+                val timestampForPreviousEvent = sequence[i - 1].timestamp
+                val timeDistance = observableEvent.timestamp - timestampForPreviousEvent
+                if (timeDistance > ObservationQueue.MAXIMUM_TIME_BETWEEN_EVENTS_IN_PATTERN_MS) {
+                    return false
+                }
+            }
+
+            eventHolder.beforeEventData = observableEvent.beforeEventData
+            eventHolder.onEventData = observableEvent.onEventData
+            eventHolder.afterEventData = observableEvent.afterEventData
+
+            // return immediately as soon as we realize the pattern diverges
+            if (!eventHolder.testFitsBeforeOnAndAfter()) {
+                return false
+            }
+        }
+
+        return true
+    }
+
     abstract fun isUserOperationObservedInSequence(sequence: EventSequence<TextWatcherEvent>) : Boolean
-    abstract fun isUserOperationPartiallyObservedInSequence(sequence: EventSequence<TextWatcherEvent>) : Boolean
     abstract fun buildReplacementEventWithSequenceData(sequence: EventSequence<TextWatcherEvent>) : TextWatcherEvent
 }
 

aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/known/space/API26InWordSpaceInsertionEvent.kt

@@ -77,37 +77,6 @@ class API26InWordSpaceInsertionEvent : UserOperationEvent() {
         return false
     }
 
-    override fun isUserOperationPartiallyObservedInSequence(sequence: EventSequence<TextWatcherEvent>): Boolean {
-        for (i in sequence.indices) {
-
-            val eventHolder = this.sequence[i]
-            val observableEvent = sequence[i]
-
-            // if time distance between any of the events is longer than 50 millis, discard this as this pattern is
-            // likely not produced by the platform, but rather the user.
-            // WARNING! When debugging with breakpoints, you should disable this check as time can exceed the 50 MS limit and
-            // create undesired behavior.
-            if (i > 0) { // only try to compare when we have at least 2 events, so we can compare with the previous one
-                val timestampForPreviousEvent = sequence[i - 1].timestamp
-                val timeDistance = observableEvent.timestamp - timestampForPreviousEvent
-                if (timeDistance > ObservationQueue.MAXIMUM_TIME_BETWEEN_EVENTS_IN_PATTERN_MS) {
-                    return false
-                }
-            }
-
-            eventHolder.beforeEventData = observableEvent.beforeEventData
-            eventHolder.onEventData = observableEvent.onEventData
-            eventHolder.afterEventData = observableEvent.afterEventData
-
-            // return immediately as soon as we realize the pattern diverges
-            if (!eventHolder.testFitsBeforeOnAndAfter()) {
-                return false
-            }
-        }
-
-        return true
-    }
-
     override fun buildReplacementEventWithSequenceData(sequence: EventSequence<TextWatcherEvent>): TextWatcherEvent {
         val builder = TextWatcherEventInsertText.Builder()
         // here make it all up as a unique event that does the insert as usual, as we'd get it on older APIs

aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/known/space/API26PrependNewLineOnStyledTextEvent.kt

@@ -72,37 +72,6 @@ class API26PrependNewLineOnStyledTextEvent : UserOperationEvent() {
         return false
     }
 
-    override fun isUserOperationPartiallyObservedInSequence(sequence: EventSequence<TextWatcherEvent>): Boolean {
-        for (i in sequence.indices) {
-
-            val eventHolder = this.sequence[i]
-            val observableEvent = sequence[i]
-
-            // if time distance between any of the events is longer than 50 millis, discard this as this pattern is
-            // likely not produced by the platform, but rather the user.
-            // WARNING! When debugging with breakpoints, you should disable this check as time can exceed the 50 MS limit and
-            // create undesired behavior.
-            if (i > 0) { // only try to compare when we have at least 2 events, so we can compare with the previous one
-                val timestampForPreviousEvent = sequence[i - 1].timestamp
-                val timeDistance = observableEvent.timestamp - timestampForPreviousEvent
-                if (timeDistance > ObservationQueue.MAXIMUM_TIME_BETWEEN_EVENTS_IN_PATTERN_MS) {
-                    return false
-                }
-            }
-
-            eventHolder.beforeEventData = observableEvent.beforeEventData
-            eventHolder.onEventData = observableEvent.onEventData
-            eventHolder.afterEventData = observableEvent.afterEventData
-
-            // return immediately as soon as we realize the pattern diverges
-            if (!eventHolder.testFitsBeforeOnAndAfter()) {
-                return false
-            }
-        }
-
-        return true
-    }
-
     override fun buildReplacementEventWithSequenceData(sequence: EventSequence<TextWatcherEvent>): TextWatcherEvent {
         val builder = TextWatcherEventInsertText.Builder()
         // here make it all up as a unique event that does the insert as usual, as we'd get it on older APIs