Skip to content

Removing deprecated ClassKind.getDescriptionValue/getDescriptionAccusativeValue. Some localization #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
Apr 9, 2026
Merged

Removing deprecated ClassKind.getDescriptionValue/getDescriptionAccusativeValue. Some localization #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions ...main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ClassKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,8 @@
* @since 2014-05-28
*/
public interface ClassKind {
@Deprecated(forRemoval = true)
default LocalizeValue getDescriptionValue() {
return getDescription();
}

LocalizeValue getDescription();

@Deprecated(forRemoval = true)
default LocalizeValue getDescriptionAccusativeValue() {
return getDescriptionAccusative();
}

default LocalizeValue getDescriptionAccusative() {
return getDescription();
}
Expand Down
2 changes: 1 addition & 1 deletion ...rtifact-impl/src/main/java/com/intellij/java/compiler/artifact/impl/ManifestFileUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public static VirtualFile createManifestFile(VirtualFile directory, final Projec

public static FileChooserDescriptor createDescriptorForManifestDirectory() {
FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor();
descriptor.withTitleValue(LocalizeValue.localizeTODO("Select Directory for META-INF/MANIFEST.MF file"));
descriptor.withTitle(LocalizeValue.localizeTODO("Select Directory for META-INF/MANIFEST.MF file"));
return descriptor;
}

Expand Down
2 changes: 1 addition & 1 deletion ...ntellij/java/compiler/artifact/impl/ui/properties/ElementWithManifestPropertiesPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
.MANIFEST_FILE_NAME));
}
};
descriptor.withTitleValue(LocalizeValue.localizeTODO("Specify Path to MANIFEST.MF file"));
descriptor.withTitle(LocalizeValue.localizeTODO("Specify Path to MANIFEST.MF file"));
final VirtualFile file = IdeaFileChooser.chooseFile(descriptor, myContext.getProject(), null);
if (file == null) {
return;
Expand Down
11 changes: 6 additions & 5 deletions plugin/src/main/java/com/intellij/java/impl/codeInsight/ExternalAnnotationsManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import consulo.annotation.access.RequiredReadAction;
import consulo.annotation.access.RequiredWriteAction;
import consulo.annotation.component.ServiceImpl;
import consulo.application.AllIcons;
import consulo.application.Application;
import consulo.application.Result;
import consulo.application.util.function.Processor;
Expand Down Expand Up @@ -65,6 +64,7 @@
import consulo.module.content.layer.orderEntry.ModuleExtensionWithSdkOrderEntry;
import consulo.module.content.layer.orderEntry.ModuleOrderEntry;
import consulo.module.content.layer.orderEntry.OrderEntry;
import consulo.platform.base.icon.PlatformIconGroup;
import consulo.platform.base.localize.CommonLocalize;
import consulo.project.DumbService;
import consulo.project.Project;
Expand All @@ -86,6 +86,7 @@
import consulo.util.collection.SmartList;
import consulo.util.lang.Comparing;
import consulo.util.lang.StringUtil;
import consulo.util.lang.xml.XmlStringUtil;
import consulo.virtualFileSystem.ReadonlyStatusHandler;
import consulo.virtualFileSystem.VirtualFile;
import consulo.virtualFileSystem.VirtualFileManager;
Expand Down Expand Up @@ -234,8 +235,8 @@ private boolean setupRootAndAnnotateExternally(
@Nullable final PsiNameValuePair[] value
) {
FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor();
descriptor.withTitleValue(ProjectLocalize.externalAnnotationsRootChooserTitle(entry.getPresentableName()));
descriptor.withDescriptionValue(ProjectLocalize.externalAnnotationsRootChooserDescription());
descriptor.withTitle(ProjectLocalize.externalAnnotationsRootChooserTitle(entry.getPresentableName()));
descriptor.withDescription(ProjectLocalize.externalAnnotationsRootChooserDescription());
final VirtualFile newRoot = IdeaFileChooser.chooseFile(descriptor, project, null);
if (newRoot == null) {
notifyAfterAnnotationChanging(listOwner, annotationFQName, false);
Expand Down Expand Up @@ -313,7 +314,7 @@ public String getTextFor(VirtualFile value) {

@Override
public Image getIconFor(VirtualFile aValue) {
return AllIcons.Modules.Annotation;
return PlatformIconGroup.modulesAnnotation();
}
}).showInBestPositionFor(DataManager.getInstance().getDataContext());
} else {
Expand Down Expand Up @@ -708,7 +709,7 @@ private static String createAnnotationTag(String annotationFQName, @Nullable Psi
text = " <annotation name=\'" + annotationFQName + "\'>\n" + StringUtil.join(
values,
pair -> "<val" + (pair.getName() != null ? " name=\"" + pair.getName() + "\"" : "") +
" val=\"" + StringUtil.escapeXml(pair.getValue().getText()) + "\"/>",
" val=\"" + XmlStringUtil.escapeAttr(pair.getValue().getText(), '"') + "\"/>",
" \n"
) + " </annotation>";
} else {
Expand Down
29 changes: 16 additions & 13 deletions ...ava/com/intellij/java/impl/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import consulo.fileChooser.FileChooserDescriptorFactory;
import consulo.fileChooser.IdeaFileChooser;
import consulo.fileEditor.*;
import consulo.java.impl.JavaBundle;
import consulo.java.localize.JavaLocalize;
import consulo.language.psi.PsiFile;
import consulo.language.psi.PsiManager;
import consulo.localize.LocalizeValue;
Expand All @@ -54,15 +54,14 @@
import consulo.ui.ex.popup.ListSeparator;
import consulo.ui.ex.popup.PopupStep;
import consulo.ui.util.TextWithMnemonic;
import consulo.util.collection.ContainerUtil;
import consulo.util.concurrent.AsyncResult;
import consulo.util.dataholder.Key;
import consulo.util.lang.Comparing;
import consulo.virtualFileSystem.VirtualFile;
import consulo.virtualFileSystem.util.VirtualFilePathUtil;
import consulo.virtualFileSystem.util.VirtualFileUtil;
import org.jspecify.annotations.Nullable;
import jakarta.inject.Inject;
import org.jspecify.annotations.Nullable;

import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
Expand Down Expand Up @@ -115,7 +114,7 @@ public EditorNotificationBuilder buildNotification(
return builder;
}

String text = JavaBundle.message("class.file.decompiled.text");
String text = JavaLocalize.classFileDecompiledText().get();
String classInfo = getClassFileInfo(file);
if (classInfo != null)
{
Expand Down Expand Up @@ -186,10 +185,13 @@ else if (!(action instanceof AttachSourcesProvider.LightAttachSourcesAction)) {
}
else
{
builder.withAction(LocalizeValue.localizeTODO(JavaBundle.message("class.file.open.source.action")), (e) -> {
OpenFileDescriptor descriptor = OpenFileDescriptorFactory.getInstance(myProject).builder(sourceFile).build();
FileEditorManager.getInstance(myProject).openTextEditor(descriptor, true);
});
builder.withAction(
JavaLocalize.classFileOpenSourceAction(),
(e) -> {
OpenFileDescriptor descriptor = OpenFileDescriptorFactory.getInstance(myProject).builder(sourceFile).build();
FileEditorManager.getInstance(myProject).openTextEditor(descriptor, true);
}
);
}

return builder;
Expand Down Expand Up @@ -286,6 +288,7 @@ public String getBusyText()
}

@Override
@RequiredUIAccess
public AsyncResult<Void> perform(List<LibraryOrderEntry> orderEntriesContainingFile, ComponentEvent<Component> e)
{
List<Library.ModifiableModel> modelsToCommit = new ArrayList<>();
Expand Down Expand Up @@ -359,8 +362,8 @@ public String getBusyText()
public AsyncResult<Void> perform(List<LibraryOrderEntry> libraries, ComponentEvent<Component> e)
{
FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createMultipleJavaPathDescriptor();
descriptor.withTitleValue(ProjectLocalize.libraryAttachSourcesAction());
descriptor.withDescriptionValue(ProjectLocalize.libraryAttachSourcesDescription());
descriptor.withTitle(ProjectLocalize.libraryAttachSourcesAction());
descriptor.withDescription(ProjectLocalize.libraryAttachSourcesDescription());
Library firstLibrary = libraries.get(0).getLibrary();
VirtualFile[] roots = firstLibrary != null ? firstLibrary.getFiles(BinariesOrderRootType.getInstance()) : VirtualFile.EMPTY_ARRAY;
VirtualFile[] candidates =
Expand All @@ -383,9 +386,9 @@ public AsyncResult<Void> perform(List<LibraryOrderEntry> libraries, ComponentEve
else
{
librariesToAppendSourcesTo.put(null, null);
String title = JavaBundle.message("library.choose.one.to.attach");
List<LibraryOrderEntry> entries = ContainerUtil.newArrayList(librariesToAppendSourcesTo.values());
JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<LibraryOrderEntry>(title, entries)
LocalizeValue title = JavaLocalize.libraryChooseOneToAttach();
List<LibraryOrderEntry> entries = new ArrayList<>(librariesToAppendSourcesTo.values());
JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<LibraryOrderEntry>(title.get(), entries)
{
@Override
public ListSeparator getSeparatorAbove(LibraryOrderEntry value)
Expand Down
Loading