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

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2019-01-31 19:20:20 +01:00
parent 3bf9c3e92f
commit 85431d6d72
2 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+8 -11
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.compiler.impl;
import com.intellij.CommonBundle;
@@ -73,15 +73,12 @@ public class CompileDriver {
private final Map<Module, String> myModuleOutputPaths = new HashMap<>();
private final Map<Module, String> myModuleTestOutputPaths = new HashMap<>();
@SuppressWarnings("deprecation") private CompilerFilter myCompilerFilter = CompilerFilter.ALL;
public CompileDriver(Project project) {
myProject = project;
}
@SuppressWarnings("deprecation")
public void setCompilerFilter(CompilerFilter compilerFilter) {
myCompilerFilter = compilerFilter == null? CompilerFilter.ALL : compilerFilter;
@SuppressWarnings({"deprecation", "unused"})
public void setCompilerFilter(@SuppressWarnings("unused") CompilerFilter compilerFilter) {
}
public void rebuild(CompileStatusNotification callback) {
@@ -205,8 +202,7 @@ public class CompileDriver {
}
@Nullable
private TaskFuture compileInExternalProcess(@NotNull final CompileContextImpl compileContext, final boolean onlyCheckUpToDate)
throws Exception {
private TaskFuture compileInExternalProcess(@NotNull final CompileContextImpl compileContext, final boolean onlyCheckUpToDate) {
final CompileScope scope = compileContext.getCompileScope();
final Collection<String> paths = CompileScopeUtil.fetchFiles(compileContext);
List<TargetTypeBuildScope> scopes = getBuildScopes(compileContext, scope, paths);
@@ -776,9 +772,10 @@ public class CompileDriver {
case ERROR: case INTERNAL_BUILDER_ERROR:
return CompilerMessageCategory.ERROR;
case WARNING: return CompilerMessageCategory.WARNING;
case INFO: return CompilerMessageCategory.INFORMATION;
case JPS_INFO: return CompilerMessageCategory.INFORMATION;
case OTHER: return CompilerMessageCategory.INFORMATION;
case INFO:
case JPS_INFO:
case OTHER:
return CompilerMessageCategory.INFORMATION;
default: return defaultCategory;
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
+3 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.vcs.configurable;
import com.intellij.application.options.colors.fileStatus.FileStatusColorsConfigurable;
@@ -122,7 +108,7 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
result.add(new ChangelistConflictConfigurable(ChangeListManagerImpl.getInstanceImpl(myProject)));
}
result.add(new CommitDialogConfigurable(myProject));
result.add(new ShelfProjectConfigurable(myProject));
result.add(new ShelfProjectConfigurable(myProject));
for (VcsConfigurableProvider provider : VcsConfigurableProvider.EP_NAME.getExtensions()) {
addIfNotNull(result, provider.getConfigurable(myProject));
}
@@ -157,6 +143,7 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
VcsConfigurableEP(@NotNull Project project, @NotNull VcsDescriptor descriptor) {
super(project);
myDescriptor = descriptor;
displayName = descriptor.getDisplayName();
id = getVcsConfigurableId(descriptor.getDisplayName());