Skip to content

Commit a2d6882

Browse files
authored
Merge pull request #20 from unv-unv/config-type-ep-name-fix
Fixing compilation error with ConfigurationType.EP_NAME
2 parents f76aabb + 8b8e811 commit a2d6882

1 file changed

Lines changed: 46 additions & 44 deletions

File tree

python-impl/src/main/java/com/jetbrains/python/impl/run/PythonConfigurationType.java

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
1716
package com.jetbrains.python.impl.run;
1817

19-
import com.jetbrains.python.impl.PythonIcons;
2018
import consulo.annotation.component.ExtensionImpl;
19+
import consulo.application.Application;
2120
import consulo.execution.configuration.ConfigurationFactory;
2221
import consulo.execution.configuration.ConfigurationType;
2322
import consulo.execution.configuration.RunConfiguration;
2423
import consulo.localize.LocalizeValue;
2524
import consulo.module.extension.ModuleExtensionHelper;
2625
import consulo.project.Project;
26+
import consulo.python.impl.icon.PythonImplIconGroup;
2727
import consulo.python.impl.localize.PyLocalize;
2828
import consulo.python.module.extension.PyModuleExtension;
2929
import consulo.ui.image.Image;
@@ -36,62 +36,64 @@
3636
*/
3737
@ExtensionImpl
3838
public class PythonConfigurationType implements ConfigurationType {
39-
private final PythonConfigurationFactory myFactory = new PythonConfigurationFactory(this);
39+
private final PythonConfigurationFactory myFactory = new PythonConfigurationFactory(this);
40+
41+
public static PythonConfigurationType getInstance() {
42+
return Application.get().getExtensionPoint(ConfigurationType.class)
43+
.findExtensionOrFail(PythonConfigurationType.class);
44+
}
45+
46+
private static class PythonConfigurationFactory extends ConfigurationFactory {
47+
protected PythonConfigurationFactory(ConfigurationType configurationType) {
48+
super(configurationType);
49+
}
50+
51+
@Nonnull
52+
@Override
53+
public String getId() {
54+
return "Python";
55+
}
4056

41-
public static PythonConfigurationType getInstance() {
42-
return EP_NAME.findExtensionOrFail(PythonConfigurationType.class);
43-
}
57+
@Override
58+
public boolean isApplicable(@Nonnull Project project) {
59+
return ModuleExtensionHelper.getInstance(project).hasModuleExtension(PyModuleExtension.class);
60+
}
4461

45-
private static class PythonConfigurationFactory extends ConfigurationFactory {
46-
protected PythonConfigurationFactory(ConfigurationType configurationType) {
47-
super(configurationType);
62+
@Override
63+
public RunConfiguration createTemplateConfiguration(Project project) {
64+
return new PythonRunConfiguration(project, this);
65+
}
4866
}
4967

5068
@Nonnull
5169
@Override
52-
public String getId() {
53-
return "Python";
70+
public LocalizeValue getDisplayName() {
71+
return PyLocalize.pythonConfigurationName();
5472
}
5573

74+
@Nonnull
5675
@Override
57-
public boolean isApplicable(@Nonnull Project project) {
58-
return ModuleExtensionHelper.getInstance(project).hasModuleExtension(PyModuleExtension.class);
76+
public LocalizeValue getConfigurationTypeDescription() {
77+
return PyLocalize.pythonConfigurationDescription();
5978
}
6079

6180
@Override
62-
public RunConfiguration createTemplateConfiguration(Project project) {
63-
return new PythonRunConfiguration(project, this);
81+
public Image getIcon() {
82+
return PythonImplIconGroup.pythonPython();
6483
}
65-
}
66-
67-
@Override
68-
public LocalizeValue getDisplayName() {
69-
return PyLocalize.pythonConfigurationName();
70-
}
71-
72-
@Override
73-
public LocalizeValue getConfigurationTypeDescription() {
74-
return PyLocalize.pythonConfigurationDescription();
75-
}
7684

77-
@Override
78-
public Image getIcon() {
79-
return PythonIcons.Python.Python;
80-
}
81-
82-
@Override
83-
public ConfigurationFactory[] getConfigurationFactories() {
84-
return new ConfigurationFactory[]{myFactory};
85-
}
85+
@Override
86+
public ConfigurationFactory[] getConfigurationFactories() {
87+
return new ConfigurationFactory[]{myFactory};
88+
}
8689

87-
public PythonConfigurationFactory getFactory() {
88-
return myFactory;
89-
}
90+
public PythonConfigurationFactory getFactory() {
91+
return myFactory;
92+
}
9093

91-
@Override
92-
@Nonnull
93-
@NonNls
94-
public String getId() {
95-
return "PythonConfigurationType";
96-
}
94+
@Nonnull
95+
@Override
96+
public String getId() {
97+
return "PythonConfigurationType";
98+
}
9799
}

0 commit comments

Comments
 (0)