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: remove dependency on [images] module

Browse Source 
GitOrigin-RevId: 3749bcb3c12718360619a061c0c057f203b4cb38
This commit is contained in:
Aleksey Pivovarov
2020-02-17 12:02:20 +00:00
committed by intellij-monorepo-bot
parent 66d60b426c
commit a65d09f1a2
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
+6
View File
@@ -30,6 +30,7 @@ import org.intellij.images.editor.ImageFileEditor;
import org.intellij.images.editor.ImageZoomModel;
import org.intellij.images.options.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.beans.PropertyChangeEvent;
@@ -164,4 +165,9 @@ final class ImageFileEditorImpl extends UserDataHolderBase implements ImageFileE
public ImageEditor getImageEditor() {
return imageEditor;
}
@Override
public @Nullable VirtualFile getFile() {
return imageEditor.getFile();
}
}
platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
-1
View File
@@ -15,7 +15,6 @@
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.platform.vcs.log" />
<orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
<orderEntry type="module" module-name="intellij.platform.images" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.vcs.dvcs" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
platform/dvcs-impl/src/com/intellij/dvcs/DvcsUtil.java
+1 -10
View File
@@ -9,12 +9,10 @@ import com.intellij.dvcs.repo.RepositoryManager;
import com.intellij.ide.file.BatchFileChangeListener;
import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.progress.util.BackgroundTaskUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.JdkOrderEntry;
@@ -41,7 +39,6 @@ import com.intellij.vcs.log.VcsFullCommitDetails;
import com.intellij.vcs.log.util.VcsLogUtil;
import com.intellij.vcsUtil.VcsImplUtil;
import com.intellij.vcsUtil.VcsUtil;
import org.intellij.images.editor.ImageFileEditor;
import org.jetbrains.annotations.*;
import java.io.File;
@@ -135,13 +132,7 @@ public class DvcsUtil {
final FileEditor fileEditor = StatusBarUtil.getCurrentFileEditor(statusBar);
VirtualFile result = null;
if (fileEditor != null) {
if (fileEditor instanceof TextEditor) {
Document document = ((TextEditor)fileEditor).getEditor().getDocument();
result = FileDocumentManager.getInstance().getFile(document);
}
else if (fileEditor instanceof ImageFileEditor) {
result = ((ImageFileEditor)fileEditor).getImageEditor().getFile();
}
result = fileEditor.getFile();
}
if (result == null) {