azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: rename method and optimize cycles in methods

Browse Source
This commit is contained in:
Nikolay Krasko
2014-04-21 16:47:12 +04:00
parent 3a5592ee34
commit da0efe2a9e
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinInProjectAction.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class ConfigureKotlinInProjectAction extends AnAction {
} }
Collection<KotlinProjectConfigurator> configurators = Collection<KotlinProjectConfigurator> configurators =
Collections2.filter(ConfigureKotlinInProjectUtils.getApplicableConfigurators(project), new Predicate<KotlinProjectConfigurator>() { Collections2.filter(ConfigureKotlinInProjectUtils.getAbleToRunConfigurators(project), new Predicate<KotlinProjectConfigurator>() {
@Override @Override
public boolean apply(KotlinProjectConfigurator input) { public boolean apply(KotlinProjectConfigurator input) {
return !input.getName().equals(KotlinJsModuleConfigurator.NAME); return !input.getName().equals(KotlinJsModuleConfigurator.NAME);
idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java
+15 -8
View File
@@ -98,16 +98,20 @@ public class ConfigureKotlinInProjectUtils {
} }
@NotNull @NotNull
public static Collection<KotlinProjectConfigurator> getApplicableConfigurators(@NotNull Project project) { public static Collection<KotlinProjectConfigurator> getAbleToRunConfigurators(@NotNull Project project) {
Set<KotlinProjectConfigurator> applicableConfigurators = Sets.newHashSet(); Collection<Module> modules = getModulesWithKotlinFiles(project);
Set<KotlinProjectConfigurator> canRunConfigurators = Sets.newHashSet();
for (KotlinProjectConfigurator configurator : Extensions.getExtensions(KotlinProjectConfigurator.EP_NAME)) { for (KotlinProjectConfigurator configurator : Extensions.getExtensions(KotlinProjectConfigurator.EP_NAME)) {
for (Module module : getNonConfiguredModules(project, configurator)) { for (Module module : modules) {
if (configurator.isApplicable(module)) { if (configurator.isApplicable(module) && !configurator.isConfigured(module)) {
applicableConfigurators.add(configurator); canRunConfigurators.add(configurator);
break;
} }
} }
} }
return applicableConfigurators;
return canRunConfigurators;
} }
@NotNull @NotNull
@@ -145,13 +149,16 @@ public class ConfigureKotlinInProjectUtils {
@NotNull @NotNull
public static Collection<Module> getNonConfiguredModules(@NotNull Project project) { public static Collection<Module> getNonConfiguredModules(@NotNull Project project) {
Set<Module> modules = Sets.newHashSet(); Set<Module> modules = Sets.newHashSet();
for (KotlinProjectConfigurator configurator : getApplicableConfigurators(project)) { Collection<Module> modulesWithKotlinFiles = getModulesWithKotlinFiles(project);
for (Module module : getModulesWithKotlinFiles(project)) {
for (KotlinProjectConfigurator configurator : getAbleToRunConfigurators(project)) {
for (Module module : modulesWithKotlinFiles) {
if (!configurator.isConfigured(module)) { if (!configurator.isConfigured(module)) {
modules.add(module); modules.add(module);
} }
} }
} }
return modules; return modules;
} }
idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/ConfigureKotlinNotification.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class ConfigureKotlinNotification extends Notification {
builder.append(" in '").append(project.getName()).append("' project"); builder.append(" in '").append(project.getName()).append("' project");
builder.append("<br/>"); builder.append("<br/>");
String links = StringUtil.join(ConfigureKotlinInProjectUtils.getApplicableConfigurators(project), new Function<KotlinProjectConfigurator, String>() { String links = StringUtil.join(ConfigureKotlinInProjectUtils.getAbleToRunConfigurators(project), new Function<KotlinProjectConfigurator, String>() {
@Override @Override
public String fun(KotlinProjectConfigurator configurator) { public String fun(KotlinProjectConfigurator configurator) {
return getLink(configurator, isOnlyOneModule); return getLink(configurator, isOnlyOneModule);