/*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public class RemoteConfiguration extends ModuleBasedConfiguration<JavaRunConfigurationModule>
implements RunConfigurationWithSuppressedDefaultRunAction, RemoteRunProfile {
-
@Override
public void writeExternal(final Element element) throws WriteExternalException {
super.writeExternal(element);
public Collection<Module> getValidModules() {
return getAllModules();
}
-
-
}
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.util.xmlb.annotations.Property;
+import gnu.trove.THashSet;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
import java.util.Collection;
-import java.util.HashSet;
import java.util.Set;
/**
myModule.setModule(module);
}
- protected void readModule(final Element element) throws InvalidDataException {
+ protected void readModule(final Element element) {
myModule.readExternal(element);
}
- protected void writeModule(final Element element) throws WriteExternalException {
+ protected void writeModule(final Element element) {
myModule.writeExternal(element);
}
RunConfiguration configuration = getFactory().createTemplateConfiguration(getProject());
configuration.setName(getName());
configuration.readExternal(element);
-
return (ModuleBasedConfiguration)configuration;
- } catch (InvalidDataException e) {
+ }
+ catch (InvalidDataException e) {
LOG.error(e);
return null;
- } catch (WriteExternalException e) {
+ }
+ catch (WriteExternalException e) {
LOG.error(e);
return null;
}
@Override
@NotNull
public Module[] getModules() {
- return ApplicationManager.getApplication().runReadAction(new Computable<Module[]>() {
- @Override
- @SuppressWarnings({"ConstantConditions"})
- public Module[] compute() {
- final Module module = getConfigurationModule().getModule();
- return module == null ? Module.EMPTY_ARRAY : new Module[] {module};
- }
- });
+ Module module = ApplicationManager.getApplication().runReadAction((Computable<Module>)() -> getConfigurationModule().getModule());
+ return module == null ? Module.EMPTY_ARRAY : new Module[] {module};
}
public void restoreOriginalModule(final Module originalModule) {
- if (originalModule == null) return;
- final Module[] classModules = getModules();
- final Set<Module> modules = new HashSet<>();
- for (Module classModule : classModules) {
+ if (originalModule == null) {
+ return;
+ }
+
+ Set<Module> modules = new THashSet<>();
+ for (Module classModule : getModules()) {
ModuleUtilCore.collectModulesDependsOn(classModule, modules);
}
- if (modules.contains(originalModule)) setModule(originalModule);
+ if (modules.contains(originalModule)) {
+ setModule(originalModule);
+ }
}
public void onNewConfigurationCreated() {
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
@Override
- @SuppressWarnings({"unchecked"})
public void readExternal(@NotNull Element element) {
List<Element> modules = element.getChildren(ELEMENT);
if (!modules.isEmpty()) {
@Nullable
@Transient
public Module getModule() {
- if (myModuleName != null) { //caching
+ //caching
+ if (myModuleName != null) {
myModule = findModule(myModuleName);
}
if (myModule != null && myModule.isDisposed()) {
}
@Nullable
- public Module findModule(final String moduleName) {
+ public Module findModule(@NotNull String moduleName) {
if (myProject.isDisposed()) {
return null;
}
-
- return ApplicationManager.getApplication().runReadAction(new Computable<Module>() {
- @Nullable
- @Override
- public Module compute() {
- return getModuleManager().findModuleByName(moduleName);
- }
- });
+ return ApplicationManager.getApplication().runReadAction((Computable<Module>)() -> getModuleManager().findModuleByName(moduleName));
}
public void setModule(final Module module) {
* @param result resulted set
*/
public static void collectModulesDependsOn(@NotNull final Module module, @NotNull Set<Module> result) {
- if (result.contains(module)) return;
- result.add(module);
+ if (!result.add(module)) {
+ return;
+ }
+
final ModuleManager moduleManager = ModuleManager.getInstance(module.getProject());
final List<Module> dependentModules = moduleManager.getModuleDependentModules(module);
for (final Module dependentModule : dependentModules) {
if (orderEntry.getModule() == module) {
if (orderEntry.isExported()) {
collectModulesDependsOn(dependentModule, result);
- } else {
+ }
+ else {
result.add(dependentModule);
}
break;