From c3ff6648769833101c6a17676c3c388e5feb8dae Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 26 Jul 2013 13:44:42 +0200 Subject: [PATCH] change configurations to extend LocatableConfigurationBase and delete isGeneratedName() implementations --- .../ExternalSystemRunConfiguration.java | 19 ++----------------- .../LocatableConfiguration.java | 6 +++++- .../execution/MavenRunConfiguration.java | 17 +---------------- .../xpath/xslt/run/XsltRunConfiguration.java | 7 +------ 4 files changed, 9 insertions(+), 40 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java index 2f98ac9b9521..061a88c5b9ae 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java @@ -25,7 +25,6 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemBundle; import com.intellij.openapi.externalSystem.util.ExternalSystemUtil; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.util.text.StringUtil; @@ -44,7 +43,7 @@ import java.util.List; * @author Denis Zhdanov * @since 23.05.13 18:30 */ -public class ExternalSystemRunConfiguration extends RunConfigurationBase implements LocatableConfiguration { +public class ExternalSystemRunConfiguration extends LocatableConfigurationBase { private static final Logger LOG = Logger.getInstance("#" + ExternalSystemRunConfiguration.class.getName()); @@ -59,19 +58,9 @@ public class ExternalSystemRunConfiguration extends RunConfigurationBase impleme mySettings.setExternalSystemIdString(externalSystemId.getId()); } - @Override - public boolean isGeneratedName() { - return Comparing.equal(getName(), getGeneratedName()); - } - - @NotNull - private String getGeneratedName() { - return AbstractExternalSystemTaskConfigurationType.generateName(getProject(), mySettings); - } - @Override public String suggestedName() { - return getGeneratedName(); + return AbstractExternalSystemTaskConfigurationType.generateName(getProject(), mySettings); } @Override @@ -113,10 +102,6 @@ public class ExternalSystemRunConfiguration extends RunConfigurationBase impleme return new MyRunnableState(mySettings, getProject(), DefaultDebugExecutor.EXECUTOR_ID.equals(executor.getId())); } - @Override - public void checkConfiguration() throws RuntimeConfigurationException { - } - public static class MyRunnableState implements RunProfileState { @NotNull private final ExternalSystemTaskExecutionSettings mySettings; diff --git a/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfiguration.java index c56396d8e5df..34663cb301e9 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfiguration.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfiguration.java @@ -15,6 +15,8 @@ */ package com.intellij.execution.configurations; +import org.jetbrains.annotations.Nullable; + /** * Base class for configurations that can be created from context (a location in a file) by implementations of * {@link com.intellij.execution.junit.RuntimeConfigurationProducer}. @@ -34,7 +36,9 @@ public interface LocatableConfiguration extends RunProfile { * Returns the default name for the run configuration based on its settings (such as the name of class or file to run). * * @return the suggested name for the configuration, or null if no name could be suggested based on the current settings (for example, - * the name of the file to run isn't yet specified). + * the name of the file to run isn't yet specified). NOTE: Please don't return hard-coded strings which are not based on the current + * run configuration settings (such as "Unnamed"). */ + @Nullable String suggestedName(); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java index f135a4ef8a69..a2ebbd2538f2 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java @@ -27,7 +27,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.options.SettingsEditorGroup; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.wm.ToolWindowId; @@ -37,7 +36,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.project.*; -public class MavenRunConfiguration extends RunConfigurationBase implements LocatableConfiguration, ModuleRunProfile { +public class MavenRunConfiguration extends LocatableConfigurationBase implements ModuleRunProfile { private MavenSettings mySettings; protected MavenRunConfiguration(Project project, ConfigurationFactory factory, String name) { @@ -108,11 +107,6 @@ public class MavenRunConfiguration extends RunConfigurationBase implements Locat return state; } - @Override - public void checkConfiguration() throws RuntimeConfigurationException { - - } - private void updateProjectsFolders() { MavenProjectsManager.getInstance(getProject()).updateProjectTargetFolders(); } @@ -171,17 +165,8 @@ public class MavenRunConfiguration extends RunConfigurationBase implements Locat element.addContent(XmlSerializer.serialize(mySettings)); } - @Override - public boolean isGeneratedName() { - return Comparing.equal(getName(), getGeneratedName()); - } - @Override public String suggestedName() { - return getGeneratedName(); - } - - private String getGeneratedName() { return MavenRunConfigurationType.generateName(getProject(), mySettings.myRunnerParameters); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java index 271607e37b18..8e528e3b32d6 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java @@ -61,7 +61,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -public final class XsltRunConfiguration extends RunConfigurationBase implements LocatableConfiguration, ModuleRunConfiguration, RunConfigurationWithSuppressedDefaultDebugAction { +public final class XsltRunConfiguration extends LocatableConfigurationBase implements ModuleRunConfiguration, RunConfigurationWithSuppressedDefaultDebugAction { private static final String NAME = "XSLT Configuration"; private static final String STRICT_FILE_PATH_EXPR = "(file\\://?(?:/?\\p{Alpha}\\:)?(?:/\\p{Alpha}\\:)?[^:]+)"; @@ -496,11 +496,6 @@ public final class XsltRunConfiguration extends RunConfigurationBase implements return module; } - @Override - public boolean isGeneratedName() { - return mySuggestedName != null; - } - @Override public String suggestedName() { return mySuggestedName;