From ec7cc10b05ccc5a2395b3600aa60eb1a5440a2b3 Mon Sep 17 00:00:00 2001 From: Georgii Ustinov Date: Tue, 16 Jul 2024 12:29:14 +0300 Subject: [PATCH] [Java. Code Formatting] Rename ui names related to blank lines near fields to 'Before' instead of 'Around' IDEA-110857 GitOrigin-RevId: 660836d90fa3ea06c5fb006b9ce14f59c55155ff --- .../intellij/ide/JavaLanguageCodeStyleSettingsProvider.java | 4 ++++ java/openapi/resources/messages/JavaBundle.properties | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java index 217906af0f4d..579aeac5807f 100644 --- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java +++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java @@ -306,6 +306,10 @@ public final class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeSty JavaBundle.message("editbox.blanklines.around.initializer"), getInstance().BLANK_LINES); + consumer.renameStandardOption( + "BLANK_LINES_AROUND_FIELD_IN_INTERFACE", + JavaBundle.message("editbox.blank.lines.field.in.interface")); + consumer.renameStandardOption( "BLANK_LINES_AROUND_FIELD", JavaBundle.message("editbox.blank.lines.field.without.annotations")); diff --git a/java/openapi/resources/messages/JavaBundle.properties b/java/openapi/resources/messages/JavaBundle.properties index 7a8554482648..ee464293e857 100644 --- a/java/openapi/resources/messages/JavaBundle.properties +++ b/java/openapi/resources/messages/JavaBundle.properties @@ -220,8 +220,9 @@ dialog.title.testdatapath.file.generate=Generate files from class to @TestDataPa do.not.import.inner.classes.for=Exclude inner classes by short name: do.not.import.inner.classes.no.classes=No inner classes defined editbox.blanklines.around.initializer=Around initializer: -editbox.blank.lines.field.without.annotations=Around field without annotations: -editbox.blank.lines.field.with.annotations=Around field with annotations: +editbox.blank.lines.field.in.interface=Before field in interface +editbox.blank.lines.field.without.annotations=Before field without annotations: +editbox.blank.lines.field.with.annotations=Before field with annotations: editbox.class.count.to.use.import.with.star=Class count to use import with '*': editbox.names.count.to.use.static.import.with.star=Names count to use static import with '*': enum.not.allowed=Enum is not allowed