[jvm-lang] rename create getter/setter actions

- _Create Getter_ -> _Create read-only property 'foo' in 'Bar'_
- _Create Setter_ -> _Create write-only property 'foo' in 'Bar'_

Action names are now consistent with _Create property 'foo' in 'Bar'_.
This commit is contained in:
Daniil Ovchinnikov
2018-02-15 15:43:35 +03:00
parent 0590c5ddd4
commit 872ddb5d0e
6 changed files with 16 additions and 6 deletions

View File

@@ -41,12 +41,12 @@ object CreatePropertyActionGroup : JvmActionGroup {
object CreateReadOnlyPropertyActionGroup : JvmActionGroup {
override fun getDisplayText(data: JvmActionGroup.RenderData?): String {
return message("create.getter")
return message("create.read.only.property.from.usage.text", requireNotNull(data?.entityName))
}
}
object CreateWriteOnlyPropertyActionGroup : JvmActionGroup {
override fun getDisplayText(data: JvmActionGroup.RenderData?): String {
return message("create.setter")
return message("create.write.only.property.from.usage.text", requireNotNull(data?.entityName))
}
}

View File

@@ -103,6 +103,10 @@ create.parameter.from.usage.text=Create parameter ''{0}''
create.property.from.usage.family=Create property From Usage
create.property.from.usage.text=Create property ''{0}''
create.property.from.usage.full.text=Create property ''{0}'' in ''{1}''
create.read.only.property.from.usage.text=Create read-only property ''{0}''
create.read.only.property.from.usage.full.text=Create read-only property ''{0}'' in ''{1}''
create.write.only.property.from.usage.text=Create write-only property ''{0}''
create.write.only.property.from.usage.full.text=Create write-only property ''{0}'' in ''{1}''
create.getter=Create Getter
create.setter=Create Setter
defer.final.assignment.with.temp.family=Defer final assignment with temp

View File

@@ -12,6 +12,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiFile
import com.intellij.psi.presentation.java.ClassPresentationUtil.getNameForClass
/**
* This action renders a read-only property (field + getter) in Java class when getter is requested.
@@ -24,7 +25,9 @@ internal class CreateGetterWithFieldAction(target: PsiClass, request: CreateMeth
return super.isAvailable(project, editor, file) && propertyInfo.second != PropertyKind.SETTER
}
override fun getText(): String = message("create.getter")
override fun getText(): String {
return message("create.read.only.property.from.usage.full.text", propertyInfo.first, getNameForClass(target, false))
}
override fun createRenderer(project: Project) = object : PropertyRenderer(project, target, request, propertyInfo) {

View File

@@ -12,6 +12,7 @@ import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiFile
import com.intellij.psi.presentation.java.ClassPresentationUtil.getNameForClass
/**
* This action renders a write-only property (field + setter) in Java class when setter is requested.
@@ -24,7 +25,9 @@ internal class CreateSetterWithFieldAction(target: PsiClass, request: CreateMeth
return super.isAvailable(project, editor, file) && propertyInfo.second == PropertyKind.SETTER
}
override fun getText(): String = message("create.setter")
override fun getText(): String {
return message("create.write.only.property.from.usage.full.text", propertyInfo.first, getNameForClass(target, false))
}
override fun createRenderer(project: Project) = object : PropertyRenderer(project, target, request, propertyInfo) {

View File

@@ -1,4 +1,4 @@
// "Create Getter" "true"
// "Create read-only property 'field' in 'Test'" "true"
public class Test {
Integer field;
public foo() {

View File

@@ -1,4 +1,4 @@
// "Create Getter" "true"
// "Create read-only property 'field' in 'Test'" "true"
public class Test {
Integer field;
public foo() {