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

vcs: Deprecate useless "ProjectLevelVcsManager.updateActiveVcss()"

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2018-07-18 13:55:08 +03:00
parent 3e091e3a0d
commit d751347e65
11 changed files with 11 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
+6 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2013 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-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.
package com.intellij.openapi.vcs;
import com.intellij.execution.ui.ConsoleViewContentType;
@@ -244,7 +230,11 @@ public abstract class ProjectLevelVcsManager {
@NotNull
public abstract VcsRoot[] getAllVcsRoots();
public abstract void updateActiveVcss();
/**
* @deprecated Use just {@link #setDirectoryMappings(List)}.
*/
@Deprecated
public void updateActiveVcss() {}
public abstract List<VcsDirectoryMapping> getDirectoryMappings();
public abstract List<VcsDirectoryMapping> getDirectoryMappings(AbstractVcs vcs);
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsDetector.java
-1
View File
@@ -38,7 +38,6 @@ public class ModuleVcsDetector {
if (myVcsManager.needAutodetectMappings()) {
autoDetectVcsMappings(true);
}
myVcsManager.updateActiveVcss();
});
startupManager.registerPostStartupActivity(() -> {
MessageBusConnection connection = myProject.getMessageBus().connect();
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
-5
View File
@@ -675,11 +675,6 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
return vcsRoots.toArray(new VcsRoot[0]);
}
@Override
public void updateActiveVcss() {
// not needed
}
@Override
public void notifyDirectoryMappingChanged() {
BackgroundTaskUtil.syncPublisher(myProject, VCS_CONFIGURATION_CHANGED).directoryMappingChanged();
platform/vcs-impl/src/com/intellij/platform/PlatformVcsDetector.java
+1 -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-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.
package com.intellij.platform;
import com.intellij.openapi.application.ApplicationManager;
@@ -48,7 +34,6 @@ public class PlatformVcsDetector implements ProjectComponent {
myVcsManager.removeDirectoryMapping(new VcsDirectoryMapping("", ""));
myVcsManager.setAutoDirectoryMapping(file.getPath(), vcs.getName());
myVcsManager.cleanupMappings();
myVcsManager.updateActiveVcss();
}
}
};
platform/vcs-tests/src/com/intellij/testFramework/vcs/AbstractVcsTestCase.java
+1 -17
View File
@@ -1,18 +1,4 @@
/*
* 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.
* 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-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.
package com.intellij.testFramework.vcs;
import com.intellij.execution.process.ProcessOutput;
@@ -77,7 +63,6 @@ public abstract class AbstractVcsTestCase {
protected void setVcsMappings(List<VcsDirectoryMapping> mappings) {
ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(myProject);
vcsManager.setDirectoryMappings(mappings);
vcsManager.updateActiveVcss();
ChangeListManagerImpl.getInstanceImpl(myProject).waitUntilRefreshed();
}
@@ -107,7 +92,6 @@ public abstract class AbstractVcsTestCase {
protected void activateVCS(final String vcsName) {
ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(myProject);
vcsManager.setDirectoryMapping(myWorkingCopyDir.getPath(), vcsName);
vcsManager.updateActiveVcss();
AbstractVcs vcs = vcsManager.findVcsByName(vcsName);
Assert.assertEquals(1, vcsManager.getRootsUnderVcs(vcs).length);
platform/vcs-tests/testSrc/com/intellij/openapi/vcs/IgnoreIdeaLevelTest.java
-1
View File
@@ -48,7 +48,6 @@ public class IgnoreIdeaLevelTest extends PlatformTestCase {
myVcsManager.registerVcs(myVcs);
myVcsManager.setDirectoryMapping("", myVcs.getName());
myVcsManager.setDirectoryMapping(myModuleRootFile.getAbsolutePath(), myVcs.getName());
myVcsManager.updateActiveVcss();
myClManager = ChangeListManagerImpl.getInstanceImpl(myProject);
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ImportAction.java
+1 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2014 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-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.
package com.intellij.cvsSupport2.actions;
import com.intellij.CvsBundle;
@@ -111,7 +97,6 @@ public class ImportAction extends ActionOnSelectedElement {
final String path = mapRoot.equals(projectBaseDir) ? "" : mapRoot.getPath();
ProjectLevelVcsManager manager = ProjectLevelVcsManager.getInstance(project);
manager.setDirectoryMappings(VcsUtil.addMapping(manager.getDirectoryMappings(), path, CvsVcs2.getInstance(project).getName()));
manager.updateActiveVcss();
}
};
}
plugins/git4idea/src/git4idea/actions/GitInit.java
+1 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2012 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-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.
package git4idea.actions;
import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -92,7 +78,6 @@ public class GitInit extends DumbAwareAction {
VfsUtil.markDirtyAndRefresh(false, true, false, root);
ProjectLevelVcsManager manager = ProjectLevelVcsManager.getInstance(project);
manager.setDirectoryMappings(VcsUtil.addMapping(manager.getDirectoryMappings(), path, GitVcs.NAME));
manager.updateActiveVcss();
VcsDirtyScopeManager.getInstance(project).dirDirtyRecursively(root);
}
}
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgInit.java
+1 -16
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2014 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-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.
package org.zmlx.hg4idea.action;
import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -102,7 +88,6 @@ public class HgInit extends DumbAwareAction {
final String path = mapRoot.equals(myProject.getBaseDir()) ? "" : mapRoot.getPath();
ProjectLevelVcsManager manager = ProjectLevelVcsManager.getInstance(myProject);
manager.setDirectoryMappings(VcsUtil.addMapping(manager.getDirectoryMappings(), path, HgVcs.VCS_NAME));
manager.updateActiveVcss();
}
}
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnLocalChangesAndRootsTest.java
-2
View File
@@ -29,7 +29,6 @@ public class SvnLocalChangesAndRootsTest extends SvnTestCase {
myProjectLevelVcsManager = (ProjectLevelVcsManagerImpl) ProjectLevelVcsManager.getInstance(myProject);
myProjectLevelVcsManager.setDirectoryMapping(myAlienRoot.getAbsolutePath(), SvnVcs.VCS_NAME);
myProjectLevelVcsManager.updateActiveVcss();
myClManager = ChangeListManager.getInstance(myProject);*/
}
@@ -142,7 +141,6 @@ public class SvnLocalChangesAndRootsTest extends SvnTestCase {
}
newMappings.add(new VcsDirectoryMapping(myMappingTarget.getPath(), SvnVcs.VCS_NAME));
myProjectLevelVcsManager.setDirectoryMappings(newMappings);
myProjectLevelVcsManager.updateActiveVcss();
sleep100();
}
plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRootAboveTest.java
-2
View File
@@ -64,7 +64,6 @@ public class SvnRootAboveTest extends SvnTestCase {
myProjectLevelVcsManager = (ProjectLevelVcsManagerImpl) ProjectLevelVcsManager.getInstance(myProject);
myProjectLevelVcsManager.setDirectoryMapping(myLocalWcRoot.getAbsolutePath(), SvnVcs.VCS_NAME);
myProjectLevelVcsManager.updateActiveVcss();
final SvnVcs vcs = SvnVcs.getInstance(myProject);
((SvnFileUrlMappingImpl) vcs.getSvnFileUrlMapping()).realRefresh(myRefreshCopiesStub);
@@ -108,7 +107,6 @@ public class SvnRootAboveTest extends SvnTestCase {
}
newMappings.add(new VcsDirectoryMapping(myMappingTarget.getPath(), SvnVcs.VCS_NAME));
myProjectLevelVcsManager.setDirectoryMappings(newMappings);
myProjectLevelVcsManager.updateActiveVcss();
sleep100();
}