From 82f66261db3f20006be927bcfccfb4a88fc4f4df Mon Sep 17 00:00:00 2001 From: UNV Date: Wed, 30 Apr 2025 10:36:20 +0300 Subject: [PATCH 1/2] Reformatting ConfigurationType descendants and coverage. --- .../java/coverage/CoverageConfigurable.java | 513 +++++++++--------- .../coverage/DefaultJavaCoverageRunner.java | 39 +- .../ApplicationConfigurationType.java | 137 ++--- .../impl/remote/RemoteConfigurationType.java | 49 +- 4 files changed, 378 insertions(+), 360 deletions(-) diff --git a/java-coverage-impl/src/main/java/com/intellij/java/coverage/CoverageConfigurable.java b/java-coverage-impl/src/main/java/com/intellij/java/coverage/CoverageConfigurable.java index 707710a327..6f136893e1 100644 --- a/java-coverage-impl/src/main/java/com/intellij/java/coverage/CoverageConfigurable.java +++ b/java-coverage-impl/src/main/java/com/intellij/java/coverage/CoverageConfigurable.java @@ -55,285 +55,296 @@ * group.addEditor(title, yourConfigurable); * group.addEditor(title, yourCoverageConfigurable); * + * * @author ven */ public class CoverageConfigurable extends SettingsEditor { - private static final Logger LOG = Logger.getInstance(CoverageConfigurable.class); - - private final JreVersionDetector myVersionDetector = new JreVersionDetector(); - Project myProject; - private MyClassFilterEditor myClassFilterEditor; - private JLabel myCoverageNotSupportedLabel; - private JComboBox myCoverageRunnerCb; - private JPanel myRunnerPanel; - private JCheckBox myTrackPerTestCoverageCb; - private JCheckBox myTrackTestSourcesCb; - - private JRadioButton myTracingRb; - private JRadioButton mySamplingRb; - private final RunConfigurationBase myConfig; - - private static class MyClassFilterEditor extends ClassFilterEditor { - public MyClassFilterEditor(Project project) { - super(project, aClass -> aClass.getContainingClass() == null); - } + private static final Logger LOG = Logger.getInstance(CoverageConfigurable.class); + + private final JreVersionDetector myVersionDetector = new JreVersionDetector(); + Project myProject; + private MyClassFilterEditor myClassFilterEditor; + private JLabel myCoverageNotSupportedLabel; + private JComboBox myCoverageRunnerCb; + private JPanel myRunnerPanel; + private JCheckBox myTrackPerTestCoverageCb; + private JCheckBox myTrackTestSourcesCb; + + private JRadioButton myTracingRb; + private JRadioButton mySamplingRb; + private final RunConfigurationBase myConfig; + + private static class MyClassFilterEditor extends ClassFilterEditor { + public MyClassFilterEditor(Project project) { + super(project, aClass -> aClass.getContainingClass() == null); + } - protected void addPatternFilter() { - PackageChooser packageChooser = myProject.getInstance(PackageChooserFactory.class).create(); - - List packages = packageChooser.showAndSelect(); - if (packages != null) { - if (!packages.isEmpty()) { - for (final PsiJavaPackage aPackage : packages) { - final String fqName = aPackage.getQualifiedName(); - final String pattern = fqName.isEmpty() ? "*" : fqName + ".*"; - myTableModel.addRow(createFilter(pattern)); - } - int row = myTableModel.getRowCount() - 1; - myTable.getSelectionModel().setSelectionInterval(row, row); - myTable.scrollRectToVisible(myTable.getCellRect(row, 0, true)); - myTable.requestFocus(); + protected void addPatternFilter() { + PackageChooser packageChooser = myProject.getInstance(PackageChooserFactory.class).create(); + + List packages = packageChooser.showAndSelect(); + if (packages != null) { + if (!packages.isEmpty()) { + for (final PsiJavaPackage aPackage : packages) { + final String fqName = aPackage.getQualifiedName(); + final String pattern = fqName.isEmpty() ? "*" : fqName + ".*"; + myTableModel.addRow(createFilter(pattern)); + } + int row = myTableModel.getRowCount() - 1; + myTable.getSelectionModel().setSelectionInterval(row, row); + myTable.scrollRectToVisible(myTable.getCellRect(row, 0, true)); + myTable.requestFocus(); + } + } } - } - } - protected String getAddPatternButtonText() { - return CodeInsightLocalize.coverageButtonAddPackage().get(); - } + protected String getAddPatternButtonText() { + return CodeInsightLocalize.coverageButtonAddPackage().get(); + } - @Override - protected Image getAddPatternButtonIcon() { - return PlatformIconGroup.nodesPackage(); + @Override + protected Image getAddPatternButtonIcon() { + return PlatformIconGroup.nodesPackage(); + } } - } - - public CoverageConfigurable(RunConfigurationBase config) { - myConfig = config; - myProject = config.getProject(); - } - - protected void resetEditorFrom(final RunConfigurationBase runConfiguration) { - final boolean isJre50; - if (runConfiguration instanceof CommonJavaRunConfigurationParameters configurationParameters - && myVersionDetector.isJre50Configured(configurationParameters)) { - isJre50 = true; - } else if (runConfiguration instanceof ModuleBasedConfiguration moduleBasedConfiguration) { - isJre50 = myVersionDetector.isModuleJre50Configured(moduleBasedConfiguration); - } else { - isJre50 = true; + + public CoverageConfigurable(RunConfigurationBase config) { + myConfig = config; + myProject = config.getProject(); } - myCoverageNotSupportedLabel.setVisible(!isJre50); - - final JavaCoverageEnabledConfiguration configuration = (JavaCoverageEnabledConfiguration)CoverageEnabledConfiguration.getOrCreate(runConfiguration); - CoverageRunner runner = configuration.getCoverageRunner(); - if (runner != null) { - myCoverageRunnerCb.setSelectedItem(new CoverageRunnerItem(runner)); - } else { - final String runnerId = configuration.getRunnerId(); - if (runnerId != null){ - final CoverageRunnerItem runnerItem = new CoverageRunnerItem(runnerId); - final DefaultComboBoxModel model = (DefaultComboBoxModel)myCoverageRunnerCb.getModel(); - if (model.getIndexOf(runnerItem) == -1) { - model.addElement(runnerItem); + protected void resetEditorFrom(final RunConfigurationBase runConfiguration) { + final boolean isJre50; + if (runConfiguration instanceof CommonJavaRunConfigurationParameters configurationParameters + && myVersionDetector.isJre50Configured(configurationParameters)) { + isJre50 = true; } - myCoverageRunnerCb.setSelectedItem(runnerItem); - } else { - myCoverageRunnerCb.setSelectedIndex(0); - } - runner = ((CoverageRunnerItem)myCoverageRunnerCb.getSelectedItem()).getRunner(); - } - UIUtil.setEnabled(myRunnerPanel, isJre50, true); - - - myClassFilterEditor.setFilters(configuration.getCoveragePatterns()); - final boolean isCoverageByTestApplicable = runner != null && runner.isCoverageByTestApplicable(); - myTracingRb.setEnabled(myTracingRb.isEnabled() && isCoverageByTestApplicable); - mySamplingRb.setSelected(configuration.isSampling() || !isCoverageByTestApplicable); - myTracingRb.setSelected(!mySamplingRb.isSelected()); - - myTrackPerTestCoverageCb.setSelected(configuration.isTrackPerTestCoverage()); - myTrackPerTestCoverageCb.setEnabled(myTracingRb.isEnabled() && myTracingRb.isSelected() && canHavePerTestCoverage()); - - myTrackTestSourcesCb.setSelected(configuration.isTrackTestFolders()); - } - - protected boolean canHavePerTestCoverage() { - return CoverageEnabledConfiguration.getOrCreate(myConfig).canHavePerTestCoverage(); - } - - protected void applyEditorTo(final RunConfigurationBase runConfiguration) throws ConfigurationException { - final JavaCoverageEnabledConfiguration configuration = (JavaCoverageEnabledConfiguration)CoverageEnabledConfiguration.getOrCreate(runConfiguration); - configuration.setCoveragePatterns(myClassFilterEditor.getFilters()); - configuration.setCoverageRunner(getSelectedRunner()); - configuration.setTrackPerTestCoverage(myTrackPerTestCoverageCb.isSelected()); - configuration.setSampling(mySamplingRb.isSelected()); - configuration.setTrackTestFolders(myTrackTestSourcesCb.isSelected()); - } - - @Nonnull - protected JComponent createEditor() { - JPanel result = new JPanel(new GridBagLayout()); - - final DefaultComboBoxModel runnersModel = new DefaultComboBoxModel<>(); - myCoverageRunnerCb = new JComboBox<>(runnersModel); - - final JavaCoverageEnabledConfiguration javaCoverageEnabledConfiguration = JavaCoverageEnabledConfiguration.getFrom(myConfig); - LOG.assertTrue(javaCoverageEnabledConfiguration != null); - final JavaCoverageEngine provider = javaCoverageEnabledConfiguration.getCoverageProvider(); - for (CoverageRunner runner : Extensions.getExtensions(CoverageRunner.EP_NAME)) { - if (runner.acceptsCoverageEngine(provider)) { - runnersModel.addElement(new CoverageRunnerItem(runner)); - } - } - myCoverageRunnerCb.setRenderer(new ListCellRendererWrapper<>() { - @Override - public void customize(JList list, CoverageRunnerItem value, int index, boolean selected, boolean hasFocus) { - if (value != null) { - setText(value.getPresentableName()); + else if (runConfiguration instanceof ModuleBasedConfiguration moduleBasedConfiguration) { + isJre50 = myVersionDetector.isModuleJre50Configured(moduleBasedConfiguration); + } + else { + isJre50 = true; } - } - }); - myCoverageRunnerCb.addActionListener(e -> { - final CoverageRunner runner = getSelectedRunner(); - enableTracingPanel(runner != null && runner.isCoverageByTestApplicable()); - myTrackPerTestCoverageCb.setEnabled( - myTracingRb.isSelected() && canHavePerTestCoverage() && runner != null && runner.isCoverageByTestApplicable() - ); - }); - myRunnerPanel = new JPanel(new GridBagLayout()); - myRunnerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - myRunnerPanel.add( - new JLabel("Choose coverage runner:"), - new GridBagConstraints( - 0, 0, 1, 1, 0, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, - JBUI.insetsRight(10), 0, 0 - ) - ); - myRunnerPanel.add( - myCoverageRunnerCb, - new GridBagConstraints( - 1, 0, 1, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, - JBUI.emptyInsets(), 0, 0 - ) - ); - final JPanel cPanel = new JPanel(new VerticalFlowLayout()); - - mySamplingRb = new JRadioButton("Sampling"); - cPanel.add(mySamplingRb); - myTracingRb = new JRadioButton("Tracing"); - cPanel.add(myTracingRb); - - final ButtonGroup group = new ButtonGroup(); - group.add(mySamplingRb); - group.add(myTracingRb); - - ActionListener samplingListener = e -> { - final CoverageRunner runner = getSelectedRunner(); - myTrackPerTestCoverageCb.setEnabled( - canHavePerTestCoverage() && myTracingRb.isSelected() && runner != null && runner.isCoverageByTestApplicable() - ); - }; - - mySamplingRb.addActionListener(samplingListener); - myTracingRb.addActionListener(samplingListener); - - myTrackPerTestCoverageCb = new JCheckBox("Track per test coverage"); - final JPanel tracingPanel = new JPanel(new BorderLayout()); - tracingPanel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 0)); - tracingPanel.add(myTrackPerTestCoverageCb, BorderLayout.CENTER); - cPanel.add(tracingPanel); - myRunnerPanel.add( - cPanel, - new GridBagConstraints( - 0, 1, GridBagConstraints.REMAINDER, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, - JBUI.emptyInsets(), 0, 0 - ) - ); - - final GridBagConstraints gc = new GridBagConstraints( - 0, GridBagConstraints.RELATIVE, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, - JBUI.emptyInsets(), 0, 0 - ); - result.add(myRunnerPanel, gc); - - JPanel panel = new JPanel(new GridBagLayout()); - panel.setBorder(IdeBorderFactory.createTitledBorder(ExecutionLocalize.recordCoverageFiltersTitle().get(), false)); - myClassFilterEditor = new MyClassFilterEditor(myProject); - final GridBagConstraints bagConstraints = new GridBagConstraints( - 0, GridBagConstraints.RELATIVE, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, - JBUI.emptyInsets(), 0, 0 - ); - panel.add(myClassFilterEditor, bagConstraints); - - bagConstraints.weighty = 0; - myTrackTestSourcesCb = new JCheckBox("Enable coverage in test folders"); - panel.add(myTrackTestSourcesCb, bagConstraints); - - result.add(panel, gc); - - myCoverageNotSupportedLabel = new JLabel(CodeInsightLocalize.codeCoverageIsNotSupported().get()); - myCoverageNotSupportedLabel.setIcon(TargetAWT.to(AllIcons.General.WarningDialog)); - result.add(myCoverageNotSupportedLabel, gc); - return result; - } - - @Nullable - private CoverageRunner getSelectedRunner() { - final CoverageRunnerItem runnerItem = (CoverageRunnerItem)myCoverageRunnerCb.getSelectedItem(); - if (runnerItem == null) { - LOG.debug("Available runners: " + myCoverageRunnerCb.getModel().getSize()); - } - return runnerItem != null ? runnerItem.getRunner() : null; - } - private void enableTracingPanel(final boolean enabled) { - myTracingRb.setEnabled(enabled); - if (!enabled) { - mySamplingRb.setSelected(true); - } - } + myCoverageNotSupportedLabel.setVisible(!isJre50); - private static class CoverageRunnerItem { - private CoverageRunner myRunner; - private @Nonnull - String myRunnerId; + final JavaCoverageEnabledConfiguration configuration = + (JavaCoverageEnabledConfiguration)CoverageEnabledConfiguration.getOrCreate(runConfiguration); + CoverageRunner runner = configuration.getCoverageRunner(); + if (runner != null) { + myCoverageRunnerCb.setSelectedItem(new CoverageRunnerItem(runner)); + } + else { + final String runnerId = configuration.getRunnerId(); + if (runnerId != null) { + final CoverageRunnerItem runnerItem = new CoverageRunnerItem(runnerId); + final DefaultComboBoxModel model = (DefaultComboBoxModel)myCoverageRunnerCb.getModel(); + if (model.getIndexOf(runnerItem) == -1) { + model.addElement(runnerItem); + } + myCoverageRunnerCb.setSelectedItem(runnerItem); + } + else { + myCoverageRunnerCb.setSelectedIndex(0); + } + runner = ((CoverageRunnerItem)myCoverageRunnerCb.getSelectedItem()).getRunner(); + } + UIUtil.setEnabled(myRunnerPanel, isJre50, true); - private CoverageRunnerItem(@Nonnull CoverageRunner runner) { - myRunner = runner; - myRunnerId = runner.getId(); + + myClassFilterEditor.setFilters(configuration.getCoveragePatterns()); + final boolean isCoverageByTestApplicable = runner != null && runner.isCoverageByTestApplicable(); + myTracingRb.setEnabled(myTracingRb.isEnabled() && isCoverageByTestApplicable); + mySamplingRb.setSelected(configuration.isSampling() || !isCoverageByTestApplicable); + myTracingRb.setSelected(!mySamplingRb.isSelected()); + + myTrackPerTestCoverageCb.setSelected(configuration.isTrackPerTestCoverage()); + myTrackPerTestCoverageCb.setEnabled(myTracingRb.isEnabled() && myTracingRb.isSelected() && canHavePerTestCoverage()); + + myTrackTestSourcesCb.setSelected(configuration.isTrackTestFolders()); } - private CoverageRunnerItem(@Nonnull String runnerId) { - myRunnerId = runnerId; + protected boolean canHavePerTestCoverage() { + return CoverageEnabledConfiguration.getOrCreate(myConfig).canHavePerTestCoverage(); } - public CoverageRunner getRunner() { - return myRunner; + protected void applyEditorTo(final RunConfigurationBase runConfiguration) throws ConfigurationException { + final JavaCoverageEnabledConfiguration configuration = + (JavaCoverageEnabledConfiguration)CoverageEnabledConfiguration.getOrCreate(runConfiguration); + configuration.setCoveragePatterns(myClassFilterEditor.getFilters()); + configuration.setCoverageRunner(getSelectedRunner()); + configuration.setTrackPerTestCoverage(myTrackPerTestCoverageCb.isSelected()); + configuration.setSampling(mySamplingRb.isSelected()); + configuration.setTrackTestFolders(myTrackTestSourcesCb.isSelected()); } @Nonnull - public String getRunnerId() { - return myRunnerId; + protected JComponent createEditor() { + JPanel result = new JPanel(new GridBagLayout()); + + final DefaultComboBoxModel runnersModel = new DefaultComboBoxModel<>(); + myCoverageRunnerCb = new JComboBox<>(runnersModel); + + final JavaCoverageEnabledConfiguration javaCoverageEnabledConfiguration = JavaCoverageEnabledConfiguration.getFrom(myConfig); + LOG.assertTrue(javaCoverageEnabledConfiguration != null); + final JavaCoverageEngine provider = javaCoverageEnabledConfiguration.getCoverageProvider(); + for (CoverageRunner runner : Extensions.getExtensions(CoverageRunner.EP_NAME)) { + if (runner.acceptsCoverageEngine(provider)) { + runnersModel.addElement(new CoverageRunnerItem(runner)); + } + } + myCoverageRunnerCb.setRenderer(new ListCellRendererWrapper<>() { + @Override + public void customize(JList list, CoverageRunnerItem value, int index, boolean selected, boolean hasFocus) { + if (value != null) { + setText(value.getPresentableName()); + } + } + }); + myCoverageRunnerCb.addActionListener(e -> { + final CoverageRunner runner = getSelectedRunner(); + enableTracingPanel(runner != null && runner.isCoverageByTestApplicable()); + myTrackPerTestCoverageCb.setEnabled( + myTracingRb.isSelected() && canHavePerTestCoverage() && runner != null && runner.isCoverageByTestApplicable() + ); + }); + myRunnerPanel = new JPanel(new GridBagLayout()); + myRunnerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); + myRunnerPanel.add( + new JLabel("Choose coverage runner:"), + new GridBagConstraints( + 0, 0, 1, 1, 0, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, + JBUI.insetsRight(10), 0, 0 + ) + ); + myRunnerPanel.add( + myCoverageRunnerCb, + new GridBagConstraints( + 1, 0, 1, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, + JBUI.emptyInsets(), 0, 0 + ) + ); + final JPanel cPanel = new JPanel(new VerticalFlowLayout()); + + mySamplingRb = new JRadioButton("Sampling"); + cPanel.add(mySamplingRb); + myTracingRb = new JRadioButton("Tracing"); + cPanel.add(myTracingRb); + + final ButtonGroup group = new ButtonGroup(); + group.add(mySamplingRb); + group.add(myTracingRb); + + ActionListener samplingListener = e -> { + final CoverageRunner runner = getSelectedRunner(); + myTrackPerTestCoverageCb.setEnabled( + canHavePerTestCoverage() && myTracingRb.isSelected() && runner != null && runner.isCoverageByTestApplicable() + ); + }; + + mySamplingRb.addActionListener(samplingListener); + myTracingRb.addActionListener(samplingListener); + + myTrackPerTestCoverageCb = new JCheckBox("Track per test coverage"); + final JPanel tracingPanel = new JPanel(new BorderLayout()); + tracingPanel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 0)); + tracingPanel.add(myTrackPerTestCoverageCb, BorderLayout.CENTER); + cPanel.add(tracingPanel); + myRunnerPanel.add( + cPanel, + new GridBagConstraints( + 0, 1, GridBagConstraints.REMAINDER, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, + JBUI.emptyInsets(), 0, 0 + ) + ); + + final GridBagConstraints gc = new GridBagConstraints( + 0, GridBagConstraints.RELATIVE, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, + JBUI.emptyInsets(), 0, 0 + ); + result.add(myRunnerPanel, gc); + + JPanel panel = new JPanel(new GridBagLayout()); + panel.setBorder(IdeBorderFactory.createTitledBorder(ExecutionLocalize.recordCoverageFiltersTitle().get(), false)); + myClassFilterEditor = new MyClassFilterEditor(myProject); + final GridBagConstraints bagConstraints = new GridBagConstraints( + 0, GridBagConstraints.RELATIVE, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, + JBUI.emptyInsets(), 0, 0 + ); + panel.add(myClassFilterEditor, bagConstraints); + + bagConstraints.weighty = 0; + myTrackTestSourcesCb = new JCheckBox("Enable coverage in test folders"); + panel.add(myTrackTestSourcesCb, bagConstraints); + + result.add(panel, gc); + + myCoverageNotSupportedLabel = new JLabel(CodeInsightLocalize.codeCoverageIsNotSupported().get()); + myCoverageNotSupportedLabel.setIcon(TargetAWT.to(AllIcons.General.WarningDialog)); + result.add(myCoverageNotSupportedLabel, gc); + return result; } - public String getPresentableName() { - return myRunner != null ? myRunner.getPresentableName() : myRunnerId; + @Nullable + private CoverageRunner getSelectedRunner() { + final CoverageRunnerItem runnerItem = (CoverageRunnerItem)myCoverageRunnerCb.getSelectedItem(); + if (runnerItem == null) { + LOG.debug("Available runners: " + myCoverageRunnerCb.getModel().getSize()); + } + return runnerItem != null ? runnerItem.getRunner() : null; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + private void enableTracingPanel(final boolean enabled) { + myTracingRb.setEnabled(enabled); + if (!enabled) { + mySamplingRb.setSelected(true); + } + } - CoverageRunnerItem that = (CoverageRunnerItem) o; + private static class CoverageRunnerItem { + private CoverageRunner myRunner; + private @Nonnull + String myRunnerId; - return myRunnerId.equals(that.myRunnerId); - } + private CoverageRunnerItem(@Nonnull CoverageRunner runner) { + myRunner = runner; + myRunnerId = runner.getId(); + } + + private CoverageRunnerItem(@Nonnull String runnerId) { + myRunnerId = runnerId; + } + + public CoverageRunner getRunner() { + return myRunner; + } - @Override - public int hashCode() { - return myRunnerId.hashCode(); + @Nonnull + public String getRunnerId() { + return myRunnerId; + } + + public String getPresentableName() { + return myRunner != null ? myRunner.getPresentableName() : myRunnerId; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + CoverageRunnerItem that = (CoverageRunnerItem)o; + + return myRunnerId.equals(that.myRunnerId); + } + + @Override + public int hashCode() { + return myRunnerId.hashCode(); + } } - } } diff --git a/java-coverage-impl/src/main/java/com/intellij/java/coverage/DefaultJavaCoverageRunner.java b/java-coverage-impl/src/main/java/com/intellij/java/coverage/DefaultJavaCoverageRunner.java index 74e8c9aa76..fc3d7c170a 100644 --- a/java-coverage-impl/src/main/java/com/intellij/java/coverage/DefaultJavaCoverageRunner.java +++ b/java-coverage-impl/src/main/java/com/intellij/java/coverage/DefaultJavaCoverageRunner.java @@ -26,26 +26,27 @@ @ExtensionImpl(id = "DefaultJavaCoverageRunner") public class DefaultJavaCoverageRunner extends DefaultJavaProgramRunner { - public boolean canRun(@Nonnull final String executorId, @Nonnull final RunProfile profile) { - try { - return executorId.equals(CoverageExecutor.EXECUTOR_ID) && - //profile instanceof ModuleBasedConfiguration && - !(profile instanceof RunConfigurationWithSuppressedDefaultRunAction) && - profile instanceof RunConfigurationBase && - CoverageEngine.EP_NAME.findExtension(JavaCoverageEngine.class).isApplicableTo((RunConfigurationBase) profile); - } catch (Exception e) { - return false; + public boolean canRun(@Nonnull final String executorId, @Nonnull final RunProfile profile) { + try { + return executorId.equals(CoverageExecutor.EXECUTOR_ID) + // && profile instanceof ModuleBasedConfiguration + && !(profile instanceof RunConfigurationWithSuppressedDefaultRunAction) + && profile instanceof RunConfigurationBase + && CoverageEngine.EP_NAME.findExtension(JavaCoverageEngine.class).isApplicableTo((RunConfigurationBase)profile); + } + catch (Exception e) { + return false; + } } - } - @Override - public RunnerSettings createConfigurationData(ConfigurationInfoProvider settingsProvider) { - return new CoverageRunnerData(); - } + @Override + public RunnerSettings createConfigurationData(ConfigurationInfoProvider settingsProvider) { + return new CoverageRunnerData(); + } - @Nonnull - @Override - public String getRunnerId() { - return "Cover"; - } + @Nonnull + @Override + public String getRunnerId() { + return "Cover"; + } } diff --git a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/application/ApplicationConfigurationType.java b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/application/ApplicationConfigurationType.java index 42f162a7b9..cef44a0ba4 100644 --- a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/application/ApplicationConfigurationType.java +++ b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/application/ApplicationConfigurationType.java @@ -38,86 +38,87 @@ @ExtensionImpl public class ApplicationConfigurationType implements ConfigurationType { - private final ConfigurationFactory myFactory; + private final ConfigurationFactory myFactory; - public ApplicationConfigurationType() { - myFactory = new ConfigurationFactory(this) { - @Nonnull - @Override - public String getId() { - // non localized string as id - do change, this can break loading old projects - return "Java Application"; - } + public ApplicationConfigurationType() { + myFactory = new ConfigurationFactory(this) { + @Nonnull + @Override + public String getId() { + // non localized string as id - do change, this can break loading old projects + return "Java Application"; + } - @Override - public RunConfiguration createTemplateConfiguration(Project project) { - return new ApplicationConfiguration("", project, ApplicationConfigurationType.this); - } + @Override + public RunConfiguration createTemplateConfiguration(Project project) { + return new ApplicationConfiguration("", project, ApplicationConfigurationType.this); + } - @Override - public boolean isApplicable(@Nonnull Project project) { - return ModuleExtensionHelper.getInstance(project).hasModuleExtension(JavaModuleExtension.class); - } + @Override + public boolean isApplicable(@Nonnull Project project) { + return ModuleExtensionHelper.getInstance(project).hasModuleExtension(JavaModuleExtension.class); + } - @Override - public void onNewConfigurationCreated(@Nonnull RunConfiguration configuration) { - ((ModuleBasedConfiguration) configuration).onNewConfigurationCreated(); - } - }; - } + @Override + public void onNewConfigurationCreated(@Nonnull RunConfiguration configuration) { + ((ModuleBasedConfiguration)configuration).onNewConfigurationCreated(); + } + }; + } - @Override - public LocalizeValue getDisplayName() { - return JavaExecutionLocalize.applicationConfigurationName(); - } + @Override + public LocalizeValue getDisplayName() { + return JavaExecutionLocalize.applicationConfigurationName(); + } - @Override - public LocalizeValue getConfigurationTypeDescription() { - return JavaExecutionLocalize.applicationConfigurationDescription(); - } + @Override + public LocalizeValue getConfigurationTypeDescription() { + return JavaExecutionLocalize.applicationConfigurationDescription(); + } - @Override - public Image getIcon() { - return JavaPsiImplIconGroup.java(); - } + @Override + public Image getIcon() { + return JavaPsiImplIconGroup.java(); + } - @Override - public ConfigurationFactory[] getConfigurationFactories() { - return new ConfigurationFactory[]{myFactory}; - } + @Override + public ConfigurationFactory[] getConfigurationFactories() { + return new ConfigurationFactory[]{myFactory}; + } - @Nullable - public static PsiClass getMainClass(PsiElement element) { - while (element != null) { - if (element instanceof PsiClass) { - final PsiClass aClass = (PsiClass) element; - if (PsiMethodUtil.findMainInClass(aClass) != null) { - return aClass; - } - } else if (element instanceof PsiJavaFile) { - final PsiJavaFile javaFile = (PsiJavaFile) element; - final PsiClass[] classes = javaFile.getClasses(); - for (PsiClass aClass : classes) { - if (PsiMethodUtil.findMainInClass(aClass) != null) { - return aClass; - } + @Nullable + public static PsiClass getMainClass(PsiElement element) { + while (element != null) { + if (element instanceof PsiClass) { + final PsiClass aClass = (PsiClass)element; + if (PsiMethodUtil.findMainInClass(aClass) != null) { + return aClass; + } + } + else if (element instanceof PsiJavaFile) { + final PsiJavaFile javaFile = (PsiJavaFile)element; + final PsiClass[] classes = javaFile.getClasses(); + for (PsiClass aClass : classes) { + if (PsiMethodUtil.findMainInClass(aClass) != null) { + return aClass; + } + } + } + element = element.getParent(); } - } - element = element.getParent(); + return null; } - return null; - } - @Override - @Nonnull - @NonNls - public String getId() { - return "JavaApplication"; - } + @Override + @Nonnull + @NonNls + public String getId() { + return "JavaApplication"; + } - @Nullable - public static ApplicationConfigurationType getInstance() { - return EP_NAME.findExtensionOrFail(ApplicationConfigurationType.class); - } + @Nullable + public static ApplicationConfigurationType getInstance() { + return EP_NAME.findExtensionOrFail(ApplicationConfigurationType.class); + } } diff --git a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/remote/RemoteConfigurationType.java b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/remote/RemoteConfigurationType.java index 851fd5995e..5f1d76810c 100644 --- a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/remote/RemoteConfigurationType.java +++ b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/remote/RemoteConfigurationType.java @@ -34,29 +34,34 @@ @ExtensionImpl public class RemoteConfigurationType extends ConfigurationTypeBase { - public RemoteConfigurationType() { - super("JavaRemoteConfigurationType", JavaExecutionLocalize.remoteDebugConfigurationDisplayName(), JavaExecutionLocalize.remoteDebugConfigurationDescription(), PlatformIconGroup.runconfigurationsRemote()); - addFactory(new ConfigurationFactory(this) { - @Nonnull - @Override - public String getId() { - return "Java Remote"; - } + public RemoteConfigurationType() { + super( + "JavaRemoteConfigurationType", + JavaExecutionLocalize.remoteDebugConfigurationDisplayName(), + JavaExecutionLocalize.remoteDebugConfigurationDescription(), + PlatformIconGroup.runconfigurationsRemote() + ); + addFactory(new ConfigurationFactory(this) { + @Nonnull + @Override + public String getId() { + return "Java Remote"; + } - @Override - public RunConfiguration createTemplateConfiguration(Project project) { - return new RemoteConfiguration(project, this); - } + @Override + public RunConfiguration createTemplateConfiguration(Project project) { + return new RemoteConfiguration(project, this); + } - @Override - public boolean isApplicable(@Nonnull Project project) { - return ModuleExtensionHelper.getInstance(project).hasModuleExtension(JavaModuleExtension.class); - } - }); - } + @Override + public boolean isApplicable(@Nonnull Project project) { + return ModuleExtensionHelper.getInstance(project).hasModuleExtension(JavaModuleExtension.class); + } + }); + } - @Nonnull - public static RemoteConfigurationType getInstance() { - return EP_NAME.findExtensionOrFail(RemoteConfigurationType.class); - } + @Nonnull + public static RemoteConfigurationType getInstance() { + return EP_NAME.findExtensionOrFail(RemoteConfigurationType.class); + } } From 102badcfa322ecbf33fa8c45c6a9e5efc81728a2 Mon Sep 17 00:00:00 2001 From: UNV Date: Wed, 30 Apr 2025 10:40:23 +0300 Subject: [PATCH 2/2] Fixing compilation error with ConfigurationType.EP_NAME, CoverageEngine.EP_NAME, CoverageRunner.EP_NAME. --- .../java/coverage/CoverageConfigurable.java | 79 ++++++++++--------- .../coverage/DefaultJavaCoverageRunner.java | 15 +++- .../ApplicationConfigurationType.java | 11 +-- .../impl/remote/RemoteConfigurationType.java | 14 ++-- 4 files changed, 68 insertions(+), 51 deletions(-) diff --git a/java-coverage-impl/src/main/java/com/intellij/java/coverage/CoverageConfigurable.java b/java-coverage-impl/src/main/java/com/intellij/java/coverage/CoverageConfigurable.java index 6f136893e1..0ee4947244 100644 --- a/java-coverage-impl/src/main/java/com/intellij/java/coverage/CoverageConfigurable.java +++ b/java-coverage-impl/src/main/java/com/intellij/java/coverage/CoverageConfigurable.java @@ -22,8 +22,6 @@ import com.intellij.java.language.impl.ui.PackageChooser; import com.intellij.java.language.impl.ui.PackageChooserFactory; import com.intellij.java.language.psi.PsiJavaPackage; -import consulo.application.AllIcons; -import consulo.component.extension.Extensions; import consulo.configurable.Configurable; import consulo.configurable.ConfigurationException; import consulo.execution.configuration.ModuleBasedConfiguration; @@ -33,6 +31,7 @@ import consulo.execution.coverage.CoverageRunner; import consulo.execution.localize.ExecutionLocalize; import consulo.language.editor.localize.CodeInsightLocalize; +import consulo.localize.LocalizeValue; import consulo.logging.Logger; import consulo.platform.base.icon.PlatformIconGroup; import consulo.project.Project; @@ -62,7 +61,7 @@ public class CoverageConfigurable extends SettingsEditor { private static final Logger LOG = Logger.getInstance(CoverageConfigurable.class); private final JreVersionDetector myVersionDetector = new JreVersionDetector(); - Project myProject; + private final Project myProject; private MyClassFilterEditor myClassFilterEditor; private JLabel myCoverageNotSupportedLabel; private JComboBox myCoverageRunnerCb; @@ -79,15 +78,16 @@ public MyClassFilterEditor(Project project) { super(project, aClass -> aClass.getContainingClass() == null); } + @Override protected void addPatternFilter() { PackageChooser packageChooser = myProject.getInstance(PackageChooserFactory.class).create(); List packages = packageChooser.showAndSelect(); if (packages != null) { if (!packages.isEmpty()) { - for (final PsiJavaPackage aPackage : packages) { - final String fqName = aPackage.getQualifiedName(); - final String pattern = fqName.isEmpty() ? "*" : fqName + ".*"; + for (PsiJavaPackage aPackage : packages) { + String fqName = aPackage.getQualifiedName(); + String pattern = fqName.isEmpty() ? "*" : fqName + ".*"; myTableModel.addRow(createFilter(pattern)); } int row = myTableModel.getRowCount() - 1; @@ -98,6 +98,7 @@ protected void addPatternFilter() { } } + @Override protected String getAddPatternButtonText() { return CodeInsightLocalize.coverageButtonAddPackage().get(); } @@ -113,8 +114,9 @@ public CoverageConfigurable(RunConfigurationBase config) { myProject = config.getProject(); } - protected void resetEditorFrom(final RunConfigurationBase runConfiguration) { - final boolean isJre50; + @Override + protected void resetEditorFrom(RunConfigurationBase runConfiguration) { + boolean isJre50; if (runConfiguration instanceof CommonJavaRunConfigurationParameters configurationParameters && myVersionDetector.isJre50Configured(configurationParameters)) { isJre50 = true; @@ -128,17 +130,18 @@ else if (runConfiguration instanceof ModuleBasedConfiguration moduleBasedConfigu myCoverageNotSupportedLabel.setVisible(!isJre50); - final JavaCoverageEnabledConfiguration configuration = + JavaCoverageEnabledConfiguration configuration = (JavaCoverageEnabledConfiguration)CoverageEnabledConfiguration.getOrCreate(runConfiguration); CoverageRunner runner = configuration.getCoverageRunner(); if (runner != null) { myCoverageRunnerCb.setSelectedItem(new CoverageRunnerItem(runner)); } else { - final String runnerId = configuration.getRunnerId(); + String runnerId = configuration.getRunnerId(); if (runnerId != null) { - final CoverageRunnerItem runnerItem = new CoverageRunnerItem(runnerId); - final DefaultComboBoxModel model = (DefaultComboBoxModel)myCoverageRunnerCb.getModel(); + CoverageRunnerItem runnerItem = new CoverageRunnerItem(runnerId); + @SuppressWarnings("unchecked") + DefaultComboBoxModel model = (DefaultComboBoxModel)myCoverageRunnerCb.getModel(); if (model.getIndexOf(runnerItem) == -1) { model.addElement(runnerItem); } @@ -153,7 +156,7 @@ else if (runConfiguration instanceof ModuleBasedConfiguration moduleBasedConfigu myClassFilterEditor.setFilters(configuration.getCoveragePatterns()); - final boolean isCoverageByTestApplicable = runner != null && runner.isCoverageByTestApplicable(); + boolean isCoverageByTestApplicable = runner != null && runner.isCoverageByTestApplicable(); myTracingRb.setEnabled(myTracingRb.isEnabled() && isCoverageByTestApplicable); mySamplingRb.setSelected(configuration.isSampling() || !isCoverageByTestApplicable); myTracingRb.setSelected(!mySamplingRb.isSelected()); @@ -168,8 +171,9 @@ protected boolean canHavePerTestCoverage() { return CoverageEnabledConfiguration.getOrCreate(myConfig).canHavePerTestCoverage(); } - protected void applyEditorTo(final RunConfigurationBase runConfiguration) throws ConfigurationException { - final JavaCoverageEnabledConfiguration configuration = + @Override + protected void applyEditorTo(RunConfigurationBase runConfiguration) throws ConfigurationException { + JavaCoverageEnabledConfiguration configuration = (JavaCoverageEnabledConfiguration)CoverageEnabledConfiguration.getOrCreate(runConfiguration); configuration.setCoveragePatterns(myClassFilterEditor.getFilters()); configuration.setCoverageRunner(getSelectedRunner()); @@ -179,20 +183,21 @@ protected void applyEditorTo(final RunConfigurationBase runConfiguration) throws } @Nonnull + @Override protected JComponent createEditor() { JPanel result = new JPanel(new GridBagLayout()); - final DefaultComboBoxModel runnersModel = new DefaultComboBoxModel<>(); + DefaultComboBoxModel runnersModel = new DefaultComboBoxModel<>(); myCoverageRunnerCb = new JComboBox<>(runnersModel); - final JavaCoverageEnabledConfiguration javaCoverageEnabledConfiguration = JavaCoverageEnabledConfiguration.getFrom(myConfig); + JavaCoverageEnabledConfiguration javaCoverageEnabledConfiguration = JavaCoverageEnabledConfiguration.getFrom(myConfig); LOG.assertTrue(javaCoverageEnabledConfiguration != null); - final JavaCoverageEngine provider = javaCoverageEnabledConfiguration.getCoverageProvider(); - for (CoverageRunner runner : Extensions.getExtensions(CoverageRunner.EP_NAME)) { + JavaCoverageEngine provider = javaCoverageEnabledConfiguration.getCoverageProvider(); + myProject.getApplication().getExtensionPoint(CoverageRunner.class).forEach(runner -> { if (runner.acceptsCoverageEngine(provider)) { runnersModel.addElement(new CoverageRunnerItem(runner)); } - } + }); myCoverageRunnerCb.setRenderer(new ListCellRendererWrapper<>() { @Override public void customize(JList list, CoverageRunnerItem value, int index, boolean selected, boolean hasFocus) { @@ -202,7 +207,7 @@ public void customize(JList list, CoverageRunnerItem value, int index, boolean s } }); myCoverageRunnerCb.addActionListener(e -> { - final CoverageRunner runner = getSelectedRunner(); + CoverageRunner runner = getSelectedRunner(); enableTracingPanel(runner != null && runner.isCoverageByTestApplicable()); myTrackPerTestCoverageCb.setEnabled( myTracingRb.isSelected() && canHavePerTestCoverage() && runner != null && runner.isCoverageByTestApplicable() @@ -211,7 +216,7 @@ public void customize(JList list, CoverageRunnerItem value, int index, boolean s myRunnerPanel = new JPanel(new GridBagLayout()); myRunnerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); myRunnerPanel.add( - new JLabel("Choose coverage runner:"), + new JLabel(LocalizeValue.localizeTODO("Choose coverage runner:").get()), new GridBagConstraints( 0, 0, 1, 1, 0, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, JBUI.insetsRight(10), 0, 0 @@ -224,19 +229,19 @@ public void customize(JList list, CoverageRunnerItem value, int index, boolean s JBUI.emptyInsets(), 0, 0 ) ); - final JPanel cPanel = new JPanel(new VerticalFlowLayout()); + JPanel cPanel = new JPanel(new VerticalFlowLayout()); - mySamplingRb = new JRadioButton("Sampling"); + mySamplingRb = new JRadioButton(LocalizeValue.localizeTODO("Sampling").get()); cPanel.add(mySamplingRb); - myTracingRb = new JRadioButton("Tracing"); + myTracingRb = new JRadioButton(LocalizeValue.localizeTODO("Tracing").get()); cPanel.add(myTracingRb); - final ButtonGroup group = new ButtonGroup(); + ButtonGroup group = new ButtonGroup(); group.add(mySamplingRb); group.add(myTracingRb); ActionListener samplingListener = e -> { - final CoverageRunner runner = getSelectedRunner(); + CoverageRunner runner = getSelectedRunner(); myTrackPerTestCoverageCb.setEnabled( canHavePerTestCoverage() && myTracingRb.isSelected() && runner != null && runner.isCoverageByTestApplicable() ); @@ -245,8 +250,8 @@ public void customize(JList list, CoverageRunnerItem value, int index, boolean s mySamplingRb.addActionListener(samplingListener); myTracingRb.addActionListener(samplingListener); - myTrackPerTestCoverageCb = new JCheckBox("Track per test coverage"); - final JPanel tracingPanel = new JPanel(new BorderLayout()); + myTrackPerTestCoverageCb = new JCheckBox(LocalizeValue.localizeTODO("Track per test coverage").get()); + JPanel tracingPanel = new JPanel(new BorderLayout()); tracingPanel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 0)); tracingPanel.add(myTrackPerTestCoverageCb, BorderLayout.CENTER); cPanel.add(tracingPanel); @@ -258,7 +263,7 @@ public void customize(JList list, CoverageRunnerItem value, int index, boolean s ) ); - final GridBagConstraints gc = new GridBagConstraints( + GridBagConstraints gc = new GridBagConstraints( 0, GridBagConstraints.RELATIVE, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, JBUI.emptyInsets(), 0, 0 ); @@ -267,34 +272,34 @@ public void customize(JList list, CoverageRunnerItem value, int index, boolean s JPanel panel = new JPanel(new GridBagLayout()); panel.setBorder(IdeBorderFactory.createTitledBorder(ExecutionLocalize.recordCoverageFiltersTitle().get(), false)); myClassFilterEditor = new MyClassFilterEditor(myProject); - final GridBagConstraints bagConstraints = new GridBagConstraints( + GridBagConstraints bagConstraints = new GridBagConstraints( 0, GridBagConstraints.RELATIVE, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, JBUI.emptyInsets(), 0, 0 ); panel.add(myClassFilterEditor, bagConstraints); bagConstraints.weighty = 0; - myTrackTestSourcesCb = new JCheckBox("Enable coverage in test folders"); + myTrackTestSourcesCb = new JCheckBox(LocalizeValue.localizeTODO("Enable coverage in test folders").get()); panel.add(myTrackTestSourcesCb, bagConstraints); result.add(panel, gc); myCoverageNotSupportedLabel = new JLabel(CodeInsightLocalize.codeCoverageIsNotSupported().get()); - myCoverageNotSupportedLabel.setIcon(TargetAWT.to(AllIcons.General.WarningDialog)); + myCoverageNotSupportedLabel.setIcon(TargetAWT.to(PlatformIconGroup.generalWarningdialog())); result.add(myCoverageNotSupportedLabel, gc); return result; } @Nullable private CoverageRunner getSelectedRunner() { - final CoverageRunnerItem runnerItem = (CoverageRunnerItem)myCoverageRunnerCb.getSelectedItem(); + CoverageRunnerItem runnerItem = (CoverageRunnerItem)myCoverageRunnerCb.getSelectedItem(); if (runnerItem == null) { LOG.debug("Available runners: " + myCoverageRunnerCb.getModel().getSize()); } return runnerItem != null ? runnerItem.getRunner() : null; } - private void enableTracingPanel(final boolean enabled) { + private void enableTracingPanel(boolean enabled) { myTracingRb.setEnabled(enabled); if (!enabled) { mySamplingRb.setSelected(true); @@ -303,8 +308,8 @@ private void enableTracingPanel(final boolean enabled) { private static class CoverageRunnerItem { private CoverageRunner myRunner; - private @Nonnull - String myRunnerId; + @Nonnull + private String myRunnerId; private CoverageRunnerItem(@Nonnull CoverageRunner runner) { myRunner = runner; diff --git a/java-coverage-impl/src/main/java/com/intellij/java/coverage/DefaultJavaCoverageRunner.java b/java-coverage-impl/src/main/java/com/intellij/java/coverage/DefaultJavaCoverageRunner.java index fc3d7c170a..0c86ddb8fe 100644 --- a/java-coverage-impl/src/main/java/com/intellij/java/coverage/DefaultJavaCoverageRunner.java +++ b/java-coverage-impl/src/main/java/com/intellij/java/coverage/DefaultJavaCoverageRunner.java @@ -17,22 +17,33 @@ import com.intellij.java.execution.impl.DefaultJavaProgramRunner; import consulo.annotation.component.ExtensionImpl; +import consulo.application.Application; import consulo.execution.configuration.*; import consulo.execution.coverage.CoverageEngine; import consulo.execution.coverage.CoverageExecutor; import consulo.execution.coverage.CoverageRunnerData; import jakarta.annotation.Nonnull; +import jakarta.inject.Inject; @ExtensionImpl(id = "DefaultJavaCoverageRunner") public class DefaultJavaCoverageRunner extends DefaultJavaProgramRunner { - public boolean canRun(@Nonnull final String executorId, @Nonnull final RunProfile profile) { + private final Application myApplication; + + @Inject + public DefaultJavaCoverageRunner(Application myApplication) { + this.myApplication = myApplication; + } + + @Override + public boolean canRun(@Nonnull String executorId, @Nonnull RunProfile profile) { try { return executorId.equals(CoverageExecutor.EXECUTOR_ID) // && profile instanceof ModuleBasedConfiguration && !(profile instanceof RunConfigurationWithSuppressedDefaultRunAction) && profile instanceof RunConfigurationBase - && CoverageEngine.EP_NAME.findExtension(JavaCoverageEngine.class).isApplicableTo((RunConfigurationBase)profile); + && myApplication.getExtensionPoint(CoverageEngine.class) + .findExtensionOrFail(JavaCoverageEngine.class).isApplicableTo((RunConfigurationBase)profile); } catch (Exception e) { return false; diff --git a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/application/ApplicationConfigurationType.java b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/application/ApplicationConfigurationType.java index cef44a0ba4..31893a5310 100644 --- a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/application/ApplicationConfigurationType.java +++ b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/application/ApplicationConfigurationType.java @@ -19,6 +19,7 @@ import com.intellij.java.language.psi.PsiJavaFile; import com.intellij.java.language.psi.util.PsiMethodUtil; import consulo.annotation.component.ExtensionImpl; +import consulo.application.Application; import consulo.execution.configuration.ConfigurationFactory; import consulo.execution.configuration.ConfigurationType; import consulo.execution.configuration.ModuleBasedConfiguration; @@ -31,8 +32,6 @@ import consulo.module.extension.ModuleExtensionHelper; import consulo.project.Project; import consulo.ui.image.Image; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -66,11 +65,13 @@ public void onNewConfigurationCreated(@Nonnull RunConfiguration configuration) { }; } + @Nonnull @Override public LocalizeValue getDisplayName() { return JavaExecutionLocalize.applicationConfigurationName(); } + @Nonnull @Override public LocalizeValue getConfigurationTypeDescription() { return JavaExecutionLocalize.applicationConfigurationDescription(); @@ -112,13 +113,13 @@ else if (element instanceof PsiJavaFile) { @Override @Nonnull - @NonNls public String getId() { return "JavaApplication"; } - @Nullable + @Nonnull public static ApplicationConfigurationType getInstance() { - return EP_NAME.findExtensionOrFail(ApplicationConfigurationType.class); + return Application.get().getExtensionPoint(ConfigurationType.class) + .findExtensionOrFail(ApplicationConfigurationType.class); } } diff --git a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/remote/RemoteConfigurationType.java b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/remote/RemoteConfigurationType.java index 5f1d76810c..972dc96e6e 100644 --- a/java-execution-impl/src/main/java/com/intellij/java/execution/impl/remote/RemoteConfigurationType.java +++ b/java-execution-impl/src/main/java/com/intellij/java/execution/impl/remote/RemoteConfigurationType.java @@ -13,15 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * Class RemoteConfigurationFactory - * @author Jeka - */ package com.intellij.java.execution.impl.remote; import consulo.annotation.component.ExtensionImpl; +import consulo.application.Application; import consulo.execution.configuration.ConfigurationFactory; +import consulo.execution.configuration.ConfigurationType; import consulo.execution.configuration.ConfigurationTypeBase; import consulo.execution.configuration.RunConfiguration; import consulo.java.execution.localize.JavaExecutionLocalize; @@ -29,9 +26,11 @@ import consulo.module.extension.ModuleExtensionHelper; import consulo.platform.base.icon.PlatformIconGroup; import consulo.project.Project; - import jakarta.annotation.Nonnull; +/** + * @author Jeka + */ @ExtensionImpl public class RemoteConfigurationType extends ConfigurationTypeBase { public RemoteConfigurationType() { @@ -62,6 +61,7 @@ public boolean isApplicable(@Nonnull Project project) { @Nonnull public static RemoteConfigurationType getInstance() { - return EP_NAME.findExtensionOrFail(RemoteConfigurationType.class); + return Application.get().getExtensionPoint(ConfigurationType.class) + .findExtensionOrFail(RemoteConfigurationType.class); } }