fix format

yorkie-team · Jun 21, 2024 · c6b5a84 · c6b5a84
1 parent 619f565
commit c6b5a84
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/examples/texteditor/src/main/java/com/example/texteditor/EditorViewModel.kt b/examples/texteditor/src/main/java/com/example/texteditor/EditorViewModel.kt
@@ -8,11 +8,11 @@ import com.google.gson.Gson
 import dev.yorkie.core.Client
 import dev.yorkie.core.Client.SyncMode.Realtime
 import dev.yorkie.core.Client.SyncMode.RealtimePushOnly
-import dev.yorkie.document.presence.PresenceInfo
 import dev.yorkie.document.Document
 import dev.yorkie.document.Document.Event.PresenceChanged
 import dev.yorkie.document.json.JsonText
 import dev.yorkie.document.operation.OperationInfo
+import dev.yorkie.document.presence.PresenceInfo
 import dev.yorkie.document.time.ActorID
 import kotlin.random.Random
 import kotlinx.coroutines.CoroutineScope

diff --git a/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeTest.kt b/yorkie/src/androidTest/kotlin/dev/yorkie/document/json/JsonTreeTest.kt
@@ -8,7 +8,6 @@ import dev.yorkie.api.toCrdtTree
 import dev.yorkie.core.Client
 import dev.yorkie.core.Client.SyncMode.Manual
 import dev.yorkie.core.GENERAL_TIMEOUT
-import dev.yorkie.document.presence.Presence
 import dev.yorkie.core.createClient
 import dev.yorkie.core.withTwoClientsAndDocuments
 import dev.yorkie.document.Document
@@ -23,6 +22,7 @@ import dev.yorkie.document.operation.OperationInfo
 import dev.yorkie.document.operation.OperationInfo.SetOpInfo
 import dev.yorkie.document.operation.OperationInfo.TreeEditOpInfo
 import dev.yorkie.document.operation.OperationInfo.TreeStyleOpInfo
+import dev.yorkie.document.presence.Presence
 import dev.yorkie.gson
 import kotlin.test.assertEquals
 import kotlin.test.assertIs

diff --git a/yorkie/src/main/kotlin/dev/yorkie/api/ElementConverter.kt b/yorkie/src/main/kotlin/dev/yorkie/api/ElementConverter.kt
@@ -23,7 +23,6 @@ import dev.yorkie.api.v1.treeNode
 import dev.yorkie.api.v1.treeNodeID
 import dev.yorkie.api.v1.treeNodes
 import dev.yorkie.api.v1.treePos
-import dev.yorkie.document.presence.P
 import dev.yorkie.document.crdt.CrdtArray
 import dev.yorkie.document.crdt.CrdtCounter
 import dev.yorkie.document.crdt.CrdtCounter.Companion.asCounterValue
@@ -47,6 +46,7 @@ import dev.yorkie.document.crdt.RgaTreeSplitPos
 import dev.yorkie.document.crdt.Rht
 import dev.yorkie.document.crdt.RhtNode
 import dev.yorkie.document.crdt.TextValue
+import dev.yorkie.document.presence.P
 import dev.yorkie.document.time.ActorID
 import dev.yorkie.document.time.TimeTicket.Companion.InitialTimeTicket
 import dev.yorkie.util.IndexTreeNode

diff --git a/yorkie/src/main/kotlin/dev/yorkie/core/Client.kt b/yorkie/src/main/kotlin/dev/yorkie/core/Client.kt
@@ -24,8 +24,6 @@ import dev.yorkie.api.v1.detachDocumentRequest
 import dev.yorkie.api.v1.pushPullChangesRequest
 import dev.yorkie.api.v1.removeDocumentRequest
 import dev.yorkie.api.v1.watchDocumentRequest
-import dev.yorkie.document.presence.Presences.Companion.UninitializedPresences
-import dev.yorkie.document.presence.Presences.Companion.asPresences
 import dev.yorkie.document.Document
 import dev.yorkie.document.Document.DocumentStatus
 import dev.yorkie.document.Document.Event.PresenceChanged.MyPresence.Initialized
@@ -34,6 +32,8 @@ import dev.yorkie.document.Document.Event.StreamConnectionChanged
 import dev.yorkie.document.Document.Event.SyncStatusChanged
 import dev.yorkie.document.presence.P
 import dev.yorkie.document.presence.PresenceInfo
+import dev.yorkie.document.presence.Presences.Companion.UninitializedPresences
+import dev.yorkie.document.presence.Presences.Companion.asPresences
 import dev.yorkie.document.time.ActorID
 import dev.yorkie.util.Logger.Companion.log
 import dev.yorkie.util.OperationResult

diff --git a/yorkie/src/main/kotlin/dev/yorkie/document/Document.kt b/yorkie/src/main/kotlin/dev/yorkie/document/Document.kt
@@ -3,13 +3,6 @@ package dev.yorkie.document
 import androidx.annotation.VisibleForTesting
 import com.google.protobuf.ByteString
 import dev.yorkie.api.toSnapshot
-import dev.yorkie.document.presence.P
-import dev.yorkie.document.presence.Presence
-import dev.yorkie.document.presence.PresenceChange
-import dev.yorkie.document.presence.PresenceInfo
-import dev.yorkie.document.presence.Presences
-import dev.yorkie.document.presence.Presences.Companion.UninitializedPresences
-import dev.yorkie.document.presence.Presences.Companion.asPresences
 import dev.yorkie.document.Document.Event.PresenceChanged
 import dev.yorkie.document.Document.Event.PresenceChanged.MyPresence
 import dev.yorkie.document.Document.Event.PresenceChanged.Others
@@ -25,6 +18,13 @@ import dev.yorkie.document.json.JsonArray
 import dev.yorkie.document.json.JsonElement
 import dev.yorkie.document.json.JsonObject
 import dev.yorkie.document.operation.OperationInfo
+import dev.yorkie.document.presence.P
+import dev.yorkie.document.presence.Presence
+import dev.yorkie.document.presence.PresenceChange
+import dev.yorkie.document.presence.PresenceInfo
+import dev.yorkie.document.presence.Presences
+import dev.yorkie.document.presence.Presences.Companion.UninitializedPresences
+import dev.yorkie.document.presence.Presences.Companion.asPresences
 import dev.yorkie.document.time.ActorID
 import dev.yorkie.document.time.TimeTicket
 import dev.yorkie.document.time.TimeTicket.Companion.InitialTimeTicket

diff --git a/yorkie/src/main/kotlin/dev/yorkie/document/change/Change.kt b/yorkie/src/main/kotlin/dev/yorkie/document/change/Change.kt
@@ -1,10 +1,10 @@
 package dev.yorkie.document.change
 
-import dev.yorkie.document.presence.PresenceChange
-import dev.yorkie.document.presence.Presences
 import dev.yorkie.document.crdt.CrdtRoot
 import dev.yorkie.document.operation.Operation
 import dev.yorkie.document.operation.OperationInfo
+import dev.yorkie.document.presence.PresenceChange
+import dev.yorkie.document.presence.Presences
 import dev.yorkie.document.time.ActorID
 
 /**

diff --git a/yorkie/src/main/kotlin/dev/yorkie/document/change/ChangeContext.kt b/yorkie/src/main/kotlin/dev/yorkie/document/change/ChangeContext.kt
@@ -1,11 +1,11 @@
 package dev.yorkie.document.change
 
-import dev.yorkie.document.presence.PresenceChange
 import dev.yorkie.document.crdt.CrdtContainer
 import dev.yorkie.document.crdt.CrdtElement
 import dev.yorkie.document.crdt.CrdtRoot
 import dev.yorkie.document.crdt.GCPair
 import dev.yorkie.document.operation.Operation
+import dev.yorkie.document.presence.PresenceChange
 import dev.yorkie.document.time.TimeTicket
 
 /**

diff --git a/yorkie/src/test/kotlin/dev/yorkie/api/ConverterTest.kt b/yorkie/src/test/kotlin/dev/yorkie/api/ConverterTest.kt
@@ -3,7 +3,6 @@ package dev.yorkie.api
 import com.google.protobuf.kotlin.toByteStringUtf8
 import dev.yorkie.api.v1.jSONElement
 import dev.yorkie.api.v1.operation
-import dev.yorkie.document.presence.PresenceChange
 import dev.yorkie.document.Document
 import dev.yorkie.document.change.Change
 import dev.yorkie.document.change.ChangeID
@@ -40,6 +39,7 @@ import dev.yorkie.document.operation.SetOperation
 import dev.yorkie.document.operation.StyleOperation
 import dev.yorkie.document.operation.TreeEditOperation
 import dev.yorkie.document.operation.TreeStyleOperation
+import dev.yorkie.document.presence.PresenceChange
 import dev.yorkie.document.time.ActorID
 import dev.yorkie.document.time.ActorID.Companion.INITIAL_ACTOR_ID
 import dev.yorkie.document.time.TimeTicket