MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

CR-IC-4717 review result fixing

Browse Source
This commit is contained in:
Artem Govorov
2014-03-15 02:47:50 +10:00
parent a5cc688a8a
commit 3457c99ded
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java
+1 -6
View File
@@ -39,7 +39,7 @@ import java.util.List;
* @author dyoma
*/
public abstract class RunConfigurationBase extends UserDataHolderBase
implements RunConfiguration, TargetAwareRunProfile, CompatibilityAwareRunProfile {
implements RunConfiguration, TargetAwareRunProfile {
private final ConfigurationFactory myFactory;
private final Project myProject;
private String myName = "";
@@ -120,11 +120,6 @@ public abstract class RunConfigurationBase extends UserDataHolderBase
return true;
}
@Override
public boolean isCompatibleWith(@NotNull RunConfiguration configuration) {
return true;
}
public final boolean equals(final Object obj) {
return super.equals(obj);
}
platform/lang-api/src/com/intellij/execution/configurations/CompatibilityAwareRunProfile.java → platform/lang-impl/src/com/intellij/execution/configuration/CompatibilityAwareRunProfile.java
+4 -2
View File
@@ -1,8 +1,10 @@
package com.intellij.execution.configurations;
package com.intellij.execution.configuration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.configurations.RunProfile;
import org.jetbrains.annotations.NotNull;
public interface CompatibilityAwareRunProfile {
public interface CompatibilityAwareRunProfile extends RunProfile {
/**
* Checks whether the run configuration is compatible with the configuration passed as a parameter
* and may still run if the configuration passed as a parameter starts as well.
platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java
+3 -2
View File
@@ -18,6 +18,7 @@ package com.intellij.execution.impl;
import com.intellij.CommonBundle;
import com.intellij.execution.*;
import com.intellij.execution.configuration.CompatibilityAwareRunProfile;
import com.intellij.execution.configurations.*;
import com.intellij.execution.process.ProcessAdapter;
import com.intellij.execution.process.ProcessEvent;
@@ -41,12 +42,12 @@ import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Trinity;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.ui.docking.DockManager;
import com.intellij.util.Alarm;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Predicate;
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -481,7 +482,7 @@ public class ExecutionManagerImpl extends ExecutionManager implements ProjectCom
if (names.length() > 0) {
names.append(", ");
}
names.append(name.equals(null) || name.isEmpty() ? ExecutionBundle.message("run.configuration.no.name")
names.append(StringUtil.isEmpty(name) ? ExecutionBundle.message("run.configuration.no.name")
: String.format("'%s'", name));
}