From dbeee4f6ffc4129d84b191298240c051a799b982 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 24 Jul 2012 16:17:22 +0400 Subject: [PATCH] unused code removed --- .../artifacts/ArtifactSourceFilesState.java | 3 +-- .../jps/incremental/artifacts/IncArtifactBuilder.java | 2 +- .../incremental/artifacts/impl/ArtifactSorter.java | 9 +++------ .../ArtifactInstructionsBuilderContext.java | 3 --- .../ArtifactInstructionsBuilderContextImpl.java | 11 +---------- 5 files changed, 6 insertions(+), 22 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/ArtifactSourceFilesState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/ArtifactSourceFilesState.java index 16424cd10169..efd4b4889425 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/ArtifactSourceFilesState.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/ArtifactSourceFilesState.java @@ -148,8 +148,7 @@ public class ArtifactSourceFilesState extends CompositeStorageOwner { private ArtifactInstructionsBuilder computeInstructions() { final JpsCompositePackagingElement rootElement = myArtifact.getRootElement(); - ArtifactInstructionsBuilderContext context = new ArtifactInstructionsBuilderContextImpl(myProject, - myModel, myRootsIndex, new ProjectPaths(myModel.getProject())); + ArtifactInstructionsBuilderContext context = new ArtifactInstructionsBuilderContextImpl(myModel, myRootsIndex, new ProjectPaths(myModel.getProject())); final ArtifactInstructionsBuilderImpl instructionsBuilder = new ArtifactInstructionsBuilderImpl(myRootsIndex, myProject.getIgnoredFilePatterns()); final CopyToDirectoryInstructionCreator instructionCreator = new CopyToDirectoryInstructionCreator(instructionsBuilder, myArtifact.getOutputPath()); LayoutElementBuildersRegistry.getInstance().generateInstructions(rootElement, instructionCreator, context); diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/IncArtifactBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/IncArtifactBuilder.java index 19023797f523..ded0ff369ee7 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/IncArtifactBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/IncArtifactBuilder.java @@ -42,7 +42,7 @@ public class IncArtifactBuilder extends ProjectLevelBuilder { affected.add(artifact); } } - final Set toBuild = ArtifactSorter.addIncludedArtifacts(affected, context.getProjectDescriptor().project, context.getProjectDescriptor().jpsModel); + final Set toBuild = ArtifactSorter.addIncludedArtifacts(affected); final ArtifactSorter sorter = new ArtifactSorter(context.getProjectDescriptor().jpsModel); final Map selfIncludingNameMap = sorter.getArtifactToSelfIncludingNameMap(); diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/ArtifactSorter.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/ArtifactSorter.java index c532a31df839..70103e226bcf 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/ArtifactSorter.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/ArtifactSorter.java @@ -24,7 +24,6 @@ import com.intellij.util.graph.GraphGenerator; import gnu.trove.TIntArrayList; import gnu.trove.TIntProcedure; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.Project; import org.jetbrains.jps.model.JpsModel; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.artifact.JpsArtifact; @@ -120,17 +119,15 @@ public class ArtifactSorter { } @NotNull - public static Set addIncludedArtifacts(@NotNull Collection artifacts, @NotNull Project project, JpsModel model) { + public static Set addIncludedArtifacts(@NotNull Collection artifacts) { Set result = new HashSet(); for (JpsArtifact artifact : artifacts) { - collectIncludedArtifacts(artifact, project, model, new HashSet(), result, true); + collectIncludedArtifacts(artifact, new HashSet(), result, true); } return result; } private static void collectIncludedArtifacts(JpsArtifact artifact, - final Project project, - final JpsModel model, final Set processed, final Set result, final boolean withOutputPathOnly) { @@ -144,7 +141,7 @@ public class ArtifactSorter { processIncludedArtifacts(artifact, new Consumer() { @Override public void consume(JpsArtifact included) { - collectIncludedArtifacts(included, project, model, processed, result, withOutputPathOnly); + collectIncludedArtifacts(included, processed, result, withOutputPathOnly); } }); } diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ArtifactInstructionsBuilderContext.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ArtifactInstructionsBuilderContext.java index 5153cf18fb62..086b83afa474 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ArtifactInstructionsBuilderContext.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ArtifactInstructionsBuilderContext.java @@ -1,7 +1,6 @@ package org.jetbrains.jps.incremental.artifacts.instructions; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.Project; import org.jetbrains.jps.ProjectPaths; import org.jetbrains.jps.incremental.ModuleRootsIndex; import org.jetbrains.jps.model.JpsModel; @@ -11,8 +10,6 @@ import org.jetbrains.jps.model.JpsProject; * @author nik */ public interface ArtifactInstructionsBuilderContext { - @NotNull - Project getProject(); @NotNull ProjectPaths getProjectPaths(); diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ArtifactInstructionsBuilderContextImpl.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ArtifactInstructionsBuilderContextImpl.java index 1a2fa99c193f..cf5d7dfe3fd3 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ArtifactInstructionsBuilderContextImpl.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/ArtifactInstructionsBuilderContextImpl.java @@ -1,7 +1,6 @@ package org.jetbrains.jps.incremental.artifacts.instructions; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.Project; import org.jetbrains.jps.ProjectPaths; import org.jetbrains.jps.incremental.ModuleRootsIndex; import org.jetbrains.jps.model.JpsModel; @@ -11,14 +10,12 @@ import org.jetbrains.jps.model.JpsProject; * @author nik */ public class ArtifactInstructionsBuilderContextImpl implements ArtifactInstructionsBuilderContext { - private final Project myProject; private final JpsProject myJpsProject; private final ModuleRootsIndex myRootsIndex; private final ProjectPaths myProjectPaths; private JpsModel myModel; - public ArtifactInstructionsBuilderContextImpl(Project project, JpsModel jpsModel, ModuleRootsIndex rootsIndex, ProjectPaths projectPaths) { - myProject = project; + public ArtifactInstructionsBuilderContextImpl(JpsModel jpsModel, ModuleRootsIndex rootsIndex, ProjectPaths projectPaths) { myJpsProject = jpsModel.getProject(); myModel = jpsModel; myRootsIndex = rootsIndex; @@ -40,12 +37,6 @@ public class ArtifactInstructionsBuilderContextImpl implements ArtifactInstructi return myModel; } - @NotNull - @Override - public Project getProject() { - return myProject; - } - @NotNull @Override public ProjectPaths getProjectPaths() {