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

removing unused parameter and field

Browse Source
This commit is contained in:
Eugene Zhuravlev
2014-04-01 11:25:14 +04:00
parent a8cfc8b18f
commit 00efb07a90
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+1 -1
View File
@@ -207,7 +207,7 @@ public class CompileDriver {
compileScope = projectScope;
}
else {
CompileScope scopeWithArtifacts = ArtifactCompileScope.createScopeWithArtifacts(projectScope, ArtifactUtil.getArtifactWithOutputPaths(myProject), false);
CompileScope scopeWithArtifacts = ArtifactCompileScope.createScopeWithArtifacts(projectScope, ArtifactUtil.getArtifactWithOutputPaths(myProject));
compileScope = addAdditionalRoots(scopeWithArtifacts, ALL_EXCEPT_SOURCE_PROCESSING);
}
doRebuild(callback, null, true, compileScope);
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java
+5 -10
View File
@@ -43,8 +43,7 @@ public class ArtifactCompileScope {
private static final Key<Boolean> FORCE_ARTIFACT_BUILD = Key.create("force_artifact_build");
private static final Key<Artifact[]> ARTIFACTS_KEY = Key.create("artifacts");
private static final Key<Set<Artifact>> CACHED_ARTIFACTS_KEY = Key.create("cached_artifacts");
private static final Key<Key<?>> ARTIFACTS_CONTENT_ID_KEY = Key.create("build_artifacts_task");
private ArtifactCompileScope() {
}
@@ -61,19 +60,15 @@ public class ArtifactCompileScope {
public static CompileScope createArtifactsScope(@NotNull Project project,
@NotNull Collection<Artifact> artifacts,
final boolean forceArtifactBuild) {
return createScopeWithArtifacts(createScopeForModulesInArtifacts(project, artifacts), artifacts, true, forceArtifactBuild);
return createScopeWithArtifacts(createScopeForModulesInArtifacts(project, artifacts), artifacts, forceArtifactBuild);
}
public static CompileScope createScopeWithArtifacts(final CompileScope baseScope,
@NotNull Collection<Artifact> artifacts,
boolean useCustomContentId) {
return createScopeWithArtifacts(baseScope, artifacts, useCustomContentId, false);
@NotNull Collection<Artifact> artifacts) {
return createScopeWithArtifacts(baseScope, artifacts, false);
}
public static CompileScope createScopeWithArtifacts(final CompileScope baseScope,
@NotNull Collection<Artifact> artifacts,
boolean useCustomContentId,
final boolean forceArtifactBuild) {
public static CompileScope createScopeWithArtifacts(final CompileScope baseScope, @NotNull Collection<Artifact> artifacts, final boolean forceArtifactBuild) {
baseScope.putUserData(ARTIFACTS_KEY, artifacts.toArray(new Artifact[artifacts.size()]));
if (forceArtifactBuild) {
baseScope.putUserData(FORCE_ARTIFACT_BUILD, Boolean.TRUE);
plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class AppEngineUploader {
final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
final CompileScope moduleScope = compilerManager.createModuleCompileScope(myAppEngineFacet.getModule(), true);
final CompileScope compileScope = ArtifactCompileScope.createScopeWithArtifacts(moduleScope, Collections.singletonList(myArtifact), true);
final CompileScope compileScope = ArtifactCompileScope.createScopeWithArtifacts(moduleScope, Collections.singletonList(myArtifact));
ApplicationManager.getApplication().invokeLater(new Runnable() {
public void run() {
compilerManager.make(compileScope, new CompileStatusNotification() {