MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

LAB-62 get rid of static *Bundle usages: fix incorrect field renames

Browse Source 
GitOrigin-RevId: 786fac15a8a393ba91a82e3bf85270393e4383fb
This commit is contained in:
Dmitry.Krasilschikov
2019-12-31 20:14:38 +02:00
committed by intellij-monorepo-bot
parent a2c075ab5d
commit 240e2cea4c
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java
View File

@@ -175,7 +175,7 @@ public class ClasspathPanelImpl extends JPanel implements ClasspathPanel {
}
}
};
setFixedColumnWidth(ClasspathTableModel.EXPORT_COLUMN, ClasspathTableModel.getName());
setFixedColumnWidth(ClasspathTableModel.EXPORT_COLUMN, ClasspathTableModel.getEXPORT_COLUMN_NAME());
setFixedColumnWidth(ClasspathTableModel.SCOPE_COLUMN, DependencyScope.COMPILE.toString() + " "); // leave space for combobox border
myEntryTable.getTableHeader().getColumnModel().getColumn(ClasspathTableModel.ITEM_COLUMN).setPreferredWidth(10000); // consume all available space

5
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathTableModel.java
View File

@@ -38,8 +38,7 @@ import java.util.List;
* @author nik
*/
class ClasspathTableModel extends ListTableModel<ClasspathTableItem<?>> implements ItemRemovable {
private static final ColumnInfo<ClasspathTableItem<?>, Boolean> EXPORT_COLUMN_INFO = new ColumnInfo<ClasspathTableItem<?>, Boolean>(
getName()) {
private static final ColumnInfo<ClasspathTableItem<?>, Boolean> EXPORT_COLUMN_INFO = new ColumnInfo<ClasspathTableItem<?>, Boolean>(getEXPORT_COLUMN_NAME()) {
@Nullable
@Override
public Boolean valueOf(ClasspathTableItem<?> item) {
@@ -189,7 +188,7 @@ class ClasspathTableModel extends ListTableModel<ClasspathTableItem<?>> implemen
return ProjectBundle.message("modules.order.export.scope.column");
}
static String getName() {
static String getEXPORT_COLUMN_NAME() {
return ProjectBundle.message("modules.order.export.export.column");
}
}

4
java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
View File

@@ -236,7 +236,7 @@ public class CanBeFinalInspection extends GlobalJavaBatchInspectionTool {
@Override
@NotNull
public String getFamilyName() {
return getCanBePrivate();
return getQUICK_FIX_NAME();
}
@Override
@@ -265,7 +265,7 @@ public class CanBeFinalInspection extends GlobalJavaBatchInspectionTool {
}
}
private static String getCanBePrivate() {
private static String getQUICK_FIX_NAME() {
return InspectionsBundle.message("inspection.can.be.final.accept.quickfix");
}
}

4
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
View File

@@ -80,7 +80,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
@NotNull TextRange priorityRange,
boolean ignoreSuppressed,
@NotNull HighlightInfoProcessor highlightInfoProcessor, boolean inspectInjectedPsi) {
super(file.getProject(), document, getCollectingDataMessage(), file, null, new TextRange(startOffset, endOffset), true, highlightInfoProcessor);
super(file.getProject(), document, getPRESENTABLE_NAME(), file, null, new TextRange(startOffset, endOffset), true, highlightInfoProcessor);
assert file.isPhysical() : "can't inspect non-physical file: " + file + "; " + file.getVirtualFile();
myPriorityRange = priorityRange;
myIgnoreSuppressed = ignoreSuppressed;
@@ -830,7 +830,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
}
}
private static String getCollectingDataMessage() {
private static String getPRESENTABLE_NAME() {
return DaemonBundle.message("pass.inspection");
}
}

4
plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadWriteStatistics.java
View File

@@ -71,7 +71,7 @@ public class ReadWriteStatistics {
}
if (myShownReadKBytes > 0) {
buffer.append(myShownReadKBytes);
buffer.append(getRefactoringName());
buffer.append(getREAD_PROGRESS_MESSAGE());
if (myShownSentKBytes > 0) buffer.append("; ");
}
@@ -84,7 +84,7 @@ public class ReadWriteStatistics {
myProgress.setText(buffer.toString());
}
private static String getRefactoringName() {
private static String getREAD_PROGRESS_MESSAGE() {
return CvsBundle.message("progress.text.kb.read");
}

4
xml/impl/src/com/intellij/application/options/XmlCodeStyleSettingsProvider.java
View File

@@ -46,7 +46,7 @@ public class XmlCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
@Override
public String getConfigurableDisplayName() {
return getDisplayName();
return getCONFIGURABLE_DISPLAY_NAME();
}
@Override
@@ -54,7 +54,7 @@ public class XmlCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
return new XmlCodeStyleSettings(settings);
}
public static String getDisplayName() {
public static String getCONFIGURABLE_DISPLAY_NAME() {
return ApplicationBundle.message("title.xml");
}
}

4
xml/impl/src/com/intellij/application/options/XmlLanguageCodeStyleSettingsProvider.java
View File

@@ -36,7 +36,7 @@ public class XmlLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSetti
@NotNull
public CodeStyleConfigurable createConfigurable(@NotNull final CodeStyleSettings baseSettings,
@NotNull final CodeStyleSettings modelSettings) {
return new CodeStyleAbstractConfigurable(baseSettings, modelSettings, getRefactoringName()){
return new CodeStyleAbstractConfigurable(baseSettings, modelSettings, getCONFIGURABLE_DISPLAY_NAME()){
@Override
protected CodeStyleAbstractPanel createPanel(final CodeStyleSettings settings) {
return new XmlCodeStyleMainPanel(getCurrentSettings(), settings);
@@ -121,7 +121,7 @@ public class XmlLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSetti
return super.getAccessor(codeStyleObject, field);
}
public static String getRefactoringName() {
public static String getCONFIGURABLE_DISPLAY_NAME() {
return ApplicationBundle.message("title.xml");
}
}