mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
change configurations to extend LocatableConfigurationBase and delete isGeneratedName() implementations
This commit is contained in:
+2
-17
@@ -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;
|
||||
|
||||
+5
-1
@@ -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();
|
||||
}
|
||||
|
||||
+1
-16
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
+1
-6
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user