From 75795dc88da31af82030ff20980147585dc11135 Mon Sep 17 00:00:00 2001 From: UNV Date: Thu, 15 Oct 2026 01:33:32 +0300 Subject: [PATCH] Fixing compilation errors after platform update. --- .../extension/DotNetConfigurationPanel.java | 18 +- .../remote/DotNetRemoteConfigurable.java | 2 +- .../impl/DotNetProgramParametersPanel.java | 7 +- .../DotNetCoverageConfigurationEditor.java | 168 ++++++++---------- .../DotNetLibraryOrderEntryTypeEditor.java | 52 +++--- 5 files changed, 116 insertions(+), 131 deletions(-) diff --git a/dotnet-api/src/main/java/consulo/dotnet/module/extension/DotNetConfigurationPanel.java b/dotnet-api/src/main/java/consulo/dotnet/module/extension/DotNetConfigurationPanel.java index 86d07fa9b..f558bc687 100644 --- a/dotnet-api/src/main/java/consulo/dotnet/module/extension/DotNetConfigurationPanel.java +++ b/dotnet-api/src/main/java/consulo/dotnet/module/extension/DotNetConfigurationPanel.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.dotnet.module.extension; import consulo.annotation.access.RequiredReadAction; @@ -59,7 +58,7 @@ /** * @author VISTALL - * @since 31.07.14 + * @since 2014-07-31 */ public final class DotNetConfigurationPanel { private DotNetConfigurationPanel() { @@ -171,11 +170,14 @@ protected void doAdd(AnActionEvent e) { return null; }) .showAsync(listBox) - .whenCompleteAsync((value, error) -> { - if (error == null && !StringUtil.isEmpty(value) && model.indexOf(value) < 0) { - model.add(value); - } - }, uiAccess); + .whenCompleteAsync( + (value, error) -> { + if (error == null && !StringUtil.isEmpty(value) && model.indexOf(value) < 0) { + model.add(value); + } + }, + uiAccess + ); } }) .build(); @@ -199,7 +201,7 @@ private static ComboBox createMainTypeBox( MutableFlatDataModel model = FlatDataModel.of(initialItems); ComboBox mainTypeBox = ComboBox.create(model); - mainTypeBox.setRender((presentation, item) -> { + mainTypeBox.setRenderer((presentation, item) -> { DotNetMainTypeItem value = item.getValue(); String qualifiedName = value == null ? null : value.qualifiedName(); if (value == null || qualifiedName == null) { diff --git a/dotnet-debugger-impl/src/main/java/consulo/dotnet/debugger/impl/runner/remote/DotNetRemoteConfigurable.java b/dotnet-debugger-impl/src/main/java/consulo/dotnet/debugger/impl/runner/remote/DotNetRemoteConfigurable.java index b198cbb0d..332f7918e 100644 --- a/dotnet-debugger-impl/src/main/java/consulo/dotnet/debugger/impl/runner/remote/DotNetRemoteConfigurable.java +++ b/dotnet-debugger-impl/src/main/java/consulo/dotnet/debugger/impl/runner/remote/DotNetRemoteConfigurable.java @@ -48,7 +48,7 @@ public DotNetRemoteConfigurable(Project project) { myPortField = IntBox.create().withRange(0, MAX_PORT); myModuleComboBox = ComboBox.create(ModuleManager.getInstance(project).getSortedModules()); - myModuleComboBox.setRender((presentation, item) -> { + myModuleComboBox.setRenderer((presentation, item) -> { Module module = item.getValue(); if (module == null) { presentation.append(DotNetExecutionLocalize.runConfigurationModuleNone()); diff --git a/dotnet-execution-impl/src/main/java/consulo/dotnet/run/impl/DotNetProgramParametersPanel.java b/dotnet-execution-impl/src/main/java/consulo/dotnet/run/impl/DotNetProgramParametersPanel.java index b34b56f12..dbb8cd568 100644 --- a/dotnet-execution-impl/src/main/java/consulo/dotnet/run/impl/DotNetProgramParametersPanel.java +++ b/dotnet-execution-impl/src/main/java/consulo/dotnet/run/impl/DotNetProgramParametersPanel.java @@ -1,6 +1,5 @@ package consulo.dotnet.run.impl; -import consulo.application.Application; import consulo.dotnet.execution.localize.DotNetExecutionLocalize; import consulo.dotnet.module.extension.DotNetRunModuleExtension; import consulo.execution.ui.CommonProgramParametersLayout; @@ -41,8 +40,7 @@ protected void addAfter(FormBuilder builder) { } ComboBox moduleComboBox = ComboBox.create(modules); - moduleComboBox.setRender((presentation, item) -> - { + moduleComboBox.setRenderer((presentation, item) -> { Module module = item.getValue(); if (module != null) { presentation.withIcon(PlatformIconGroup.nodesModule()); @@ -54,8 +52,7 @@ protected void addAfter(FormBuilder builder) { builder.addLabeled(DotNetExecutionLocalize.runConfigurationModuleLabel(), moduleComboBox); ComboBox consoleTypeBox = ComboBox.create(ProcessConsoleType.listSupported()); - consoleTypeBox.setRender((presentation, item) -> - { + consoleTypeBox.setRenderer((presentation, item) -> { ProcessConsoleType consoleType = item.getValue(); if (consoleType != null) { presentation.append(consoleType.getDisplayName()); diff --git a/dotnet-execution-impl/src/main/java/consulo/dotnet/run/impl/coverage/DotNetCoverageConfigurationEditor.java b/dotnet-execution-impl/src/main/java/consulo/dotnet/run/impl/coverage/DotNetCoverageConfigurationEditor.java index c29510cee..a8ee700e8 100644 --- a/dotnet-execution-impl/src/main/java/consulo/dotnet/run/impl/coverage/DotNetCoverageConfigurationEditor.java +++ b/dotnet-execution-impl/src/main/java/consulo/dotnet/run/impl/coverage/DotNetCoverageConfigurationEditor.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.dotnet.run.impl.coverage; import consulo.configurable.ConfigurationException; @@ -38,94 +37,83 @@ /** * @author VISTALL - * @since 10.01.15 + * @since 2015-01-10 */ -public class DotNetCoverageConfigurationEditor extends SettingsEditor -{ - private static final Object NO_RUNNER = new Object(); - - private final MutableFlatDataModel myRunnersModel = FlatDataModel.of(List.of(NO_RUNNER)); - private final ComboBox myRunnersBox; - private final CheckBox myEnabledCheckBox; - - @RequiredUIAccess - public DotNetCoverageConfigurationEditor() - { - myEnabledCheckBox = CheckBox.create(DotNetExecutionLocalize.coverageEnabledCheckbox()); - - myRunnersBox = ComboBox.create(myRunnersModel); - myRunnersBox.setRender((presentation, item) -> - { - Object value = item.getValue(); - if(value == null || value == NO_RUNNER) - { - presentation.append(DotNetExecutionLocalize.coverageNoRunner()); - } - else if(value instanceof String runnerId) - { - presentation.append(runnerId, TextAttribute.ERROR); - } - else if(value instanceof CoverageRunner coverageRunner) - { - presentation.append(coverageRunner.getPresentableName()); - } - }); - } - - @Override - @RequiredUIAccess - protected void resetEditorFrom(DotNetConfigurationWithCoverage s) - { - CoverageEnabledConfiguration coverageEnabledConfiguration = DotNetCoverageEnabledConfiguration.getOrCreate((RunConfigurationBase) s); - - myEnabledCheckBox.setValue(coverageEnabledConfiguration.isCoverageEnabled()); - - List runners = new ArrayList<>(); - runners.add(NO_RUNNER); - runners.addAll(DotNetCoverageRunner.findAvailableRunners(s)); - - Object selected = NO_RUNNER; - CoverageRunner coverageRunner = coverageEnabledConfiguration.getCoverageRunner(); - if(coverageRunner != null) - { - selected = coverageRunner; - } - else if(coverageEnabledConfiguration.getRunnerId() != null) - { - selected = coverageEnabledConfiguration.getRunnerId(); - runners.add(selected); - } - - myRunnersModel.replaceAll(runners); - myRunnersBox.setValue(selected); - } - - @Override - @RequiredUIAccess - protected void applyEditorTo(DotNetConfigurationWithCoverage s) throws ConfigurationException - { - CoverageEnabledConfiguration coverageEnabledConfiguration = DotNetCoverageEnabledConfiguration.getOrCreate((RunConfigurationBase) s); - - coverageEnabledConfiguration.setCoverageEnabled(Boolean.TRUE.equals(myEnabledCheckBox.getValue())); - - Object selectedItem = myRunnersBox.getValue(); - if(selectedItem instanceof CoverageRunner coverageRunner) - { - coverageEnabledConfiguration.setCoverageRunner(coverageRunner); - } - else if(selectedItem == null || selectedItem == NO_RUNNER) - { - coverageEnabledConfiguration.setCoverageRunner(null); - } - } - - @Override - @RequiredUIAccess - protected Component createUIComponent() - { - VerticalLayout layout = VerticalLayout.create(); - layout.add(myEnabledCheckBox); - layout.add(FormBuilder.create().addLabeled(DotNetExecutionLocalize.coverageRunnerLabel(), myRunnersBox).build()); - return layout; - } +public class DotNetCoverageConfigurationEditor extends SettingsEditor { + private static final Object NO_RUNNER = new Object(); + + private final MutableFlatDataModel myRunnersModel = FlatDataModel.of(List.of(NO_RUNNER)); + private final ComboBox myRunnersBox; + private final CheckBox myEnabledCheckBox; + + @RequiredUIAccess + public DotNetCoverageConfigurationEditor() { + myEnabledCheckBox = CheckBox.create(DotNetExecutionLocalize.coverageEnabledCheckbox()); + + myRunnersBox = ComboBox.create(myRunnersModel); + myRunnersBox.setRenderer((presentation, item) -> { + Object value = item.getValue(); + if (value == null || value == NO_RUNNER) { + presentation.append(DotNetExecutionLocalize.coverageNoRunner()); + } + else if (value instanceof String runnerId) { + presentation.append(runnerId, TextAttribute.ERROR); + } + else if (value instanceof CoverageRunner coverageRunner) { + presentation.append(coverageRunner.getPresentableName()); + } + }); + } + + @Override + @RequiredUIAccess + protected void resetEditorFrom(DotNetConfigurationWithCoverage s) { + CoverageEnabledConfiguration coverageEnabledConfiguration = + DotNetCoverageEnabledConfiguration.getOrCreate((RunConfigurationBase) s); + + myEnabledCheckBox.setValue(coverageEnabledConfiguration.isCoverageEnabled()); + + List runners = new ArrayList<>(); + runners.add(NO_RUNNER); + runners.addAll(DotNetCoverageRunner.findAvailableRunners(s)); + + Object selected = NO_RUNNER; + CoverageRunner coverageRunner = coverageEnabledConfiguration.getCoverageRunner(); + if (coverageRunner != null) { + selected = coverageRunner; + } + else if (coverageEnabledConfiguration.getRunnerId() != null) { + selected = coverageEnabledConfiguration.getRunnerId(); + runners.add(selected); + } + + myRunnersModel.replaceAll(runners); + myRunnersBox.setValue(selected); + } + + @Override + @RequiredUIAccess + protected void applyEditorTo(DotNetConfigurationWithCoverage s) throws ConfigurationException { + CoverageEnabledConfiguration coverageEnabledConfiguration = + DotNetCoverageEnabledConfiguration.getOrCreate((RunConfigurationBase) s); + + coverageEnabledConfiguration.setCoverageEnabled(Boolean.TRUE.equals(myEnabledCheckBox.getValue())); + + Object selectedItem = myRunnersBox.getValue(); + if (selectedItem instanceof CoverageRunner coverageRunner) { + coverageEnabledConfiguration.setCoverageRunner(coverageRunner); + } + else if (selectedItem == null || selectedItem == NO_RUNNER) { + coverageEnabledConfiguration.setCoverageRunner(null); + } + } + + @Override + @RequiredUIAccess + protected Component createUIComponent() { + VerticalLayout layout = VerticalLayout.create(); + layout.add(myEnabledCheckBox); + layout.add(FormBuilder.create().addLabeled(DotNetExecutionLocalize.coverageRunnerLabel(), myRunnersBox).build()); + return layout; + } } diff --git a/dotnet-impl/src/main/java/consulo/dotnet/impl/roots/orderEntry/DotNetLibraryOrderEntryTypeEditor.java b/dotnet-impl/src/main/java/consulo/dotnet/impl/roots/orderEntry/DotNetLibraryOrderEntryTypeEditor.java index 62fa92eb0..8322edcc7 100644 --- a/dotnet-impl/src/main/java/consulo/dotnet/impl/roots/orderEntry/DotNetLibraryOrderEntryTypeEditor.java +++ b/dotnet-impl/src/main/java/consulo/dotnet/impl/roots/orderEntry/DotNetLibraryOrderEntryTypeEditor.java @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.dotnet.impl.roots.orderEntry; import consulo.annotation.component.ExtensionImpl; -import consulo.application.AllIcons; import consulo.dotnet.module.extension.DotNetLibraryOrderEntryModel; import consulo.dotnet.module.extension.DotNetSimpleModuleExtension; import consulo.ide.setting.module.CustomOrderEntryTypeEditor; import consulo.module.content.layer.ModuleExtensionProvider; import consulo.module.content.layer.orderEntry.CustomOrderEntry; +import consulo.platform.base.icon.PlatformIconGroup; import consulo.ui.ex.ColoredTextContainer; import consulo.ui.image.Image; @@ -30,31 +29,30 @@ /** * @author VISTALL - * @since 06-Jun-16 + * @since 2016-06-06 */ @ExtensionImpl -public class DotNetLibraryOrderEntryTypeEditor implements CustomOrderEntryTypeEditor -{ - @Override - public Consumer getRender(CustomOrderEntry orderEntry, DotNetLibraryOrderEntryModel model) - { - return it -> { - - DotNetSimpleModuleExtension extension = orderEntry.getModuleRootLayer().getExtension(DotNetSimpleModuleExtension.class); - - ModuleExtensionProvider provider = extension == null ? null : ModuleExtensionProvider.findProvider(extension.getId()); - - Image icon = provider == null ? AllIcons.Toolbar.Unknown : provider.getIcon(); - - it.append(model.getPresentableName()); - - it.setIcon(icon); - }; - } - - @Override - public String getOrderTypeId() - { - return "dot-net-library"; - } +public class DotNetLibraryOrderEntryTypeEditor implements CustomOrderEntryTypeEditor { + @Override + public Consumer getRenderer( + CustomOrderEntry orderEntry, + DotNetLibraryOrderEntryModel model + ) { + return it -> { + DotNetSimpleModuleExtension extension = orderEntry.getModuleRootLayer().getExtension(DotNetSimpleModuleExtension.class); + + ModuleExtensionProvider provider = extension == null ? null : ModuleExtensionProvider.findProvider(extension.getId()); + + Image icon = provider == null ? PlatformIconGroup.toolbarUnknown() : provider.getIcon(); + + it.append(model.getPresentableName()); + + it.setIcon(icon); + }; + } + + @Override + public String getOrderTypeId() { + return "dot-net-library"; + } }