diff --git a/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/sourceSetModel/DefaultGradleSourceSetModel.java b/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/sourceSetModel/DefaultGradleSourceSetModel.java index 68c26ce6af3b..20f0db69678a 100644 --- a/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/sourceSetModel/DefaultGradleSourceSetModel.java +++ b/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/sourceSetModel/DefaultGradleSourceSetModel.java @@ -5,7 +5,6 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.gradle.model.DefaultExternalSourceSet; -import org.jetbrains.plugins.gradle.model.ExternalSourceSet; import org.jetbrains.plugins.gradle.model.GradleSourceSetModel; import java.io.File; @@ -31,18 +30,6 @@ public final class DefaultGradleSourceSetModel implements GradleSourceSetModel { additionalArtifacts = new ArrayList<>(0); } - public DefaultGradleSourceSetModel(@NotNull GradleSourceSetModel sourceSetModel) { - sourceCompatibility = sourceSetModel.getSourceCompatibility(); - targetCompatibility = sourceSetModel.getTargetCompatibility(); - taskArtifacts = sourceSetModel.getTaskArtifacts(); - configurationArtifacts = sourceSetModel.getConfigurationArtifacts(); - sourceSets = new LinkedHashMap<>(); - for (Map.Entry entry : sourceSetModel.getSourceSets().entrySet()) { - sourceSets.put(entry.getKey(), new DefaultExternalSourceSet(entry.getValue())); - } - additionalArtifacts = new ArrayList<>(sourceSetModel.getAdditionalArtifacts()); - } - @Override public @Nullable String getSourceCompatibility() { return sourceCompatibility; diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java index e69666744cd2..8e9a1c21d15a 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProject.java @@ -52,35 +52,6 @@ public final class DefaultExternalProject implements ExternalProject, ExternalPr sourceSetModel = new DefaultGradleSourceSetModel(); } - public DefaultExternalProject(@NotNull ExternalProject externalProject) { - id = externalProject.getId(); - path = externalProject.getPath(); - identityPath = externalProject.getIdentityPath(); - name = externalProject.getName(); - qName = externalProject.getQName(); - version = externalProject.getVersion(); - group = externalProject.getGroup(); - description = externalProject.getDescription(); - projectDir = externalProject.getProjectDir(); - buildDir = externalProject.getBuildDir(); - buildFile = externalProject.getBuildFile(); - externalSystemId = externalProject.getExternalSystemId(); - - Map externalProjectChildProjects = externalProject.getChildProjects(); - childProjects = new TreeMap<>(); - for (Map.Entry entry : externalProjectChildProjects.entrySet()) { - childProjects.put(entry.getKey(), new DefaultExternalProject(entry.getValue())); - } - - Map externalProjectTasks = externalProject.getTasks(); - tasks = new HashMap<>(externalProjectTasks.size()); - for (Map.Entry entry : externalProjectTasks.entrySet()) { - this.tasks.put(entry.getKey(), new DefaultExternalTask(entry.getValue())); - } - - sourceSetModel = new DefaultGradleSourceSetModel(externalProject.getSourceSetModel()); - } - @NotNull @Override public String getExternalSystemId() { @@ -177,20 +148,12 @@ public final class DefaultExternalProject implements ExternalProject, ExternalPr return sourceSetModel.getSourceCompatibility(); } - public void setSourceCompatibility(@Nullable String sourceCompatibility) { - sourceSetModel.setSourceCompatibility(sourceCompatibility); - } - @Override @Nullable public String getTargetCompatibility() { return sourceSetModel.getTargetCompatibility(); } - public void setTargetCompatibility(@Nullable String targetCompatibility) { - sourceSetModel.setTargetCompatibility(targetCompatibility); - } - @NotNull @Override public Map getChildProjects() { @@ -275,14 +238,6 @@ public final class DefaultExternalProject implements ExternalProject, ExternalPr return sourceSetModel.getTaskArtifacts(); } - public void setArtifacts(@NotNull List artifacts) { - sourceSetModel.setTaskArtifacts(artifacts); - } - - public void setArtifactsByConfiguration(@NotNull Map> artifactsByConfiguration) { - sourceSetModel.setConfigurationArtifacts(artifactsByConfiguration); - } - @NotNull @Override public Map> getArtifactsByConfiguration() { diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceDirectorySet.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceDirectorySet.java index 40bcf2de58b4..bd0ab7bc2745 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceDirectorySet.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceDirectorySet.java @@ -28,22 +28,6 @@ public final class DefaultExternalSourceDirectorySet implements ExternalSourceDi patterns = new FilePatternSetImpl(); } - public DefaultExternalSourceDirectorySet(ExternalSourceDirectorySet sourceDirectorySet) { - name = sourceDirectorySet.getName(); - srcDirs = new HashSet<>(sourceDirectorySet.getSrcDirs()); - outputDir = sourceDirectorySet.getOutputDir(); - gradleOutputDirs = new ArrayList<>(sourceDirectorySet.getGradleOutputDirs()); - - patterns = new FilePatternSetImpl(sourceDirectorySet.getIncludes(), - sourceDirectorySet.getExcludes()); - - filters = new ArrayList<>(sourceDirectorySet.getFilters().size()); - for (ExternalFilter filter : sourceDirectorySet.getFilters()) { - filters.add(new DefaultExternalFilter(filter)); - } - inheritedCompilerOutput = sourceDirectorySet.isCompilerOutputPathInherited(); - } - @NotNull @Override public String getName() { diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java index da0d22f8bf04..1e2316b26cfb 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalSourceSet.java @@ -2,7 +2,6 @@ package org.jetbrains.plugins.gradle.model; import com.intellij.openapi.externalSystem.model.project.ExternalSystemSourceType; -import com.intellij.openapi.externalSystem.model.project.IExternalSystemSourceType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,17 +33,6 @@ public final class DefaultExternalSourceSet implements ExternalSourceSet { artifacts = new ArrayList<>(0); } - public DefaultExternalSourceSet(ExternalSourceSet sourceSet) { - name = sourceSet.getName(); - isPreview = sourceSet.isPreview(); - javaToolchainHome = sourceSet.getJavaToolchainHome(); - sourceCompatibility = sourceSet.getSourceCompatibility(); - targetCompatibility = sourceSet.getTargetCompatibility(); - artifacts = copyArtifacts(sourceSet.getArtifacts()); - dependencies = ModelFactory.createCopy(sourceSet.getDependencies()); - sources = copySources(sourceSet.getSources()); - } - @Override public @NotNull String getName() { return name; @@ -131,27 +119,4 @@ public final class DefaultExternalSourceSet implements ExternalSourceSet { return "sourceSet '" + name + '\'' ; } - private static @NotNull Map copySources( - @Nullable Map sources - ) { - if (sources == null) { - // Collection can be modified outside by mutation methods - return new LinkedHashMap<>(0); - } - Map result = new LinkedHashMap<>(sources.size()); - for (Map.Entry entry : sources.entrySet()) { - ExternalSystemSourceType sourceType = ExternalSystemSourceType.from(entry.getKey()); - DefaultExternalSourceDirectorySet directorySet = new DefaultExternalSourceDirectorySet(entry.getValue()); - result.put(sourceType, directorySet); - } - return result; - } - - private static @NotNull Collection copyArtifacts(@Nullable Collection artifacts) { - if (artifacts == null) { - // Collection can be modified outside by mutation methods - return new ArrayList<>(0); - } - return new ArrayList<>(artifacts); - } }