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

inline with keep declaration: wording to visually distinguish options

Browse Source
This commit is contained in:
Anna Kozlova
2017-01-13 16:24:36 +01:00
parent 1700f14d67
commit a9b80d32df
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class InlineFieldDialog extends InlineOptionsWithSearchSettingsDialog {
}
protected String getNameLabelText() {
final String occurrencesString = myOccurrencesNumber > -1 ? " (" + myOccurrencesNumber + " occurrence" + (myOccurrencesNumber == 1 ? ")" : "s)") : "";
final String occurrencesString = myOccurrencesNumber > -1 ? " - " + myOccurrencesNumber + " occurrence" + (myOccurrencesNumber == 1 ? "" : "s") : "";
String fieldText = PsiFormatUtil.formatVariable(myField, PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_TYPE,PsiSubstitutor.EMPTY);
return RefactoringBundle.message("inline.field.field.name.label", fieldText, occurrencesString);
java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class InlineMethodDialog extends InlineOptionsWithSearchSettingsDialog {
@Override
protected String getNameLabelText() {
final String occurrencesString = myOccurrencesNumber > -1 ? " (" + myOccurrencesNumber + " occurrence" + (myOccurrencesNumber == 1 ? ")" : "s)") : "";
final String occurrencesString = myOccurrencesNumber > -1 ? " - " + myOccurrencesNumber + " occurrence" + (myOccurrencesNumber == 1 ? "" : "s") : "";
String methodText = PsiFormatUtil.formatMethod(myMethod,
PsiSubstitutor.EMPTY, PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_PARAMETERS,
PsiFormatUtilBase.SHOW_TYPE);
platform/platform-resources-en/src/messages/RefactoringBundle.properties
+6 -6
View File
@@ -436,11 +436,11 @@ inline.field.command=Inline field {0}
0.will.not.be.accessible.from.1.after.inlining={0} will not be accessible from {1} after inlining
inline.field.field.name.label=Field {0} {1}
inline.field.border.title=Inline
all.references.and.remove.the.field=Inline &all references and remove the field
all.references.keep.field=Inline all references and k&eep the field
all.references.and.remove.the.field=Inline &all and remove the field
all.references.keep.field=Inline all and k&eep the field
all.references.and.remove.the.local=Inline &all references and remove the variable
this.reference.only.and.keep.the.variable=Inline this reference only and &keep the variable
this.reference.only.and.keep.the.field=Inline this reference only and &keep the field
this.reference.only.and.keep.the.field=Inline this only and &keep the field
all.references.and.remove.super.class=Inline &all references and remove the class
this.reference.only.and.keep.super.class=Inline this reference only and &keep the super class
inline.variable.title=Inline Variable
@@ -454,10 +454,10 @@ occurrences.string=({0,choice,1#1 occurrence|2#{0,number} occurrences})
inline.method.title=Inline Method
inline.method.method.label=Method {0} {1}
inline.method.border.title=Inline
all.invocations.and.remove.the.method=Inline &all invocations and remove the method
all.invocations.keep.the.method=Inline all invocations and k&eep the method
all.invocations.and.remove.the.method=Inline &all and remove the method
all.invocations.keep.the.method=Inline all and k&eep the method
all.invocations.in.project=&All invocations in project
this.invocation.only.and.keep.the.method=Inline this invocation only and &keep the method
this.invocation.only.and.keep.the.method=Inline this only and &keep the method
refactoring.cannot.be.applied.to.abstract.methods={0} refactoring cannot be applied to abstract methods
refactoring.cannot.be.applied.no.sources.attached={0} refactoring cannot be applied: no sources attached
refactoring.is.not.supported.when.return.statement.interrupts.the.execution.flow={0} refactoring is not supported when return statement interrupts the execution flow