diff --git a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ClassKind.java b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ClassKind.java index e7ef25e62..128c42736 100644 --- a/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ClassKind.java +++ b/java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/quickfix/ClassKind.java @@ -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(); } diff --git a/java-compiler-artifact-impl/src/main/java/com/intellij/java/compiler/artifact/impl/ManifestFileUtil.java b/java-compiler-artifact-impl/src/main/java/com/intellij/java/compiler/artifact/impl/ManifestFileUtil.java index 8161a34cf..34f65070c 100644 --- a/java-compiler-artifact-impl/src/main/java/com/intellij/java/compiler/artifact/impl/ManifestFileUtil.java +++ b/java-compiler-artifact-impl/src/main/java/com/intellij/java/compiler/artifact/impl/ManifestFileUtil.java @@ -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; } diff --git a/java-compiler-artifact-impl/src/main/java/com/intellij/java/compiler/artifact/impl/ui/properties/ElementWithManifestPropertiesPanel.java b/java-compiler-artifact-impl/src/main/java/com/intellij/java/compiler/artifact/impl/ui/properties/ElementWithManifestPropertiesPanel.java index d2ebc100d..362d619cd 100644 --- a/java-compiler-artifact-impl/src/main/java/com/intellij/java/compiler/artifact/impl/ui/properties/ElementWithManifestPropertiesPanel.java +++ b/java-compiler-artifact-impl/src/main/java/com/intellij/java/compiler/artifact/impl/ui/properties/ElementWithManifestPropertiesPanel.java @@ -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; diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/ExternalAnnotationsManagerImpl.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/ExternalAnnotationsManagerImpl.java index 908edb751..2ed001313 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/ExternalAnnotationsManagerImpl.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/ExternalAnnotationsManagerImpl.java @@ -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; @@ -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; @@ -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; @@ -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); @@ -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 { @@ -708,7 +709,7 @@ private static String createAnnotationTag(String annotationFQName, @Nullable Psi text = " \n" + StringUtil.join( values, pair -> "", + " val=\"" + XmlStringUtil.escapeAttr(pair.getValue().getText(), '"') + "\"/>", " \n" ) + " "; } else { diff --git a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java index e76919ae4..ec5ad29db 100644 --- a/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java +++ b/plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java @@ -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; @@ -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; @@ -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) { @@ -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; @@ -286,6 +288,7 @@ public String getBusyText() } @Override + @RequiredUIAccess public AsyncResult perform(List orderEntriesContainingFile, ComponentEvent e) { List modelsToCommit = new ArrayList<>(); @@ -359,8 +362,8 @@ public String getBusyText() public AsyncResult perform(List libraries, ComponentEvent 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 = @@ -383,9 +386,9 @@ public AsyncResult perform(List libraries, ComponentEve else { librariesToAppendSourcesTo.put(null, null); - String title = JavaBundle.message("library.choose.one.to.attach"); - List entries = ContainerUtil.newArrayList(librariesToAppendSourcesTo.values()); - JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep(title, entries) + LocalizeValue title = JavaLocalize.libraryChooseOneToAttach(); + List entries = new ArrayList<>(librariesToAppendSourcesTo.values()); + JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep(title.get(), entries) { @Override public ListSeparator getSeparatorAbove(LibraryOrderEntry value)