MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: remove "my" prefixes from kotlin class

Browse Source
This commit is contained in:
Kirill Likhodedov
2016-03-21 17:17:33 +03:00
parent 9f25ff87a3
commit 2087ca24ee
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/MultiRootMessage.kt
+17 -17
View File
@@ -22,38 +22,38 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.containers.ContainerUtil
import com.intellij.vcsUtil.VcsImplUtil.getShortVcsRootName
class MultiRootMessage(private val myProject: Project, private val myAllRoots: Collection<VirtualFile>, html: Boolean) {
class MultiRootMessage(private val project: Project, private val allRoots: Collection<VirtualFile>, html: Boolean) {
private val LOG = Logger.getInstance(MultiRootMessage::class.java)
private val myMessages = ContainerUtil.newLinkedHashMap<VirtualFile, String>()
private val myLineSeparator = if (html) "<br/>\n" else "\n"
private val messages = ContainerUtil.newLinkedHashMap<VirtualFile, String>()
private val lineSeparator = if (html) "<br/>\n" else "\n"
fun append(root: VirtualFile, message: String): MultiRootMessage {
if (!myAllRoots.contains(root)) {
LOG.error("The root ${root.path} is unexpected: $myAllRoots")
if (!allRoots.contains(root)) {
LOG.error("The root ${root.path} is unexpected: $allRoots")
return this
}
if (myMessages.containsKey(root)) {
if (messages.containsKey(root)) {
LOG.error("Duplicate root ${root.path} reporting message [$message]")
}
myMessages.put(root, message)
messages.put(root, message)
return this
}
fun asString(): String {
if (myMessages.isEmpty()) return "";
if (myAllRoots.size == 1) return myMessages.values.first()
if (myMessages.size == 1) {
val (root, message) = myMessages.entries.first()
return "$message in ${getShortVcsRootName(myProject, root)}"
if (messages.isEmpty()) return "";
if (allRoots.size == 1) return messages.values.first()
if (messages.size == 1) {
val (root, message) = messages.entries.first()
return "$message in ${getShortVcsRootName(project, root)}"
}
val grouped = myMessages.keys.groupBy { myMessages[it]!!.trim() }
if (grouped.size == 1 && myAllRoots.size == myMessages.size) return myMessages.values.first()
return grouped.keys.joinToString(myLineSeparator) {
val shortRootNames = grouped[it]!!.map { getShortVcsRootName(myProject, it) }
val grouped = messages.keys.groupBy { messages[it]!!.trim() }
if (grouped.size == 1 && allRoots.size == messages.size) return messages.values.first()
return grouped.keys.joinToString(lineSeparator) {
val shortRootNames = grouped[it]!!.map { getShortVcsRootName(project, it) }
"$it in ${joinWithAnd(shortRootNames, 5)}" }
}
override fun toString(): String {
return myMessages.toString()
return messages.toString()
}
}
platform/dvcs-impl/testSrc/com.intellij.dvcs/MultiRootMessageTest.kt
+11 -11
View File
@@ -28,24 +28,24 @@ import java.io.File
class MultiRootMessageTest {
private lateinit var myProject : Project
private lateinit var project: Project
@Before
fun setUp() {
myProject = mock(Project::class.java)
Mockito.`when`(myProject.baseDir).thenReturn(MockVirtualFile(true, "idea"))
project = mock(Project::class.java)
Mockito.`when`(project.baseDir).thenReturn(MockVirtualFile(true, "idea"))
}
@Test
fun `test empty message`() {
val root = myProject.baseDir
val root = project.baseDir
val multiRootMessage = multiRootMessage(root)
assertTrue(multiRootMessage.asString().isEmpty())
}
@Test
fun `test single repository`() {
val root = myProject.baseDir
val root = project.baseDir
val multiRootMessage = multiRootMessage(root)
multiRootMessage.append(root, "Pruned obsolete remote references: origin/fix1, origin/fix2")
assertEquals("Pruned obsolete remote references: origin/fix1, origin/fix2", multiRootMessage.asString())
@@ -53,7 +53,7 @@ class MultiRootMessageTest {
@Test
fun `test single root message in multi-root project`() {
val idea = myProject.baseDir
val idea = project.baseDir
val community = createSubDir(idea, "community")
val multiRootMessage = multiRootMessage(idea, community)
@@ -63,7 +63,7 @@ class MultiRootMessageTest {
@Test
fun `test two roots with same messages`() {
val idea = myProject.baseDir
val idea = project.baseDir
val community = createSubDir(idea, "community")
val multiRootMessage = multiRootMessage(idea, community)
@@ -74,7 +74,7 @@ class MultiRootMessageTest {
@Test
fun `test two roots with different messages`() {
val idea = myProject.baseDir
val idea = project.baseDir
val community = createSubDir(idea, "community")
val multiRootMessage = multiRootMessage(idea, community)
@@ -89,12 +89,12 @@ class MultiRootMessageTest {
@Test
fun `test html message for three roots with same message, and one root with another`() {
val idea = myProject.baseDir
val idea = project.baseDir
val community = createSubDir(idea, "community")
val contrib = createSubDir(idea, "contrib")
val android = createSubDir(community, "android")
val multiRootMessage = MultiRootMessage(myProject, setOf(idea, community, contrib, android), true)
val multiRootMessage = MultiRootMessage(project, setOf(idea, community, contrib, android), true)
multiRootMessage.append(idea, "Pruned obsolete remote references: origin/fix1, origin/fix2")
multiRootMessage.append(community, "Pruned obsolete remote references: origin/fix3")
multiRootMessage.append(contrib, "Pruned obsolete remote references: origin/fix3")
@@ -106,7 +106,7 @@ class MultiRootMessageTest {
""".trimIndent(), multiRootMessage.asString())
}
private fun multiRootMessage(vararg roots : VirtualFile) = MultiRootMessage(myProject, roots.asList(), false)
private fun multiRootMessage(vararg roots : VirtualFile) = MultiRootMessage(project, roots.asList(), false)
private fun createSubDir(parent: VirtualFile, name: String): VirtualFile {
val vf = MockVirtualFile(true, name)