Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions plugin/src/test1/java/git4idea/tests/SkeletonBuilderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@
package git4idea.tests;

import com.intellij.mock.MockVirtualFileSystem;
import consulo.ui.ex.awt.ColumnInfo;
import consulo.util.collection.ArrayUtil;
import consulo.util.lang.StringUtil;
import consulo.ide.impl.idea.openapi.vcs.Ring;
import consulo.virtualFileSystem.VirtualFile;
import consulo.ide.impl.idea.util.containers.Convertor;
import consulo.ide.impl.idea.util.containers.ReadonlyList;
import consulo.ui.ex.awt.ColumnInfo;
import consulo.util.collection.ArrayUtil;
import consulo.util.lang.EmptyRunnable;
import consulo.util.lang.StringUtil;
import consulo.util.lang.ref.Ref;
import consulo.virtualFileSystem.BaseVirtualFile;
import consulo.virtualFileSystem.VirtualFile;
import consulo.virtualFileSystem.VirtualFileSystem;
import git4idea.history.wholeTree.*;
import git4idea.history.wholeTree.AbstractHash;
import jakarta.annotation.Nonnull;
import junit.framework.Assert;
import junit.framework.TestCase;
import jakarta.annotation.Nonnull;

import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -776,7 +777,7 @@ public void beforeStart() {
System.out.println("2");
}

private static class MyVf extends VirtualFile {
private static class MyVf extends BaseVirtualFile {
@Nonnull
@Override
public String getName() {
Expand Down
Loading