From 051483fba4cc6e07116c017d3bc28993bf32fd3c Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 7 Apr 2015 16:54:19 +0300 Subject: [PATCH] diff: move --- .../com/intellij/diff/contents}/FileAwareDocumentContent.java | 4 +--- .../com/intellij/openapi/vcs/actions/DiffActionExecutor.java | 3 +-- .../vcs/changes/actions/diff/ChangeDiffRequestProducer.java | 1 + .../src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java | 3 +-- .../org/jetbrains/idea/svn/diff/FileWithBranchComparer.java | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) rename platform/{vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff => diff-impl/src/com/intellij/diff/contents}/FileAwareDocumentContent.java (95%) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/FileAwareDocumentContent.java b/platform/diff-impl/src/com/intellij/diff/contents/FileAwareDocumentContent.java similarity index 95% rename from platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/FileAwareDocumentContent.java rename to platform/diff-impl/src/com/intellij/diff/contents/FileAwareDocumentContent.java index 27b197faee93..3da5722396a3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/FileAwareDocumentContent.java +++ b/platform/diff-impl/src/com/intellij/diff/contents/FileAwareDocumentContent.java @@ -1,7 +1,5 @@ -package com.intellij.openapi.vcs.changes.actions.diff; +package com.intellij.diff.contents; -import com.intellij.diff.contents.DiffContent; -import com.intellij.diff.contents.DocumentContentImpl; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.fileEditor.OpenFileDescriptor; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java index d1aab151c7b3..a9b37e7f655a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java @@ -16,11 +16,11 @@ package com.intellij.openapi.vcs.actions; import com.intellij.diff.DiffContentFactory; -import com.intellij.diff.DiffDialogHints; import com.intellij.diff.DiffManager; import com.intellij.diff.DiffRequestFactory; import com.intellij.diff.contents.DiffContent; import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.contents.FileAwareDocumentContent; import com.intellij.diff.requests.DiffRequest; import com.intellij.diff.requests.SimpleDiffRequest; import com.intellij.diff.util.DiffUserDataKeys; @@ -38,7 +38,6 @@ import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.BackgroundFromStartOption; import com.intellij.openapi.vcs.changes.BinaryContentRevision; import com.intellij.openapi.vcs.changes.ContentRevision; -import com.intellij.openapi.vcs.changes.actions.diff.FileAwareDocumentContent; import com.intellij.openapi.vcs.diff.DiffProvider; import com.intellij.openapi.vcs.diff.ItemLatestState; import com.intellij.openapi.vcs.history.VcsRevisionNumber; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java index d82c494e6bb0..c5ce44d1ca18 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProducer.java @@ -21,6 +21,7 @@ import com.intellij.diff.DiffRequestFactoryImpl; import com.intellij.diff.chains.DiffRequestProducer; import com.intellij.diff.chains.DiffRequestProducerException; import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.FileAwareDocumentContent; import com.intellij.diff.impl.DiffViewerWrapper; import com.intellij.diff.requests.DiffRequest; import com.intellij.diff.requests.ErrorDiffRequest; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java index f79340bc524a..77921bf87a38 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java @@ -16,10 +16,10 @@ package com.intellij.openapi.vcs.history; import com.intellij.diff.DiffContentFactory; -import com.intellij.diff.DiffDialogHints; import com.intellij.diff.DiffManager; import com.intellij.diff.DiffRequestFactoryImpl; import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.FileAwareDocumentContent; import com.intellij.diff.requests.DiffRequest; import com.intellij.diff.requests.SimpleDiffRequest; import com.intellij.openapi.diagnostic.Logger; @@ -33,7 +33,6 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsException; -import com.intellij.openapi.vcs.changes.actions.diff.FileAwareDocumentContent; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.encoding.EncodingManager; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java index d668ba9e92b3..e2bf5c0c304c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java @@ -16,9 +16,9 @@ package org.jetbrains.idea.svn.diff; import com.intellij.diff.DiffContentFactory; -import com.intellij.diff.DiffDialogHints; import com.intellij.diff.DiffManager; import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.FileAwareDocumentContent; import com.intellij.diff.requests.DiffRequest; import com.intellij.diff.requests.SimpleDiffRequest; import com.intellij.openapi.progress.ProgressIndicator; @@ -26,7 +26,6 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; import com.intellij.openapi.vcs.VcsException; -import com.intellij.openapi.vcs.changes.actions.diff.FileAwareDocumentContent; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull;