diff options
Diffstat (limited to 'platform/dvcs/src/com/intellij/dvcs')
4 files changed, 3 insertions, 12 deletions
diff --git a/platform/dvcs/src/com/intellij/dvcs/DvcsPlatformFacade.java b/platform/dvcs/src/com/intellij/dvcs/DvcsPlatformFacade.java index 22e5b7a6c610..91adfa23dd92 100644 --- a/platform/dvcs/src/com/intellij/dvcs/DvcsPlatformFacade.java +++ b/platform/dvcs/src/com/intellij/dvcs/DvcsPlatformFacade.java @@ -92,9 +92,6 @@ public interface DvcsPlatformFacade { void saveAllDocuments(); - @Nullable - VirtualFile getVirtualFileByPath(@NotNull String path); - @NotNull ProjectManagerEx getProjectManager(); diff --git a/platform/dvcs/src/com/intellij/dvcs/DvcsPlatformFacadeImpl.java b/platform/dvcs/src/com/intellij/dvcs/DvcsPlatformFacadeImpl.java index 273c13c31dc6..9f10311f68d3 100644 --- a/platform/dvcs/src/com/intellij/dvcs/DvcsPlatformFacadeImpl.java +++ b/platform/dvcs/src/com/intellij/dvcs/DvcsPlatformFacadeImpl.java @@ -36,7 +36,6 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ui.UIUtil; -import com.intellij.vcsUtil.VcsUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -125,12 +124,6 @@ public abstract class DvcsPlatformFacadeImpl implements DvcsPlatformFacade { }); } - @Nullable - @Override - public VirtualFile getVirtualFileByPath(@NotNull String path) { - return VcsUtil.getVirtualFile(path); - } - @NotNull @Override public ProjectManagerEx getProjectManager() { diff --git a/platform/dvcs/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java b/platform/dvcs/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java index f39591e556cc..3b935745a212 100644 --- a/platform/dvcs/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java +++ b/platform/dvcs/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java @@ -40,7 +40,7 @@ import java.awt.*; public class BranchActionGroupPopup extends PopupFactoryImpl.ActionGroupPopup { public BranchActionGroupPopup(@NotNull String title, @NotNull Project project, @NotNull Condition<AnAction> preselectActionCondition, @NotNull ActionGroup actions) { - super(title, actions, SimpleDataContext.getProjectContext(project), false, false, false, true, null, -1, + super(title, actions, SimpleDataContext.getProjectContext(project), false, false, false, false, null, -1, preselectActionCondition, null); } diff --git a/platform/dvcs/src/com/intellij/dvcs/ui/RootAction.java b/platform/dvcs/src/com/intellij/dvcs/ui/RootAction.java index a8790481290d..93e49042648c 100644 --- a/platform/dvcs/src/com/intellij/dvcs/ui/RootAction.java +++ b/platform/dvcs/src/com/intellij/dvcs/ui/RootAction.java @@ -43,13 +43,14 @@ public class RootAction<T extends Repository> extends ActionGroup { * @param branchText */ public RootAction(@NotNull T repository, @Nullable T currentRepository, @NotNull ActionGroup actionsGroup, @NotNull String branchText) { - super(DvcsUtil.getShortRepositoryName(repository), true); + super("", true); myRepository = repository; myGroup = actionsGroup; myBranchText = branchText; if (repository.equals(currentRepository)) { getTemplatePresentation().setIcon(PlatformIcons.CHECK_ICON); } + getTemplatePresentation().setText(DvcsUtil.getShortRepositoryName(repository), false); } @NotNull |